diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java index 65a535b..1998334 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java @@ -106,9 +106,9 @@ public class TimingRemindImpl implements TimingRemindService { .eq(JContacts::getDefaultcontact, "1").list(); list.forEach(y -> { //先添加工单再发送短信 - smsAlertsService.addSsmPhone(y.getTyshxydm()); + smsAlertsService.addSsmPhone(y.getYddh()); //可在导入或者新增的时候将该常用联系人的手机号添加进工单 - smsAlertsService.enterSms(y.getQymc(), s, y.getTyshxydm()); + smsAlertsService.enterSms(y.getQymc(), s, y.getYddh()); log.info(y.getQymc() + "发送短信成功!"); }); } @@ -137,10 +137,10 @@ public class TimingRemindImpl implements TimingRemindService { sd.setZwId(x.getUserId()); if (isTiming) { if (sd.getProjectId() != null & !x.getPhonenumber().isEmpty()) { - smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个项目自定义通知,请前往工作台查看", x.getPhonenumber()); + smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个项目自定义通知,请前往工作台查看,"+"登录网址为:https://idp.sipac.gov.cn/bms/#/login", x.getPhonenumber()); } if (!x.getPhonenumber().isEmpty() & sd.getProjectId() == null) { - smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个全局自定义通知,请前往工作台查看", x.getPhonenumber()); + smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个全局自定义通知,请前往工作台查看,"+"登录网址为:https://idp.sipac.gov.cn/bms/#/login", x.getPhonenumber()); } } listAdd.add(sd); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java index 73c13e4..0216699 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java @@ -15,6 +15,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -105,6 +106,7 @@ public class BmsTemplateRecordController extends BaseController { @PreAuthorize("@ss.hasAnyRoles('admin,other-gov')") @Log(title = "在线模板", businessType = BusinessType.INSERT) @PostMapping + @Transactional(rollbackFor = Exception.class) public AjaxResult add(@RequestBody BmsTemplateRecordAddDto bmsTemplateRecordAddDto) { return toAjax(bmsTemplateRecordService.insertBmsTemplateRecord(bmsTemplateRecordAddDto)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java index 236572e..b3e4bee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java @@ -48,7 +48,7 @@ public class SmsEnterChange { list1.removeIf(x -> x.getPhonenumber().isEmpty()); for (SysUser items : list1) { if("0".equals(items.getDelFlag()) & "0".equals(items.getStatus())) { - smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count + "个新的申报审核任务[待初审]", items.getPhonenumber()); + smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count + "个新的申报审核任务[待初审],"+"登录网址为:https://idp.sipac.gov.cn/bms/#/login", items.getPhonenumber()); } } } @@ -61,7 +61,7 @@ public class SmsEnterChange { list2.removeIf(x -> x.getPhonenumber().isEmpty()); for (SysUser items : list2) { if("0".equals(items.getDelFlag()) & "0".equals(items.getStatus())) { - smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count1 + "个新的申报审核任务[待复审]", items.getPhonenumber()); + smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count1 + "个新的申报审核任务[待复审],"+"登录网址为:https://idp.sipac.gov.cn/bms/#/login", items.getPhonenumber()); } } } @@ -74,7 +74,7 @@ public class SmsEnterChange { list3.removeIf(x -> x.getPhonenumber().isEmpty()); for (SysUser items : list3) { if("0".equals(items.getDelFlag()) & "0".equals(items.getStatus())) { - smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count2 + "个新的申报审核任务[待终审]", items.getPhonenumber()); + smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count2 + "个新的申报审核任务[待终审],"+"登录网址为:https://idp.sipac.gov.cn/bms/#/login", items.getPhonenumber()); } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java index ad4221a..f5a8c15 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java @@ -303,7 +303,7 @@ public class TimeChange { y.setZwId(o.getUserId()); bmsDeclarationRecords.add(y); if (isTiming) { - smsAlertsService.enterSms("政府人员-" + o.getNickName(), "您有1个项目即将建设完成,请前往工作台查看。", o.getPhonenumber()); + smsAlertsService.enterSms("政府人员-" + o.getNickName(), "您有1个项目即将建设完成,请前往工作台查看。"+"登录网址为:https://idp.sipac.gov.cn/bms/#/login", o.getPhonenumber()); } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/SmsAlertsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/SmsAlertsServiceImpl.java index 59df4dc..7d41e1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/SmsAlertsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/SmsAlertsServiceImpl.java @@ -78,7 +78,7 @@ public class SmsAlertsServiceImpl implements SmsAlertsService { //请求体 JSONObject params = new JSONObject();//存放参数 params.set("param1", param1); - params.set("param2", param2+"登录网址为:https://idp.sipac.gov.cn/bms/#/login"); + params.set("param2", param2); jsonObject.set("type", paramType); jsonObject.set("empowerCode", smsV); jsonObject.set("numbers", numbers);