兼容邮储产品

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/UserController.java

@@ -35,6 +35,7 @@ import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.config.RsaProperties;
 import me.zhengjie.dao.mybatis.entity.*;
 import me.zhengjie.dao.mybatis.mapper.BankMapper;
+import me.zhengjie.dao.mybatis.mapper.FileInfoMapper;
 import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.utils.RsaUtils;
@@ -75,7 +76,7 @@ public class UserController {
     private final DeptService deptService;
     private final RoleService roleService;
     private final VerifyService verificationCodeService;
-    private final FileInfoService fileInfoService;
+    private final FileInfoMapper fileInfoMapper;
     private final ApplicationContextUtil contextUtil;
     private final BankMapper bankMapper;
     private final NotaryOfficeMapper notaryOfficeMapper;
@@ -101,7 +102,7 @@ public class UserController {
                    }
         	}
          
-            FileInfoEntity fileInfo = fileInfoService.getById(nocacheUser.getSignImgId());
+            FileInfoEntity fileInfo = fileInfoMapper.selectById(nocacheUser.getSignImgId());
             if (fileInfo != null) {
                 nocacheUser.setSignImgUrl(FileUploadUtil.getFileUrl(fileInfo.getPath()));
             } else {

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -85,6 +85,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Autowired
 	FileInfoService fileInfoService;
 	@Autowired
+	FileInfoMapper fileInfoMapper;
+	@Autowired
 	ApplicationContextUtil contextUtil;
 	@Autowired
 	ContractOrderRepository contractOrderRepository;
@@ -466,7 +468,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Transactional(rollbackFor = Exception.class)
 	public AppBaseResponse uploadNotarization(FileVo file) {
 		AppBaseResponse response = new AppBaseResponse<>();
-		FileInfoEntity fileInfoEntity = fileInfoService.getById(file.getImageId());
+		FileInfoEntity fileInfoEntity = fileInfoMapper.selectById(file.getImageId());
 		OrderFileEntity notaryOrderFile = new OrderFileEntity();
 		notaryOrderFile.setBusinessNo(file.getBusinessNo());
 		notaryOrderFile.setCode(ModelConstant.MODEL_TYPE_NOTARIZATION);
@@ -661,7 +663,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			list.addAll(toIntList(otherArray));
 		}
 		// 取出所有的图片
-		List<FileInfoEntity> fileInfo = fileInfoService.listByIds(list);
+		List<FileInfoEntity> fileInfo = fileInfoMapper.selectBatchIds(list);
 		return fileInfo;
 	}
 

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/NotaryOfficeServiceImpl.java

@@ -14,7 +14,7 @@ import me.zhengjie.base.util.ApplicationContextUtil;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.AppResultData;
-import me.zhengjie.dao.mybatis.mapper.SysUserMapper;
+import me.zhengjie.dao.mybatis.mapper.*;
 import me.zhengjie.application.bank.service.FileInfoService;
 import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.base.util.FileUploadUtil;
@@ -27,9 +27,6 @@ import me.zhengjie.application.admin.controller.vo.CertificateReq;
 import me.zhengjie.application.admin.controller.vo.NotaryOfficeCreateReq;
 import me.zhengjie.application.admin.controller.vo.NotaryOfficeQueryReq;
 import me.zhengjie.application.admin.controller.vo.NotaryOfficeQueryRsp;
-import me.zhengjie.dao.mybatis.mapper.BankMapper;
-import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
-import me.zhengjie.dao.mybatis.mapper.OfficeXbankMapper;
 import me.zhengjie.application.admin.service.NotaryOfficeService;
 import me.zhengjie.base.util.CFCACertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +71,8 @@ public class NotaryOfficeServiceImpl extends ServiceImpl<NotaryOfficeMapper, Not
 	@Value("${spring.profiles.active}")
 	private String systemEnv;
 	@Autowired
+	private FileInfoMapper fileInfoMapper;
+	@Autowired
 	private FileInfoService fileInfoService;
 	@Autowired
 	private ApplicationContextUtil contextUtil;
