bug修改

2021-10-09 16:26:56 +08:00
parent 39c0a8eada
commit 676cb9265b
7 changed files with 42 additions and 266 deletions
@@ -76,12 +76,14 @@ public class SendMessageServiceImpl implements SendMessageService {
                content = content.replace(str, entry.getValue());
            }
        }
-
        // 1短信 2邮件 3系统
        // 发送邮件 true
        String fromUser = sendMessageDTO.getFromUser();
        LoginUser loginUser = sysBaseAPI.getUserByName(fromUser);
-        if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && Objects.nonNull(loginUser)){
+        if(templateType.contains(ProjectCommon.MESSAGE_TYPE2)){
+            if(StringUtils.isEmpty(sendMessageDTO.getEmail())){
+                throw new JeroBootException("发送邮件，邮箱地址不能为空！");
+            }
            try {
                String email = loginUser.getEmail();
                String emailPassword = loginUser.getEmailPassword();
@@ -102,10 +104,14 @@ public class SendMessageServiceImpl implements SendMessageService {
                }
            }catch (Exception e){
                log.error("发送邮件异常",e);
+                throw new JeroBootException("邮件发送失败！");
            }
        }
        // 发送消息
-        if(templateType.contains(ProjectCommon.MESSAGE_TYPE3) && !StringUtils.isEmpty(sendMessageDTO.getToUser())){
+        if(templateType.contains(ProjectCommon.MESSAGE_TYPE3)){
+            if(StringUtils.isEmpty(sendMessageDTO.getToUser())){
+                throw new JeroBootException("发送消息，账号不能为空！");
+            }
            try {
                String toUser = sendMessageDTO.getToUser();
                String busId = sendMessageDTO.getBusId();
@@ -161,10 +167,14 @@ public class SendMessageServiceImpl implements SendMessageService {
                }
            }catch (Exception e){
                log.error("发送消息异常",e);
+                throw new JeroBootException("消息发送失败！");
            }
        }
        // todo 发送短信 待完成
-        if(templateType.contains(ProjectCommon.MESSAGE_TYPE1) && !StringUtils.isEmpty(sendMessageDTO.getPhone())){
+        if(templateType.contains(ProjectCommon.MESSAGE_TYPE1)){
+            if(StringUtils.isEmpty(sendMessageDTO.getPhone())){
+                throw new JeroBootException("发送短信，手机号不能为空！");
+            }
            try {
                String sender = "";
                String signature = "";
@@ -334,242 +344,8 @@ public class SendMessageServiceImpl implements SendMessageService {
                sysBaseAPI.sendMessage(sendMessageDTO.getPhone(),sender,templateId,signature,templateParas);
            }catch (Exception e){
                log.error("发送短信异常",e);
+                throw new JeroBootException("短信发送失败！");
            }
        }
    }
-
-    void sendEmail(SendMessageDTO sendMessageDTO, LoginUser loginUser, String title, String content){
-        String email = loginUser.getEmail();
-        String emailPassword = loginUser.getEmailPassword();
-        //如果发件人没有邮箱或邮箱密码则使用admin账户的邮箱密码
-        if (StringUtils.isBlank(email) || StringUtils.isBlank(emailPassword)) {
-            loginUser = sysBaseAPI.getUserByName("admin");
-            email = loginUser.getEmail();
-            emailPassword = loginUser.getEmailPassword();
-        }
-        email = PasswordUtil.decrypt(email);
-        emailPassword = PasswordUtil.decrypt(emailPassword);
-        EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(email,emailPassword);
-        // 发送带附件邮箱
-        if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){
-            emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile());
-        }else{
-            emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content);
-        }
-    }
-    void sendMessage(SendMessageDTO sendMessageDTO, SysMessageTemplate sysSmsTemplate, String content, String fromUser, String title){
-        String toUser = sendMessageDTO.getToUser();
-        String busId = sendMessageDTO.getBusId();
-        String busType = sendMessageDTO.getBusType();
-
-        SysAnnouncement announcement = new SysAnnouncement();
-        announcement.setTitile(sysSmsTemplate.getTemplateName());
-        announcement.setMsgContent(content);
-        announcement.setSender(fromUser);
-        announcement.setPriority(CommonConstant.PRIORITY_M);
-        announcement.setMsgType(CommonConstant.MSG_TYPE_UESR);
-        announcement.setSendStatus(CommonConstant.HAS_SEND);
-        announcement.setSendTime(new Date());
-        announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2);
-        announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
-        announcement.setBusId(busId);
-        announcement.setBusType(busType);
-        if(!StringUtils.isEmpty(busType)){
-            announcement.setOpenType(MessageUrlEnums.getByType(busType).getOpenType());
-            announcement.setOpenPage(MessageUrlEnums.getByType(busType).getOpenPage());
-        }
-        announcement.setTemplateCode(sendMessageDTO.getTemplateCode());
-        sysAnnouncementService.save(announcement);
-        // 2.插入用户通告阅读标记表记录
-        String userId = toUser;
-        String[] userIds = userId.split(",");
-        String anntId = announcement.getId();
-        for(int i=0;i<userIds.length;i++) {
-            if(oConvertUtils.isNotEmpty(userIds[i])) {
-                SysUser sysUser = sysUserService.getUserByName(userIds[i]);
-                if(Objects.isNull(sysUser)) {
-                    continue;
-                }
-                SysAnnouncementSend announcementSend = new SysAnnouncementSend();
-                announcementSend.setAnntId(anntId);
-                announcementSend.setUserId(sysUser.getId());
-                announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
-                sysAnnouncementSendService.save(announcementSend);
-                JSONObject obj = new JSONObject();
-                obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
-                obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
-                obj.put(WebsocketConst.MSG_ID, announcement.getId());
-                obj.put(WebsocketConst.MSG_TXT, title);
-                webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
-            }
-        }
-    }
-    void sendSMS(SendMessageDTO sendMessageDTO, HashMap<String, String> map){
-        String sender = "";
-        String signature = "";
-        String templateId = "";
-        String codeType = sendMessageDTO.getTemplateCode();
-        switch (codeType) {
-            case "GL_1_HTTZ_CREATE_PROJECT":
-                //中汽中心标准所-管理端-项目通知-1
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "7ffc2ce832a1408383b933702277f866";
-                //通知类短信，不需要存redis
-                break;
-            case "GL_2_HTTZ_SUBMIT":
-                //中汽中心标准所-管理端-合同通知-2
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "8f080f2c0b334f93af5219f76c0b5dc3";
-                break;
-            case "GL_3_HTTZ_AUDIT":
-                //中汽中心标准所-管理端-合同通知-3
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "488e5a176aca4eea8472a6a7b8cd2911";
-                break;
-            case "GL_4_HTTZ_NOT_AUDIT":
-                //中汽中心标准所-管理端-合同通知-4
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "0596842946244aa9b5c5a1d16d9a1d0a";
-                //通知类短信，不需要存redis
-                break;
-            case "GL_5_HYTZ_SIGN_UP_UPLOAD":
-                //	中汽中心标准所-管理端-会议通知-5
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "ef7374b862e3442e9ea6f84c3e626e9c";
-                break;
-            case "GL_6_DBTZ_ADD":
-                //	中汽中心标准所-管理端-打包通知-6
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "0f62447b46ed4dcb88f3b8d9fa38a549";
-                break;
-            case "GL_7_DBTZ_CONTRACT":
-                //中汽中心标准所-管理端-打包通知-7
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "7705a7180c644b028839af77fc51d371";
-                //通知类短信，不需要存redis
-                break;
-            case "GL_8_HYTZ_ON_ACCESS_UPDATE":
-                //	中汽中心标准所-管理端-会议通知-8
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "bfc6abc5bf3347029e9079214eb54868";
-                break;
-            case "GL_9_QYTZ_CREATE":
-                //中汽中心标准所-管理端-企业通知-9
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "1b9dd79bb217420fa25725feb1ffaef4";
-                break;
-            case "QY_1_HYTZ_WORK_GROUP_CREATE":
-                //中汽中心标准所-企业端-会议通知-1
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "b477be3ced93438a930675b2998d841d";
-                //通知类短信，不需要存redis
-                break;
-            case "QY_2_HYTZ_WORK_GROUP_SIGN_UP":
-                //中汽中心标准所-企业端-会议通知-2
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = ""; //todo 审核不通过
-                break;
-            case "QY_3_HYTZ_WORK_GROUP_UPLOAD":
-                //中汽中心标准所-企业端-会议通知-3
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "";//todo 审核不通过
-                break;
-            case "QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD":
-                //中汽中心标准所-企业端-会议通知-4
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "";//todo 审核不通过
-                //通知类短信，不需要存redis
-                break;
-            case "QY_5_HYTZ_NOT_AUDIT":
-                //中汽中心标准所-企业端-会议通知-5
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "b564769d75ea43bda281ba4e26936fb6";
-                break;
-            case "QY_6_HYTZ_AUDIT":
-                //中汽中心标准所-企业端-会议通知-6
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "";//todo 审核不通过
-                break;
-            case "QY_7_WJTZ_MEETING_SEND":
-                //中汽中心标准所-企业端-文件通知-7
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "";//todo 审核不通过
-                //通知类短信，不需要存redis
-                break;
-            case "QY_8_HTTZ_PHASE":
-                //中汽中心标准所-企业端-合同通知-8
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "891d3236a8034a0c8ef266bb287a9ffa";
-                break;
-            case "QY_9_YJTZ_MAIL":
-                //中汽中心标准所-企业端-邮寄通知-9
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "1003b89133e04cd7922cee64451813d4";
-                break;
-            case "QY_10_YJTZ_MAIL_CONTRACT":
-                //	中汽中心标准所-企业端-邮寄通知-10
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "203aa025094e401b9f144b9a66e3c52e";
-                //通知类短信，不需要存redis
-                break;
-            case "QY_11_CKTZ_PAY":
-                //	中汽中心标准所-企业端-催款通知-1
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "c139886b751943feb6fd8aad46a3abbe";
-                break;
-            case "QY_12_WJTZ_WORK_GROUP_SEND":
-                //中汽中心标准所-企业端-文件通知-12
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "077964a02a814149bb01900e43c9a04e";
-                break;
-            default:
-                throw new JeroBootException("codeType flase.");
-        }
-
-        String str = "";
-        // 管理端
-        if(Objects.equals(sendMessageDTO.getTemplateCode().substring(0,2),"GL")){
-            str = ManagementMessageEnums.getByCode(sendMessageDTO.getTemplateCode()).getField();
-        }
-        // 企业端
-        if(Objects.equals(sendMessageDTO.getTemplateCode().substring(0,2),"QY")){
-            str = CompanyMessageEnums.getByCode(sendMessageDTO.getTemplateCode()).getField();
-        }
-        String templateParas = "";
-        if(!StringUtils.isEmpty(str)){
-            StringBuilder sb = new StringBuilder();
-            sb.append("[");
-            String[] s = str.split(",");
-            for (int i = 0; i < s.length; i++) {
-                sb.append("\"" + map.get(s[i]) + "\"");
-                if(i < (s.length - 1)){
-                    sb.append(",");
-                }
-            }
-            sb.append("]");
-            templateParas = sb.toString();
-        }
-        sysBaseAPI.sendMessage(sendMessageDTO.getPhone(),sender,templateId,signature,templateParas);
-    }
 }
