全部提交先

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java

@@ -32,7 +32,7 @@ public class IdCardCryptoUtil {
         String key = "VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
         System.out.println("====================== 示例 ======================");
         // 加密
-        String source_dec = "18676981102";
+        String source_dec = "15118142870";
         String enc = IdCardCryptoUtil.symmetricEncryptIdCard(key, source_dec);
         System.out.println(source_dec+" 加密后 : "+enc);
         // 解密
@@ -51,12 +51,9 @@ public class IdCardCryptoUtil {
 
         System.out.println("====================== 实用 ======================");
         String[] strings={
-                "13360957126",
-                "16688211945",
-                "17339838670",
-                "18460319603",
-                "15626498490",
-                "18080147218",
+                "13316581687",
+                "15302630206",
+                "13923735911",
         };
 
 //        刘义	13410900924	19020722074

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java

@@ -53,7 +53,7 @@ public final class JasyptUtils {
          String s = encryptWithMD5("jdbc:mysql://10.76.108.1:15144/zfjd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8", "ATPfOhpnAVp6yBas7RU");
          System.out.println(s);
         String channelcs1 = decryptWithMD5("Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==", "ATPfOhpnAVp6yBas7RU");
-        String channelcs2 = decryptWithMD5("jGDVr5PtJpE/xa9FyHzmV2PhFrtctWjETGP5lrUlOyZ68APa81+jbQYA9RNKMI/dldAm7xxTQian8370eQqlYSAyoQV9EYlhsK3MgJkn4+OmnfBNmg227+/hizsmt1swxyW2uQbdlhzw6QaXYJ175Rjtlq1yVx+NOiamEoeSO4hzHWqxKTJT/y19fHg6QTuQc3r+PEsAFQp503HsvC5lgA==", "ATPfOhpnAVp6yBas7RU");
+        String channelcs2 = decryptWithMD5("nCzTixQexFdZNVhREOMMps2pNJ5gxrZb", "ATPfOhpnAVp6yBas7RU");
         System.out.println(channelcs1);
         System.out.println(channelcs2);
     }

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml

@@ -10,7 +10,8 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
 #  profile: C:/ruoyi/uploadPath
-  profile: /usr/local/uploadPath
+#  profile: /usr/local/uploadPath
+  profile: /data/upload
 #  profile: /Users/kylin_stone/Workspaces/uploads
   # 获取ip地址开关
   addressEnabled: false

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/enterprise_pub_qrcode/enterprisePubQrcodeList.html

@@ -68,7 +68,7 @@
                 <a class="btn btn-info" onclick="importData()">
                     <i class="fa fa-upload"></i> 批量导入
                 </a>
-                <a class="btn btn-default" onclick="downloadTemplate()">
+                <a class="btn btn-warning" style="color: #F54927; background-color: #FCC6BB; border-color: #F54927" onclick="downloadTemplate()">
                     <i class="fa fa-file-excel-o"></i> 下载模板
                 </a>
                 <a class="btn btn-warning" onclick="matchData()">

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java

@@ -45,6 +45,7 @@ public interface ThirdLoginService {
      * @return
      */
     Boolean checkIsLawOfficer(String userIdCard);
+    String checkIsLawOfficer2(String userIdCard);
 
     /**
      * 获取市场监督管理局H5页面企业信息

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java

@@ -179,12 +179,17 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             // 获取执法主体
             user.setBureauDept(deptApi.iterationDeptParentToBureau(user.getDeptId()));
             // 判断是否执法人员
-            if(StrUtil.isNotEmpty(user.getCertificateNumber())){
-                user.setLawOfficer(this.checkIsLawOfficer(user.getCertificateNumber()));
-                log.info("-----------> {} - 判断是否执法人员: {}", user.getUserId(), user.getLawOfficer());
+            log.info("-----------> {} - 执法证件号: {}", user.getUserName(), user.getLawCertificateNum());
+            if(StrUtil.isNotEmpty(user.getLawCertificateNum())){
+//                user.setLawOfficer(this.checkIsLawOfficer(user.getCertificateNumber()));
+                user.setLawOfficer(true);
             }else if (StrUtil.isNotEmpty(user.getCertificateNumber())){  // 没有身份证的话就用执法证去找下
-                List<Zfryjdm2405301> zfryjdm2405301s = xzjcjbxx025711Mapper.queryZFRYByzfcode(user.getLawCertificateNum());
-                if (zfryjdm2405301s.size() > 0) {
+                String zfcode = this.checkIsLawOfficer2(user.getCertificateNumber());
+                if (zfcode.length() > 0) {
+                    UserBean tmpUser = new UserBean();
+                    tmpUser.setUserId(user.getUserId());
+                    tmpUser.setLawCertificateNum(zfcode);
+                    userApi.updateUser(tmpUser);
                     user.setLawOfficer(true);
                 } else {
                     user.setLawOfficer(false);
@@ -454,6 +459,28 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         return Boolean.FALSE;
     }
 
+    @Override
+    public String checkIsLawOfficer2(String userIdCard) {
+        //证件号解密
+        String s = IdCardCryptoUtil.symmetricDecryptIdCard(srzSecretKey, userIdCard);
+        log.error("----> 打印出身份证解密用盐: {}", srzSecretKey);
+        System.out.println("======身份证解密========");
+        log.info(s);
+        System.out.println("==============");
+        List<Zfryjdm2405301> zfryjdm2405301s = xzjcjbxx025711Mapper.queryZFRYByIdCard(s);
+        System.out.println("======解密后查询========");
+        System.out.println(zfryjdm2405301s);
+        System.out.println("==============");
+        if(zfryjdm2405301s.size() > 0 ){
+            if(BeanUtil.isNotEmpty(zfryjdm2405301s.get(0).getZfcode())){
+                return zfryjdm2405301s.get(0).getZfcode();
+            }else{
+                return "";
+            }
+        }
+        return "";
+    }
+
     @Override
     public String getSjEnterpriseInfo(String url) {
         HttpClient httpClient = HttpClients.createDefault();

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/ZwSmsClient.java

@@ -34,21 +34,21 @@ public class ZwSmsClient {
 //        password = Azdg.encrypt(password);
 //        ConnMas();
         sendMessage("18520089969", "【测试短信】尊敬的 石磊先生 , 您有一条于: 今天 的执法预约信息, 请查收");
-        String orgCode = "10";  // 发送用户标记 一般两位数字
-        String mobileNum = "17608416852,18520089969";  //接收号码, 多个逗号分隔
-        String content = "测试内容：xxx";  // 短信内容
-        Integer needReport = 1;  // 是否需要短信报告  1 需要  其他不需要
-
-        String sendbody = "<sendbody>\n" +
-                "\t<message>\n" +
-                "\t<orgaddr></orgaddr><mobile>%s</mobile>" +
-                "<content><![CDATA[%s]]></content>" +
-                "<sendtime></sendtime>" +
-                "<needreport>%s</needreport>\n" +
-                "\t</message>\n" +
-                "\t<publicContent></publicContent>\n" +
-                "</sendbody>";
-        InsertDownSms(String.format(sendbody, mobileNum, content, needReport));
+//        String orgCode = "10";  // 发送用户标记 一般两位数字
+//        String mobileNum = "17608416852,18520089969";  //接收号码, 多个逗号分隔
+//        String content = "测试内容：xxx";  // 短信内容
+//        Integer needReport = 1;  // 是否需要短信报告  1 需要  其他不需要
+//
+//        String sendbody = "<sendbody>\n" +
+//                "\t<message>\n" +
+//                "\t<orgaddr></orgaddr><mobile>%s</mobile>" +
+//                "<content><![CDATA[%s]]></content>" +
+//                "<sendtime></sendtime>" +
+//                "<needreport>%s</needreport>\n" +
+//                "\t</message>\n" +
+//                "\t<publicContent></publicContent>\n" +
+//                "</sendbody>";
+//        InsertDownSms(String.format(sendbody, mobileNum, content, needReport));
     }
 
     /**