短信发送测试

distributed-print-business/src/main/java/com/qmth/distributed/print/business/domain/SmsDomain.java

@@ -6,22 +6,23 @@ package com.qmth.distributed.print.business.domain;
 public class SmsDomain {
 
     String smsNormalCode;
-
     Integer codeExpiredTime;
-
     Integer codeSendInterval;
-
     String aliyunSMSKey;
-
     String aliyunSMSSecret;
-
     String aliyunSMSSignName;
-
     String aliyunSMSTplCode;
-
     String aliyunSMSAuditPassCode;
-
     String aliyunSMSAuditNotPassCode;
+    String aliyunSMSExamTaskCreatedCode;
+    String aliyunSMSExamTaskWillExpireCode;
+    String aliyunSMSExamTaskOverdueCode;
+    String aliyunSMSAllocationWillExpireCode;
+    String aliyunSMSAllocationOverdueCode;
+    String aliyunSMSAuditCreatedCode;
+    String aliyunSMSAuditReviewCode;
+    String aliyunSMSAuditWillExpireCode;
+    String aliyunSMSAuditOverdueCode;
 
     public String getSmsNormalCode() {
         return smsNormalCode;
@@ -95,4 +96,75 @@ public class SmsDomain {
         this.aliyunSMSAuditNotPassCode = aliyunSMSAuditNotPassCode;
     }
 
+    public String getAliyunSMSExamTaskCreatedCode() {
+        return aliyunSMSExamTaskCreatedCode;
+    }
+
+    public void setAliyunSMSExamTaskCreatedCode(String aliyunSMSExamTaskCreatedCode) {
+        this.aliyunSMSExamTaskCreatedCode = aliyunSMSExamTaskCreatedCode;
+    }
+
+    public String getAliyunSMSExamTaskWillExpireCode() {
+        return aliyunSMSExamTaskWillExpireCode;
+    }
+
+    public void setAliyunSMSExamTaskWillExpireCode(String aliyunSMSExamTaskWillExpireCode) {
+        this.aliyunSMSExamTaskWillExpireCode = aliyunSMSExamTaskWillExpireCode;
+    }
+
+    public String getAliyunSMSExamTaskOverdueCode() {
+        return aliyunSMSExamTaskOverdueCode;
+    }
+
+    public void setAliyunSMSExamTaskOverdueCode(String aliyunSMSExamTaskOverdueCode) {
+        this.aliyunSMSExamTaskOverdueCode = aliyunSMSExamTaskOverdueCode;
+    }
+
+    public String getAliyunSMSAllocationWillExpireCode() {
+        return aliyunSMSAllocationWillExpireCode;
+    }
+
+    public void setAliyunSMSAllocationWillExpireCode(String aliyunSMSAllocationWillExpireCode) {
+        this.aliyunSMSAllocationWillExpireCode = aliyunSMSAllocationWillExpireCode;
+    }
+
+    public String getAliyunSMSAllocationOverdueCode() {
+        return aliyunSMSAllocationOverdueCode;
+    }
+
+    public void setAliyunSMSAllocationOverdueCode(String aliyunSMSAllocationOverdueCode) {
+        this.aliyunSMSAllocationOverdueCode = aliyunSMSAllocationOverdueCode;
+    }
+
+    public String getAliyunSMSAuditCreatedCode() {
+        return aliyunSMSAuditCreatedCode;
+    }
+
+    public void setAliyunSMSAuditCreatedCode(String aliyunSMSAuditCreatedCode) {
+        this.aliyunSMSAuditCreatedCode = aliyunSMSAuditCreatedCode;
+    }
+
+    public String getAliyunSMSAuditReviewCode() {
+        return aliyunSMSAuditReviewCode;
+    }
+
+    public void setAliyunSMSAuditReviewCode(String aliyunSMSAuditReviewCode) {
+        this.aliyunSMSAuditReviewCode = aliyunSMSAuditReviewCode;
+    }
+
+    public String getAliyunSMSAuditWillExpireCode() {
+        return aliyunSMSAuditWillExpireCode;
+    }
+
+    public void setAliyunSMSAuditWillExpireCode(String aliyunSMSAuditWillExpireCode) {
+        this.aliyunSMSAuditWillExpireCode = aliyunSMSAuditWillExpireCode;
+    }
+
+    public String getAliyunSMSAuditOverdueCode() {
+        return aliyunSMSAuditOverdueCode;
+    }
+
+    public void setAliyunSMSAuditOverdueCode(String aliyunSMSAuditOverdueCode) {
+        this.aliyunSMSAuditOverdueCode = aliyunSMSAuditOverdueCode;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/MessageEnum.java

@@ -31,8 +31,8 @@ public enum MessageEnum {
      * 审核待办提醒
      */
     // 命题任务被命题老师提交后触发，业务id为命题任务id，短信发送给考务老师 examTask.getCreateId()
-    NOTICE_OF_AUDIT_CREATED("审核待办生成通知","${userName}您好，${courseName}课程、${paperNumber}试卷已提交入库，请您尽快审核！"),
-    NOTICE_OF_AUDIT_REVIEW("审核待办修改申请通知","${userName}您好，${courseName}课程、${paperNumber}试卷重新提交修改申请，请您尽快审核！"),
+    NOTICE_OF_AUDIT_CREATED("审核待办生成通知","${userName}您好，${courseNameAndPaperNumber}试卷已提交入库，请您尽快审核！"),
+    NOTICE_OF_AUDIT_REVIEW("审核待办修改申请通知","${userName}您好，${courseNameAndPaperNumber}试卷重新提交修改申请，请您尽快审核！"),
     // 定时任务查询触发，业务id为考务老师id，短信发送给考务老师
     NOTICE_OF_AUDIT_WILL_EXPIRE("审核待办到期预警通知","${userName}您好，您还有${count}条审核待办即将逾期，请您尽快处理！"),
     NOTICE_OF_AUDIT_OVERDUE("审核待办逾期通知","${userName}您好，您有${count}条审核待办已逾期！"),

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicMessageServiceImpl.java

@@ -223,8 +223,8 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
 
             Map<String, Object> jsonMap = new HashMap<>();
             jsonMap.put("userName", userName);
-            jsonMap.put("courseName", examTask.getCourseName());
-            jsonMap.put("paperNumber", examTask.getPaperNumber());
+            StringJoiner sj = new StringJoiner("、").add(examTask.getCourseName()).add(examTask.getPaperNumber());
+            jsonMap.put("courseNameAndPaperNumber", sj.toString());
             String variableParams = JSON.toJSONString(jsonMap);
             String remark = String.format("命题任务ID：%s", examTask.getId().toString());
             this.saveMessageSendLog(userId, mobileNumber, examTask.getId(), variableParams, sysUser.getId(), messageType, remark);
@@ -322,6 +322,42 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
                 templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditNotPassCode();
                 templateContent = messageEnum.getTemplate();
                 break;
+            case NOTICE_OF_EXAM_TASK_CREATED:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSExamTaskCreatedCode();
+                templateContent = messageEnum.getTemplate();
+                break;
+            case NOTICE_OF_EXAM_TASK_WILL_EXPIRE:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSExamTaskWillExpireCode();
+                templateContent = messageEnum.getTemplate();
+                break;
+            case NOTICE_OF_EXAM_TASK_OVERDUE:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSExamTaskOverdueCode();
+                templateContent = messageEnum.getTemplate();
+                break;
+            case NOTICE_OF_ALLOCATION_WILL_EXPIRE:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAllocationWillExpireCode();
+                templateContent = messageEnum.getTemplate();
+                break;
+            case NOTICE_OF_ALLOCATION_OVERDUE:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAllocationOverdueCode();
+                templateContent = messageEnum.getTemplate();
+                break;
+            case NOTICE_OF_AUDIT_CREATED:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditCreatedCode();
+                templateContent = messageEnum.getTemplate();
+                break;
+            case NOTICE_OF_AUDIT_REVIEW:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditReviewCode();
+                templateContent = messageEnum.getTemplate();
+                break;
+            case NOTICE_OF_AUDIT_WILL_EXPIRE:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditWillExpireCode();
+                templateContent = messageEnum.getTemplate();
+                break;
+            case NOTICE_OF_AUDIT_OVERDUE:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditOverdueCode();
+                templateContent = messageEnum.getTemplate();
+                break;
         }
         result.put("templateContent", templateContent);
         result.put("templateCode", templateCode);

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -158,10 +158,10 @@ public class ExamTaskController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public Result save(@RequestBody ExamTask examTask) {
         ExamTask task = examTaskService.saveExamTask(examTask);
-        // todo 发送短信
-        /*if(task.getId() != null){
+        //发送短信
+        if(task.getId() != null){
             basicMessageService.sendNoticeTaskCreate(task);
-        }*/
+        }
         return ResultUtil.ok(true);
     }
 
@@ -206,11 +206,11 @@ public class ExamTaskController {
     @RequestMapping(value = "/save_batch", method = RequestMethod.POST)
     public Result saveBatch(@RequestBody ExamTask task) {
         List<ExamTask> examTasks = examTaskService.saveBatch(task);
-        /*if(examTasks != null && examTasks.size() > 0){
-            // todo 发送短信
+        if(examTasks != null && examTasks.size() > 0){
+            // 发送短信
             ExamTask[] tasks = examTasks.toArray(new ExamTask[examTasks.size()]);
             basicMessageService.sendNoticeTaskCreate(tasks);
-        }*/
+        }
         return ResultUtil.ok(true);
     }
 
@@ -290,10 +290,10 @@ public class ExamTaskController {
             // 校验是否可以提交打印状态
             commonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), (SysUser) ServletUtil.getRequestUser());
         }
