提交是否执法人员校验

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

@@ -34,7 +34,7 @@ public class IdCardCryptoUtil {
         String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "汪鑫");
 
 //        String secret = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "ae739d8c-86ed-4898-b57d-eed3be42debf");
-        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", userIdCode);
+        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "31nylKvncOOOz4z0RNiEcQDv5OcXNQowwTb9vUh8RCo=");
 
 //        System.out.println(userIdCode);
 //        System.out.println(phone);

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java

@@ -11,11 +11,13 @@ import com.zdxt.auth.project.system.dict.service.IDictDataService;
 import com.zdxt.auth.project.system.user.service.IUserService;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.IdCardCryptoUtil;
 import com.zdxt.domain.auth.DictData;
 import com.zdxt.domain.auth.Post;
 import com.zdxt.domain.auth.User;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,6 +47,9 @@ public class AppSystemController extends BaseController {
 
     @Autowired
     private PostApi postApi;
+    @Value("${srnwg.secretKey}")
+    private String secretKey;
+
 
     @GetMapping("/getUserInfo/{userId}")
     @ResponseBody
@@ -69,6 +74,13 @@ public class AppSystemController extends BaseController {
     @ResponseBody
     public ZDResponse listApp(User user) {
         List<User> list = userService.selectUserList(user);
+        //解密
+//        if(list.size() > 0){
+//            for (int i = 0; i < list.size(); i++) {
+//                String s = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, list.get(i).getPhonenumber());
+//                list.get(i).setPhonenumber(s);
+//            }
+//        }
         // 查询出职务
         for (User userData : list) {
             List<PostBean> postBeanList = postApi.selectPostsByUserId(userData.getUserId());

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java

@@ -272,4 +272,12 @@ public class AppThirdLoginController {
         zwSmsClient.sendMessage(phone,content);
     }
 
+    @GetMapping("/queryByIdCard")
+    @ResponseBody
+    public ZDResponse queryByIdCard(String idCards) throws Exception {
+//        zwSmsClient.sendMessage(phone,content);
+        Boolean aBoolean = thirdLoginService.checkIsLawOfficer(idCards);
+        return ZDResponse.success("校验成功",aBoolean);
+    }
+
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -80,7 +80,7 @@
     </resultMap>
 
     <sql id="selectUserVo">
-        select  u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password,u.law_certificate_num, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.kingdee_org_id,u.kingdee_user_id, u.type,
+        select  u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password,u.law_certificate_num, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.kingdee_org_id,u.kingdee_user_id, u.type,u.certificateNumber,
        		    u.strUserId,
        		    d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.tenant_code,

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

@@ -91,7 +91,12 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             DeptBean dept = deptApi.getDeptById(user.getOrganizationId());
             user.setDept(dept);
             user.setDeptId(user.getOrganizationId());
-            user.setLawOfficer(this.checkIsLawOfficer(user.getCertificateNumber()));
+            //TODO 正式启动启动此代码
+//            if(StrUtil.isNotEmpty(user.getCertificateNumber())){
+//                user.setLawOfficer(this.checkIsLawOfficer(user.getCertificateNumber()));
+//            }else{
+//                user.setLawOfficer(false);
+//            }
             return ZDResponse.success("登录成功",user);
         } catch (Exception e) {
             e.printStackTrace();