Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,8 @@
 package com.zdxt.common.util;
 
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class StringNumUtil {
@@ -21,12 +24,70 @@ public class StringNumUtil {
         String l = "%0"+len+"d";
         return String.format(l, nextVal);
     }
-    public static void main(String args[]){
+    public static void main(String args[]) throws UnsupportedEncodingException {
-        StringNumUtil stringNumUtil = new StringNumUtil();
+//        StringNumUtil stringNumUtil = new StringNumUtil();
-//        System.out.println(stringNumUtil.getNext());
+////        System.out.println(stringNumUtil.getNext());
-        System.out.println(stringNumUtil.getNext(0-1,"3"));
+//        System.out.println(stringNumUtil.getNext(0-1,"3"));
-//        String str = "000000001234034120";
+////        String str = "000000001234034120";
-//        String newStr = str.replaceAll("^(0+)", "");
+////        String newStr = str.replaceAll("^(0+)", "");
-//        System.out.println(newStr);
+////        System.out.println(newStr);
+
+        String testString = "娆ц搐鍐�";
+//        System.out.println(new String(testString.getBytes("ISO-8859-1"),"gb2312"));
+//        System.out.println(new String(testString.getBytes("UTF8"),"gb2312"));
+//        System.out.println(new String(testString.getBytes("GB2312"),"gb2312"));
+//        System.out.println(new String(testString.getBytes("GBK"),"gb2312"));
+//        System.out.println(new String(testString.getBytes("BIG5"),"gb2312"));
+
+        List<String> source = new ArrayList<>(10);
+        List<String> corrupted = new ArrayList<>(10);
+
+        source.add("信息");
+        // "信息"用utf8编码，gbk解码后，显示的文字就是"淇℃伅"。后面的也是同理。
+        corrupted.add("淇℃伅");
+        corrupted.add("娆ц搐鍐�");
+        encodeAndDecode(source, corrupted);
+
+    }
+
+    public static void encodeAndDecode(List<String> source, List<String> corrupted) {
+        for (String s : source) {
+            //utf8编码，gbk解码
+            try {
+                System.out.println("编码前的原文: " + s);
+                byte[] utf8Bytes = s.getBytes("utf8");
+                System.out.print("utf8编码后的字节: ");
+                for (byte b : utf8Bytes) {
+                    System.out.print(Integer.toHexString(b & 0xff) + ",");
+                }
+                System.out.println();
+
+                String utf8ToGbk = null;
+                // 直接获取到utf8编码后的字节，然后用gbk解码
+                utf8ToGbk = new String(utf8Bytes, "gbk");
+                System.out.println("utf8编码，gbk解码后的文字: " + utf8ToGbk + "\n" + "----------------------");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        System.out.println("<==================分割线===================>");
+        for (String s : corrupted) {
+            // gbk编码，utf8解码
+            try {
+                System.out.println("编码前的原文: " + s);
+                byte[] gbkBytes = s.getBytes("gbk");
+                System.out.print("gbk编码后的字节: ");
+                for (byte b : gbkBytes) {
+                    System.out.print(Integer.toHexString(b & 0xff) + ",");
+                }
+                System.out.println();
+
+                String gbkToUtf8 = new String(gbkBytes, "utf8");
+                System.out.println("gbk编码，utf8解码后的文字: " + gbkToUtf8 + "\n" + "----------------------");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
     }
 }

lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java

@@ -159,6 +159,35 @@ public class User extends BaseDomain {
     /** 执法证件号 */
     private String lawCertificateNum;
 
+    /** 姓名 */
+    private String fullname;
+    /** 任务ID */
+    private String taskId;
+    /** 业务系统ID */
+    private String systemId;
+    /** 作用点 (CREATE：新建；UPDATE：更新；DELETED：删除；ENABLED：启用；DISABLED：禁用) */
+    private String effectOn;
+    /** 是否删除 (0否;1是)*/
+    private int isDeleted;
+    /** 是否禁用 (0否;1是)*/
+    private int isDisabled;
+    /** 创建日期 */
+    private String createAt;
+    /** 更新日期 */
+    private String updateAt;
+    /** 下游唯一标识 */
+    private String guid;
+    /** 手机号 */
+    private String mobileNumber;
+    /** 证件号码 */
+    private String certificateNumber;
+    /** 省认证用户id */
+    private String srzUserid;
+    /** 是否驻区人员 */
+    private String isMappingPerson;
+    /** 人员所在部门（包括主岗和兼岗部门） */
+    private String units;
+
     public String getLawCertificateNum() {
         return lawCertificateNum;
     }
@@ -433,6 +462,118 @@ public class User extends BaseDomain {
         this.token = token;
     }
 
+    public String getFullname() {
+        return fullname;
+    }
+
+    public void setFullname(String fullname) {
+        this.fullname = fullname;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getSystemId() {
+        return systemId;
+    }
+
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
+    }
+
+    public String getEffectOn() {
+        return effectOn;
+    }
+
+    public void setEffectOn(String effectOn) {
+        this.effectOn = effectOn;
+    }
+
+    public int getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(int isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public int getIsDisabled() {
+        return isDisabled;
+    }
+
+    public void setIsDisabled(int isDisabled) {
+        this.isDisabled = isDisabled;
+    }
+
+    public String getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(String createAt) {
+        this.createAt = createAt;
+    }
+
+    public String getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(String updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getMobileNumber() {
+        return mobileNumber;
+    }
+
+    public void setMobileNumber(String mobileNumber) {
+        this.mobileNumber = mobileNumber;
+    }
+
+    public String getCertificateNumber() {
+        return certificateNumber;
+    }
+
+    public void setCertificateNumber(String certificateNumber) {
+        this.certificateNumber = certificateNumber;
+    }
+
+    public String getSrzUserid() {
+        return srzUserid;
+    }
+
+    public void setSrzUserid(String srzUserid) {
+        this.srzUserid = srzUserid;
+    }
+
+    public String getIsMappingPerson() {
+        return isMappingPerson;
+    }
+
+    public void setIsMappingPerson(String isMappingPerson) {
+        this.isMappingPerson = isMappingPerson;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
+
     @Override
     public String toString() {
         return "User{" +

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

@@ -59,7 +59,7 @@ public class AppEnforcementRegistrationController extends BaseController
     /**
      * 查询执法端-执法登记列表
      */
-    @RequiresPermissions("code:registration:list")
+//    @RequiresPermissions("code:registration:list")
     @GetMapping("/queryList")
     @ResponseBody
     public ZDResponse queryList(EnforcementRegistration enforcementRegistration)
@@ -80,7 +80,7 @@ public class AppEnforcementRegistrationController extends BaseController
     /**
      * 新增保存执法端-执法登记
      */
-    @RequiresPermissions("code:registration:add")
+//    @RequiresPermissions("code:registration:add")
     @PostMapping("/add")
     @ResponseBody
     public ZDResponse addSave(@RequestBody EnforcementRegistration enforcementRegistration)
@@ -103,7 +103,7 @@ public class AppEnforcementRegistrationController extends BaseController
     /**
      * 修改保存执法端-执法登记
      */
-    @RequiresPermissions("code:registration:edit")
+//    @RequiresPermissions("code:registration:edit")
     @PostMapping("/edit")
     @ResponseBody
     public ZDResponse editSave(@RequestBody EnforcementRegistration enforcementRegistration)
@@ -208,16 +208,16 @@ public class AppEnforcementRegistrationController extends BaseController
     /**
      * 查看预约记录详情
      */
-    @GetMapping( "/getByUserIdAndZero")
+    @GetMapping( "/getByUserIdAndZero/{userId}")
     @ResponseBody
-    public ZDResponse getByUserIdAndZero()
+    public ZDResponse getByUserIdAndZero(@PathVariable Long userId)
     {
-        EnforcementRegistration registration = enforcementRegistrationService.getByUserIdAndZero();
+        EnforcementRegistration registration = enforcementRegistrationService.getByUserIdAndZero(userId);
         Map<String, Object> params = new HashMap<>();
         LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem());
-        params.put("lawEnforcementItemText", tmp.getTitle());
+        params.put("lawEnforcementItemText", null!=tmp?tmp.getTitle():"");
         tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis());
-        params.put("lawEnforcementBasisText", tmp.getTitle());
+        params.put("lawEnforcementBasisText", null!=tmp?tmp.getTitle():"");
         registration.setParams(params);
         return ZDResponse.success("查询成功", registration);
     }

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

@@ -60,7 +60,7 @@ public class AppEnterpriseComplaintController extends BaseController
     /**
      * 新增保存企业执法-在线投诉
      */
-    @RequiresPermissions("code:complaint:add")
+//    @RequiresPermissions("code:complaint:add")
     @PostMapping("/add")
     @ResponseBody
     public ZDResponse addSave(@RequestBody EnterpriseComplaint enterpriseComplaint)

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

@@ -157,10 +157,10 @@ public class AppEnterpriseInformationController extends BaseController
     /**
      * 查询企业二维码信息
      */
-    @RequiresPermissions("code:information:getQrCode")
+//    @RequiresPermissions("code:information:getQrCode")
-    @GetMapping("/getQrCode")
+    @GetMapping("/getQrCode/{enterpriseNumber}")
     @ResponseBody
-    public ZDResponse getQrCode(String enterpriseNumber)
+    public ZDResponse getQrCode(@PathVariable String enterpriseNumber)
     {
         //查询企业二维码信息
         QrCodeGenerateHistory qrCodeGenerateHistory = iQrCodeGenerateHistoryService.selectQrCodeGenerateHistoryByNewest(enterpriseNumber);

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

@@ -1,5 +1,7 @@
 package com.zdxt.app.controller;
 
+import com.zdxt.auth.dto.UserBean;
+import com.zdxt.auth.feign.UserApi;
 import com.zdxt.code.domain.EnterpriseLawEnforcement;
 import com.zdxt.code.domain.LinkageDict;
 import com.zdxt.code.service.IEnterpriseLawEnforcementService;
@@ -57,7 +59,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController
     /**
      * 查询企业端-执法部门预约记录列表
      */
-    @RequiresPermissions("code:enforcement:queryList")
+//    @RequiresPermissions("code:enforcement:queryList")
     @GetMapping("/queryList")
     @ResponseBody
     public ZDResponse queryList(EnterpriseLawEnforcement enterpriseLawEnforcement)
@@ -113,7 +115,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController
     /**
      * 修改保存企业端-执法部门预约记录
      */
-    @RequiresPermissions("code:enforcement:edit")
+//    @RequiresPermissions("code:enforcement:edit")
     @PostMapping("/edit")
     @ResponseBody
     public ZDResponse editSave(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement)
@@ -156,11 +158,11 @@ public class AppEnterpriseLawEnforcementController extends BaseController
     /**
      * 查看预约记录详情
      */
-    @GetMapping( "/getByUserIdAndZero")
+    @GetMapping( "/getByUserIdAndZero/{userId}")
     @ResponseBody
-    public ZDResponse getByUserIdAndZero()
+    public ZDResponse getByUserIdAndZero(@PathVariable Long userId)
     {
-        EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getByUserIdAndZero();
+        EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getByUserIdAndZero(userId);
         Map<String, Object> params = new HashMap<>();
         LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem());
         params.put("checkItemText", tmp.getTitle());

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

@@ -42,10 +42,11 @@ public class AppSystemController extends BaseController {
     @Autowired
     private PostApi postApi;
 
-    @GetMapping("/getUserInfo")
+    @GetMapping("/getUserInfo/{userId}")
     @ResponseBody
-    public ZDResponse getUserInfo(){
+    public ZDResponse getUserInfo(@PathVariable Long userId){
-        UserBean user = userApi.getCurrentUser();
+//        UserBean user = userApi.getCurrentUser();
+        UserBean user = userApi.getUserByUserId(userId);
         return ZDResponse.success("查询成功",user);
     }
 
@@ -57,7 +58,7 @@ public class AppSystemController extends BaseController {
         return ZDResponse.success("获取字典成功",list);
     }
 
-    @RequiresPermissions("system:user:list")
+//    @RequiresPermissions("system:user:list")
     @PostMapping("/listApp")
     @ResponseBody
     public ZDResponse listApp(@RequestBody User user) {

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

@@ -1,7 +1,9 @@
 package com.zdxt.app.controller;
 
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.auth0.jwt.JWTVerifier;
+import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.auth.framework.shiro.jwt.JWTUtils;
 import com.zdxt.auth.project.system.user.service.IUserService;
@@ -10,6 +12,7 @@ import com.zdxt.code.service.ThirdLoginService;
 import com.zdxt.code.utils.HttpUtil;
 import com.zdxt.code.utils.IdCardCryptoUtil;
 import com.zdxt.common.ZDResponse;
+import com.zdxt.common.util.RedisCache;
 import com.zdxt.domain.auth.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,41 +41,54 @@ public class AppThirdLoginController {
     @Value("${siq.siqUrl}")
     private String siqUrl;
 
+    @Value("${szypt.corpid}")
+    private String szyptCorpid;
+    @Value("${szypt.corpsecret}")
+    private String szyptCorpsecret;
+    @Value("${szypt.url}")
+    private String szyptUrl;
+
     @Autowired
     private ThirdLoginService thirdLoginService;
 
     @Autowired
     private UserApi userApi;
+    @Autowired
+    private RedisCache redisCache;
+
     /**
-     * 深i企用户登录
+     * 深圳易平台登录
-     * @param siqLogin
      */
-    @PostMapping("/siqLogin")
+    @GetMapping("/szyptLogin/{code}")
     @ResponseBody
-    public ZDResponse siqLogin(@RequestBody SiqLogin siqLogin){
+    public ZDResponse szyptLogin(@PathVariable String code){
-        //敏感信息加密
-        String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, siqLogin.getUserId());
-        String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, siqLogin.getUserName());
 
-        //获取登录的token
+        System.out.println("====================== code ======================");
-        String token = IdCardCryptoUtil.httpSendPost(siqUrl + "/pub/auth/token", userIdCode, userNameCode, code);
+        System.out.println(code);
-        Map<String, String> params = new HashMap<>();
+        System.out.println("====================== code ======================");
-        log.info("获取用户登录令牌：{}",token);
+
-        String secret = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, token);
+        String accessToken = "";
-        params.put("accessKeySign",secret);
+        String userInfo = "";
-        params.put("appCode",code);
-        String userInfo = null;
         try {
-            userInfo = HttpUtil.HttpSendPost(siqUrl + "/pub/auth/getUserInfo", params, null, null);
+            // 获取 access_token
+            accessToken = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/gettoken?corpid="+szyptCorpid+"&corpsecret="+szyptCorpsecret, null);
+            System.out.println("====================== accessToken ======================");
+            System.out.println(accessToken);
+            System.out.println("====================== accessToken ======================");
+
+            // 获取 用户信息
+            userInfo = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/user/getuserinfo?access_token="+accessToken+"&code="+code, null);
+            System.out.println("====================== userInfo ======================");
+            System.out.println(userInfo);
+            System.out.println("====================== userInfo ======================");
+
+            redisCache.setCacheObject("shiro:app:1731", new User()); // todo:这里需要将转换出来的User存redis用于做权限
         } catch (Exception e) {
             e.printStackTrace();
         }
         JSONObject jsonObject = JSONObject.parseObject(userInfo);
-        //添加深i企用户
+
-        thirdLoginService.addSiqUser(jsonObject);
+        return ZDResponse.success();
-        //添加深i企用户关联企业信息
-        thirdLoginService.addSiqUserCompany(jsonObject);
-        return thirdLoginService.siqLogin(jsonObject);
     }
 
 
@@ -111,4 +127,63 @@ public class AppThirdLoginController {
         return map;
 
     }
+
+    /**
+     * 深i企用户登录
+     * @param siqLogin
+     */
+    @PostMapping("/siqLogin")
+    @ResponseBody
+    public ZDResponse siqLogin(@RequestBody SiqLogin siqLogin){
+        Map<String, String> params = new HashMap<>();
+        String secret = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, siqLogin.getCode());
+        params.put("accessKeySign",secret);
+        params.put("appCode",code);
+        String data = null;
+        try {
+            data = HttpUtil.httpSendPost(siqUrl + "/pub/auth/getUserInfo", JSONObject.toJSONString(params),new HashMap<>());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        JSONObject userInfo = (JSONObject) jsonObject.get("data");
+
+        //添加深i企用户
+        Long userId = thirdLoginService.addSiqUser(userInfo);
+        userInfo.put("userId", userId);
+
+        //添加深i企用户关联企业信息
+        thirdLoginService.addSiqUserCompany(userInfo);
+        return thirdLoginService.siqLogin(userInfo);
+    }
+
+    @PostMapping("/siqLoginTest")
+    @ResponseBody
+    public ZDResponse siqLoginTest(@RequestBody SiqLogin siqLogin){
+        String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", siqLogin.getUserId());
+        String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", siqLogin.getUserName());
+
+        Map<String,Object> heardMap = new HashMap<>();
+        heardMap.put("x-auth-channel", IdUtil.simpleUUID());
+        heardMap.put("x-auth-app-code","zfjdm");
+        String s = IdCardCryptoUtil.httpSendPost("http://egbpub.siqhz.com/egb/api/thirdauth/pub/auth/token",userIdCode,userNameCode,"zfjdm");
+
+        String secret = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", s);
+        Map<String,Object> params = new HashMap<>();
+        params.put("accessKeySign",secret);
+        params.put("appCode","zfjdm");
+        String data = HttpUtil.httpSendPost("http://egbpub.siqhz.com/egb/api/thirdauth/pub/auth/getUserInfo", JSONObject.toJSONString(params),new HashMap<>());
+
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        JSONObject userInfo = (JSONObject) jsonObject.get("data");
+        //添加深i企用户
+
+        Long userId = thirdLoginService.addSiqUser(userInfo);
+        userInfo.put("userId", userId);
+
+        //添加深i企用户关联企业信息
+        thirdLoginService.addSiqUserCompany(userInfo);
+        return thirdLoginService.siqLogin(userInfo);
+    }
 }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java

@@ -0,0 +1,100 @@
+package com.zdxt.app.task;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zdxt.auth.dto.UserBean;
+import com.zdxt.auth.feign.UserApi;
+import com.zdxt.code.utils.HttpUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @Author: kylin
+ * @Date: 2024/5/9 2:58 下午
+ * @Version: 1.0
+ * @Desc: TODO
+ */
+@Component("userInfoAndDeptTask")
+public class UserInfoAndDeptTask {
+
+    @Value("${znwg.systemCode}")
+    private String systemCode;
+    @Value("${znwg.integrationKey}")
+    private String integrationKey;
+    @Value("${znwg.url}")
+    private String znwgUrl;
+
+    @Autowired private UserApi userApi;
+
+
+    public void run(){
+        this.userInfoAndDept();
+    }
+
+    /**
+     * 预警任务
+     */
+    public void userInfoAndDept(){
+        String token = "";
+        String userInfo = "";
+        String deptInfo = "";
+        String destroyTken = "";
+        try {
+            // 获取 access_token
+            token = HttpUtil.HttpSendGet(znwgUrl + "/ebus/sfrzhqxglmk/sysPullLogin?systemCode="+systemCode+"&integrationKey="+integrationKey, null);
+            System.out.println("====================== accessToken ======================");
+            System.out.println(token);
+            System.out.println("====================== accessToken ======================");
+
+            // 获取 用户信息
+            userInfo = HttpUtil.HttpSendGet(znwgUrl + "/ebus/sfrzhqxglmk/sysPullTacc?token="+token+"&page=0&pageSize=20&status=0", null);
+            System.out.println("====================== userInfo ======================");
+            System.out.println(userInfo);
+            System.out.println("====================== userInfo ======================");
+
+            // 获取 部门信息
+            deptInfo = HttpUtil.HttpSendGet(znwgUrl + "/ebus/sfrzhqxglmk/sysPullOrg?token="+token+"&page=0&pageSize=20&status=0", null);
+            System.out.println("====================== userInfo ======================");
+            System.out.println(deptInfo);
+            System.out.println("====================== userInfo ======================");
+
+            // 注销token
+            HttpUtil.HttpSendGet(znwgUrl + "/ebus/sfrzhqxglmk/sysPullLogout?token="+token, null);
+            System.out.println("====================== destroyTken ======================");
+            System.out.println(destroyTken);
+            System.out.println("====================== destroyTken ======================");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        JSONObject userObj = JSONObject.parseObject(userInfo);
+        JSONObject deptObj = JSONObject.parseObject(deptInfo);
+        System.out.println("====================== userInfo ======================");
+        System.out.println(userObj);
+        System.out.println("====================== userInfo ======================");
+        System.out.println("====================== userInfo ======================");
+        System.out.println(deptObj);
+        System.out.println("====================== userInfo ======================");
+
+        userApi.insertOrUpdateUserResId(convertUser(userObj));
+    }
+
+    private UserBean convertUser(JSONObject userJson) {
+        UserBean userBean = new UserBean();
+        userBean.setFullname(userJson.getString("fullname"));
+        userBean.setTaskId(userJson.getString("taskId"));
+        userBean.setSystemId(userJson.getString("systemId"));
+        userBean.setEffectOn(userJson.getString("effectOn"));
+        userBean.setIsDeleted(Integer.valueOf(userJson.getString("isDeleted")));
+        userBean.setIsDisabled(Integer.valueOf(userJson.getString("isDisabled")));
+        userBean.setCreateAt(userJson.getString("createAt"));
+        userBean.setUpdateAt(userJson.getString("updateAt"));
+        userBean.setGuid(userJson.getString("guid"));
+        userBean.setMobileNumber(userJson.getString("mobileNumber"));
+        userBean.setCertificateNumber(userJson.getString("certificateNumber"));
+        userBean.setSrzUserid(userJson.getString("srzUserid"));
+        userBean.setIsMappingPerson(userJson.getString("isMappingPerson"));
+        userBean.setUnits(userJson.getString("units"));
+        return userBean;
+    }
+}

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/constant/UserConstants.java

@@ -32,7 +32,7 @@ public class UserConstants
      * 用户名长度限制
      */
     public static final int USERNAME_MIN_LENGTH = 2;
-    public static final int USERNAME_MAX_LENGTH = 20;
+    public static final int USERNAME_MAX_LENGTH = 30;
 
     /** 登录名称是否唯一的返回结果码 */
     public final static String USER_NAME_UNIQUE = "0";

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java

@@ -1,7 +1,6 @@
 package com.zdxt.auth.feign;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.zdxt.auth.common.constant.UserConstants;
 import com.zdxt.auth.common.utils.security.ShiroUtils;
 import com.zdxt.auth.dto.DeptBean;
 import com.zdxt.auth.dto.RoleBean;
@@ -11,6 +10,8 @@ import com.zdxt.auth.project.system.dict.mapper.DictDataMapper;
 import com.zdxt.auth.project.system.user.mapper.UserMapper;
 import com.zdxt.auth.project.system.user.service.IUserService;
 import com.zdxt.common.annotation.DataScope;
+import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.util.UserConstants;
 import com.zdxt.domain.auth.Dept;
 import com.zdxt.domain.auth.Role;
 import com.zdxt.domain.auth.User;
@@ -248,6 +249,23 @@ public class UserApiImpl implements UserApi {
         return iUserService.updateUserInfo(user);
     }
 
+    @Override
+    public Long insertOrUpdateUserResId(UserBean userBean) {
+        if(UserConstants.USER_NAME_UNIQUE.equals(this.checkLoginNameUnique(userBean.getLoginName()))){
+            //设置默认用户权限，权限为默认值
+            userBean.setRoleId(178L);
+            //设置为默认密码
+            userBean.setPassword("123456");
+            userBean.setCreateTime(DateUtils.getNowDate());
+            //部门ID设置为默认值
+            userBean.setDeptId(405L);
+
+            return this.insertUserResId(userBean);
+        }
+        int resNum = this.updateUserInfo(userBean);
+        return resNum>0?userBean.getUserId():0L;
+    }
+
     @Override
     public String checkLoginNameUnique(String loginName) {
         return iUserService.checkLoginNameUnique(loginName);

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/JacksonConverters.java

@@ -0,0 +1,24 @@
+//package com.zdxt.auth.framework.config;
+//
+//import com.fasterxml.jackson.databind.DeserializationFeature;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+//
+//@Configuration
+//public class JacksonConverters {
+//    @Bean
+//    public HttpMessageConverters JacksonHttpMessageConverters() {
+//        MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter
+//                = new MappingJackson2HttpMessageConverter();
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        //省略其他配置开始
+//        //反序列化的时候如果多了其他属性,抛出异常
+//        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
+//        mappingJackson2HttpMessageConverter.setObjectMapper(objectMapper);
+//        //省略其他配置结束
+//        return new HttpMessageConverters(mappingJackson2HttpMessageConverter);
+//    }
+//}

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java

@@ -63,29 +63,30 @@ public class ResourcesConfig implements WebMvcConfigurer
     public void addInterceptors(InterceptorRegistry registry)
     {
 //        registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
-        registry.addInterceptor(new JWTInterceptor())
+//        registry.addInterceptor(new JWTInterceptor())
-                .excludePathPatterns("/app/thirdLogin/siqLogin", "/appLogin","/login","/index",
+//                .addPathPatterns("/app/**")
-                        "/enterpriseInformation",
+//                .excludePathPatterns("/app/thirdLogin/siqLogin", "/appLogin","/login","/index",
-                        "/code/registration",
+//                        "/enterpriseInformation",
-                        "/code/linkage",
+//                        "/code/registration",
-                        "/code/ruleList",
+//                        "/code/linkage",
-                        "/code/LawEnforcementWarningList",
+//                        "/code/ruleList",
-                        "/system/dept",
+//                        "/code/LawEnforcementWarningList",
-                        "/system/user",
+//                        "/system/dept",
-                        "/system/role",
+//                        "/system/user",
-                        "/system/post",
+//                        "/system/role",
-                        "/system/menu",
+//                        "/system/post",
-                        "/monitor/operlog",
+//                        "/system/menu",
-                        "/monitor/logininfor",
+//                        "/monitor/operlog",
-                        "/system/dict",
+//                        "/monitor/logininfor",
-                        "/system/config",
+//                        "/system/dict",
-                        "/monitor/job",
+//                        "/system/config",
-                        "/statistical/analysis",
+//                        "/monitor/job",
-                        "/statistical/view",
+//                        "/statistical/analysis",
-                        "/**/*.css",
+//                        "/statistical/view",
-                        "/**/*.js", "/**/*.png", "/**/*.jpg",
+//                        "/**/*.css",
-                        "/**/*.jpeg", "/**/*.gif", "/**/fonts/*"
+//                        "/**/*.js", "/**/*.png", "/**/*.jpg",
-                        ).addPathPatterns("/**");
+//                        "/**/*.jpeg", "/**/*.gif", "/**/fonts/*"
+//                        ).addPathPatterns("/**");
         // 除了登录放行，其他接口都token验证
     }
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ShiroConfig.java

@@ -288,6 +288,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/app/**", "anon");
         filterChainDefinitionMap.put("/app-z/**", "anon");
         filterChainDefinitionMap.put("/Cesium-1.95/**", "anon");
+        // 临时放开附件, 不然浏览器玩不了
+        filterChainDefinitionMap.put("/common/upload", "anon");
 
         filterChainDefinitionMap.put("/api/**", "anon");
         filterChainDefinitionMap.put("/auth-center/**", "anon");

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/XssAndSqlHttpServletRequestWrapper.java

@@ -295,6 +295,7 @@ public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrappe
         Map<String, String[]> submitParams = new HashMap(parameterMap);
         Set<String> submitNames = submitParams.keySet();
         for (String submitName : submitNames) {
+            if ("cronExpression".equals(submitName)) { return false; }
             Object submitValues = submitParams.get(submitName);
             if ((submitValues instanceof String)) {
                 if (checkXSSAndSql((String) submitValues)) {

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

@@ -29,6 +29,20 @@
         <result property="kingdeeOrgId" column="kingdee_org_id"/>
         <result property="type" column="type"/>
         <result property="tenantCode" column="tenant_code"/>
+        <result property="fullname" column="fullname"/>
+        <result property="taskId" column="taskId"/>
+        <result property="systemId" column="systemId"/>
+        <result property="effectOn" column="effectOn"/>
+        <result property="isDeleted" column="isDeleted"/>
+        <result property="isDisabled" column="isDisabled"/>
+        <result property="createAt" column="createAt"/>
+        <result property="updateAt" column="updateAt"/>
+        <result property="guid" column="guid"/>
+        <result property="mobileNumber" column="mobileNumber"/>
+        <result property="certificateNumber" column="certificateNumber"/>
+        <result property="srzUserid" column="srzUserid"/>
+        <result property="isMappingPerson" column="isMappingPerson"/>
+        <result property="units" column="units"/>
         <association property="dept" column="dept_id" javaType="Dept" resultMap="deptResult"/>
         <association property="tenant" column="tenant_code" javaType="SysTenant" resultMap="tenantResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -314,6 +328,20 @@
             <if test="type != null and type != ''">type = #{type},</if>
             <if test="kingdeeOrgId != null and kingdeeOrgId != ''">kingdee_org_id = #{kingdeeOrgId},</if>
             <if test="kingdeeUserId != null and kingdeeUserId != ''">kingdee_user_id = #{kingdeeUserId},</if>
+            <if test="fullname != null and fullname != ''">fullname = #{fullname},</if>
+            <if test="taskId != null and taskId != ''">taskId = #{taskId},</if>
+            <if test="systemId != null and systemId != ''">systemId = #{systemId},</if>
+            <if test="effectOn != null and effectOn != ''">effectOn = #{effectOn},</if>
+            <if test="isDeleted != null and isDeleted != ''">isDeleted = #{isDeleted},</if>
+            <if test="isDisabled != null and isDisabled != ''">isDisabled = #{isDisabled},</if>
+            <if test="createAt != null and createAt != ''">createAt = #{createAt},</if>
+            <if test="updateAt != null and updateAt != ''">updateAt = #{updateAt},</if>
+            <if test="guid != null and guid != ''">guid = #{guid},</if>
+            <if test="mobileNumber != null and mobileNumber != ''">mobileNumber = #{mobileNumber},</if>
+            <if test="certificateNumber != null and certificateNumber != ''">certificateNumber = #{certificateNumber},</if>
+            <if test="srzUserid != null and srzUserid != ''">srzUserid = #{srzUserid},</if>
+            <if test="isMappingPerson != null and isMappingPerson != ''">isMappingPerson = #{isMappingPerson},</if>
+            <if test="units != null and units != ''">units = #{units},</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}
@@ -367,6 +395,20 @@
         <if test="kingdeeOrgId != null and kingdeeOrgId != ''">kingdee_org_id,</if>
         <if test="kingdeeUserId != null and kingdeeUserId != ''">kingdee_user_id,</if>
         <if test="tenantCode != null and tenantCode != ''">tenant_code,</if>
+        <if test="fullname != null and fullname != ''">fullname,</if>
+        <if test="taskId != null and taskId != ''">taskId,</if>
+        <if test="systemId != null and systemId != ''">systemId,</if>
+        <if test="effectOn != null and effectOn != ''">effectOn,</if>
+        <if test="isDeleted != null and isDeleted != ''">isDeleted,</if>
+        <if test="isDisabled != null and isDisabled != ''">isDisabled,</if>
+        <if test="createAt != null and createAt != ''">createAt,</if>
+        <if test="updateAt != null and updateAt != ''">updateAt,</if>
+        <if test="guid != null and guid != ''">guid,</if>
+        <if test="mobileNumber != null and mobileNumber != ''">mobileNumber,</if>
+        <if test="certificateNumber != null and certificateNumber != ''">certificateNumber,</if>
+        <if test="srzUserid != null and srzUserid != ''">srzUserid,</if>
+        <if test="isMappingPerson != null and isMappingPerson != ''">isMappingPerson,</if>
+        <if test="units != null and units != ''">units,</if>
         create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -387,6 +429,20 @@
         <if test="kingdeeOrgId != null and kingdeeOrgId != ''">#{kingdeeOrgId},</if>
         <if test="kingdeeUserId != null and kingdeeUserId != ''">#{kingdeeUserId},</if>
         <if test="tenantCode != null and tenantCode != ''">#{tenantCode},</if>
+        <if test="fullname != null and fullname != ''">#{fullname},</if>
+        <if test="taskId != null and taskId != ''">#{taskId},</if>
+        <if test="systemId != null and systemId != ''">#{systemId},</if>
+        <if test="effectOn != null and effectOn != ''">#{effectOn},</if>
+        <if test="isDeleted != null and isDeleted != ''">#{isDeleted},</if>
+        <if test="isDisabled != null and isDisabled != ''">#{isDisabled},</if>
+        <if test="createAt != null and createAt != ''">#{createAt},</if>
+        <if test="updateAt != null and updateAt != ''">#{updateAt},</if>
+        <if test="guid != null and guid != ''">#{guid},</if>
+        <if test="mobileNumber != null and mobileNumber != ''">#{mobileNumber},</if>
+        <if test="certificateNumber != null and certificateNumber != ''">#{certificateNumber},</if>
+        <if test="srzUserid != null and srzUserid != ''">#{srzUserid},</if>
+        <if test="isMappingPerson != null and isMappingPerson != ''">#{isMappingPerson},</if>
+        <if test="units != null and units != ''">#{units},</if>
         sysdate()
         )
     </insert>

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@@ -209,11 +209,11 @@ public class EnforcementRegistrationController extends BaseController
     /**
      * 查看预约记录详情
      */
-    @GetMapping( "/getByUserIdAndZero")
+    @GetMapping( "/getByUserIdAndZero/{userId}")
     @ResponseBody
-    public ZDResponse getByUserIdAndZero()
+    public ZDResponse getByUserIdAndZero(@PathVariable Long userId)
     {
-        EnforcementRegistration registration = enforcementRegistrationService.getByUserIdAndZero();
+        EnforcementRegistration registration = enforcementRegistrationService.getByUserIdAndZero(userId);
         Map<String, Object> params = new HashMap<>();
         LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem());
         params.put("lawEnforcementItemText", tmp.getTitle());

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java

@@ -156,11 +156,11 @@ public class EnterpriseLawEnforcementController extends BaseController
     /**
      * 查看预约记录详情
      */
-    @GetMapping( "/getByUserIdAndZero")
+    @GetMapping( "/getByUserIdAndZero/{userId}")
     @ResponseBody
-    public ZDResponse getByUserIdAndZero()
+    public ZDResponse getByUserIdAndZero(@PathVariable Long userId)
     {
-        EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getByUserIdAndZero();
+        EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getByUserIdAndZero(userId);
         Map<String, Object> params = new HashMap<>();
         LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem());
         params.put("checkItemText", tmp.getTitle());

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java

@@ -49,6 +49,8 @@ public class EnforcementInspectionProgram extends BaseDomain
      */
     private List<FileObject> fileList;
 
+    private List<FileObject> fileListObj;
+
     /**
      * 执法计划
      */
@@ -204,6 +206,14 @@ public class EnforcementInspectionProgram extends BaseDomain
         this.isPublish = isPublish;
     }
 
+    public List<FileObject> getFileListObj() {
+        return fileListObj;
+    }
+
+    public void setFileListObj(List<FileObject> fileListObj) {
+        this.fileListObj = fileListObj;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -129,6 +129,53 @@ public class EnforcementRegistration extends BaseDomain
      */
     private String searchText;
 
+    /** 临时用 */
+    private String lawCertificateNum;
+    private String lawCertificateNumText;
+    private String lawCertificateNumTwoText;
+    private String subsidiaryerText;
+    private List fileListObj;
+
+    public List getFileListObj() {
+        return fileListObj;
+    }
+
+    public void setFileListObj(List fileListObj) {
+        this.fileListObj = fileListObj;
+    }
+
+    public String getSubsidiaryerText() {
+        return subsidiaryerText;
+    }
+
+    public void setSubsidiaryerText(String subsidiaryerText) {
+        this.subsidiaryerText = subsidiaryerText;
+    }
+
+    public String getLawCertificateNumTwoText() {
+        return lawCertificateNumTwoText;
+    }
+
+    public void setLawCertificateNumTwoText(String lawCertificateNumTwoText) {
+        this.lawCertificateNumTwoText = lawCertificateNumTwoText;
+    }
+
+    public String getLawCertificateNumText() {
+        return lawCertificateNumText;
+    }
+
+    public void setLawCertificateNumText(String lawCertificateNumText) {
+        this.lawCertificateNumText = lawCertificateNumText;
+    }
+
+    public String getLawCertificateNum() {
+        return lawCertificateNum;
+    }
+
+    public void setLawCertificateNum(String lawCertificateNum) {
+        this.lawCertificateNum = lawCertificateNum;
+    }
+
     public String getId() {
         return id;
     }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java

@@ -40,6 +40,52 @@ public class EnterpriseComplaint extends BaseDomain
      */
     private List<String> fileList;
 
+    public String enterpriseNumber;
+    public String lawEnforcementIncident;
+    public String enforceTypeText;
+    public String enterpriseName;
+    private List fileListObj;
+
+    public String getEnforceTypeText() {
+        return enforceTypeText;
+    }
+
+    public void setEnforceTypeText(String enforceTypeText) {
+        this.enforceTypeText = enforceTypeText;
+    }
+
+    public String getEnterpriseNumber() {
+        return enterpriseNumber;
+    }
+
+    public void setEnterpriseNumber(String enterpriseNumber) {
+        this.enterpriseNumber = enterpriseNumber;
+    }
+
+    public List getFileListObj() {
+        return fileListObj;
+    }
+
+    public void setFileListObj(List fileListObj) {
+        this.fileListObj = fileListObj;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getLawEnforcementIncident() {
+        return lawEnforcementIncident;
+    }
+
+    public void setLawEnforcementIncident(String lawEnforcementIncident) {
+        this.lawEnforcementIncident = lawEnforcementIncident;
+    }
+
     public void setId(String id)
     {
         this.id = id;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java

@@ -28,6 +28,7 @@ public class EnterpriseInformation extends BaseDomain
 
     /** 企业类型 */
     private String enterpriseType;
+    private String companyOrgType;
 
     /** 企业地址 */
     private String enterpriseAddress;
@@ -219,6 +220,14 @@ public class EnterpriseInformation extends BaseDomain
         this.enterpriseTel = enterpriseTel;
     }
 
+    public String getCompanyOrgType() {
+        return companyOrgType;
+    }
+
+    public void setCompanyOrgType(String companyOrgType) {
+        this.companyOrgType = companyOrgType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java

@@ -94,6 +94,44 @@ public class EnterpriseLawEnforcement extends BaseDomain
      */
     private Integer dateType;
 
+    /** 临时用 */
+    private String lawCertificateNum;
+    private String lawEnforcerText;
+    private String lawCertificateNumTwo;
+    private String lawEnforcerTextTwo;
+    private String dataScopeId;
+
+    public String getDataScopeId() {
+        return dataScopeId;
+    }
+
+    public void setDataScopeId(String dataScopeId) {
+        this.dataScopeId = dataScopeId;
+    }
+
+    public String getLawEnforcerTextTwo() {
+        return lawEnforcerTextTwo;
+    }
+
+    public void setLawEnforcerTextTwo(String lawEnforcerTextTwo) {
+        this.lawEnforcerTextTwo = lawEnforcerTextTwo;
+    }
+
+    public String getLawCertificateNumTwo() {
+        return lawCertificateNumTwo;
+    }
+
+    public void setLawCertificateNumTwo(String lawCertificateNumTwo) {
+        this.lawCertificateNumTwo = lawCertificateNumTwo;
+    }
+
+    public String getLawEnforcerText() {
+        return lawEnforcerText;
+    }
+
+    public void setLawEnforcerText(String lawEnforcerText) {
+        this.lawEnforcerText = lawEnforcerText;
+    }
 
     public void setId(String id)
     {
@@ -322,6 +360,14 @@ public class EnterpriseLawEnforcement extends BaseDomain
         this.isSubmit = isSubmit;
     }
 
+    public String getLawCertificateNum() {
+        return lawCertificateNum;
+    }
+
+    public void setLawCertificateNum(String lawCertificateNum) {
+        this.lawCertificateNum = lawCertificateNum;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -77,6 +77,6 @@ public interface IEnforcementRegistrationService
      */
     AttFileRespDTO queryFiles(String key);
 
-    public EnforcementRegistration getByUserIdAndZero();
+    public EnforcementRegistration getByUserIdAndZero(Long userId);
 
 }

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

@@ -19,7 +19,7 @@ public interface IEnterpriseLawEnforcementService
      */
     public EnterpriseLawEnforcement selectEnterpriseLawEnforcementById(String id);
     public EnterpriseLawEnforcement getEnterpriseLawEnforcementById(String id);
-    public EnterpriseLawEnforcement getByUserIdAndZero();
+    public EnterpriseLawEnforcement getByUserIdAndZero(Long userId);
 
     /**
      * 查询企业端-执法部门预约记录列表

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

@@ -18,7 +18,7 @@ public interface ThirdLoginService {
      * @param jsonObject
      * @return
      */
-     Boolean addSiqUser(JSONObject jsonObject);
+    Long addSiqUser(JSONObject jsonObject);
 
     /**
      * 添加深i企

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

@@ -98,7 +98,7 @@ public class EnforcementInspectionProgramServiceImpl implements IEnforcementInsp
     {
         enforcementInspectionProgram.setCreateTime(DateUtils.getNowDate());
 
-        UserBean user = userApi.getCurrentUser();
+        UserBean user = userApi.getUserByUserId(enforcementInspectionProgram.getUserId());
         enforcementInspectionProgram.setCreateTime(DateUtils.getNowDate());
         enforcementInspectionProgram.setId(IdUtil.simpleUUID());
         enforcementInspectionProgram.setUserId(user.getUserId());

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

@@ -132,7 +132,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     @Override
     public int insertEnforcementRegistration(EnforcementRegistration enforcementRegistration)
     {
-        UserBean user = userApi.getCurrentUser();
+        UserBean user = userApi.getUserByUserId(enforcementRegistration.getUserId());
         int resNum = 0;
         if (StringUtils.isNotEmpty(enforcementRegistration.getId())) {
 //            enforcementRegistration.setIsSubmit(0);
@@ -173,7 +173,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     @Override
     public int updateEnforcementRegistration(EnforcementRegistration enforcementRegistration)
     {
-        UserBean user = userApi.getCurrentUser();
+        UserBean user = userApi.getUserByUserId(enforcementRegistration.getUserId());
         enforcementRegistration.setUpdateTime(DateUtils.getNowDate());
         int i = enforcementRegistrationMapper.updateEnforcementRegistration(enforcementRegistration);
         if (i > 0 && enforcementRegistration.getFileList().size() > 0) {
@@ -303,10 +303,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     }
 
     @Override
-    public EnforcementRegistration getByUserIdAndZero() {
+    public EnforcementRegistration getByUserIdAndZero(Long userId) {
         EnforcementRegistration registration = new EnforcementRegistration();
-        UserBean user = userApi.getCurrentUser();
+        registration.setUserId(userId);
-        registration.setUserId(user.getUserId());
         registration.setIsSubmit(0);
         List<EnforcementRegistration> es = enforcementRegistrationMapper.selectEnforcementRegistrationList(registration);
 

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

@@ -71,7 +71,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
     @Override
     public int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint)
     {
-        UserBean user = userApi.getCurrentUser();
+        UserBean user = userApi.getUserByUserId(enterpriseComplaint.getUserId());
         enterpriseComplaint.setCreateTime(DateUtils.getNowDate());
         enterpriseComplaint.setId(IdUtil.simpleUUID());
         int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint);

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

@@ -110,14 +110,23 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
     {
         enterpriseInformation.setCreateTime(DateUtils.getNowDate());
         enterpriseInformation.setId(IdUtil.simpleUUID());
-        UserBean user = userApi.getCurrentUser();
+//        UserBean user = userApi.getCurrentUser();
+        UserBean user = userApi.getUserByUserId(enterpriseInformation.getUserId());
         enterpriseInformation.setCreateBy(user.getUserName());
         enterpriseInformation.setUserId(user.getUserId());
         enterpriseInformation.setDeptId(user.getDeptId());
         //生成企业统一信用代码盐
         String salt = PasswordTools.encrypt(enterpriseInformation.getEnterpriseNumber());
         enterpriseInformation.setSalt(salt);
-        int i = enterpriseInformationMapper.updateEnterpriseInformationByEnterpriseNumber(enterpriseInformation);
+        EnterpriseInformation info = enterpriseInformationMapper.selectEnterpriseInformationById(enterpriseInformation.getId());
+        int i=0;
+        if (null!=info && null != info.getId()) {
+            i = enterpriseInformationMapper.updateEnterpriseInformationByEnterpriseNumber(enterpriseInformation);
+        } else {
+            System.out.println("````````````````````````````````````````");
+            System.out.println(enterpriseInformation.getEnterpriseName());
+            i = enterpriseInformationMapper.insertEnterpriseInformation(enterpriseInformation);
+        }
         if(i > 0){
             String text = salt;
             //这里设置自定义网站url

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

@@ -12,6 +12,7 @@ import com.zdxt.code.domain.EnterpriseMerchantAuthorization;
 import com.zdxt.code.domain.LinkageDict;
 import com.zdxt.code.service.IEnterpriseMerchantAuthorizationService;
 import com.zdxt.code.service.ILinkageDictService;
+import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.util.DateUtils;
 import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
@@ -88,10 +89,9 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
     }
 
     @Override
-    public EnterpriseLawEnforcement getByUserIdAndZero() {
+    public EnterpriseLawEnforcement getByUserIdAndZero(Long userId) {
         EnterpriseLawEnforcement enterpriseLawEnforcement = new EnterpriseLawEnforcement();
-        UserBean user = userApi.getCurrentUser();
+        enterpriseLawEnforcement.setUserId(userId);
-        enterpriseLawEnforcement.setUserId(user.getUserId());
         enterpriseLawEnforcement.setIsSubmit(0);
         List<EnterpriseLawEnforcement> es = enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementList(enterpriseLawEnforcement);
         return null != es && es.size() >0 ? es.get(0):null;
@@ -135,7 +135,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
             enterpriseLawEnforcement.setCreateTime(DateUtils.getNowDate());
             enterpriseLawEnforcement.setId(IdUtil.simpleUUID());
             enterpriseLawEnforcement.setLawEnforcementCode(IdUtil.simpleUUID());
-            UserBean user = userApi.getCurrentUser();
+            UserBean user = userApi.getUserByUserId(enterpriseLawEnforcement.getUserId());
             enterpriseLawEnforcement.setUserId(user.getUserId());
             enterpriseLawEnforcement.setDeptId(user.getDeptId());
             enterpriseLawEnforcement.setCreateBy(user.getUserName());

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

@@ -52,14 +52,14 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
     public ZDResponse siqLogin(JSONObject jsonObject) {
         try {
             //查询登录用户
-            JSONObject tmpObj = JSON.parseObject(jsonObject.getString("data"));
+            log.info("用户名：{}",jsonObject.getString("account"));
-            log.info("用户名：{}",tmpObj.getString("account"));
+            UserBean user = userApi.getUserByUserLoginName(jsonObject.getString("account"));
-            UserBean user = userApi.getUserByUserLoginName(tmpObj.getString("account"));
             //本系统令牌
 //            UsernamePasswordToken sysToken = new UsernamePasswordToken(user.getLoginName(), user.getPassword(), false);
             UserToken sysToken = new UserToken(user.getLoginName(), LoginType.NOPASSWD);
             Subject subject = SecurityUtils.getSubject();
             subject.login(sysToken);
+            user.setEnterpriseNumber(jsonObject.getString("corpCid"));
             return ZDResponse.success("登录成功",user);
         } catch (Exception e) {
             e.printStackTrace();
@@ -68,18 +68,18 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
     }
 
     @Override
-    public Boolean addSiqUser(JSONObject jsonObject) {
+    public Long addSiqUser(JSONObject jsonObject) {
-        if(UserConstants.USER_NAME_NOT_UNIQUE.equals(userApi.checkLoginNameUnique(jsonObject.getString("account")))){
+        if(UserConstants.USER_NAME_UNIQUE.equals(userApi.checkLoginNameUnique(jsonObject.getString("account")))){
             //新增用户信息
             UserBean userBean = new UserBean();
             //设置默认用户权限，权限为默认值
             userBean.setRoleId(178L);
             //用户姓名
-            userBean.setUserName(jsonObject.getString("contactName"));
+            userBean.setUserName(jsonObject.getString("userName"));
             //登录账号
             userBean.setLoginName(jsonObject.getString("account"));
             //手机号码
-            userBean.setPhonenumber(IdCardCryptoUtil.symmetricDecryptIdCard(secretKey,jsonObject.getString("account")));
+            userBean.setPhonenumber(IdCardCryptoUtil.symmetricDecryptIdCard(secretKey,jsonObject.getString("phone")));
             //设置为默认密码
             userBean.setPassword("123456");
             userBean.setCreateTime(DateUtils.getNowDate());
@@ -87,9 +87,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             //部门ID设置为默认值
             userBean.setDeptId(405L);
 
-            return userApi.insertUser(userBean) > 0 ? Boolean.TRUE : Boolean.FALSE;
+            return userApi.insertUserResId(userBean);
         }
-        return true;
+        UserBean tmp = userApi.getUserByUserLoginName(jsonObject.getString("account"));
+        return tmp.getUserId();
     }
 
     @Override
@@ -105,6 +106,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             enterpriseInformation.setEnterpriseNumber(jsonObject.getString("corpCid"));
             //企业名称
             enterpriseInformation.setEnterpriseName(jsonObject.getString("corpName"));
+            //企业类型
+            enterpriseInformation.setCompanyOrgType(jsonObject.getString("companyOrgType"));
+            //注册时间
+            enterpriseInformation.setEstablishmentTime(jsonObject.getSqlDate("establishDate"));
             //经营范围
             enterpriseInformation.setBusinessScope(jsonObject.getString("businessScope"));
             //注册地址
@@ -112,9 +117,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             //注册资金
             enterpriseInformation.setRegisteredCapital(jsonObject.getString("regCapital"));
             //企业联系人电话
-            enterpriseInformation.setEnterpriseTel(jsonObject.getString("contactTel"));
+            enterpriseInformation.setEnterpriseTel(IdCardCryptoUtil.symmetricDecryptIdCard(secretKey,jsonObject.getString("phone")));
             //企业法人
             enterpriseInformation.setLegalPerson(jsonObject.getString("legalPersonName"));
+            //用户Id
+            enterpriseInformation.setUserId(Long.valueOf(jsonObject.getString("userId")));
             //营业时间
             //开始时间
             String termStart = jsonObject.getString("termStart");
@@ -123,8 +130,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             //营业时间
             enterpriseInformation.setOperatingTerm(termStart+ "-" +termEnd);
 
-            return enterpriseInformationService.insertEnterpriseInformation(enterpriseInformation) > 0
+            return enterpriseInformationService.insertEnterpriseInformation(enterpriseInformation) > 0 ? Boolean.TRUE : Boolean.FALSE;
-                    ? Boolean.TRUE : Boolean.FALSE;
         }
         return true;
     }

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

@@ -179,6 +179,7 @@ public class HttpUtil {
             HttpURLConnection connection = (HttpURLConnection) uri.openConnection();
             connection.setRequestMethod("POST");
             connection.setRequestProperty("Content-Type","application/json");
+            connection.setRequestProperty("Charsert","UTF-8");
             for (Map.Entry<String, Object> entry : heardMap.entrySet()) {
                 // 对value进行相应的操作
                 connection.setRequestProperty(entry.getKey(), String.valueOf(entry.getValue()));
@@ -187,12 +188,13 @@ public class HttpUtil {
 //            connection.setRequestProperty("x-auth-app-code","zfjdm");
             connection.setDoOutput(true);
             DataOutputStream out = new DataOutputStream(connection.getOutputStream());
-            out.writeBytes(params);
+//            out.writeBytes(params);
+            out.write(params.getBytes("utf-8")); //解决中文乱码
             out.flush();
             out.close();
             int responseCode = connection.getResponseCode();
             if(responseCode == HttpURLConnection.HTTP_OK){
-                BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
                 String inputLine;
                 StringBuffer response = new StringBuffer();
 
@@ -202,6 +204,7 @@ public class HttpUtil {
                 in.close();
                 System.out.println(new String(response.toString()));
                 System.out.println("请求成功");
+                return response.toString();
             }else{
                 System.out.println("请求失败");
             }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -73,43 +73,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and status = #{status}</if>
             <if test="lawEnforcementCode != null  and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
             <if test="searchValue != null and searchValue != ''">
-                and ( law_enforcement_item like concat(concat('%',#{searchValue}),'%')
+                and ( law_enforcement_item in (SELECT id FROM linkage_dict where title like concat(concat('%',#{searchValue}),'%'))
                 or law_enforcement like concat(concat('%',#{searchValue}),'%')
                 or law_enforcer like concat(concat('%',#{searchValue}),'%')
+                or law_enforcer_two like concat(concat('%',#{searchValue}),'%')
+                or enterprise_name like concat(concat('%',#{searchValue}),'%')
                 )
             </if>
             <if test="dateType != null and dateType == 1">
-                and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+                and DATE_FORMAT(enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
             </if>
             <if test="dateType != null and dateType == 2">
-                and create_time >= CONCAT(YEAR(CURDATE()), '-', QUARTER(CURDATE()), '-01')
+                and enforcement_time >= CONCAT(YEAR(CURDATE()), '-',
-                and create_time &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE WHEN QUARTER(CURDATE()) IN (1) THEN 2
+                WHEN QUARTER(CURDATE()) IN (2) THEN 4
+                WHEN QUARTER(CURDATE()) IN (3) THEN 7
+                ELSE 10 END, '-01')
+                and enforcement_time &lt;= CONCAT(YEAR(CURDATE()), '-',
                 CASE
-                WHEN QUARTER(CURDATE()) IN (1, 2, 3) THEN 3
+                WHEN QUARTER(CURDATE()) IN (1) THEN 3
-                WHEN QUARTER(CURDATE()) IN (4, 5, 6) THEN 6
+                WHEN QUARTER(CURDATE()) IN (2) THEN 6
-                WHEN QUARTER(CURDATE()) IN (7, 8, 9) THEN 9
+                WHEN QUARTER(CURDATE()) IN (3) THEN 9
                 ELSE 12
                 END,
                 '-',
                 DAY(LAST_DAY(CURDATE())))
             </if>
             <if test="dateType != null and dateType == 3">
-                and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
+                and DATE_FORMAT(enforcement_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
             </if>
             <if test="dateSearch != null and dateSearch != ''">
-                and DATE_FORMAT(create_time, '%Y-%m') = #{dateSearch}
+                and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dateSearch}
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                and DATE_FORMAT(create_time, '%Y-%m')  <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and DATE_FORMAT(create_time, '%Y-%m')  <![CDATA[ <= ]]> #{endTime}
-            </if>
-            <if test="params.beginEnforcementTime != null and params.beginEnforcementTime != ''">
-                AND create_time <![CDATA[ >= ]]> #{params.beginEnforcementTime}
-            </if>
-            <if test="params.endEnforcementTime != null and params.endEnforcementTime != ''">
-                AND create_time <![CDATA[ <= ]]> #{params.endEnforcementTime}
             </if>
         </where>
         order by create_time desc

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enterpriseName"    column="enterprise_name"    />
         <result property="enterpriseNumber"    column="enterprise_number"    />
         <result property="enterpriseType"    column="enterprise_type"    />
+        <result property="companyOrgType"    column="company_org_type"    />
         <result property="enterpriseAddress"    column="enterprise_address"    />
         <result property="legalPerson"    column="legal_person"    />
         <result property="registeredCapital"    column="registered_capital"    />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEnterpriseInformationVo">
-        select id, enterprise_name, enterprise_number, enterprise_type, enterprise_address, legal_person, registered_capital, establishment_time,
+        select id, enterprise_name, enterprise_number, enterprise_type, company_org_type, enterprise_address, legal_person, registered_capital, establishment_time,
         operating_term, business_scope, create_time, create_by, user_id, dept_id,is_unsubscribe ,is_delete,salt,enterprise_tel  from enterprise_information
     </sql>
 
@@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number like concat('%', #{enterpriseNumber}, '%')</if>
             <if test="enterpriseType != null  and enterpriseType != ''"> and enterprise_type = #{enterpriseType}</if>
+            <if test="companyOrgType != null  and companyOrgType != ''"> and company_org_type = #{companyOrgType}</if>
             <if test="enterpriseAddress != null  and enterpriseAddress != ''"> and enterprise_address = #{enterpriseAddress}</if>
             <if test="legalPerson != null  and legalPerson != ''"> and legal_person = #{legalPerson}</if>
             <if test="registeredCapital != null  and registeredCapital != ''"> and registered_capital = #{registeredCapital}</if>
@@ -71,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name,</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number,</if>
             <if test="enterpriseType != null  and enterpriseType != ''">enterprise_type,</if>
+            <if test="companyOrgType != null  and companyOrgType != ''">company_org_type,</if>
             <if test="enterpriseAddress != null  and enterpriseAddress != ''">enterprise_address,</if>
             <if test="legalPerson != null  and legalPerson != ''">legal_person,</if>
             <if test="registeredCapital != null  and registeredCapital != ''">registered_capital,</if>
@@ -83,12 +86,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="isUnsubscribe != null">is_unsubscribe,</if>
             <if test="salt != null and salt != ''">salt,</if>
+            <if test="enterpriseTel != null and enterpriseTel != ''">enterprise_tel,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
             <if test="enterpriseName != null  and enterpriseName != ''">#{enterpriseName},</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">#{enterpriseNumber},</if>
             <if test="enterpriseType != null  and enterpriseType != ''">#{enterpriseType},</if>
+            <if test="companyOrgType != null  and companyOrgType != ''">#{companyOrgType},</if>
             <if test="enterpriseAddress != null  and enterpriseAddress != ''">#{enterpriseAddress},</if>
             <if test="legalPerson != null  and legalPerson != ''">#{legalPerson},</if>
             <if test="registeredCapital != null  and registeredCapital != ''">#{registeredCapital},</if>
@@ -101,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null  and deptId != ''">#{deptId},</if>
             <if test="isUnsubscribe != null">#{isUnsubscribe},</if>
             <if test="salt != null and salt != ''">#{salt},</if>
+            <if test="enterpriseTel != null and enterpriseTel != ''">#{enterpriseTel},</if>
          </trim>
     </insert>
 
@@ -110,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
             <if test="enterpriseType != null  and enterpriseType != ''">enterprise_type = #{enterpriseType},</if>
+            <if test="companyOrgType != null  and companyOrgType != ''">company_org_type = #{companyOrgType},</if>
             <if test="enterpriseAddress != null  and enterpriseAddress != ''">enterprise_address = #{enterpriseAddress},</if>
             <if test="legalPerson != null  and legalPerson != ''">legal_person = #{legalPerson},</if>
             <if test="registeredCapital != null  and registeredCapital != ''">registered_capital = #{registeredCapital},</if>
@@ -128,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
             <if test="enterpriseType != null  and enterpriseType != ''">enterprise_type = #{enterpriseType},</if>
+            <if test="companyOrgType != null  and companyOrgType != ''">company_org_type = #{companyOrgType},</if>
             <if test="enterpriseAddress != null  and enterpriseAddress != ''">enterprise_address = #{enterpriseAddress},</if>
             <if test="legalPerson != null  and legalPerson != ''">legal_person = #{legalPerson},</if>
             <if test="registeredCapital != null  and registeredCapital != ''">registered_capital = #{registeredCapital},</if>

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml

@@ -40,7 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="checkTime != null "> and check_time = #{checkTime}</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''"> and law_enforcer = #{lawEnforcer}</if>
-            <if test="lawEnforcerId != null "> and law_enforcer_id = #{lawEnforcerId}</if>
             <if test="lawEnforcerTel != null  and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
             <if test="status != null"> and status = #{lawEnforcerTel}</if>
             <if test="isSubmit != null "> and is_submit = #{isSubmit}</if>
@@ -59,31 +58,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="searchValue != null and searchValue != ''">
                 and ( enterprise_name like concat(concat('%',#{searchValue}),'%')
-                or check_item like concat(concat('%',#{searchValue}),'%')
+                or check_item in (SELECT id FROM linkage_dict where title like concat(concat('%',#{searchValue}),'%'))
                 or law_enforcement_code like concat(concat('%',#{searchValue}),'%')
                 or law_enforcement like concat(concat('%',#{searchValue}),'%')
                 )
             </if>
             <if test="dateType != null and dateType == 1">
-                and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+                and DATE_FORMAT(check_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
             </if>
             <if test="dateType != null and dateType == 2">
-                and create_time >= CONCAT(YEAR(CURDATE()), '-', QUARTER(CURDATE()), '-01')
+                and check_time >= CONCAT(YEAR(CURDATE()), '-',
-                and create_time &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE WHEN QUARTER(CURDATE()) IN (1) THEN 2
+                WHEN QUARTER(CURDATE()) IN (2) THEN 4
+                WHEN QUARTER(CURDATE()) IN (3) THEN 7
+                ELSE 10 END, '-01')
+                and check_time &lt;= CONCAT(YEAR(CURDATE()), '-',
                 CASE
-                WHEN QUARTER(CURDATE()) IN (1, 2, 3) THEN 3
+                WHEN QUARTER(CURDATE()) IN (1) THEN 3
-                WHEN QUARTER(CURDATE()) IN (4, 5, 6) THEN 6
+                WHEN QUARTER(CURDATE()) IN (2) THEN 6
-                WHEN QUARTER(CURDATE()) IN (7, 8, 9) THEN 9
+                WHEN QUARTER(CURDATE()) IN (3) THEN 9
                 ELSE 12
                 END,
                 '-',
                 DAY(LAST_DAY(CURDATE())))
             </if>
             <if test="dateType != null and dateType == 3">
-                and DATE_FORMAT(create_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
+                and DATE_FORMAT(check_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
             </if>
             <if test="searchDate != null and searchDate != ''">
-                and DATE_FORMAT(create_time, '%Y-%m') = #{searchDate}
+                and DATE_FORMAT(check_time, '%Y-%m') = #{searchDate}
             </if>
         </where>
         order by create_time desc

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java

@@ -78,6 +78,9 @@ public class UserBean implements Serializable {
     @ApiModelProperty("执法证件号")
     private String lawCertificateNum;
 
+    /** 企业纳税识别号 */
+    private String enterpriseNumber;
+
     /**
      * 用户性别
      */
@@ -117,6 +120,37 @@ public class UserBean implements Serializable {
 
     private String password;
 
+
+
+    /** 姓名 */
+    private String fullname;
+    /** 任务ID */
+    private String taskId;
+    /** 业务系统ID */
+    private String systemId;
+    /** 作用点 (CREATE：新建；UPDATE：更新；DELETED：删除；ENABLED：启用；DISABLED：禁用) */
+    private String effectOn;
+    /** 是否删除 (0否;1是)*/
+    private int isDeleted;
+    /** 是否禁用 (0否;1是)*/
+    private int isDisabled;
+    /** 创建日期 */
+    private String createAt;
+    /** 更新日期 */
+    private String updateAt;
+    /** 下游唯一标识 */
+    private String guid;
+    /** 手机号 */
+    private String mobileNumber;
+    /** 证件号码 */
+    private String certificateNumber;
+    /** 省认证用户id */
+    private String srzUserid;
+    /** 是否驻区人员 */
+    private String isMappingPerson;
+    /** 人员所在部门（包括主岗和兼岗部门） */
+    private String units;
+
     public Long getUserId() {
         return userId;
     }
@@ -292,6 +326,126 @@ public class UserBean implements Serializable {
         this.token = token;
     }
 
+    public String getEnterpriseNumber() {
+        return enterpriseNumber;
+    }
+
+    public void setEnterpriseNumber(String enterpriseNumber) {
+        this.enterpriseNumber = enterpriseNumber;
+    }
+
+    public String getFullname() {
+        return fullname;
+    }
+
+    public void setFullname(String fullname) {
+        this.fullname = fullname;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getSystemId() {
+        return systemId;
+    }
+
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
+    }
+
+    public String getEffectOn() {
+        return effectOn;
+    }
+
+    public void setEffectOn(String effectOn) {
+        this.effectOn = effectOn;
+    }
+
+    public int getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(int isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public int getIsDisabled() {
+        return isDisabled;
+    }
+
+    public void setIsDisabled(int isDisabled) {
+        this.isDisabled = isDisabled;
+    }
+
+    public String getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(String createAt) {
+        this.createAt = createAt;
+    }
+
+    public String getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(String updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getMobileNumber() {
+        return mobileNumber;
+    }
+
+    public void setMobileNumber(String mobileNumber) {
+        this.mobileNumber = mobileNumber;
+    }
+
+    public String getCertificateNumber() {
+        return certificateNumber;
+    }
+
+    public void setCertificateNumber(String certificateNumber) {
+        this.certificateNumber = certificateNumber;
+    }
+
+    public String getSrzUserid() {
+        return srzUserid;
+    }
+
+    public void setSrzUserid(String srzUserid) {
+        this.srzUserid = srzUserid;
+    }
+
+    public String getIsMappingPerson() {
+        return isMappingPerson;
+    }
+
+    public void setIsMappingPerson(String isMappingPerson) {
+        this.isMappingPerson = isMappingPerson;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
+
     @Override
     public String toString() {
         return "UserBean{" +

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/UserApi.java

@@ -67,6 +67,10 @@ public interface UserApi {
     @ApiOperation("修改用户信息，不修改用户角色，职务")
     public int updateUserInfo(UserBean userBean);
 
+    @PostMapping("/insertOrUpdateUserResId")
+    @ApiOperation("插入或更新")
+    public Long insertOrUpdateUserResId(UserBean userBean);
+
     @PostMapping("/checkLoginNameUnique")
     @ApiOperation("校验用户名称是否唯一")
     public String checkLoginNameUnique(String loginName);