From ec6f30dcd606790bdf5453327b9465a4ef4134fc Mon Sep 17 00:00:00 2001 From: yanyan Date: Tue, 24 Jun 2025 15:22:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...AppEnterpriseLawEnforcementController.java | 29 ++++++++++++++++++- .../code/domain/EnterpriseLawEnforcement.java | 9 ++++++ .../java/com/zdxt/auth/dto/DictDataBean.java | 11 +++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java index 6cfa192b..948e5e77 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java @@ -7,7 +7,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.zdxt.auth.dto.DeptBean; +import com.zdxt.auth.dto.DictDataBean; import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.DictDataApi; import com.zdxt.auth.feign.UserApi; import com.zdxt.code.domain.EnterpriseComplaint; import com.zdxt.code.domain.EnterpriseLawEnforcement; @@ -50,6 +52,8 @@ public class AppEnterpriseLawEnforcementController extends BaseController @Autowired private IEnterpriseComplaintService enterpriseComplaintService; @Autowired private UserApi userApi; + @Autowired private DictDataApi dictDataApi; + @Autowired private ZwSmsClient zwSmsClient; @@ -277,12 +281,35 @@ public class AppEnterpriseLawEnforcementController extends BaseController // 下发短信 public void sendSms(EnterpriseLawEnforcement enterpriseLawEnforcement) { - //【xx企业】尊敬的xx，xx活动将定于本月15日上午开赛，请各位参赛者务必提前抵达会场，以免耽误您的比赛！ + //【深圳政务短信平台】尊敬的{name}（先生/女士），您好！ + // 深圳市行政执法监督码系统向您推送关于{enterpriseName}行政检查预告信息，请您查收。 + // 信息内容如下： 执法单位：{enforceUnit} 执法人员：{enforceUser} + // 检查时间：{enforceTime} 如需了解预告详情，请登录{appName}App执法监督码小程序进行查看，感谢您的理解！ try { String smsStr = "您好! "+enterpriseLawEnforcement.getEnterpriseName()+", " + enterpriseLawEnforcement.getLinkMan() +", 您有一条于: "+ enterpriseLawEnforcement.getCheckTime()+" 的执法预约信息, 请查收"; + + DictDataBean dictParams = new DictDataBean(); + dictParams.setDictType("msg_template"); + List dicts = dictDataApi.getDictData(dictParams); + for (DictDataBean d : dicts) { + if (d.getDictValue().equals("registerEnforcement") && StringUtils.isNotEmpty(d.getRemark())) { + String users = enterpriseLawEnforcement.getLawEnforcer(); + if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getLawEnforcerTwo())){ + users = users+","+ enterpriseLawEnforcement.getLawEnforcerTwo(); + } + smsStr =d.getRemark(); + smsStr = smsStr.replace("{name}", enterpriseLawEnforcement.getLinkMan()); + smsStr = smsStr.replace("{enterpriseName}", enterpriseLawEnforcement.getEnterpriseName()); + smsStr = smsStr.replace("{enforceUnit}", enterpriseLawEnforcement.getBureauDeptName()); + smsStr = smsStr.replace("{enforceUser}", users); + smsStr = smsStr.replace("{enforceTime}", enterpriseLawEnforcement.getCheckTime()); + smsStr = smsStr.replace("{appName}", StringUtils.isEmpty(enterpriseLawEnforcement.getAppName())?"深i企":enterpriseLawEnforcement.getAppName()); + break; + } + } ZwSmsClient.sendMessage(enterpriseLawEnforcement.getLinkTel(),smsStr); } catch (Exception e) { System.out.println("短信下发异常"); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java index 64e062b8..82e717b8 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java @@ -129,6 +129,7 @@ public class EnterpriseLawEnforcement extends BaseDomain private String tmpDeptJson; // 用来展示执法人员名称 - 执法编码的 private String lawEnforcer2Show; + private String appName; public List getUserObjs() { return userObjs; @@ -525,4 +526,12 @@ public class EnterpriseLawEnforcement extends BaseDomain .append("lawEnforcerTel", getLawEnforcerTel()) .toString(); } + + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName; + } } diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DictDataBean.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DictDataBean.java index 447ea425..709dbbc8 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DictDataBean.java +++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DictDataBean.java @@ -39,6 +39,9 @@ public class DictDataBean{ /** 状态（0正常 1停用） */ private String status; + /** 备注 */ + private String remark; + public Long getDictCode() { return dictCode; } @@ -110,4 +113,12 @@ public class DictDataBean{ public void setStatus(String status) { this.status = status; } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } }