Przeglądaj źródła

武大考务数据对接-数据变动短信通知

xiaof 3 lat temu
rodzic
commit
a855974c4f

+ 15 - 2
src/main/java/com/qmth/eds/service/impl/BasicMessageServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmth.eds.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.eds.bean.dto.ExamSyncTotalDownloadDto;
@@ -15,6 +16,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,11 +44,17 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
 
     @Override
     public void sendTeachDataChangeNotice(Long schoolId, Long semesterId, Long examTypeId) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String currentDate = LocalDate.now().format(formatter);
         List<ExamSyncTotalDownloadDto> examSyncTotalDownloadDtos = examSyncTotalService.listDownloadRecordInfos(schoolId, semesterId, examTypeId);
         if (!examSyncTotalDownloadDtos.isEmpty()) {
             for (ExamSyncTotalDownloadDto examSyncTotalDownloadDto : examSyncTotalDownloadDtos) {
-                // todo 参数拼接
-                String variableParams = "{}";
+                // 短信参数
+                Map<String, String> map = new HashMap<>();
+                map.put("userName", examSyncTotalDownloadDto.getUserName());
+                map.put("schoolName", examSyncTotalDownloadDto.getSchoolName());
+                map.put("currentDate", currentDate);
+                String variableParams = JSONObject.toJSONString(map);
                 String remark = "下载的文件有变动,请重新下载";
                 saveMessageSendLog(schoolId, examSyncTotalDownloadDto.getUserId(), examSyncTotalDownloadDto.getUserName(), examSyncTotalDownloadDto.getMobileNumber(), variableParams, MessageEnum.NOTICE_OF_TEACH_DATA_CHANGE, examSyncTotalDownloadDto.getId(), remark);
             }

+ 1 - 1
src/main/java/com/qmth/eds/service/impl/DataSyncServiceImpl.java

@@ -139,7 +139,7 @@ public class DataSyncServiceImpl implements DataSyncService {
                 examSyncTotalService.updateById(examSyncTotal);
 
                 // 下载过学校+学期+考试类型  文件的实施人员发送短信
-//                basicMessageService.sendTeachDataChangeNotice(schoolId, semesterId, examTypeId);
+                basicMessageService.sendTeachDataChangeNotice(schoolId, semesterId, examTypeId);
             }
             result = TaskResultEnum.SUCCESS;
         } catch (ApiException | IOException e) {

+ 4 - 4
src/main/resources/application-dev.properties

@@ -18,9 +18,9 @@ db.password=root
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=13
+com.qmth.redis.db=3
 com.qmth.redis.port=6379
-#com.qmth.redis.password=
+#com.qmth.redis.password=123456
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -116,8 +116,8 @@ sms.config.expiredTime=2
 sms.config.sendInterval=60
 sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
-sms.config.teachDataChangeNoticeCode=SMS_147416565
+sms.config.aliyunSMSSignName=\u542f\u660e\u6cf0\u548c
+sms.config.teachDataChangeNoticeCode=SMS_242831889
 
 whu.config.appKey=DD1198B44CD624B6E0530107010AF5DF
 whu.config.appSecret=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAojkSbVqi/6v7hNdHZIPU4EKLyyxO7akNAIXilJ0+c0sYHV4Z6vctSrds4LIPp3fXUuMA9F7d1vp6s7HOQfuIfwIDAQABAkBiCowQew635oEEL/d90A7/2jgSepzZFao9/qyJlN8BXg8M6zwBFiEB51GbW0642bWTftFT0Arrq6ipYkXTyH7BAiEA8oMCG7HqUYXX4bt6h9Bz8LIwI4oFx3x90RpK+b0iPmMCIQCrPuAZB90EJtr4fOE3+lQBORoKVOF/cwFQX14mBXRKNQIhAKLeVVYgQMwLZZcWgA4icxsdsLLNiWAWPbFnRR9AZHUdAiA5tGJHjQLJF17KRSqPdmdAUkGYIaorDFHxB3HuVgAt0QIgIMcILJ3lJx6URAEG9e055KXh8J+nXItScHZ4bXMWls4=

+ 2 - 2
src/main/resources/application-release.properties

@@ -116,8 +116,8 @@ sms.config.expiredTime=2
 sms.config.sendInterval=60
 sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
-sms.config.teachDataChangeNoticeCode=SMS_147416565
+sms.config.aliyunSMSSignName=\u542f\u660e\u6cf0\u548c
+sms.config.teachDataChangeNoticeCode=SMS_242831889
 
 whu.config.appKey=DD1198B44CD624B6E0530107010AF5DF
 whu.config.appSecret=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAojkSbVqi/6v7hNdHZIPU4EKLyyxO7akNAIXilJ0+c0sYHV4Z6vctSrds4LIPp3fXUuMA9F7d1vp6s7HOQfuIfwIDAQABAkBiCowQew635oEEL/d90A7/2jgSepzZFao9/qyJlN8BXg8M6zwBFiEB51GbW0642bWTftFT0Arrq6ipYkXTyH7BAiEA8oMCG7HqUYXX4bt6h9Bz8LIwI4oFx3x90RpK+b0iPmMCIQCrPuAZB90EJtr4fOE3+lQBORoKVOF/cwFQX14mBXRKNQIhAKLeVVYgQMwLZZcWgA4icxsdsLLNiWAWPbFnRR9AZHUdAiA5tGJHjQLJF17KRSqPdmdAUkGYIaorDFHxB3HuVgAt0QIgIMcILJ3lJx6URAEG9e055KXh8J+nXItScHZ4bXMWls4=

+ 2 - 2
src/main/resources/application-test.properties

@@ -116,8 +116,8 @@ sms.config.expiredTime=2
 sms.config.sendInterval=60
 sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
-sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
-sms.config.teachDataChangeNoticeCode=SMS_147416565
+sms.config.aliyunSMSSignName=\u542f\u660e\u6cf0\u548c
+sms.config.teachDataChangeNoticeCode=SMS_242831889
 
 whu.config.appKey=DD1198B44CD624B6E0530107010AF5DF
 whu.config.appSecret=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAojkSbVqi/6v7hNdHZIPU4EKLyyxO7akNAIXilJ0+c0sYHV4Z6vctSrds4LIPp3fXUuMA9F7d1vp6s7HOQfuIfwIDAQABAkBiCowQew635oEEL/d90A7/2jgSepzZFao9/qyJlN8BXg8M6zwBFiEB51GbW0642bWTftFT0Arrq6ipYkXTyH7BAiEA8oMCG7HqUYXX4bt6h9Bz8LIwI4oFx3x90RpK+b0iPmMCIQCrPuAZB90EJtr4fOE3+lQBORoKVOF/cwFQX14mBXRKNQIhAKLeVVYgQMwLZZcWgA4icxsdsLLNiWAWPbFnRR9AZHUdAiA5tGJHjQLJF17KRSqPdmdAUkGYIaorDFHxB3HuVgAt0QIgIMcILJ3lJx6URAEG9e055KXh8J+nXItScHZ4bXMWls4=