@@ -93,7 +92,7 @@ public class NotaryOfficeServiceImpl extends ServiceImpl<NotaryOfficeMapper, Not
 		// 判断是否为上传图片
 		String imageId = officeQueryRsp.getImageId();
 		if (org.apache.commons.lang3.StringUtils.isNotBlank(imageId) && imageId.matches("-?[0-9]+.?[0-9]*")) {
-			String filePath = fileInfoService.getById(imageId).getPath();
+			String filePath = fileInfoMapper.selectById(imageId).getPath();
 			officeQueryRsp.setLogo(FileUploadUtil.getFileUrl(filePath));
 			officeQueryRsp.setImageId(imageId);
 		} else {
@@ -102,7 +101,7 @@ public class NotaryOfficeServiceImpl extends ServiceImpl<NotaryOfficeMapper, Not
 		}
 		String sealImg = officeQueryRsp.getSealImg();
 		if (org.apache.commons.lang3.StringUtils.isNotBlank(sealImg) && sealImg.matches("-?[0-9]+.?[0-9]*")) {
-			String filePath = fileInfoService.getById(sealImg).getPath();
+			String filePath = fileInfoMapper.selectById(sealImg).getPath();
 			officeQueryRsp.setSealImg(FileUploadUtil.getFileUrl(filePath));
 		 
 		} 

eladmin-system/src/main/java/me/zhengjie/application/bank/service/FileInfoService.java

@@ -18,11 +18,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author humuyu
  * @since 2022-03-10
  */