@@ -41,6 +41,13 @@ public class PayCompanyManagement implements Serializable {
    @NotEmpty(message = "企业名称不能为空！")
    @Size(max = 50, message = "企业名称长度不能大于50个字符")
    private String companyName;
+    /**信用代码*/
+    @Excel(name = "信用代码", width = 15)
+    @ApiModelProperty(value = "信用代码")
+    @NotEmpty(message = "信用代码不能为空！")
+    @Size(max = 18, message = "信用代码长度不能大于18个字符")
+    @Pattern(regexp = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$",message = "信用代码格式错误")
+    private String dutyCode;
 	/**公司地址*/
 	@Excel(name = "公司地址", width = 15)
    @ApiModelProperty(value = "公司地址")
@@ -53,7 +60,7 @@ public class PayCompanyManagement implements Serializable {
    @Size(max = 15, message = "公司电话长度不能大于15个字符")
    @Pattern(regexp = "^(([0-9]{3,4}-)?[0-9]{7,8})|(((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8})$",message = "公司电话格式错误")
    private String companyPhone;
-	/**邮编*/
+	/**邮政编码*/
 	@Excel(name = "邮政编码", width = 15)
    @ApiModelProperty(value = "邮政编码")
    @NotEmpty(message = "邮政编码不能为空！")
@@ -78,13 +85,6 @@ public class PayCompanyManagement implements Serializable {
    @Size(max = 50, message = "银行账号长度不能大于50个字符")
    @Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误")
    private String bankAccount;
-	/**信用代码*/
-	@Excel(name = "信用代码", width = 15)
-    @ApiModelProperty(value = "信用代码")
-    @NotEmpty(message = "信用代码不能为空！")
-    @Size(max = 18, message = "信用代码长度不能大于18个字符")
-    @Pattern(regexp = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$",message = "信用代码格式错误")
-    private String dutyCode;
    /**审核状态（1：通过，2：待审核）财务人员添加企业不需要审核默认是通过状态*/
    @ApiModelProperty(value = "审核状态（1：通过，2：待审核）财务人员添加企业不需要审核默认是通过状态")
    @Max(2)
@@ -78,7 +78,7 @@ public class PayIncomeContractCommon {
    /**
     * 支出合同excel表头
     */
-    public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订单位联系人","是否开口","负责人",
+    public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人",
            "部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点",
            "应收金额","已收金额","未收金额","账款状态","合同约定付款次数","是否打包","打包年份");
    /**
@@ -557,7 +557,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 		filedsList.add(new ExcelExportEntity("合同编号", "contractNum"));
 		filedsList.add(new ExcelExportEntity("合同名称", "contractName"));
 		filedsList.add(new ExcelExportEntity("签订单位", "signedCompanyTemporaryName"));
-		filedsList.add(new ExcelExportEntity("签订单位联系人", "signedContactsTemporaryName"));
+		filedsList.add(new ExcelExportEntity("签订联系人", "signedContactsTemporaryName"));
 		filedsList.add(new ExcelExportEntity("是否开口", "opening"));
 		filedsList.add(new ExcelExportEntity("负责人", "principalName"));
 		filedsList.add(new ExcelExportEntity("部门名称", "departmentName"));
@@ -570,8 +570,8 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 		filedsList.add(new ExcelExportEntity("应收金额", "accountsReceivableAmount"));
 		filedsList.add(new ExcelExportEntity("已收金额", "amountReceived"));
 		filedsList.add(new ExcelExportEntity("未收金额", "outstandingAmount"));
-		filedsList.add(new ExcelExportEntity("合同约定付款次数", "contractPaymentTimes"));
 		filedsList.add(new ExcelExportEntity("账款状态", "accountStatus"));
+		filedsList.add(new ExcelExportEntity("合同约定付款次数", "contractPaymentTimes"));
 		filedsList.add(new ExcelExportEntity("是否打包", "pack"));
 		filedsList.add(new ExcelExportEntity("打包年份", "packYear"));
 		int count = mapCount.get("count");
@@ -306,7 +306,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		filedsList.add(new ExcelExportEntity("合同编号", "contractNum"));
 		filedsList.add(new ExcelExportEntity("合同名称", "contractName"));
 		filedsList.add(new ExcelExportEntity("签订单位", "signedCompanyTemporaryName"));
-		filedsList.add(new ExcelExportEntity("签订单位联系人", "signedContactsTemporaryName"));
+		filedsList.add(new ExcelExportEntity("签订联系人", "signedContactsTemporaryName"));
 		filedsList.add(new ExcelExportEntity("是否开口", "opening"));
 		filedsList.add(new ExcelExportEntity("负责人", "principalName"));
 		filedsList.add(new ExcelExportEntity("部门名称", "departmentName"));
@@ -18,7 +18,7 @@ public class PaySpendingContractExcelModel implements Serializable {
    @Excel(name = "签订单位", width = 15)
    private String signedCompanyTemporaryName;
    /**临时签订单位联系人名称*/
-    @Excel(name = "签订单位联系人", width = 15)
+    @Excel(name = "签订联系人", width = 15)
    private String signedContactsTemporaryName;
    /**是否开口（1：是，0：否）*/
    @Excel(name = "是否开口", width = 15)
@@ -66,7 +66,7 @@ public class PayWorkingGroupSubItem implements Serializable {
    @ApiModelProperty(value = "临时企业联系人一id")
    private java.lang.String contactsTemporaryIdOne;
 	/**临时企业联系人一名称*/
-	@Excel(name = "企业联系人一名称", width = 15)
+	@Excel(name = "企业联系人1", width = 15)
    @ApiModelProperty(value = "临时企业联系人一名称")
    private java.lang.String contactsTemporaryNameOne;
    /**企业联系人二id*/
@@ -77,7 +77,7 @@ public class PayWorkingGroupSubItem implements Serializable {
    @ApiModelProperty(value = "临时企业联系人二id")
    private java.lang.String contactsTemporaryIdTwo;
 	/**临时企业联系人二名称*/
-	@Excel(name = "企业联系人二名称", width = 15)
+	@Excel(name = "企业联系人2", width = 15)
    @ApiModelProperty(value = "临时企业联系人二名称")
    private java.lang.String contactsTemporaryNameTwo;
    /**企业联系人三id*/
@@ -88,9 +88,19 @@ public class PayWorkingGroupSubItem implements Serializable {
    @ApiModelProperty(value = "临时企业联系人三id")
    private java.lang.String contactsTemporaryIdThree;
 	/**临时企业联系人三名称*/
-	@Excel(name = "企业联系人三名称", width = 15)
+	@Excel(name = "企业联系人3", width = 15)
    @ApiModelProperty(value = "临时企业联系人三名称")
    private java.lang.String contactsTemporaryNameThree;
+    /**临时邮寄联系人名称*/
+    @Excel(name = "邮寄联系人", width = 15)
+    @ApiModelProperty(value = "临时邮寄联系人名称")
+    private java.lang.String mailContactsTemporaryName;
+    /**来款方式（1：无，2：合同，3：收费通知）*/
+    @Excel(name = "来款方式", width = 15,dicCode = "payment_type")
+    @Dict(dicCode = "payment_type")
+    @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）")
+    @NotNull(message = "来款方式不能为空！")
+    private java.lang.Integer chargeWay;
 	/**应收金额（元）*/
 	@Excel(name = "应收金额（元）", width = 15)
    @ApiModelProperty(value = "应收金额（元）")
@@ -103,7 +113,7 @@ public class PayWorkingGroupSubItem implements Serializable {
    @JsonFormat(shape = JsonFormat.Shape.STRING)
    private BigDecimal paidAmount;
    /**来款用途（字典表）*/
-    @Excel(name = "来款用途", width = 15,dicCode="payment_charge_use")
+//    @Excel(name = "来款用途", width = 15,dicCode="payment_charge_use")
    @ApiModelProperty(value = "来款用途（字典表）")
    @Dict(dicCode = "payment_charge_use")
    private Integer chargeUse;
@@ -115,16 +125,6 @@ public class PayWorkingGroupSubItem implements Serializable {
    /**临时邮寄联系人id*/
    @ApiModelProperty(value = "临时邮寄联系人id")
    private java.lang.String mailContactsTemporaryId;
-    /**临时邮寄联系人名称*/
-    @Excel(name = "邮寄联系人名称", width = 15)
-    @ApiModelProperty(value = "临时邮寄联系人名称")
-    private java.lang.String mailContactsTemporaryName;
-	/**来款方式（1：无，2：合同，3：收费通知）*/
-	@Excel(name = "来款方式", width = 15,dicCode = "payment_type")
-    @Dict(dicCode = "payment_type")
-    @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）")
-    @NotNull(message = "来款方式不能为空！")
-    private java.lang.Integer chargeWay;
 	/**合同编号*/
 	@Excel(name = "合同编号", width = 15)
    @ApiModelProperty(value = "合同编号")