Merge remote-tracking branch 'origin/v2' into v2

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<UserBean> 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);
     }

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("发送成功");
+    }
 }

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) {

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";  // 短信内容