修改存短信接口

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/InstallNoticeDto.java

@@ -57,4 +57,8 @@ public class InstallNoticeDto  extends BaseDto {
     @ApiModelProperty(value = "安装负责人")
     private String installPri;
 
+    private String projectName;
+
+    private String companyName;
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallNoticeServiceImpl.java

@@ -104,6 +104,8 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
         InstallNoticeDto installNoticeDto = new InstallNoticeDto();
 		final ProjectDto projectDto = projectServiceImpl.queryBySeq(object.getLong("name"));
         installNoticeDto.setProjectId(object.getLong("name"));
+        installNoticeDto.setProjectName(projectDto.getName());
+        installNoticeDto.setCompanyName(projectDto.getInstallationUnit());
         installNoticeDto.setNoticeStatus(noticeStatus);
         installNoticeDto.setNoticeDate(new Date());
         installNoticeDto.setApproved(false);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemInitiationServiceImpl.java

@@ -156,7 +156,7 @@ public class ProblemInitiationServiceImpl {
             HashMap<String, String> smsParams = new HashMap();
             smsParams.put("smsCode", smsCode);
             smsParams.put("projectName", object.getString("projectName"));
-            smsParams.put("problemDesc", object.getString("problemDesc"));
+            smsParams.put("CompanyName", object.getString("CompanyName"));
             //条件构造器 通过项目id查出来的项目详情信息中的区域代码，在监管区域规则表中拿到详细信息中的监察部门id，在使用监察部门id拿到平台的监察部门id
             LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(SuperviseRule::getAdminRegionCode, projectServiceImpl.getById(object.getLong("projectId")).getInstallRegionCode());
@@ -211,7 +211,7 @@ public class ProblemInitiationServiceImpl {
                     continue;
                 }
                 if(SMSEnum.项目安装告知申请.getCode().equals(smsCode) || SMSEnum.项目立项驳回短信.getCode().equals(smsCode)){
-                    saveProjectSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel,object);
+                    saveProjectSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel,object,smsCode);
                 }else {
                     saveProblemSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel);
                 }
@@ -220,11 +220,32 @@ public class ProblemInitiationServiceImpl {
         }
     }
 
-    public void saveProjectSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel,JSONObject object){
+    public void saveProjectSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel,JSONObject object,String smsCode){
+        String content = Systemctl.smsTemplateClient.seleteOne(smsCode).getResult().getSmsContent();
+        String projectName = object.getString("projectName");
+        String companyName = object.getString("companyName");
+        String reviewInfo = object.getString("reviewInfo");
+
+        if(!ValidationUtil.isEmpty(projectName)){
+            if(content.contains("${projectName}")) {
+                content = content.replace("${projectName}", projectName);
+            }
+        }
+        if(!ValidationUtil.isEmpty(companyName)){
+            if(content.contains("${companyName}")){
+                content = content.replace("${companyName}",companyName);
+            }
+        }
+        if(!ValidationUtil.isEmpty(reviewInfo)){
+            if(content.contains("${reviewInfo}")) {
+                content = content.replace("${reviewInfo}", reviewInfo);
+            }
+        }
+
         LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
         wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr());
         InstallNoticeMsg installNoticeMsg = new InstallNoticeMsg();
-        installNoticeMsg.setContent(smsRecordModel.getSmsContent());
+        installNoticeMsg.setContent(content);
         installNoticeMsg.setInstallNoticeId(object.getLong("sequenceNbr"));
         installNoticeMsg.setTargetUnitId(Long.valueOf(noticeUnitId));
         installNoticeMsg.setTargetPersonId(orgUsrServiceImpl.getOne(wrapperQueryWrapper).getSequenceNbr());