Merge branch 'feature-2022.06.27' of https://git.flowbb.cn/RK-Dev/fqgz-server into feature-2022.06.27

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/AppBankController.java

@@ -332,6 +332,7 @@ public class AppBankController extends BaseController {
 		}
 		return ResponseDTO.success(order);
 	}
+
 	// 得到公证书
 	@RequestMapping("/getNotarization")
 	public ResponseDTO<?> getNotarization(@RequestBody String json) {
@@ -343,11 +344,8 @@ public class AppBankController extends BaseController {
 
 	// ocr解析
 	@RequestMapping("/orderOCRParser")
-	public ResponseDTO<?> orderOCRParser(@RequestBody String json) {
-		JSONObject jsonObj = JSONObject.parseObject(json);
-		String orderType = jsonObj.getString("orderType");
-		String content = jsonObj.getString("content");
-		Object object = orderService.parseOrder(orderType, content, getCurrentUser());
+	public ResponseDTO<?> orderOCRParser(MultipartFile file, String orderType) {
+		Object object = orderService.parseOrder(orderType, file, getCurrentUser());
 		if (object == null) {
 			return ResponseDTO.error(ResultCode.ORDER_OCR_SERVICE_UNAVAILABLE);
 		}
@@ -379,6 +377,7 @@ public class AppBankController extends BaseController {
 				faceVerify.getBankKeyLicence(), order.getUsername(), order.getIdCard(), orderId);
 		return ResponseDTO.success(str);
 	}
+
 	@AnonymousPostMapping("/video/call")
 	public ResponseDTO<?> videoCall(@RequestBody String json) {
 		return this.apiBankService.videoCall(json);
@@ -396,6 +395,7 @@ public class AppBankController extends BaseController {
 
 		return order;
 	}
+
 	@AnonymousPostMapping("/order/note")
 	public ResponseDTO<?> note(@RequestBody String json) {
 
@@ -411,6 +411,7 @@ public class AppBankController extends BaseController {
 
 		return ResponseDTO.success(noteUrl);
 	}
+
 	@RequestMapping("/sendAuthMessage")
 	public ResponseDTO<?> sendAuthMessage(@RequestBody String json) {
 		JSONObject jsonObj = JSONObject.parseObject(json);
@@ -431,6 +432,7 @@ public class AppBankController extends BaseController {
 		}
 		return userAXQInfoService.verifyAuthMessage(idCard, checkCode);
 	}
+
 	@RequestMapping("/order/updateStatus")
 	public ResponseDTO<?> updateOrderStatus(@RequestBody String json) throws Exception {
 
@@ -453,6 +455,7 @@ public class AppBankController extends BaseController {
 		}
 		return userAXQInfoService.getAuthStatus(idCard);
 	}
+
 	@AnonymousPostMapping("/uploadSeal")
 	public ResponseDTO<?> uploadSeal(@RequestBody String json) {
 		JSONObject jsonObj = JSONObject.parseObject(json);

eladmin-system/src/main/java/me/zhengjie/application/bank/mq/RedisReceiver.java

@@ -64,12 +64,12 @@ public class RedisReceiver implements MessageListener {
 			QueryWrapper<NotaryOrderEntity> orderEntityQw = new QueryWrapper<>();
 			orderEntityQw.eq("business_no", businessNo);
 			NotaryOrderEntity orderEntity = notaryOrderMapper.selectOne(orderEntityQw);
-			QueryWrapper<AppModelEntity> model = new QueryWrapper<AppModelEntity>();
+			QueryWrapper<ModelEntity> model = new QueryWrapper<ModelEntity>();
 			List<Integer> list = Arrays.asList(1, 2, 3, 4, 5);
 			model.eq("notary_office_id", orderEntity.getNotaryOfficeId());
 			model.eq("status", 1);
 			model.in("code", list);
-			List<AppModelEntity> models = modelService.list(model);
+			List<ModelEntity> models = modelService.list(model);
 
 			for (OrderDto order : orders) {
 				// 在保存之前先删除数据
@@ -77,7 +77,7 @@ public class RedisReceiver implements MessageListener {
 				qw.eq("contract_id", order.getOrderId());
 				orderFileMapper.delete(qw);
 				//
-				for (AppModelEntity m : models) {
+				for (ModelEntity m : models) {
 					OrderFileEntity fileEntity = new OrderFileEntity();
 					fileEntity.setBusinessNo(order.getBusinessNo());
 					fileEntity.setContractId(order.getOrderId());

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

@@ -2,7 +2,7 @@ package me.zhengjie.application.bank.service;
 
 import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
 import me.zhengjie.application.bank.controller.vo.OrderDto;
-import me.zhengjie.dao.mybatis.entity.AppBorrowerEntity;
+import me.zhengjie.dao.mybatis.entity.BorrowerEntity;
 import me.zhengjie.dao.mybatis.entity.OrderEntity;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.base.AppBaseResponse;
@@ -20,15 +20,15 @@ import java.util.Map;
  * @author humuyu
  * @since 2022-03-21
  */
-public interface BorrowerService extends AbstractService<AppBorrowerEntity> {
+public interface BorrowerService extends AbstractService<BorrowerEntity> {
 
 	AppBaseResponse saveBorrowerOrder(BorrowerVo vo, SysUserEntity entity);
 
 	List<OrderDetailDto> getBorrower(String businessNo);
 
-	List<AppBorrowerEntity> getBorrowerByCondition();
+	List<BorrowerEntity> getBorrowerByCondition();
 
-	public AppBorrowerEntity getMainBorrower(AppBorrowerEntity entity);
+	public BorrowerEntity getMainBorrower(BorrowerEntity entity);
 
 	public AppBaseResponse<OrderDetailDto> borrowerInfo(Map<String,String> map);
 

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

@@ -3,7 +3,7 @@ package me.zhengjie.application.bank.service;
 import java.util.Map;
 
 import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
-import me.zhengjie.dao.mybatis.entity.AppGuaranteeEntity;
+import me.zhengjie.dao.mybatis.entity.GuaranteeEntity;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.plus.AbstractService;
@@ -17,7 +17,7 @@ import me.zhengjie.application.bank.controller.vo.GuaranteeVo;
  * @author humuyu
  * @since 2022-03-25
  */
-public interface GuaranteeService extends AbstractService<AppGuaranteeEntity> {
+public interface GuaranteeService extends AbstractService<GuaranteeEntity> {
 	public AppBaseResponse<OrderDetailDto> guaranteeInfo(Map<String, String> map);
 
 	/**

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

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

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

@@ -3,7 +3,7 @@ package me.zhengjie.application.bank.service;
 import java.util.Map;
 
 import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
-import me.zhengjie.dao.mybatis.entity.AppMortgageEntity;
+import me.zhengjie.dao.mybatis.entity.MortgageEntity;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.plus.AbstractService;
@@ -17,7 +17,7 @@ import me.zhengjie.application.bank.controller.vo.MortgageVo;
  * @author humuyu
  * @since 2022-03-22
  */
-public interface MortgageService extends AbstractService<AppMortgageEntity> {
+public interface MortgageService extends AbstractService<MortgageEntity> {
 	public AppBaseResponse<OrderDetailDto> mortgageInfo(Map<String, String> map);
 
 	/**

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

@@ -7,12 +7,13 @@ import me.zhengjie.application.bank.controller.vo.OrderVo;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.application.bank.controller.vo.Sms;
-import me.zhengjie.dao.mybatis.entity.AppBorrowerEntity;
-import me.zhengjie.dao.mybatis.entity.AppMortgageEntity;
+import me.zhengjie.dao.mybatis.entity.BorrowerEntity;
+import me.zhengjie.dao.mybatis.entity.MortgageEntity;
 import me.zhengjie.dao.mybatis.entity.NotaryOrderEntity;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -32,7 +33,7 @@ public interface OrderService extends IService<NotaryOrderEntity> {
 
 	Integer getOrderAccountIdById(Integer id);
 
-	AppBaseResponse saveOrder(AppBorrowerEntity borrower, SysUserEntity entity);
+	AppBaseResponse saveOrder(BorrowerEntity borrower, SysUserEntity entity);
 
 	AppBaseResponse submitOrder(String businessNo, SysUserEntity currentUser);
 
@@ -40,7 +41,7 @@ public interface OrderService extends IService<NotaryOrderEntity> {
 
 	public boolean sameBorrowerMortgage(String orderId, String type);
 
-	public AppMortgageEntity getMortgageEntity(AppMortgageEntity entity);
+	public MortgageEntity getMortgageEntity(MortgageEntity entity);
 
 	public void updateStatus(String businessNo, String status, String message);
 
@@ -48,7 +49,7 @@ public interface OrderService extends IService<NotaryOrderEntity> {
 
 	public void updateOrderStatus(String orderId) ;
 
-	public Object parseOrder(String orderType, String content, SysUserEntity user);
+	public Object parseOrder(String orderType, MultipartFile file, SysUserEntity user);
 	
 	public ResponseDTO<?> videoCall(String json) ;
 	

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

@@ -6,7 +6,7 @@ import me.zhengjie.application.bank.controller.vo.OrderDto;
 import me.zhengjie.application.bank.service.*;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.AppResultData;
-import me.zhengjie.dao.mybatis.mapper.IBorrowerDao;
+import me.zhengjie.dao.mybatis.mapper.BorrowerMapper;
 import me.zhengjie.dao.mybatis.mapper.IOrderDao;
 import me.zhengjie.dao.mybatis.mapper.ISysUserDao;
 import me.zhengjie.base.plus.AbstractServiceImpl;
@@ -39,7 +39,7 @@ import java.util.Map;
  * @since 2022-03-21
  */
 @Service
-public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBorrowerEntity> implements BorrowerService {
+public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, BorrowerEntity> implements BorrowerService {
 
     @Autowired
     FileInfoService fileInfoService;
@@ -62,18 +62,18 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
     @Transactional(rollbackFor = Exception.class)
     public AppBaseResponse saveBorrowerOrder(BorrowerVo vo, SysUserEntity userEntity) {
         AppBaseResponse response = new AppBaseResponse();
-        AppBorrowerEntity entity = BeanCopyUtils.convertObj(vo, AppBorrowerEntity.class);
-        entity.setUpdater(userEntity.getUserId().intValue());
+        BorrowerEntity entity = BeanCopyUtils.convertObj(vo, BorrowerEntity.class);
+        entity.setUpdater(String.valueOf(userEntity.getUserId()));
         entity.setStartDate(DateFormatUtils.defaultFormat(entity.getStartDate()));
         entity.setEndDate(DateFormatUtils.defaultFormat(entity.getEndDate()));
         entity.setStatus(StatusEnum.NotaryStatusEnum.SUBMIT.getStatus().toString());
         //
-        QueryWrapper<AppBorrowerEntity> borrowQw = new QueryWrapper<>();
+        QueryWrapper<BorrowerEntity> borrowQw = new QueryWrapper<>();
         borrowQw.eq("business_no", vo.getBusinessNo());
-        AppBorrowerEntity borrower = borrowerService.getOne(borrowQw);
+        BorrowerEntity borrower = borrowerService.getOne(borrowQw);
         if (borrower == null){
             entity.setId(Long.valueOf("10" + new Date().getTime()));
-            entity.setCreator(userEntity.getUserId().intValue());
+            entity.setCreator(String.valueOf(userEntity.getUserId()));
             save(entity);
         } else {
             entity.setId(borrower.getId());
@@ -87,7 +87,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
     public AppBaseResponse<OrderDetailDto> borrowerInfo(Map<String,String> map) {
 
 		AppBaseResponse<OrderDetailDto> response = new AppBaseResponse<>();
-		AppBorrowerEntity borrowers = this.getById(map.get("id"));
+		BorrowerEntity borrowers = this.getById(map.get("id"));
 		if (borrowers == null) {
 			return response;
 		}
@@ -103,7 +103,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
         if (note != null) {
             order.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
         }
-		if (!StringUtils.isEmpty(borrowers.getNotaryUserId())) {
+		if (!StringUtils.isEmpty(String.valueOf(borrowers.getNotaryUserId()))) {
 			SysUserEntity user = userDao.selectById(borrowers.getNotaryUserId());
 			order.setNotaryUserName(user.getNickName());
 			order.setNotaryFee(200);
@@ -131,9 +131,9 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
 
     @Override
     public List<OrderDto> getSubOrderList(String businessNo,String status, Integer pageIndex, Integer pageSize) {
-        QueryWrapper<AppBorrowerEntity> qw = new QueryWrapper<>();
+        QueryWrapper<BorrowerEntity> qw = new QueryWrapper<>();
         qw.eq("business_no", businessNo);
-        List<AppBorrowerEntity> borrowers = borrowerService.list(qw);
+        List<BorrowerEntity> borrowers = borrowerService.list(qw);
 
         // 查询主订单，如果状态是4开会查询
         NotaryOrderEntity orderEntity = null;
@@ -145,7 +145,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
         }
 
         List<OrderDto> list = new ArrayList<OrderDto>();
-        for (AppBorrowerEntity b : borrowers) {
+        for (BorrowerEntity b : borrowers) {
             OrderDto dto = new OrderDto();
             dto.setUsername(b.getUsername());
             dto.setIdCard(b.getIdCard());
@@ -169,13 +169,13 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
             list.add(dto);
         }
 
-        AppMortgageEntity mortgage = new AppMortgageEntity();
+        MortgageEntity mortgage = new MortgageEntity();
         mortgage.setBusinessNo(businessNo);
-        QueryWrapper<AppMortgageEntity> mortgageWrapper = QueryWrapperUtil.convertQuery(mortgage);
+        QueryWrapper<MortgageEntity> mortgageWrapper = QueryWrapperUtil.convertQuery(mortgage);
 
-        List<AppMortgageEntity> mortgages = mortgageService.list(mortgageWrapper);
+        List<MortgageEntity> mortgages = mortgageService.list(mortgageWrapper);
 
-        for (AppMortgageEntity b : mortgages) {
+        for (MortgageEntity b : mortgages) {
             OrderDto dto = new OrderDto();
             dto.setUsername(b.getUsername());
             dto.setIdCard(b.getIdCard());
@@ -197,13 +197,13 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
             }
             list.add(dto);
         }
-        AppGuaranteeEntity guarantee = new AppGuaranteeEntity();
+        GuaranteeEntity guarantee = new GuaranteeEntity();
         guarantee.setBusinessNo(businessNo);
-        QueryWrapper<AppGuaranteeEntity> guaranteeWrapper = QueryWrapperUtil.convertQuery(guarantee);
+        QueryWrapper<GuaranteeEntity> guaranteeWrapper = QueryWrapperUtil.convertQuery(guarantee);
 
-        List<AppGuaranteeEntity> guarantees = guaranteeService.list(guaranteeWrapper);
+        List<GuaranteeEntity> guarantees = guaranteeService.list(guaranteeWrapper);
 
-        for (AppGuaranteeEntity b : guarantees) {
+        for (GuaranteeEntity b : guarantees) {
             OrderDto dto = new OrderDto();
             dto.setUsername(b.getUsername());
             dto.setIdCard(b.getIdCard());
@@ -226,14 +226,14 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<IBorrowerDao, AppBo
         return list;
     }
 
-    public AppBorrowerEntity getMainBorrower(AppBorrowerEntity entity) {
+    public BorrowerEntity getMainBorrower(BorrowerEntity entity) {
 
-        AppBorrowerEntity borrowerEntity = this.getOne(entity);
+        BorrowerEntity borrowerEntity = this.getOne(entity);
         return borrowerEntity;
     }
 
 	@Override
-	public List<AppBorrowerEntity> getBorrowerByCondition() {
+	public List<BorrowerEntity> getBorrowerByCondition() {
 		// TODO Auto-generated method stub
 		return null;
 	}

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

@@ -3,11 +3,11 @@ package me.zhengjie.application.bank.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
-import me.zhengjie.dao.mybatis.entity.AppGuaranteeEntity;
+import me.zhengjie.dao.mybatis.entity.GuaranteeEntity;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.AppResultData;
-import me.zhengjie.dao.mybatis.mapper.IGuaranteeDao;
+import me.zhengjie.dao.mybatis.mapper.GuaranteeMapper;
 import me.zhengjie.dao.mybatis.mapper.ISysUserDao;
 import me.zhengjie.base.plus.AbstractServiceImpl;
 import me.zhengjie.application.bank.service.GuaranteeService;
@@ -35,7 +35,7 @@ import java.util.Map;
  * @since 2022-03-25
  */
 @Service
-public class GuaranteeServiceImpl extends AbstractServiceImpl<IGuaranteeDao, AppGuaranteeEntity> implements GuaranteeService {
+public class GuaranteeServiceImpl extends AbstractServiceImpl<GuaranteeMapper, GuaranteeEntity> implements GuaranteeService {
 	@Autowired
 	OrderService orderService;
 	@Autowired
@@ -48,7 +48,7 @@ public class GuaranteeServiceImpl extends AbstractServiceImpl<IGuaranteeDao, App
 	public AppBaseResponse<OrderDetailDto> guaranteeInfo(Map<String,String> map) {
 
 		AppBaseResponse<OrderDetailDto> response = new AppBaseResponse<>();
-		AppGuaranteeEntity entity = this.getById(map.get("id"));
+		GuaranteeEntity entity = this.getById(map.get("id"));
 		if (entity == null) {
 			return response;
 		}
@@ -65,7 +65,7 @@ public class GuaranteeServiceImpl extends AbstractServiceImpl<IGuaranteeDao, App
 		if (note != null) {
 			order.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
 		}
-		if (!StringUtils.isEmpty(entity.getNotaryUserId())) {
+		if (!StringUtils.isEmpty(String.valueOf(entity.getNotaryUserId()))) {
 			SysUserEntity user = userDao.selectById(entity.getNotaryUserId());
 			order.setNotaryUserName(user.getNickName());
 			order.setNotaryFee(200);
@@ -81,20 +81,20 @@ public class GuaranteeServiceImpl extends AbstractServiceImpl<IGuaranteeDao, App
 	 */
 	@Override
 	public void saveGuarantee(GuaranteeVo vo, SysUserEntity userEntity) {
-		AppGuaranteeEntity entity = BeanCopyUtils.convertObj(vo, AppGuaranteeEntity.class);
+		GuaranteeEntity entity = BeanCopyUtils.convertObj(vo, GuaranteeEntity.class);
 		String startDate = DateFormatUtils.defaultFormat(entity.getStartDate());
 		entity.setStartDate(startDate);
 		String endDate = DateFormatUtils.defaultFormat(entity.getEndDate());
 		entity.setEndDate(endDate);
 		entity.setStatus(StatusEnum.NotaryStatusEnum.SUBMIT.getStatus().toString());
-		entity.setUpdater(userEntity.getUserId().intValue());
+		entity.setUpdater(String.valueOf(userEntity.getUserId()));
 		//
-		QueryWrapper<AppGuaranteeEntity> guaranteeQw = new QueryWrapper<>();
+		QueryWrapper<GuaranteeEntity> guaranteeQw = new QueryWrapper<>();
 		guaranteeQw.eq("business_no", vo.getBusinessNo());
-		AppGuaranteeEntity guarantee = guaranteeService.getOne(guaranteeQw);
+		GuaranteeEntity guarantee = guaranteeService.getOne(guaranteeQw);
 		if (guarantee == null){
 			entity.setId(Long.valueOf("12" + new Date().getTime()));
-			entity.setCreator(userEntity.getUserId().intValue());
+			entity.setCreator(String.valueOf(userEntity.getUserId()));
 			save(entity);
 		}else{
 			entity.setId(guarantee.getId());

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

@@ -1,11 +1,11 @@
 package me.zhengjie.application.bank.service.impl;
 
+import me.zhengjie.dao.mybatis.entity.ModelEntity;
+import me.zhengjie.dao.mybatis.mapper.ModelMapper;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import me.zhengjie.dao.mybatis.entity.AppModelEntity;
-import me.zhengjie.dao.mybatis.mapper.IModelDao;
 import me.zhengjie.application.bank.service.ModelService;
 
 /**
@@ -17,6 +17,6 @@ import me.zhengjie.application.bank.service.ModelService;
  * @since 2022-03-10
  */
 @Service
-public class ModelServiceImpl extends ServiceImpl<IModelDao, AppModelEntity> implements ModelService {
+public class ModelServiceImpl extends ServiceImpl<ModelMapper, ModelEntity> implements ModelService {
 
 }

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

@@ -2,11 +2,10 @@ package me.zhengjie.application.bank.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
-import me.zhengjie.dao.mybatis.entity.AppMortgageEntity;
+import me.zhengjie.dao.mybatis.entity.MortgageEntity;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.AppResultData;
-import me.zhengjie.dao.mybatis.mapper.IMortgageDao;
 import me.zhengjie.dao.mybatis.mapper.ISysUserDao;
 import me.zhengjie.base.plus.AbstractServiceImpl;
 import me.zhengjie.application.bank.service.MortgageService;
@@ -18,6 +17,7 @@ import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.application.bank.controller.vo.MortgageVo;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
 import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
+import me.zhengjie.dao.mybatis.mapper.MortgageMapper;
 import me.zhengjie.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,7 +34,7 @@ import java.util.Map;
  * @since 2022-03-22
  */
 @Service
-public class MortgageServiceImpl extends AbstractServiceImpl<IMortgageDao, AppMortgageEntity> implements MortgageService {
+public class MortgageServiceImpl extends AbstractServiceImpl<MortgageMapper, MortgageEntity> implements MortgageService {
 	@Autowired
 	OrderService orderService;
 	@Autowired
@@ -46,7 +46,7 @@ public class MortgageServiceImpl extends AbstractServiceImpl<IMortgageDao, AppMo
 
 	public AppBaseResponse<OrderDetailDto> mortgageInfo(Map<String, String> map) {
 		AppBaseResponse<OrderDetailDto> response = new AppBaseResponse<>();
-		AppMortgageEntity entity = this.getById(map.get("id"));
+		MortgageEntity entity = this.getById(map.get("id"));
 		if (entity == null) {
 			return response;
 		}
@@ -63,7 +63,7 @@ public class MortgageServiceImpl extends AbstractServiceImpl<IMortgageDao, AppMo
 		if (note != null) {
 			order.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
 		}
-		if (!StringUtils.isEmpty(entity.getNotaryUserId())) {
+		if (!StringUtils.isEmpty(String.valueOf(entity.getNotaryUserId()))) {
 			SysUserEntity user = userDao.selectById(entity.getNotaryUserId());
 			order.setNotaryUserName(user.getNickName());
 			order.setNotaryFee(200);
@@ -78,20 +78,20 @@ public class MortgageServiceImpl extends AbstractServiceImpl<IMortgageDao, AppMo
 	 * @param userEntity
 	 */
 	public void saveMortgage(MortgageVo vo, SysUserEntity userEntity){
-		AppMortgageEntity entity = BeanCopyUtils.convertObj(vo, AppMortgageEntity.class);
+		MortgageEntity entity = BeanCopyUtils.convertObj(vo, MortgageEntity.class);
 		String startDate = DateFormatUtils.defaultFormat(entity.getStartDate());
 		entity.setStartDate(startDate);
 		String endDate = DateFormatUtils.defaultFormat(entity.getEndDate());
 		entity.setEndDate(endDate);
 		entity.setStatus(StatusEnum.NotaryStatusEnum.SUBMIT.getStatus().toString());
-		entity.setUpdater(userEntity.getUserId().intValue());
+		entity.setUpdater(String.valueOf(userEntity.getUserId()));
 		//
-		QueryWrapper<AppMortgageEntity> mortgageQw = new QueryWrapper<>();
+		QueryWrapper<MortgageEntity> mortgageQw = new QueryWrapper<>();
 		mortgageQw.eq("business_no", vo.getBusinessNo());
-		AppMortgageEntity mortgage = mortgageService.getOne(mortgageQw);
+		MortgageEntity mortgage = mortgageService.getOne(mortgageQw);
 		if(mortgage == null){
 			entity.setId(Long.valueOf("11" + new Date().getTime()));
-			entity.setCreator(userEntity.getUserId().intValue());
+			entity.setCreator(String.valueOf(userEntity.getUserId()));
 			save(entity);
 		}else{
 			entity.setId(mortgage.getId());

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

@@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.application.bank.controller.vo.Order;
-import me.zhengjie.application.bank.controller.vo.Sms;
+import me.zhengjie.application.bank.controller.vo.*;
 import me.zhengjie.application.bank.service.*;
 import me.zhengjie.dao.mybatis.entity.*;
 import me.zhengjie.domain.order.OrderBizCodeMessage;
@@ -42,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -95,25 +95,25 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 	@Override
 	public int checkOrder(Sms sms) {
 
-		AppBorrowerEntity borrowerEntity = new AppBorrowerEntity();
+		BorrowerEntity borrowerEntity = new BorrowerEntity();
 		borrowerEntity.setUsername(sms.getUserName());
 		borrowerEntity.setIdCard(sms.getIdCode());
 		borrowerEntity.setPhone(sms.getPhone());
-		QueryWrapper<AppBorrowerEntity> borrowerQuery = QueryWrapperUtil.convertQuery(borrowerEntity);
+		QueryWrapper<BorrowerEntity> borrowerQuery = QueryWrapperUtil.convertQuery(borrowerEntity);
 		long borrower = borrowerService.count(borrowerQuery);
 
-		AppMortgageEntity mortgageEntity = new AppMortgageEntity();
+		MortgageEntity mortgageEntity = new MortgageEntity();
 		mortgageEntity.setUsername(sms.getUserName());
 		mortgageEntity.setIdCard(sms.getIdCode());
 		mortgageEntity.setPhone(sms.getPhone());
-		QueryWrapper<AppMortgageEntity> mortgageQuery = QueryWrapperUtil.convertQuery(mortgageEntity);
+		QueryWrapper<MortgageEntity> mortgageQuery = QueryWrapperUtil.convertQuery(mortgageEntity);
 		long mortgage = mortgageService.count(mortgageQuery);
 
-		AppGuaranteeEntity guaranteeEntity = new AppGuaranteeEntity();
+		GuaranteeEntity guaranteeEntity = new GuaranteeEntity();
 		guaranteeEntity.setUsername(sms.getUserName());
 		guaranteeEntity.setIdCard(sms.getIdCode());
 		guaranteeEntity.setPhone(sms.getPhone());
-		QueryWrapper<AppGuaranteeEntity> guaranteeQuery = QueryWrapperUtil.convertQuery(guaranteeEntity);
+		QueryWrapper<GuaranteeEntity> guaranteeQuery = QueryWrapperUtil.convertQuery(guaranteeEntity);
 		long guarantee = guaranteeService.count(guaranteeQuery);
 		return (int) (borrower + mortgage + guarantee);
 	}
@@ -136,7 +136,7 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 	 * @return
 	 */
 	@Override
-	public AppBaseResponse saveOrder(AppBorrowerEntity borrower, SysUserEntity entity) {
+	public AppBaseResponse saveOrder(BorrowerEntity borrower, SysUserEntity entity) {
 		AppBaseResponse response = new AppBaseResponse();
 		// 设置主订单信息并保存
 		NotaryOrderEntity orderEntity = NotaryOrderEntity.builder().build();
@@ -216,23 +216,23 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 	 * @return
 	 */
 	private boolean isSubOrderCompleted(String businessNo){
-		QueryWrapper<AppBorrowerEntity> borrowerWrapper = new QueryWrapper<>();
+		QueryWrapper<BorrowerEntity> borrowerWrapper = new QueryWrapper<>();
 		borrowerWrapper.eq("business_no", businessNo);
-		AppBorrowerEntity borrowerEntity = borrowerService.getOne(borrowerWrapper);
+		BorrowerEntity borrowerEntity = borrowerService.getOne(borrowerWrapper);
 		if(borrowerEntity == null){
 			return false;
 		}
 
-		QueryWrapper<AppMortgageEntity> mortgageWrapper = new QueryWrapper<>();
+		QueryWrapper<MortgageEntity> mortgageWrapper = new QueryWrapper<>();
 		mortgageWrapper.eq("business_no", businessNo);
-		AppMortgageEntity mortgageEntity = mortgageService.getOne(mortgageWrapper);
+		MortgageEntity mortgageEntity = mortgageService.getOne(mortgageWrapper);
 		if(mortgageEntity == null){
 			return false;
 		}
 
-		QueryWrapper<AppGuaranteeEntity> guaranteeWrapper = new QueryWrapper<>();
+		QueryWrapper<GuaranteeEntity> guaranteeWrapper = new QueryWrapper<>();
 		guaranteeWrapper.eq("business_no", businessNo);
-		AppGuaranteeEntity guaranteeEntity = guaranteeService.getOne(guaranteeWrapper);
+		GuaranteeEntity guaranteeEntity = guaranteeService.getOne(guaranteeWrapper);
 		if(guaranteeEntity == null){
 			return false;
 		}
@@ -241,21 +241,21 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 	}
 
 	public void updateStatus(String businessNo, String status, String message) {
-		UpdateWrapper<AppBorrowerEntity> borrowerWrapper = new UpdateWrapper<>();
+		UpdateWrapper<BorrowerEntity> borrowerWrapper = new UpdateWrapper<>();
 		borrowerWrapper.eq("business_no", businessNo);
-		AppBorrowerEntity borrower = new AppBorrowerEntity();
+		BorrowerEntity borrower = new BorrowerEntity();
 		borrower.setStatus(status);
 		borrowerService.update(borrower, borrowerWrapper);
 
-		UpdateWrapper<AppMortgageEntity> mortgageWrapper = new UpdateWrapper<>();
+		UpdateWrapper<MortgageEntity> mortgageWrapper = new UpdateWrapper<>();
 		mortgageWrapper.eq("business_no", businessNo);
-		AppMortgageEntity mortgage = new AppMortgageEntity();
+		MortgageEntity mortgage = new MortgageEntity();
 		mortgage.setStatus(status);
 		mortgageService.update(mortgage, mortgageWrapper);
 
-		UpdateWrapper<AppGuaranteeEntity> guaranteeWrapper = new UpdateWrapper<>();
+		UpdateWrapper<GuaranteeEntity> guaranteeWrapper = new UpdateWrapper<>();
 		guaranteeWrapper.eq("business_no", businessNo);
-		AppGuaranteeEntity guarantee = new AppGuaranteeEntity();
+		GuaranteeEntity guarantee = new GuaranteeEntity();
 		guarantee.setStatus(status);
 		guaranteeService.update(guarantee, guaranteeWrapper);
 
@@ -279,7 +279,7 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 	public OrderDto getOrderById(String id) {
 		OrderDto order = new OrderDto();
 		if (id.startsWith("10")) {
-			AppBorrowerEntity entity = borrowerService.getById(id);
+			BorrowerEntity entity = borrowerService.getById(id);
 			if (entity == null) {
 				return null;
 			}
@@ -301,7 +301,7 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 			order.setType("1");
 			order.setBusinessNo(entity.getBusinessNo());
 		} else if (id.startsWith("11")) {
-			AppMortgageEntity entity = mortgageService.getById(id);
+			MortgageEntity entity = mortgageService.getById(id);
 			if (entity == null) {
 				return order;
 			}
@@ -325,7 +325,7 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 			order.setType("2");
 			order.setBusinessNo(entity.getBusinessNo());
 		} else if (id.startsWith("12")) {
-			AppGuaranteeEntity entity = guaranteeService.getById(id);
+			GuaranteeEntity entity = guaranteeService.getById(id);
 			if (entity == null) {
 				return null;
 			}
@@ -351,25 +351,25 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 	public boolean sameBorrowerMortgage(String orderId, String type) {
 
 		if(StatusEnum.NotaryNoteEnum.BORROWER_NOTE.name().equals(type)){
-			AppBorrowerEntity borrower = borrowerService.getById(orderId);
-			AppMortgageEntity morgate = new AppMortgageEntity();
+			BorrowerEntity borrower = borrowerService.getById(orderId);
+			MortgageEntity morgate = new MortgageEntity();
 			morgate.setBusinessNo(borrower.getBusinessNo());
 			morgate.setIdCard(borrower.getIdCard());
-			QueryWrapper<AppMortgageEntity> morgateQuery = QueryWrapperUtil.convertQuery(morgate);
+			QueryWrapper<MortgageEntity> morgateQuery = QueryWrapperUtil.convertQuery(morgate);
 			long m = mortgageService.count(morgateQuery);
 			return m > 0;
 		}else{
-			AppMortgageEntity morgate = mortgageService.getById(orderId);
-			AppBorrowerEntity borrower = new AppBorrowerEntity();
+			MortgageEntity morgate = mortgageService.getById(orderId);
+			BorrowerEntity borrower = new BorrowerEntity();
 			borrower.setBusinessNo(morgate.getBusinessNo());
 			borrower.setIdCard(morgate.getIdCard());
-			QueryWrapper<AppBorrowerEntity> borrowerQuery = QueryWrapperUtil.convertQuery(borrower);
+			QueryWrapper<BorrowerEntity> borrowerQuery = QueryWrapperUtil.convertQuery(borrower);
 			long m = borrowerService.count(borrowerQuery);
 			return m > 0;
 		}
 	}
 
-	public AppMortgageEntity getMortgageEntity(AppMortgageEntity entity) {
+	public MortgageEntity getMortgageEntity(MortgageEntity entity) {
 		return mortgageService.getOne(entity);
 	}
 
@@ -506,18 +506,18 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 	public void updateOrderStatus(String orderId) {
 		Long id = Long.parseLong(orderId);
 		if (orderId.startsWith("10")) {
-			AppBorrowerEntity entity = new AppBorrowerEntity();
+			BorrowerEntity entity = new BorrowerEntity();
 			entity.setId(id);
 			entity.setStatus("2");
 			borrowerService.updateById(entity);
 			entity = borrowerService.getById(id);
 			// 判断是否在流程中
-			AppMortgageEntity mortgage = new AppMortgageEntity();
+			MortgageEntity mortgage = new MortgageEntity();
 			mortgage.setBusinessNo(entity.getBusinessNo());
 			mortgage.setStatus("1");
 			long mcount = mortgageService.count(mortgage);
 
-			AppGuaranteeEntity guarantee = new AppGuaranteeEntity();
+			GuaranteeEntity guarantee = new GuaranteeEntity();
 			guarantee.setBusinessNo(entity.getBusinessNo());
 			guarantee.setStatus("1");
 			long gcount = guaranteeService.count(guarantee);
@@ -531,18 +531,18 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 			}
 
 		} else if (orderId.startsWith("11")) {
-			AppMortgageEntity entity = mortgageService.getById(id);
+			MortgageEntity entity = mortgageService.getById(id);
 			entity.setId(id);
 			entity.setStatus("2");
 			mortgageService.updateById(entity);
 
 			// 判断是否在流程中
-			AppBorrowerEntity borrower = new AppBorrowerEntity();
+			BorrowerEntity borrower = new BorrowerEntity();
 			borrower.setBusinessNo(entity.getBusinessNo());
 			borrower.setStatus("1");
 			long bcount = borrowerService.count(borrower);
 
-			AppGuaranteeEntity guarantee = new AppGuaranteeEntity();
+			GuaranteeEntity guarantee = new GuaranteeEntity();
 			guarantee.setBusinessNo(entity.getBusinessNo());
 			guarantee.setStatus("1");
 			long gcount = guaranteeService.count(guarantee);
@@ -556,18 +556,18 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 			}
 
 		} else if (orderId.startsWith("12")) {
-			AppGuaranteeEntity entity = guaranteeService.getById(id);
+			GuaranteeEntity entity = guaranteeService.getById(id);
 			entity.setId(id);
 			entity.setStatus("2");
 			guaranteeService.updateById(entity);
 			// 这里就更新主订单状态
 			// 判断是否在流程中
-			AppBorrowerEntity borrower = new AppBorrowerEntity();
+			BorrowerEntity borrower = new BorrowerEntity();
 			borrower.setBusinessNo(entity.getBusinessNo());
 			borrower.setStatus("1");
 			long bcount = borrowerService.count(borrower);
 
-			AppMortgageEntity mortgage = new AppMortgageEntity();
+			MortgageEntity mortgage = new MortgageEntity();
 			mortgage.setBusinessNo(entity.getBusinessNo());
 			mortgage.setStatus("1");
 			long mcount = mortgageService.count(mortgage);
@@ -606,43 +606,44 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 		Integer[] intArray = Arrays.stream(array).mapToInt(Integer::parseInt).boxed().toArray(Integer[]::new);
 		return Arrays.asList(intArray);
 	}
+
 	@Override
 	public List<OrderDto> getOrderByContion(OrderVo user) {
-		AppBorrowerEntity borrower = new AppBorrowerEntity();
+		BorrowerEntity borrower = new BorrowerEntity();
 		borrower.setIdCard(user.getIdCode());
 		borrower.setUsername(user.getUserName());
 		borrower.setPhone(user.getPhone());
 		borrower.setBusinessNo(user.getBusinessNo());
 		borrower.setContractNo(user.getContractNo());
 		borrower.setStatus(user.getStatus());
-		QueryWrapper<AppBorrowerEntity> queryWrapper = QueryWrapperUtil.convertQuery(borrower);
-		List<AppBorrowerEntity> borrowers = borrowerService.list(queryWrapper);
+		QueryWrapper<BorrowerEntity> queryWrapper = QueryWrapperUtil.convertQuery(borrower);
+		List<BorrowerEntity> borrowers = borrowerService.list(queryWrapper);
 		if (user.getBusinessNo() == null && borrowers != null && borrowers.size() > 0) {
 			user.setBusinessNo(borrowers.get(0).getBusinessNo());
 		}
 
-		AppMortgageEntity mortgage = new AppMortgageEntity();
+		MortgageEntity mortgage = new MortgageEntity();
 		mortgage.setIdCard(user.getIdCode());
 		mortgage.setUsername(user.getUserName());
 		mortgage.setPhone(user.getPhone());
 		mortgage.setStatus(user.getStatus());
 		mortgage.setBusinessNo(user.getBusinessNo());
 		mortgage.setContractNo(user.getContractNo());
-		QueryWrapper<AppMortgageEntity> mortgageWrapper = QueryWrapperUtil.convertQuery(mortgage);
-		List<AppMortgageEntity> mortgages = mortgageService.list(mortgageWrapper);
+		QueryWrapper<MortgageEntity> mortgageWrapper = QueryWrapperUtil.convertQuery(mortgage);
+		List<MortgageEntity> mortgages = mortgageService.list(mortgageWrapper);
 		if (user.getBusinessNo() == null && mortgages != null && mortgages.size() > 0) {
 			user.setBusinessNo(mortgages.get(0).getBusinessNo());
 		}
 
-		AppGuaranteeEntity guarantee = new AppGuaranteeEntity();
+		GuaranteeEntity guarantee = new GuaranteeEntity();
 		guarantee.setIdCard(user.getIdCode());
 		guarantee.setUsername(user.getUserName());
 		guarantee.setPhone(user.getPhone());
 		guarantee.setStatus(user.getStatus());
 		guarantee.setBusinessNo(user.getBusinessNo());
 		guarantee.setContractNo(user.getContractNo());
-		QueryWrapper<AppGuaranteeEntity> guaranteeWrapper = QueryWrapperUtil.convertQuery(guarantee);
-		List<AppGuaranteeEntity> guarantees = guaranteeService.list(guaranteeWrapper);
+		QueryWrapper<GuaranteeEntity> guaranteeWrapper = QueryWrapperUtil.convertQuery(guarantee);
+		List<GuaranteeEntity> guarantees = guaranteeService.list(guaranteeWrapper);
 		if (user.getBusinessNo() == null && guarantees != null && guarantees.size() > 0) {
 			user.setBusinessNo(guarantees.get(0).getBusinessNo());
 		}
@@ -657,7 +658,7 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 		}
 
 		List<OrderDto> list = new ArrayList<OrderDto>();
-		for (AppBorrowerEntity b : borrowers) {
+		for (BorrowerEntity b : borrowers) {
 			OrderDto dto = new OrderDto();
 			dto.setUsername(b.getUsername());
 			dto.setIdCard(b.getIdCard());
@@ -673,14 +674,14 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 			dto.setResidence(b.getResidence());
 			dto.setRate(b.getRate());
 			dto.setType("1");
-			dto.setNotaryUserId(b.getNotaryUserId());
+			dto.setNotaryUserId(String.valueOf(b.getNotaryUserId()));
 			if (orderEntity != null) {
 				dto.setRejectReason(orderEntity.getRejectReason());
 			}
 			list.add(dto);
 		}
 
-		for (AppMortgageEntity b : mortgages) {
+		for (MortgageEntity b : mortgages) {
 			OrderDto dto = new OrderDto();
 			dto.setUsername(b.getUsername());
 			dto.setIdCard(b.getIdCard());
@@ -696,14 +697,14 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 			dto.setHouseLocation(b.getHouseLocation());
 			dto.setHousePropertyNo(b.getHousePropertyNo());
 			dto.setType("2");
-			dto.setNotaryUserId(b.getNotaryUserId());
+			dto.setNotaryUserId(String.valueOf(b.getNotaryUserId()));
 			if (orderEntity != null) {
 				dto.setRejectReason(orderEntity.getRejectReason());
 			}
 			list.add(dto);
 		}
 
-		for (AppGuaranteeEntity b : guarantees) {
+		for (GuaranteeEntity b : guarantees) {
 			OrderDto dto = new OrderDto();
 			dto.setUsername(b.getUsername());
 			dto.setIdCard(b.getIdCard());
@@ -717,7 +718,7 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 			dto.setBusinessNo(user.getBusinessNo());
 			dto.setResidence(b.getResidence());
 			dto.setType("3");
-			dto.setNotaryUserId(b.getNotaryUserId());
+			dto.setNotaryUserId(String.valueOf(b.getNotaryUserId()));
 			if (orderEntity != null) {
 				dto.setRejectReason(orderEntity.getRejectReason());
 			}
@@ -726,18 +727,22 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 		return list;
 	}
 	@Override
-	public Object parseOrder(String orderType, String content, SysUserEntity user) {
+	public Object parseOrder(String orderType, MultipartFile file, SysUserEntity user) {
 		BankEntity bank = bankMapper.selectById(user.getOrgId().split("_")[1]);
-		OrderOCRParser orderOCRParser = orderOCRParserFactory.generateOrderOCRParser(bank.getUscc());
-		if (orderOCRParser != null) {
-			String result = TencentServiceUtil.readInfoWithOCR(content);
-			if (OrderConstant.ORDER_TYPE_BORROWER.equals(orderType)) {
-				return orderOCRParser.parseBorrower(result);
-			} else if (OrderConstant.ORDER_TYPE_MORTGAGE.equals(orderType)) {
-				return orderOCRParser.parseMortgage(result);
-			} else if (OrderConstant.ORDER_TYPE_GUARANTEE.equals(orderType)) {
-				return orderOCRParser.parseGuarantee(result);
+		try {
+			OrderOCRParser orderOCRParser = orderOCRParserFactory.generateOrderOCRParser(bank.getUscc());
+			if (orderOCRParser != null) {
+				String result = TencentServiceUtil.readInfoWithOCR(file);
+				if (OrderConstant.ORDER_TYPE_BORROWER.equals(orderType)) {
+					return orderOCRParser.parseBorrower(result);
+				} else if (OrderConstant.ORDER_TYPE_MORTGAGE.equals(orderType)) {
+					return orderOCRParser.parseMortgage(result);
+				} else if (OrderConstant.ORDER_TYPE_GUARANTEE.equals(orderType)) {
+					return orderOCRParser.parseGuarantee(result);
+				}
 			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
 		return null;
 	}
@@ -747,5 +752,4 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 		System.out.println(orgId.split("_")[1]);
 		;
 	}
-	
 }

eladmin-system/src/main/java/me/zhengjie/application/user/service/ApiService.java

@@ -13,14 +13,6 @@ import me.zhengjie.application.bank.controller.vo.UserVo;
 import me.zhengjie.base.ResponseDTO;
 
 public interface ApiService {
-	/**
-	 * 发送短信信息
-	 * 
-	 * @param request http请求
-	 * @param user    用户信息
-	 * @return
-	 */
-	// ResponseDTO<?> sendSms(HttpServletRequest request, UserVo user);
 
 	ResponseDTO<?> login(SmsVo sms);
 

eladmin-system/src/main/java/me/zhengjie/base/plus/QueryWrapperUtil.java

@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
-import me.zhengjie.dao.mybatis.entity.AppBorrowerEntity;
-
+import me.zhengjie.dao.mybatis.entity.BorrowerEntity;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.ObjectUtils;
 
@@ -21,7 +20,6 @@ public class QueryWrapperUtil {
 	/**
 	 * 拼接查询条件
 	 *
-	 * @param queryWrapper 条件对象
 	 * @param obj          数据实体
 	 * @return void 返回参数说明
 	 * @exception/throws
@@ -111,7 +109,7 @@ public class QueryWrapperUtil {
 	}
 
 	public static void main(String[] args) {
-		LambdaQueryWrapper<AppBorrowerEntity> queryWrapper = new LambdaQueryWrapper<AppBorrowerEntity>();
-		queryWrapper.eq(AppBorrowerEntity::getBirth, "");
+		LambdaQueryWrapper<BorrowerEntity> queryWrapper = new LambdaQueryWrapper<BorrowerEntity>();
+		queryWrapper.eq(BorrowerEntity::getBirth, "");
 	}
 }

eladmin-system/src/main/java/me/zhengjie/base/util/TencentServiceUtil.java

@@ -9,10 +9,20 @@ import com.tencentcloudapi.faceid.v20180301.models.IdCardVerificationRequest;
 import com.tencentcloudapi.faceid.v20180301.models.IdCardVerificationResponse;
 import com.tencentcloudapi.ocr.v20181119.OcrClient;
 import com.tencentcloudapi.ocr.v20181119.models.*;
+import me.zhengjie.application.bank.controller.vo.ImageUploadVo;
+import me.zhengjie.base.config.AppConfigInfo;
 import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Encoder;
 
-import java.io.File;
-import java.io.FileInputStream;
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.util.Iterator;
 
 public class TencentServiceUtil {
 
@@ -118,11 +128,15 @@ public class TencentServiceUtil {
 
     /**
      * 读取图片文本信息(已使用)
-     * @param content
+     * @param file
      */
-    public static String readInfoWithOCR(String content) {
+    public static String readInfoWithOCR(MultipartFile file) {
         String result = "";
         try {
+            String filePath = saveFile(file, UUIDGenerator.uuid() + file.getOriginalFilename());
+            String compressFilePath = compressImage(filePath);
+            String content = encodeBase64File(compressFilePath);
+
             // 实例化一个认证对象，入参需要传入腾讯云账户secretId，secretKey,此处还需注意密钥对的保密
             // 密钥可前往https://console.cloud.tencent.com/cam/capi网站进行获取
             Credential cred = new Credential(SECRET_ID, SECRET_KEY);
@@ -142,25 +156,111 @@ public class TencentServiceUtil {
             SmartStructuralOCRResponse resp = client.SmartStructuralOCR(req);
             // 输出json格式的字符串回包
             result = SmartStructuralOCRResponse.toJsonString(resp);
-        } catch (TencentCloudSDKException e) {
+        } catch (Exception e) {
             System.out.println(e.toString());
         }
         return result;
     }
 
+    /**
+     * 输出文件
+     * @param multipartFile
+     * @param fileName
+     */
+    private static String saveFile(MultipartFile multipartFile, String fileName) {
+        OutputStream os = null;
+        InputStream inputStream = null;
+        String fullPath="";
+        try {
+            inputStream = multipartFile.getInputStream();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        try {
+            String path = AppConfigInfo.APP_UPLOAD_PATH;
+            // 二、保存到临时文件
+            // 1K的数据缓冲
+            byte[] bs = new byte[1024];
+            // 读取到的数据长度
+            int len;
+            // 输出的文件流保存到本地文件
+            File tempFile = new File(path);
+            if (!tempFile.exists()) {
+                tempFile.mkdirs();
+            }
+            fullPath = tempFile.getPath() + File.separator + fileName;
+            os = new FileOutputStream(fullPath);
+            // 开始读取
+            while ((len = inputStream.read(bs)) != -1) {
+                os.write(bs, 0, len);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            // 完毕，关闭全部连接
+            try {
+                os.close();
+                inputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return fullPath;
+    }
+
+    /**
+     * 将文件内容转换成Base64编码
+     * @param path
+     * @return
+     * @throws Exception
+     */
+    private static String encodeBase64File(String path) throws Exception {
+        File file = new File(path);
+        FileInputStream inputFile = new FileInputStream(file);
+        byte[] buffer = new byte[(int) file.length()];
+        inputFile.read(buffer);
+        inputFile.close();
+        return new BASE64Encoder().encode(buffer);
+    }
+
+    /**
+     * 图片压缩
+     * @throws Exception
+     */
+    private static String compressImage(String filePath) throws  Exception{
+        File input = new File(filePath);
+        BufferedImage image = ImageIO.read(input);
+
+        String fullPath = AppConfigInfo.APP_UPLOAD_PATH + File.separator + "compress" + input.getName();
+        File compressedImageFile = new File(fullPath);
+        OutputStream os = new FileOutputStream(compressedImageFile);
+
+        Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
+        ImageWriter writer = (ImageWriter) writers.next();
+
+        ImageOutputStream ios = ImageIO.createImageOutputStream(os);
+        writer.setOutput(ios);
+
+        ImageWriteParam param = writer.getDefaultWriteParam();
+
+        param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+        param.setCompressionQuality(0.05f);  // Change the quality value you prefer
+        writer.write(null, new IIOImage(image, null, null), param);
+
+        os.close();
+        ios.close();
+        writer.dispose();
+        //
+        return fullPath;
+    }
+
     public static void main(String[] args) {
-        File file = new File("/Users/sakuya/Downloads/1656379047403.jpg");
-        byte[] fileBytes = null;
-        FileInputStream fis = null;
         try {
-            fis = new FileInputStream(file);
-            fileBytes = new byte[(int) file.length()];
-            fis.read(fileBytes);
-            fis.close();
+            compressImage("");
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content = "data:image/png;base64," + Base64.encodeBase64String(fileBytes);
-        System.out.println(readInfoWithOCR(content));
     }
 }

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/AppBorrowerEntity.java

@@ -1,423 +0,0 @@
-package me.zhengjie.dao.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import me.zhengjie.base.plus.QueryKeyword;
-import me.zhengjie.base.plus.QueryWapper;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-/**
- * <p>
- * 借款人
- * </p>
- *
- * @author humuyu
- * @since 2022-03-21
- */
-@TableName("borrower")
-public class AppBorrowerEntity extends Model<AppBorrowerEntity> implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 主键id
-	 */
-	@TableId(value = "id", type = IdType.INPUT)
-	private Long id;
-
-	/**
-	 * 业务编号
-	 */
-	@QueryWapper(value=QueryKeyword.LIKE )
-	@TableField("business_no")
-	private String businessNo;
-
-	/**
-	 * 借款合同编号
-	 */
-	@QueryWapper(value=QueryKeyword.LIKE )
-	@TableField("contract_no")
-	private String contractNo;
-
-	/**
-	 * 借款起始日：
-	 */
-	@TableField("start_date")
-	private String startDate;
-
-	/**
-	 * 借款终止日
-	 */
-	@TableField("end_date")
-	private String endDate;
-
-	/**
-	 * 借款金额
-	 */
-	@TableField("sum_money")
-	private String sumMoney;
-
-	/**
-	 * 利率
-	 */
-	@TableField("rate")
-	private String rate;
-
-	/**
-	 * 姓名
-	 */
-	@TableField("username")
-	private String username;
-
-	/**
-	 * 性别
-	 */
-	@TableField("sex")
-	private String sex;
-
-	/**
-	 * 出生日期
-	 */
-	@TableField("birth")
-	private String birth;
-
-	/**
-	 * 身份证号码
-	 */
-	@TableField("id_card")
-	private String idCard;
-
-	/**
-	 * 居住地
-	 */
-	@TableField("residence")
-	private String residence;
-
-	/**
-	 * 手机号
-	 */
-	@TableField("phone")
-	private String phone;
-
-	/**
-	 * 婚姻状态
-	 */
-	@TableField("marriage")
-	private String marriage;
-
-	/**
-	 * 身份证正面
-	 */
-	@TableField("card_front")
-	private String cardFront;
-
-	/**
-	 * 身份证反面
-	 */
-	@TableField("card_back")
-	private String cardBack;
-
-	/**
-	 * 合同上传
-	 */
-	@TableField("compact_pic")
-	private String compactPic;
-
-	/**
-	 * 房产证
-	 */
-	@TableField("estates_pic")
-	private String estatesPic;
-
-	/**
-	 * 结婚证
-	 */
-	@TableField("marrage_pic")
-	private String marragePic;
-
-	/**
-	 * 其他上传
-	 */
-	@TableField("other_upload")
-	private String otherUpload;
-
-	/**
-	 * 户口本
-	 */
-	@TableField("hkb_pic")
-	private String hkbPic;
-
-	/**
-	 * 修改人
-	 */
-	@TableField("creator")
-	private Integer creator;
-
-	/**
-	 * 创建人
-	 */
-	@TableField("updater")
-	private Integer updater;
-
-	/**
-	 * 创建时间
-	 */
-	@TableField("create_time")
-	private LocalDateTime createTime;
-
-	/**
-	 * 更新时间
-	 */
-	@TableField("update_time")
-	private LocalDateTime updateTime;
-
-	/**
-	 *1.待公证 2待审核 3已签发 4已驳回
-	 */
-	@TableField("status")
-	private String status;
-
-	@TableField("order_by")
-	private String  orderBy;
-
-	@TableField("notary_user_id")
-	private String  notaryUserId;
-
-	public String getNotaryUserId(){
-		return notaryUserId;
-	}
-	public void setNotaryUserId(String notaryUserId){
-		this.notaryUserId = notaryUserId;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getBusinessNo() {
-		return businessNo;
-	}
-
-	public void setBusinessNo(String businessNo) {
-		this.businessNo = businessNo;
-	}
-
-	public String getContractNo() {
-		return contractNo;
-	}
-
-	public void setContractNo(String contractNo) {
-		this.contractNo = contractNo;
-	}
-
-	public String getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(String startDate) {
-		this.startDate = startDate;
-	}
-
-	public String getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(String endDate) {
-		this.endDate = endDate;
-	}
-
-	public String getSumMoney() {
-		return sumMoney;
-	}
-
-	public void setSumMoney(String sumMoney) {
-		this.sumMoney = sumMoney;
-	}
-
-	public String getRate() {
-		return rate;
-	}
-
-	public void setRate(String rate) {
-		this.rate = rate;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-	}
-
-	public String getBirth() {
-		return birth;
-	}
-
-	public void setBirth(String birth) {
-		this.birth = birth;
-	}
-
-	public String getIdCard() {
-		return idCard;
-	}
-
-	public void setIdCard(String idCard) {
-		this.idCard = idCard;
-	}
-
-	public String getResidence() {
-		return residence;
-	}
-
-	public void setResidence(String residence) {
-		this.residence = residence;
-	}
-
-	public String getPhone() {
-		return phone;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-
-	public String getMarriage() {
-		return marriage;
-	}
-
-	public void setMarriage(String marriage) {
-		this.marriage = marriage;
-	}
-
-	public String getOrderBy() {
-		return orderBy;
-	}
-
-	public void setOrderBy(String orderBy) {
-		this.orderBy = orderBy;
-	}
-
-	public String getCardFront() {
-		return cardFront;
-	}
-
-	public void setCardFront(String cardFront) {
-		this.cardFront = cardFront;
-	}
-
-	public String getCardBack() {
-		return cardBack;
-	}
-
-	public void setCardBack(String cardBack) {
-		this.cardBack = cardBack;
-	}
-
-	public String getCompactPic() {
-		return compactPic;
-	}
-
-	public void setCompactPic(String compactPic) {
-		this.compactPic = compactPic;
-	}
-
-	public String getEstatesPic() {
-		return estatesPic;
-	}
-
-	public void setEstatesPic(String estatesPic) {
-		this.estatesPic = estatesPic;
-	}
-
-	public String getMarragePic() {
-		return marragePic;
-	}
-
-	public void setMarragePic(String marragePic) {
-		this.marragePic = marragePic;
-	}
-
-	public String getOtherUpload() {
-		return otherUpload;
-	}
-
-	public void setOtherUpload(String otherUpload) {
-		this.otherUpload = otherUpload;
-	}
-
-	public String getHkbPic() {
-		return hkbPic;
-	}
-
-	public void setHkbPic(String hkbPic) {
-		this.hkbPic = hkbPic;
-	}
-
-	public Integer getCreator() {
-		return creator;
-	}
-
-	public void setCreator(Integer creator) {
-		this.creator = creator;
-	}
-
-	public Integer getUpdater() {
-		return updater;
-	}
-
-	public void setUpdater(Integer updater) {
-		this.updater = updater;
-	}
-
-	public LocalDateTime getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(LocalDateTime createTime) {
-		this.createTime = createTime;
-	}
-
-	public LocalDateTime getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(LocalDateTime updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	@Override
-	public String toString() {
-		return "BorrowerEntity{" + "id=" + id + ", businessNo=" + businessNo + ", contractNo=" + contractNo
-				+ ", startDate=" + startDate + ", endDate=" + endDate + ", sumMoney=" + sumMoney + ", rate=" + rate
-				+ ", username=" + username + ", sex=" + sex + ", birth=" + birth + ", idCard=" + idCard + ", residence="
-				+ residence + ", phone=" + phone + ", marriage=" + marriage + ", cardFront=" + cardFront + ", cardBack="
-				+ cardBack + ", compactPic=" + compactPic + ", estatesPic=" + estatesPic + ", marragePic=" + marragePic
-				+ ", otherUpload=" + otherUpload + ", hkbPic=" + hkbPic + ", creator=" + creator + ", updater="
-				+ updater + ", createTime=" + createTime + ", updateTime=" + updateTime + ", status=" + status + "}";
-	}
-}

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/AppGuaranteeEntity.java

@@ -1,418 +0,0 @@
-package me.zhengjie.dao.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import me.zhengjie.base.plus.QueryKeyword;
-import me.zhengjie.base.plus.QueryWapper;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 担保人
- * </p>
- *
- * @author humuyu
- * @since 2022-03-25
- */
-@TableName("guarantee")
-public class AppGuaranteeEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 业务编号
-     */
-    @TableField("business_no")
-    private String businessNo;
-
-    /**
-     * 担保合同编号
-     */
-    @QueryWapper(value=QueryKeyword.LIKE )
-    @TableField("contract_no")
-    private String contractNo;
-
-    /**
-     * 担保起始日：
-     */
-    @TableField("start_date")
-    private String startDate;
-
-    /**
-     * 担保终止日
-     */
-    @TableField("end_date")
-    private String endDate;
-
-    /**
-     * 身份证正面
-     */
-    @TableField("card_front")
-    private String cardFront;
-
-    /**
-     * 身份证反面
-     */
-    @TableField("card_back")
-    private String cardBack;
-
-    /**
-     * 姓名
-     */
-    @TableField("username")
-    private String username;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @TableField("birth")
-    private String birth;
-
-    /**
-     * 身份证号码
-     */
-    @TableField("id_card")
-    private String idCard;
-
-    /**
-     * 居住地
-     */
-    @TableField("residence")
-    private String residence;
-
-    /**
-     * 手机号
-     */
-    @TableField("phone")
-    private String phone;
-
-    /**
-     * 婚姻状况
-     */
-    @TableField("marriage")
-    private String marriage;
-
-    /**
-     * 结婚证
-     */
-    @TableField("marrage_pic")
-    private String marragePic;
-
-    /**
-     * 合同附件
-     */
-    @TableField("compact_pic")
-    private String compactPic;
-
-    /**
-     * 产权证
-     */
-    @TableField("estates_pic")
-    private String estatesPic;
-
-    /**
-     * 户口本
-     */
-    @TableField("hkb_pic")
-    private String hkbPic;
-
-    /**
-     * 其他上传
-     */
-    @TableField("other_upload")
-    private String otherUpload;
-
-    /**
-     * 修改人
-     */
-    @TableField("creator")
-    private Integer creator;
-
-    /**
-     * 创建人
-     */
-    @TableField("updater")
-    private Integer updater;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 1.待公证 2待审核 3已签发 4已驳回
-     */
-    @TableField("status")
-    private String status;
-
-    /**
-     * 顺序
-     */
-    @TableField("order_by")
-    private String orderBy;
-
-    @TableField("notary_user_id")
-    private String  notaryUserId;
-
-    public String getNotaryUserId(){
-        return notaryUserId;
-    }
-    public void setNotaryUserId(String notaryUserId){
-        this.notaryUserId = notaryUserId;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getBusinessNo() {
-        return businessNo;
-    }
-
-    public void setBusinessNo(String businessNo) {
-        this.businessNo = businessNo;
-    }
-
-    public String getContractNo() {
-        return contractNo;
-    }
-
-    public void setContractNo(String contractNo) {
-        this.contractNo = contractNo;
-    }
-
-    public String getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(String startDate) {
-        this.startDate = startDate;
-    }
-
-    public String getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(String endDate) {
-        this.endDate = endDate;
-    }
-
-    public String getCardFront() {
-        return cardFront;
-    }
-
-    public void setCardFront(String cardFront) {
-        this.cardFront = cardFront;
-    }
-
-    public String getCardBack() {
-        return cardBack;
-    }
-
-    public void setCardBack(String cardBack) {
-        this.cardBack = cardBack;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getBirth() {
-        return birth;
-    }
-
-    public void setBirth(String birth) {
-        this.birth = birth;
-    }
-
-    public String getIdCard() {
-        return idCard;
-    }
-
-    public void setIdCard(String idCard) {
-        this.idCard = idCard;
-    }
-
-    public String getResidence() {
-        return residence;
-    }
-
-    public void setResidence(String residence) {
-        this.residence = residence;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getMarriage() {
-        return marriage;
-    }
-
-    public void setMarriage(String marriage) {
-        this.marriage = marriage;
-    }
-
-    public String getMarragePic() {
-        return marragePic;
-    }
-
-    public void setMarragePic(String marragePic) {
-        this.marragePic = marragePic;
-    }
-
-    public String getCompactPic() {
-        return compactPic;
-    }
-
-    public void setCompactPic(String compactPic) {
-        this.compactPic = compactPic;
-    }
-
-    public String getEstatesPic() {
-        return estatesPic;
-    }
-
-    public void setEstatesPic(String estatesPic) {
-        this.estatesPic = estatesPic;
-    }
-
-    public String getHkbPic() {
-        return hkbPic;
-    }
-
-    public void setHkbPic(String hkbPic) {
-        this.hkbPic = hkbPic;
-    }
-
-    public String getOtherUpload() {
-        return otherUpload;
-    }
-
-    public void setOtherUpload(String otherUpload) {
-        this.otherUpload = otherUpload;
-    }
-
-    public Integer getCreator() {
-        return creator;
-    }
-
-    public void setCreator(Integer creator) {
-        this.creator = creator;
-    }
-
-    public Integer getUpdater() {
-        return updater;
-    }
-
-    public void setUpdater(Integer updater) {
-        this.updater = updater;
-    }
-
-    public LocalDateTime getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(LocalDateTime createTime) {
-        this.createTime = createTime;
-    }
-
-    public LocalDateTime getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(LocalDateTime updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getOrderBy() {
-        return orderBy;
-    }
-
-    public void setOrderBy(String orderBy) {
-        this.orderBy = orderBy;
-    }
-
-    @Override
-    public String toString() {
-        return "GuaranteeEntity{" +
-        "id=" + id +
-        ", businessNo=" + businessNo +
-        ", contractNo=" + contractNo +
-        ", startDate=" + startDate +
-        ", endDate=" + endDate +
-        ", cardFront=" + cardFront +
-        ", cardBack=" + cardBack +
-        ", username=" + username +
-        ", sex=" + sex +
-        ", birth=" + birth +
-        ", idCard=" + idCard +
-        ", residence=" + residence +
-        ", phone=" + phone +
-        ", marriage=" + marriage +
-        ", marragePic=" + marragePic +
-        ", compactPic=" + compactPic +
-        ", estatesPic=" + estatesPic +
-        ", hkbPic=" + hkbPic +
-        ", otherUpload=" + otherUpload +
-        ", creator=" + creator +
-        ", updater=" + updater +
-        ", createTime=" + createTime +
-        ", updateTime=" + updateTime +
-        ", status=" + status +
-        ", orderBy=" + orderBy +
-        "}";
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/AppModelEntity.java

@@ -1,89 +0,0 @@
-package me.zhengjie.dao.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-@TableName("model")
-@Getter
-@Setter
-public class AppModelEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 编号
-     */
-    @TableField("code")
-    private String code;
-
-    /**
-     * 名称
-     */
-    @TableField("title")
-    private String title;
-
-    /**
-     * 路径
-     */
-    @TableField("path")
-    private String path;
-
-    /**
-     * html模板oss位置
-     */
-    @TableField("content")
-    private String content;
-
-    /**
-     * 是否能编辑（1=是，0=否）
-     */
-    @TableField("ifModify")
-    private Integer ifModify;
-
-
-    /**
-     * 排序
-     */
-    @TableField("sort")
-    private Integer sort;
-
-    /**
-     * 状态（1=可用，0=不可用）
-     */
-    @TableField("status")
-    private Integer status;
-
-
-
-    @Override
-    public String toString() {
-        return "ModelEntity{" +
-        "id=" + id +
-        ", code=" + code +
-        ", title=" + title +
-        ", path=" + path +
-        ", content=" + content +
-        ", ifModify=" + ifModify +
-        ", sort=" + sort +
-        ", status=" + status +
-        "}";
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/AppMortgageEntity.java

@@ -1,449 +0,0 @@
-package me.zhengjie.dao.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import me.zhengjie.base.plus.QueryKeyword;
-import me.zhengjie.base.plus.QueryWapper;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 抵押人
- * </p>
- *
- * @author humuyu
- * @since 2022-03-22
- */
-@TableName("mortgage")
-public class AppMortgageEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 业务编号
-     */
-    @TableField("business_no")
-    private String businessNo;
-
-    /**
-     * 抵押合同编号
-     */
-    @QueryWapper(value=QueryKeyword.LIKE )
-    @TableField("contract_no")
-    private String contractNo;
-
-    /**
-     * 抵押起始日
-     */
-    @TableField("start_date")
-    private String startDate;
-
-    /**
-     * 抵押终止日
-     */
-    @TableField("end_date")
-    private String endDate;
-
-    /**
-     * 身份证正面
-     */
-    @TableField("card_front")
-    private String cardFront;
-
-    /**
-     * 身份证反面
-     */
-    @TableField("card_back")
-    private String cardBack;
-
-    /**
-     * 姓名
-     */
-    @TableField("username")
-    private String username;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @TableField("birth")
-    private String birth;
-
-    /**
-     * 身份证号码
-     */
-    @TableField("id_card")
-    private String idCard;
-
-    /**
-     * 居住地
-     */
-    @TableField("residence")
-    private String residence;
-
-    /**
-     * 手机号
-     */
-    @TableField("phone")
-    private String phone;
-
-    /**
-     * 婚姻状态
-     */
-    @TableField("marriage")
-    private String marriage;
-
-    /**
-     * 结婚证
-     */
-    @TableField("marrage_pic")
-    private String marragePic;
-
-    /**
-     * 合同附件
-     */
-    @TableField("compact_pic")
-    private String compactPic;
-
-    /**
-     * 产权证
-     */
-    @TableField("estates_pic")
-    private String estatesPic;
-
-    /**
-     * 户口本
-     */
-    @TableField("hkb_pic")
-    private String hkbPic;
-
-    /**
-     * 其他上传
-     */
-    @TableField("other_upload")
-    private String otherUpload;
-
-    /**
-     * 房屋产权编号
-     */
-    @TableField("house_property_no")
-    private String housePropertyNo;
-
-    /**
-     * 房屋位置
-     */
-    @TableField("house_location")
-    private String houseLocation;
-
-    /**
-     * 修改人
-     */
-    @TableField("creator")
-    private Integer creator;
-
-    /**
-     * 创建人
-     */
-    @TableField("updater")
-    private Integer updater;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 0表示删除,1表示没有删除
-     */
-    @TableField("status")
-    private String status;
-
-    /**
-     * 顺序
-     */
-    @TableField("order_by")
-    private String orderBy;
-
-    @TableField("notary_user_id")
-    private String  notaryUserId;
-
-    public String getNotaryUserId(){
-        return notaryUserId;
-    }
-    public void setNotaryUserId(String notaryUserId){
-        this.notaryUserId = notaryUserId;
-    }
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getBusinessNo() {
-        return businessNo;
-    }
-
-    public void setBusinessNo(String businessNo) {
-        this.businessNo = businessNo;
-    }
-
-    public String getContractNo() {
-        return contractNo;
-    }
-
-    public void setContractNo(String contractNo) {
-        this.contractNo = contractNo;
-    }
-
-    public String getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(String startDate) {
-        this.startDate = startDate;
-    }
-
-    public String getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(String endDate) {
-        this.endDate = endDate;
-    }
-
-    public String getCardFront() {
-        return cardFront;
-    }
-
-    public void setCardFront(String cardFront) {
-        this.cardFront = cardFront;
-    }
-
-    public String getCardBack() {
-        return cardBack;
-    }
-
-    public void setCardBack(String cardBack) {
-        this.cardBack = cardBack;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getBirth() {
-        return birth;
-    }
-
-    public void setBirth(String birth) {
-        this.birth = birth;
-    }
-
-    public String getIdCard() {
-        return idCard;
-    }
-
-    public void setIdCard(String idCard) {
-        this.idCard = idCard;
-    }
-
-    public String getResidence() {
-        return residence;
-    }
-
-    public void setResidence(String residence) {
-        this.residence = residence;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getMarriage() {
-        return marriage;
-    }
-
-    public void setMarriage(String marriage) {
-        this.marriage = marriage;
-    }
-
-    public String getMarragePic() {
-        return marragePic;
-    }
-
-    public void setMarragePic(String marragePic) {
-        this.marragePic = marragePic;
-    }
-
-    public String getCompactPic() {
-        return compactPic;
-    }
-
-    public void setCompactPic(String compactPic) {
-        this.compactPic = compactPic;
-    }
-
-    public String getEstatesPic() {
-        return estatesPic;
-    }
-
-    public void setEstatesPic(String estatesPic) {
-        this.estatesPic = estatesPic;
-    }
-
-    public String getHkbPic() {
-        return hkbPic;
-    }
-
-    public void setHkbPic(String hkbPic) {
-        this.hkbPic = hkbPic;
-    }
-
-    public String getOtherUpload() {
-        return otherUpload;
-    }
-
-    public void setOtherUpload(String otherUpload) {
-        this.otherUpload = otherUpload;
-    }
-
-    public String getHousePropertyNo() {
-        return housePropertyNo;
-    }
-
-    public void setHousePropertyNo(String housePropertyNo) {
-        this.housePropertyNo = housePropertyNo;
-    }
-
-    public String getHouseLocation() {
-        return houseLocation;
-    }
-
-    public void setHouseLocation(String houseLocation) {
-        this.houseLocation = houseLocation;
-    }
-
-    public Integer getCreator() {
-        return creator;
-    }
-
-    public void setCreator(Integer creator) {
-        this.creator = creator;
-    }
-
-    public Integer getUpdater() {
-        return updater;
-    }
-
-    public void setUpdater(Integer updater) {
-        this.updater = updater;
-    }
-
-    public LocalDateTime getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(LocalDateTime createTime) {
-        this.createTime = createTime;
-    }
-
-    public LocalDateTime getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(LocalDateTime updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getOrderBy() {
-        return orderBy;
-    }
-
-    public void setOrderBy(String orderBy) {
-        this.orderBy = orderBy;
-    }
-
-    @Override
-    public String toString() {
-        return "MortgageEntity{" +
-        "id=" + id +
-        ", businessNo=" + businessNo +
-        ", contractNo=" + contractNo +
-        ", startDate=" + startDate +
-        ", endDate=" + endDate +
-        ", cardFront=" + cardFront +
-        ", cardBack=" + cardBack +
-        ", username=" + username +
-        ", sex=" + sex +
-        ", birth=" + birth +
-        ", idCard=" + idCard +
-        ", residence=" + residence +
-        ", phone=" + phone +
-        ", marriage=" + marriage +
-        ", marragePic=" + marragePic +
-        ", compactPic=" + compactPic +
-        ", estatesPic=" + estatesPic +
-        ", hkbPic=" + hkbPic +
-        ", otherUpload=" + otherUpload +
-        ", housePropertyNo=" + housePropertyNo +
-        ", houseLocation=" + houseLocation +
-        ", creator=" + creator +
-        ", updater=" + updater +
-        ", createTime=" + createTime +
-        ", updateTime=" + updateTime +
-        ", status=" + status +
-        ", orderBy=" + orderBy +
-        "}";
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/mapper/IBorrowerDao.java

@@ -1,20 +0,0 @@
-package me.zhengjie.dao.mybatis.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import me.zhengjie.dao.mybatis.entity.AppBorrowerEntity;
-
-/**
- * <p>
- * 借款人 Mapper 接口
- * </p>
- *
- * @author humuyu
- * @since 2022-03-21
- */
-@Mapper
-public interface IBorrowerDao extends BaseMapper<AppBorrowerEntity> {
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/mapper/IGuaranteeDao.java

@@ -1,21 +0,0 @@
-package me.zhengjie.dao.mybatis.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import me.zhengjie.dao.mybatis.entity.AppGuaranteeEntity;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 担保人 Mapper 接口
- * </p>
- *
- * @author humuyu
- * @since 2022-03-25
- */
-@Mapper
-public interface IGuaranteeDao extends BaseMapper<AppGuaranteeEntity> {
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/mapper/IModelDao.java

@@ -1,18 +0,0 @@
-package me.zhengjie.dao.mybatis.mapper;
-
-import me.zhengjie.dao.mybatis.entity.AppModelEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-@Mapper
-public interface IModelDao extends BaseMapper<AppModelEntity> {
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/mapper/IMortgageDao.java

@@ -1,20 +0,0 @@
-package me.zhengjie.dao.mybatis.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import me.zhengjie.dao.mybatis.entity.AppMortgageEntity;
-
-/**
- * <p>
- * 抵押人 Mapper 接口
- * </p>
- *
- * @author humuyu
- * @since 2022-03-22
- */
-@Mapper
-public interface IMortgageDao extends BaseMapper<AppMortgageEntity> {
-
-}