-        // todo 待审核状态，发送短信
-        /*if(ExamStatusEnum.SUBMIT.name().equals(examTask.getStatus())){
+        //待审核状态，发送短信
+        if(ExamStatusEnum.SUBMIT.equals(examTask.getStatus())){
             basicMessageService.sendNoticeTaskAuditCreateOrReview(examTask, MessageEnum.NOTICE_OF_AUDIT_CREATED);
-        }*/
+        }
 
         return ResultUtil.ok(isSuccess);
     }
@@ -499,8 +499,8 @@ public class ExamTaskController {
         if(isSuccess){
             ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
             if(examTask.getReview()){
-                // todo 发送短信
-//                basicMessageService.sendNoticeTaskAuditCreateOrReview(examTask, MessageEnum.NOTICE_OF_AUDIT_REVIEW);
+                // 发送短信
+                basicMessageService.sendNoticeTaskAuditCreateOrReview(examTask, MessageEnum.NOTICE_OF_AUDIT_REVIEW);
             } else {
                 SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
                 // 校验课程关联考场，是否已经提交打印

distributed-print/src/main/resources/application.properties

@@ -115,4 +115,22 @@ sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
 sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
 sms.config.aliyunSMSTplCode=SMS_147416565
 sms.config.aliyunSMSAuditPassCode=SMS_216425141
-sms.config.aliyunSMSAuditNotPassCode=SMS_216275156
+sms.config.aliyunSMSAuditNotPassCode=SMS_216275156
+#命题任务待办生成通知
+sms.config.aliyunSMSExamTaskCreatedCode=SMS_217436292
+#命题任务待办到期预警通知
+sms.config.aliyunSMSExamTaskWillExpireCode=SMS_217436295
+#命题任务待办逾期通知
+sms.config.aliyunSMSExamTaskOverdueCode=SMS_217426313
+#命题分配待办到期预警通知
+sms.config.aliyunSMSAllocationWillExpireCode=SMS_217406305
+#命题分配待办逾期通知
+sms.config.aliyunSMSAllocationOverdueCode=SMS_217406308
+#审核待办生成通知
+sms.config.aliyunSMSAuditCreatedCode=SMS_217436298
+#审核待办修改申请通知
+sms.config.aliyunSMSAuditReviewCode=SMS_217416269
+#审核待办到期预警通知（未通过）
+sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
+#审核待办逾期通知
+sms.config.aliyunSMSAuditOverdueCode=SMS_217416271