Merge remote-tracking branch 'origin/branch-nt-1.0.0' into branch-nt-1.0.0

eladmin-security/src/main/java/me/zhengjie/security/service/dto/OnlineUserDto.java

@@ -16,60 +16,67 @@ import java.util.List;
 @Getter
 @Setter
 @NoArgsConstructor
-@ToString
 public class OnlineUserDto implements UserDetails {
-    private Long userId;
-    private String username;
-    private String password;
-    private String nickName;
-    private String dept;
-    private String key;
-    private String onlineToken;
-    private String ip;
-    private String address;
-    private String browser;
-    private Date loginTime;
-    private boolean enabled;
-    private List<Long> dataScopes;
-    private List<GrantedAuthority> authorities;
-    private String orgName;
-    @Override
-    public List<GrantedAuthority> getAuthorities() {
-        return authorities;
-    }
 
-    @Override
-    @JSONField(serialize = false)
-    public String getPassword() {
-        return password;
-    }
+	private Long userId;
+	private String username;
+	private String password;
+	private String nickName;
+	private String dept;
+	private String key;
+	private String onlineToken;
+	private String ip;
+	private String address;
+	private String browser;
+	private Date loginTime;
+	private boolean enabled;
+	private List<Long> dataScopes;
+	private List<GrantedAuthority> authorities;
+	private String orgName;
 
-    @Override
-    public String getUsername() {
-        return username;
-    }
+	@Override
+	public List<GrantedAuthority> getAuthorities() {
+		return authorities;
+	}
 
-    @JSONField(serialize = false)
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
+	@Override
+	@JSONField(serialize = false)
+	public String getPassword() {
+		return password;
+	}
 
-    @JSONField(serialize = false)
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
+	@Override
+	public String getUsername() {
+		return username;
+	}
 
-    @JSONField(serialize = false)
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
+	@JSONField(serialize = false)
+	@Override
+	public boolean isAccountNonExpired() {
+		return true;
+	}
 
-    @Override
-    @JSONField(serialize = false)
-    public boolean isEnabled() {
-        return enabled;
-    }
+	@JSONField(serialize = false)
+	@Override
+	public boolean isAccountNonLocked() {
+		return true;
+	}
+
+	@JSONField(serialize = false)
+	@Override
+	public boolean isCredentialsNonExpired() {
+		return true;
+	}
+
+	@Override
+	@JSONField(serialize = false)
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	@Override
+	public String toString() {
+		return "OnlineUserDto [" + username + "," + nickName + "," + dept + "," + ip + ", address=" + address + ","
+				+ browser + "" + orgName + "]";
+	}
 }

eladmin-sign/src/main/java/me/zhengjie/sign/connector/HttpConnector.java