-public interface FileInfoService extends IService<FileInfoEntity> {
+public interface FileInfoService {
 
-	public JSONObject saveCard(ImageUploadVo image, String filePath);
+	JSONObject saveCard(ImageUploadVo image, String filePath);
 
-	public JSONObject saveFile(FileUploadVo file, String filePath);
+	JSONObject saveFile(FileUploadVo file, String filePath);
 
 	/**
 	 * 查询所有路径
@@ -31,14 +31,14 @@ public interface FileInfoService extends IService<FileInfoEntity> {
 	 */
 	Map<String, String> getFilePath(List<Integer> idList);
 
-	public JSONObject saveFileToMinio(FileUploadVo file, String filePath);
+	JSONObject saveFileToMinio(FileUploadVo file, String filePath);
+
 	/**
-	 * 
-	 * @param imagePath 
+	 * @param imageId
 	 * @param map
 	 * @return
 	 */
-	public String getImageUrl(String imageId, Map<Integer, FileInfoEntity> map);
-	
-	public List<String> getImageUrlList(String imagePath, Map<Integer, FileInfoEntity> map);
+	String getImageUrl(String imageId, Map<Integer, FileInfoEntity> map);
+
+	List<String> getImageUrlList(String imagePath, Map<Integer, FileInfoEntity> map);
 }

eladmin-system/src/main/java/me/zhengjie/application/bank/service/SmsService.java

@@ -7,5 +7,5 @@ public interface SmsService {
 
 	String chkSmsLog(Sms sms);
 
-	public ResponseDTO<?> sendSms(String phone, String ip, String template, Integer type);
+	ResponseDTO<?> sendSms(String phone, String ip, String template, Integer type);
 }

eladmin-system/src/main/java/me/zhengjie/application/bank/service/SysUserService.java

@@ -1,7 +1,6 @@
 package me.zhengjie.application.bank.service;
 
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,8 +10,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author humuyu
  * @since 2022-03-10
  */
-public interface SysUserService extends IService<SysUserEntity> {
-
+public interface SysUserService {
 	SysUserEntity login(SysUserEntity sysUser);
-
 }

eladmin-system/src/main/java/me/zhengjie/application/bank/service/UserAXQInfoService.java

@@ -1,8 +1,6 @@
 package me.zhengjie.application.bank.service;
 
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.extension.service.IService;
-import me.zhengjie.dao.mybatis.entity.UserAXQInfoEntity;
 import me.zhengjie.base.ResponseDTO;
 
 public interface UserAXQInfoService {

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankLoginServiceImpl.java

@@ -1,17 +1,15 @@
 package me.zhengjie.application.bank.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.application.bank.controller.vo.BankLoginVO;
 import me.zhengjie.application.bank.service.BankLoginService;
-import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.application.bank.service.SysUserService;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
-import me.zhengjie.dao.mybatis.OrderFileRepository;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.security.security.TokenProvider;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -22,16 +20,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @Slf4j
+@RequiredArgsConstructor
 public class BankLoginServiceImpl implements BankLoginService {
-	@Autowired
-	OrderFileRepository orderFileRepository;
+	private final SysUserService userService;
+	private final TokenProvider tokenProvider;
 
-	@Autowired
-	SysUserService userService;
-	@Autowired
-	TokenProvider tokenProvider;
-	@Autowired
-    BankOrderService bankOrderService;
+	@Override
 	public ResponseDTO<String> login(BankLoginVO loginVo) {
 		SysUserEntity sysUser = new SysUserEntity();
 		sysUser.setPhone(loginVo.getPhone());

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankNotarizeServiceImpl.java

@@ -30,7 +30,6 @@ public class BankNotarizeServiceImpl implements BankNotarizeService {
 
     @Override
     public ResponseDTO<?> videoCall(String json) {
-
         // 可能多个机器部署，需要发送消息，确定是在哪台机器上面，广播给所有人
         // 这里打印他的roomId程序,
         log.info("推送的参数: " + json);
@@ -38,9 +37,7 @@ public class BankNotarizeServiceImpl implements BankNotarizeService {
         JSONObject jsonObject = JSONObject.parseObject(json);
         String businessNo = jsonObject.getString("businessNo");
         String roomId = jsonObject.getString("roomId");
-
         OrderRoomIdEntity orderRoomId = new OrderRoomIdEntity();
-
         // 业务流水
         orderRoomId.setBusinessNo(businessNo);
         // 房间号
@@ -61,7 +58,6 @@ public class BankNotarizeServiceImpl implements BankNotarizeService {
         redisTemplate.convertAndSend(RedisCacheConfig.CHANNEL_WEB_SOCKET, json);
 
         return ResponseDTO.success();
-
     }
 
     @Override

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/FileInfoServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
@@ -32,7 +33,9 @@ import me.zhengjie.application.bank.controller.vo.ImageUploadVo;
  * @since 2022-03-10
  */
 @Service
-public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfoEntity> implements FileInfoService {
+@RequiredArgsConstructor
+public class FileInfoServiceImpl implements FileInfoService {
+	private final FileInfoMapper fileInfoMapper;
 
 	@Override
 	public JSONObject saveCard(ImageUploadVo image, String filePath) {
@@ -51,7 +54,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfoEnt
 		fileInfo.setUpdateTime(LocalDateTime.now());
 		fileInfo.setStep(image.getStep());
 		fileInfo.setOrderBy(Integer.parseInt(image.getOrder()));
-		save(fileInfo);
+		fileInfoMapper.insert(fileInfo);
 		// 把图片url返回
 		JSONObject json = new JSONObject();
 		// 图片路径
@@ -80,7 +83,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfoEnt
 		fileInfo.setStep(file.getStep());
 		// 设置排序
 		fileInfo.setOrderBy(file.getOrder());
-		this.save(fileInfo);
+		fileInfoMapper.insert(fileInfo);
 		// 把图片url返回
 		JSONObject json = new JSONObject();
 		// 图片路径
@@ -107,7 +110,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfoEnt
 		fileInfo.setStep(file.getStep());
 		// 设置排序
 		fileInfo.setOrderBy(file.getOrder());
-		this.save(fileInfo);
+		fileInfoMapper.insert(fileInfo);
 		// 把图片url返回
 		JSONObject json = new JSONObject();
 		// 图片路径,这里需要通过nginx来处理
@@ -119,7 +122,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfoEnt
 	public Map<String, String> getFilePath(List<Integer> idList) {
 		Map<String, String> result = new HashMap<>();
 		if (CollectionUtils.isNotEmpty(idList)) {
-			List<FileInfoEntity> fileInfos = this.listByIds(idList);
+			List<FileInfoEntity> fileInfos = fileInfoMapper.selectBatchIds(idList);
 			if (fileInfos != null) {
 				for (FileInfoEntity file : fileInfos) {
 					String path = FileUploadUtil.getPreviewUrl(file.getPath());

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/SmsServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Date;
 
 import java.util.Random;
 
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,13 +25,9 @@ import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 
 @Service
+@RequiredArgsConstructor
 public class SmsServiceImpl implements SmsService {
-
-	
-	@Autowired
-	private BankOrderService bankOrderService;
-
-
+	private final BankOrderService bankOrderService;
 
 	private String getRandom(int len) {
 		Random random = new Random();
@@ -98,8 +95,6 @@ public class SmsServiceImpl implements SmsService {
 
 	}
 
-
-
 	@Override
 	public String chkSmsLog(Sms sms) {
 		return null;

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package me.zhengjie.application.bank.service.impl;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -20,38 +21,19 @@ import me.zhengjie.application.bank.service.SysUserService;
  * @since 2022-03-10
  */
 @Service
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity> implements SysUserService {
-	@Autowired
-	PasswordEncoder passwordEncoder;
-	@Autowired
-    SysUserMapper userDao;
+@RequiredArgsConstructor
+public class SysUserServiceImpl implements SysUserService {
+	private final PasswordEncoder passwordEncoder;
+	private final SysUserMapper userMapper;
 
-	/**
-	 * 登录查询
-	 * 
-	 * @param sysUser
-	 * @return
-	 */
+	@Override
 	public SysUserEntity login(SysUserEntity sysUser) {
 		QueryWrapper<SysUserEntity> queryWrapper = new QueryWrapper<SysUserEntity>();
 		queryWrapper.eq("phone", sysUser.getPhone());
-		SysUserEntity entity =  userDao.selectOne(queryWrapper);
-		if(null != entity && passwordEncoder.matches(sysUser.getPassword(), entity.getPassword())) {
+		SysUserEntity entity = userMapper.selectOne(queryWrapper);
+		if (null != entity && passwordEncoder.matches(sysUser.getPassword(), entity.getPassword())) {
 			return entity;
 		}
 		return null;
 	}
-	/**
-	 * 登录查询
-	 * 
-	 * @param sysUser
-	 * @return
-	 */
-	public SysUserEntity leftJoin(SysUserEntity sysUser) {
-		QueryWrapper<SysUserEntity> queryWrapper = new QueryWrapper<SysUserEntity>();
-		queryWrapper.eq("phone", sysUser.getPhone());
-		queryWrapper.eq("password", sysUser.getPassword());
-		return userDao.selectOne(queryWrapper);
-
-	}
 }

eladmin-system/src/main/java/me/zhengjie/application/user/app/mq/WebSocketReceiver.java

@@ -13,6 +13,7 @@ import me.zhengjie.base.websocket.AppSocketServer;
 import me.zhengjie.dao.mybatis.ContractOrderRepository;
 import me.zhengjie.dao.mybatis.entity.ContractOrderEntity;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
+import me.zhengjie.dao.mybatis.mapper.SysUserMapper;
 import me.zhengjie.security.service.OnlineUserService;
 import me.zhengjie.security.service.dto.OnlineUserDto;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +33,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
 public class WebSocketReceiver implements MessageListener {
 
 	private final OnlineUserService onlineUserService;
-	private final SysUserService sysUserService;
+	private final SysUserMapper sysUserMapper;
 	private final ApplicationContextUtil contextUtil;
 	private final ContractOrderRepository contractOrderRepository;
 
@@ -53,7 +54,7 @@ public class WebSocketReceiver implements MessageListener {
 		List<OnlineUserDto> users = onlineUserService.getAllLoginUser();
 		// share_userId
 		ContractOrderEntity notaryOrder = contractOrderRepository.getContractOrderWithBizNo(businessNo);
-		SysUserEntity sysUser = sysUserService.getById(notaryOrder.getCustomerId());
+		SysUserEntity sysUser = sysUserMapper.selectById(notaryOrder.getCustomerId());
 		// socketId,后期修改到redis里面
 		String socketId = String.valueOf(new Date().getTime());
 		List<JSONObject> list = new ArrayList<>();

eladmin-system/src/main/java/me/zhengjie/base/file/MinioFileHandle.java

@@ -5,6 +5,7 @@ import java.io.InputStream;
 
 import javax.annotation.PostConstruct;
 
+import me.zhengjie.dao.mybatis.mapper.FileInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
@@ -36,7 +37,7 @@ public class MinioFileHandle extends AbstractFileHandle {
 	public String appMinioSecretkey;
 	
 	@Autowired
-	public FileInfoService fileInfoService;
+	public FileInfoMapper fileInfoMapper;
 	
 	private MinioClient minioClient;
 
@@ -115,7 +116,7 @@ public class MinioFileHandle extends AbstractFileHandle {
 	}
 	 
 	public byte[] getByte(String fileId) throws Exception {
-		FileInfoEntity fileInfo = fileInfoService.getById(fileId);
+		FileInfoEntity fileInfo = fileInfoMapper.selectById(fileId);
 		String path=fileInfo.getPath();
 		InputStream inputStream=this.getObject(path);
 		//这里已经关闭流，不需要手动关闭