From 34b70162e7247e6af4fd4adadf522c86c50fe08b Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 31 Jul 2024 14:55:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=89=A7=E6=B3=95=E4=BA=BA=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=92=8C=E6=89=A7=E6=B3=95=E4=BE=9D=E6=8D=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85;=20=E5=8F=91=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 25 ++++++++++++++++--- ...AppEnterpriseLawEnforcementController.java | 14 +++++++++++ .../main/java/com/zdxt/code/utils/Azdg.java | 4 +-- .../java/com/zdxt/code/utils/ZwSmsClient.java | 3 ++- 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index 56ea1621..f3095754 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -241,10 +241,27 @@ public class AppEnforcementRegistrationController extends BaseController { EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); if (null != enforcementRegistration) { - LinkageDict ld1 = iLinkageDictService.selectLinkageDictById(enforcementRegistration.getLawEnforcementItem()); - Zqyjjdm137344 zq = iZqyjjdm137344Service.getZqyjjdmById(enforcementRegistration.getLawEnforcementBasis()); - enforcementRegistration.setLawEnforcementItemText(null==ld1?"":ld1.getTitle()); - enforcementRegistration.setLawEnforcementBasisText(null==zq?"":zq.getLawName()); +// LinkageDict ld1 = iLinkageDictService.selectLinkageDictById(enforcementRegistration.getLawEnforcementItem()); +// Zqyjjdm137344 zq = new Zqyjjdm137344(); +// try { +// zq = iZqyjjdm137344Service.getZqyjjdmById(enforcementRegistration.getLawEnforcementBasis()); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// enforcementRegistration.setLawEnforcementItemText(null==ld1?"":ld1.getTitle()); +// enforcementRegistration.setLawEnforcementBasisText(null==zq?"":zq.getLawName()); + + // 执法人员需要展示用户名+执法码 + List userBeans = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo()); + String tmpUserShow = ""; + for (UserBean ub : userBeans) { + String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); + tmpUserShow += ub.getUserName() +" - "+ lawCertificateNum + ","; + } + if (tmpUserShow.length() > 0) { + tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1); + } + enforcementRegistration.setLawEnforcer2Show(tmpUserShow); } return ZDResponse.success("查询成功",enforcementRegistration); } 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 b3e82824..cd45ddd4 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 @@ -345,4 +345,18 @@ public class AppEnterpriseLawEnforcementController extends BaseController enfrorcement.setDeptObjs(objs); return ZDResponse.success("查询成功", enfrorcement); } + + @GetMapping("/sendSmsTest/{tel}") + @ResponseBody + public ZDResponse sendSmsTest(@PathVariable("tel") String tel) { + try { + String smsStr = "【测试短信】尊敬的 石磊先生 , 您有一条于: 今天 的执法预约信息, 请查收"; + zwSmsClient.sendMessage(tel,smsStr); + } catch (Exception e) { + System.out.println("短信下发异常"); + e.printStackTrace(); + return ZDResponse.error("发送失败"); + } + return ZDResponse.success("发送成功"); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/Azdg.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/Azdg.java index 77776510..38233cda 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/Azdg.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/Azdg.java @@ -110,8 +110,8 @@ public class Azdg { } public String base64_encode(String str) { -// return new sun.misc.BASE64Encoder().encode(str.getBytes()); - return null; + return new sun.misc.BASE64Encoder().encode(str.getBytes()); +// return null; } public static final String strMD5(String s) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/ZwSmsClient.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/ZwSmsClient.java index e4465756..c57a7f64 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/ZwSmsClient.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/ZwSmsClient.java @@ -32,7 +32,8 @@ public class ZwSmsClient { public static void main(String[] args) throws Exception { // username = Azdg.encrypt(username); // password = Azdg.encrypt(password); - ConnMas(); +// ConnMas(); + sendMessage("18520089969", "【测试短信】尊敬的 石磊先生 , 您有一条于: 今天 的执法预约信息, 请查收"); String orgCode = "10"; // 发送用户标记 一般两位数字 String mobileNum = "17608416852,18520089969"; //接收号码, 多个逗号分隔 String content = "测试内容：xxx"; // 短信内容