@@ -55,6 +55,9 @@ public class HttpConnector implements InitializingBean {
     @Override
     public void afterPropertiesSet() throws Exception {
         Path temp = Paths.get(new File(HttpConnector.class.getClassLoader().getResource("").getPath().concat(keyStorePath)).getAbsolutePath());
+        if(Files.exists(temp)) {
+        	Files.delete(temp);
+        }
         Files.copy(HttpClient.class.getClassLoader().getResourceAsStream(keyStorePath), temp, StandardCopyOption.REPLACE_EXISTING);
         keyStorePath = temp.toFile().getPath();
         trustStorePath = keyStorePath;

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

@@ -9,8 +9,10 @@ import me.zhengjie.application.admin.controller.vo.*;
 import me.zhengjie.application.admin.service.AdminOrderService;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.AppResultData;
+import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.base.util.TencentServiceUtil;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -87,7 +89,17 @@ public class AdminOrderController {
 		response.setResult(orderDetail);
 		return response;
 	}
-
+	   /**
+		 * 删除订单
+		 *
+		 * @param json
+		 * @return
+		 */
+	@RequestMapping("/delete")
+	public ResponseDTO<String> delete(@RequestBody NotaryOrderQueryReq req) {
+		adminOrderService.updateStatus(req);
+	    return ResponseDTO.success();
+	}
 	/**
 	 * 公证订单 查询 当事人
 	 *

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

@@ -1,6 +1,9 @@
 package me.zhengjie.application.admin.controller;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -10,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.dao.mybatis.entity.BankEntity;
 import me.zhengjie.application.admin.controller.vo.BankCreateReq;
 import me.zhengjie.application.admin.controller.vo.BankQueryReq;
 import me.zhengjie.application.admin.controller.vo.BankQueryRsp;
@@ -46,6 +50,17 @@ public class BankController {
 	 *
 	 * @return
 	 */
+	@RequestMapping("/all")
+	public AppBaseResponse<?> all() {
+		List<BankEntity> banks = bankService.list();		
+		return AppBaseResponse.succ(banks);
+	}
+
+	/**
+	 * 银行 查询
+	 *
+	 * @return
+	 */
 	@RequestMapping("/detail")
 	public AppBaseResponse<BankQueryRsp> detail(@RequestBody BankQueryReq req) {
 		AppBaseResponse<BankQueryRsp> response = new AppBaseResponse<>();

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

@@ -23,4 +23,9 @@ public class NotarizationNoReq extends BaseRequest {
     private Integer leftNum;
     private Date createTime;
     private String usedYear;
+    
+    private String notaryName;
+    
+    private String startDate;
+    private String endDate;
 }

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

@@ -48,6 +48,8 @@ public class NotaryOfficeQueryRsp {
 
     private String sealImg;
     
+    private String sealImgUrl;
+    
     /**
      * 图片的id
      */

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

@@ -51,7 +51,10 @@ public class NotaryOrderQueryReq extends BaseRequest {
 	 * 所属银行
 	 */
 	private String bankName;
-
+	/**
+	 * 所属银行id
+	 */
+	private String  bankId;
 	/**
 	 * 客户经理名称
 	 */

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

@@ -2,8 +2,6 @@ package me.zhengjie.application.admin.service;
 
 import me.zhengjie.application.admin.controller.vo.*;
 import me.zhengjie.base.AppBaseResponse;
-import me.zhengjie.application.admin.controller.vo.FileVo;
-import me.zhengjie.application.admin.controller.vo.OrderDetailDto;
 import me.zhengjie.dao.mybatis.entity.BorrowerEntity;
 import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
 import me.zhengjie.dao.mybatis.entity.GuaranteeEntity;
@@ -64,4 +62,6 @@ public interface AdminOrderService {
     Map<String, FileInfoEntity> getUploadFile(String businessNo);
 
 	OrderDetailDto getOrderDetail(String businessNo);
+	
+	public void updateStatus(NotaryOrderQueryReq req);
 }

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

@@ -344,7 +344,13 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		smsTemplateService.auditBack(req.getBusinessNo());
 		return response;
 	}
-
+	@Override
+	public void updateStatus(NotaryOrderQueryReq req) {
+		String status=StatusEnum.NotaryStatusEnum.DELETE.getStatus().toString();
+		bankOrderService.updateStatus(req.getBusinessNo(),status, null);
+	
+		
+	}
 	@Override
 	public AppBaseResponse orderReject(NotaryOrderQueryReq req) {
 		AppBaseResponse response = new AppBaseResponse();

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

@@ -10,89 +10,113 @@ import me.zhengjie.base.AppResultData;
 import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.dao.mybatis.entity.NotarizationNoEntity;
+import me.zhengjie.dao.mybatis.entity.NotaryOfficeEntity;
 import me.zhengjie.application.admin.controller.vo.NotarizationNoReq;
 import me.zhengjie.dao.mybatis.mapper.NotarizationNoMapper;
+import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
 import me.zhengjie.application.admin.service.NotarizationNoService;
+import me.zhengjie.application.admin.service.NotaryOfficeService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 公证处 服务实现类
  */
 @Service
 @Slf4j
-public class NotarizationNoServiceImpl extends ServiceImpl<NotarizationNoMapper, NotarizationNoEntity> implements NotarizationNoService {
-
-    @Autowired
-    private NotarizationNoMapper notarizationNoMapper;
+public class NotarizationNoServiceImpl extends ServiceImpl<NotarizationNoMapper, NotarizationNoEntity>
+		implements NotarizationNoService {
 
-    @Override
-    public AppBaseResponse<List<NotarizationNoReq>> query(NotarizationNoReq req){
-        AppBaseResponse<List<NotarizationNoReq>> response = new AppBaseResponse<>();
-        List<NotarizationNoReq> result = new ArrayList<>();
+	@Autowired
+	private NotarizationNoMapper notarizationNoMapper;
+	@Autowired
+	private NotaryOfficeService notaryOfficeService;
 
-        IPage<NotarizationNoEntity> page = new Page<>(req.getIndex(),req.getSize());
-        QueryWrapper<NotarizationNoEntity> qw = new QueryWrapper<>();
-        if (!StringUtils.isEmpty(req.getNotaryOfficeId())){
-            qw.eq("notary_office_id", req.getNotaryOfficeId());
-        }
-        qw.eq("no_status",1);
-        page = notarizationNoMapper.selectPage(page,qw);
-        List<NotarizationNoEntity> list = page.getRecords();
-        List<NotarizationNoReq> res = BeanCopyUtils.convertList2List(list, NotarizationNoReq.class);
-        for(NotarizationNoReq temp:res){
-            int currentNum = temp.getCurrentNum() == null ? temp.getBeginNum() - 1:temp.getCurrentNum();
-            int totalNum = temp.getEndNum() - temp.getBeginNum() + 1 ;
-            int usedNum = currentNum - temp.getBeginNum() + 1;
-            int leftNum = totalNum - usedNum;
-            temp.setTotalNum(totalNum);
-            temp.setUsedNum(usedNum);
-            temp.setLeftNum(leftNum);
-        }
-        response.setData(new AppResultData<List<NotarizationNoReq>>(res,new me.zhengjie.base.Page(req.getIndex(),req.getSize(),(int)page.getTotal())));
-        return response;
-    }
+	@Override
+	public AppBaseResponse<List<NotarizationNoReq>> query(NotarizationNoReq req) {
+		AppBaseResponse<List<NotarizationNoReq>> response = new AppBaseResponse<>();
+		IPage<NotarizationNoEntity> page = new Page<>(req.getIndex(), req.getSize());
+		QueryWrapper<NotarizationNoEntity> qw = new QueryWrapper<>();
+		if (!StringUtils.isEmpty(req.getNotaryOfficeId())) {
+			qw.eq("notary_office_id", req.getNotaryOfficeId());
+		}
+		qw.eq("no_status", 1);
+		
+		if (!StringUtils.isEmpty(req.getStartDate())) {
+			qw.ge("create_time", req.getStartDate());
+		}
+		if (!StringUtils.isEmpty(req.getEndDate())) {
+			qw.le("create_time", req.getEndDate());
+		}
+		
+		page = notarizationNoMapper.selectPage(page, qw);
+		List<NotarizationNoEntity> list = page.getRecords();
+		List<NotarizationNoReq> res = BeanCopyUtils.convertList2List(list, NotarizationNoReq.class);
+		// 增加公证处名称
+		List<NotaryOfficeEntity> notaryOffice = notaryOfficeService.list();
+		Map<Integer, String> map = new HashMap<>();
+		for (NotaryOfficeEntity entity : notaryOffice) {
+			map.put(entity.getId(), entity.getName());
+		}
+		for (NotarizationNoReq temp : res) {
+			int currentNum = temp.getCurrentNum() == null ? temp.getBeginNum() - 1 : temp.getCurrentNum();
+			int totalNum = temp.getEndNum() - temp.getBeginNum() + 1;
+			int usedNum = currentNum - temp.getBeginNum() + 1;
+			int leftNum = totalNum - usedNum;
+			temp.setTotalNum(totalNum);
+			temp.setUsedNum(usedNum);
+			temp.setLeftNum(leftNum);
+			temp.setNotaryName(map.get(temp.getNotaryOfficeId()));
+		}
+		response.setData(new AppResultData<List<NotarizationNoReq>>(res,
+				new me.zhengjie.base.Page(req.getIndex(), req.getSize(), (int) page.getTotal())));
+		return response;
+	}
 
-    @Override
-    public AppBaseResponse create(NotarizationNoReq req) {
-        AppBaseResponse response = new AppBaseResponse();
-        NotarizationNoEntity notarizationNoEntity = NotarizationNoEntity.builder().notaryOfficeId(req.getNotaryOfficeId()).currentNum(0)
-                .beginNum(req.getBeginNum()).endNum(req.getEndNum()).noStatus(1).createTime(new Date()).usedYear(req.getUsedYear()).build();
-        int insertNum = notarizationNoMapper.insert(notarizationNoEntity);
-        if (insertNum == 0){
-            response.fail(ResultCode.DATA_INSERT_ERROR);
-        }
-        return  response;
-    }
+	@Override
+	public AppBaseResponse create(NotarizationNoReq req) {
+		AppBaseResponse response = new AppBaseResponse();
+		NotarizationNoEntity notarizationNoEntity = NotarizationNoEntity.builder()
+				.notaryOfficeId(req.getNotaryOfficeId()).currentNum(0).beginNum(req.getBeginNum())
+				.endNum(req.getEndNum()).noStatus(1).createTime(new Date()).usedYear(req.getUsedYear()).build();
+		int insertNum = notarizationNoMapper.insert(notarizationNoEntity);
+		if (insertNum == 0) {
+			response.fail(ResultCode.DATA_INSERT_ERROR);
+		}
+		return response;
+	}
 
-    @Override
-    public AppBaseResponse update(NotarizationNoReq req) {
-        AppBaseResponse response = new AppBaseResponse();
-        NotarizationNoEntity entity = NotarizationNoEntity.builder().notaryOfficeId(req.getNotaryOfficeId())
-                .id(req.getId()).beginNum(req.getBeginNum())
-                .endNum(req.getEndNum()).noStatus(req.getNoStaus()).usedYear(req.getUsedYear()).build();
-        int update = notarizationNoMapper.updateById(entity);
-        if (update==0){
-            response.fail(ResultCode.DATA_UPDATE_ERROR);
-        }
-        return response;
-    }
+	@Override
+	public AppBaseResponse update(NotarizationNoReq req) {
+		AppBaseResponse response = new AppBaseResponse();
+		NotarizationNoEntity entity = NotarizationNoEntity.builder().notaryOfficeId(req.getNotaryOfficeId())
+				.id(req.getId()).beginNum(req.getBeginNum()).endNum(req.getEndNum()).noStatus(req.getNoStaus())
+				.usedYear(req.getUsedYear()).build();
+		int update = notarizationNoMapper.updateById(entity);
+		if (update == 0) {
+			response.fail(ResultCode.DATA_UPDATE_ERROR);
+		}
+		return response;
+	}
 
-    @Override
-    public AppBaseResponse unUsed(NotarizationNoReq req) {
-        AppBaseResponse response = new AppBaseResponse();
-        NotarizationNoEntity notarizationNoEntity = new NotarizationNoEntity();
-        notarizationNoEntity.setId(req.getId());
-        notarizationNoEntity.setNoStatus(0);
-        int update = notarizationNoMapper.updateById(notarizationNoEntity);
-        if (update==0){
-            response.fail(ResultCode.DATA_UPDATE_ERROR);
-        }
-        return response;
-    }
+	@Override
+	public AppBaseResponse unUsed(NotarizationNoReq req) {
+		AppBaseResponse response = new AppBaseResponse();
+		NotarizationNoEntity notarizationNoEntity = new NotarizationNoEntity();
+		notarizationNoEntity.setId(req.getId());
+		notarizationNoEntity.setNoStatus(0);
+		int update = notarizationNoMapper.updateById(notarizationNoEntity);
+		if (update == 0) {
+			response.fail(ResultCode.DATA_UPDATE_ERROR);
+		}
+		return response;
+	}
 }

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

@@ -98,7 +98,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 = fileInfoMapper.selectById(sealImg).getPath();
-			officeQueryRsp.setSealImg(FileUploadUtil.getFileUrl(filePath));
+			officeQueryRsp.setSealImgUrl(FileUploadUtil.getFileUrl(filePath));
 		 
 		} 
 		response.setData(new AppResultData<NotaryOfficeQueryRsp>(officeQueryRsp));
@@ -356,16 +356,16 @@ public class NotaryOfficeServiceImpl extends ServiceImpl<NotaryOfficeMapper, Not
 				NotaryOfficeEntity saveEntity = new NotaryOfficeEntity();
 				if (me.zhengjie.utils.StringUtils.isEmpty(entity.getAxqSealId())) {
 					// 上传公证处签章
-					byte[] b = FileUploadUtil.getByte(req.getImageId());
+					byte[] b = FileUploadUtil.getByte(req.getSealImg());
 					String sealId = cfcaCertUtil.addSeal(entity.getAxqUserId(), b);
 					saveEntity.setAxqSealId(sealId);
 				} else {
 					// 修改公证员签章
-					byte[] b = FileUploadUtil.getByte(req.getImageId());
+					byte[] b = FileUploadUtil.getByte(req.getSealImg());
 					cfcaCertUtil.updateSeal(entity.getAxqUserId(), entity.getAxqSealId(), b);
 				}
 				saveEntity.setId(req.getId());
-				saveEntity.setSealImg(req.getImageId());
+				saveEntity.setSealImg(req.getSealImg());
 				notaryOfficeMapper.updateById(saveEntity);
 			} catch (Exception e) {
 				e.printStackTrace();

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

@@ -9,6 +9,7 @@ import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.util.DateUtils;
+import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.domain.order.OrderConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
@@ -106,7 +107,20 @@ public class BankOrderController extends BaseController {
         String businessNo = jsonObj.getString("businessNo");
         return bankOrderService.submitContractOrder(businessNo, getCurrentUser());
     }
-
+    /**
+	 * 删除订单
+	 *
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping("/delete")
+	public ResponseDTO<String> delete(@RequestBody String json) {
+	    JSONObject jsonObj = JSONObject.parseObject(json);
+	    String businessNo = jsonObj.getString("businessNo");
+	    String status= StatusEnum.NotaryStatusEnum.DELETE.getStatus().toString();
+	    bankOrderService.updateStatus(businessNo,status,null);
+	    return ResponseDTO.success();
+	}
     /**
      * 银行合同OCR解析输入
      *

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

@@ -116,12 +116,14 @@ public class StatusEnum {
 
     //公证状态
     public enum NotaryStatusEnum {
-    	//  '0.待提交 1.待公证 2待审核 3已签发 4已驳回'
+    	// '0.待提交 1.待公证 2待审核 3已签发 4已驳回' -1.删除 
+    	DELETE(-1, "已删除"),
         SUBMIT(0, "待提交"),
         VERIFY(1, "待审核"),
         NOTARIZED(2,"待公证"),
         PASS(3, "已签发"),
         REJECT(4, "已驳回"),
+    	
        ;
 
         private Integer status;

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

@@ -140,7 +140,7 @@ public class ContractOrderEntity implements Serializable {
 
     @TableField("customer_id")
     private String customerId;
-    
+
     @QueryWapper(QueryKeyword.LIKE)
     @TableField("customer_name")
     private String customerName;
@@ -150,7 +150,7 @@ public class ContractOrderEntity implements Serializable {
 
     @TableField("notary_user_id")
     private String notaryUserId;
-
+    @QueryWapper(QueryKeyword.LIKE)
     @TableField("notary_user_name")
     private String notaryUserName;
 
@@ -177,7 +177,7 @@ public class ContractOrderEntity implements Serializable {
 
     @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
-
+    @QueryWapper(QueryKeyword.LIKE)
     @TableField("consult_no")
     private String consultNo;