From 36d05eb348c9bdaa635f7663ac50e6c65ff37765 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Sat, 1 Jun 2024 15:06:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zdxt/common/BaseDomain.java | 2 ++ .../app/controller/AppSystemController.java | 6 ++++ .../controller/AppThirdLoginController.java | 3 +- .../zdxt/app/task/UserInfoAndDeptTask.java | 8 ++++++ .../system/user/service/UserServiceImpl.java | 1 + .../resources/mapper/system/DeptMapper.xml | 12 ++++---- .../resources/mapper/system/UserMapper.xml | 12 ++++---- .../src/main/resources/application.yml | 28 +++++++++++-------- .../com/zdxt/code/domain/EnforceRegCount.java | 2 ++ .../code/domain/EnterpriseInformation.java | 24 +++++++++++++++- .../java/com/zdxt/code/domain/SiqLogin.java | 3 ++ .../zdxt/code/domain/Xzcfajjbxx026705.java | 3 ++ .../com/zdxt/code/domain/Xzqzjbxx173774.java | 3 ++ .../impl/EnterpriseComplaintServiceImpl.java | 4 +-- 14 files changed, 83 insertions(+), 28 deletions(-) diff --git a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java index 613e4264..b5540e9f 100644 --- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java +++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java @@ -1,5 +1,6 @@ package com.zdxt.common; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.google.common.collect.Maps; import org.springframework.format.annotation.DateTimeFormat; @@ -12,6 +13,7 @@ import java.util.Map; * @createTime 2020.03.18 14:35 * @describe 实体类基类 */ +@JsonIgnoreProperties(ignoreUnknown = true) public abstract class BaseDomain implements Serializable { /** diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java index 7403e22d..8d9bf6a7 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java @@ -1,8 +1,10 @@ package com.zdxt.app.controller; import cn.hutool.core.bean.BeanUtil; +import com.zdxt.auth.dto.DeptBean; import com.zdxt.auth.dto.PostBean; import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.DeptApi; import com.zdxt.auth.feign.PostApi; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.project.system.dict.service.IDictDataService; @@ -32,6 +34,8 @@ public class AppSystemController extends BaseController { @Autowired private UserApi userApi; + @Autowired + private DeptApi deptApi; @Autowired private IDictDataService dictDataService; @@ -47,6 +51,8 @@ public class AppSystemController extends BaseController { public ZDResponse getUserInfo(@PathVariable Long userId){ // UserBean user = userApi.getCurrentUser(); UserBean user = userApi.getUserByUserId(userId); + DeptBean dept = deptApi.getDeptById(user.getDeptId()); + user.setDept(dept); return ZDResponse.success("查询成功",user); } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java index f54776ba..e86ec7a7 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java @@ -92,7 +92,8 @@ public class AppThirdLoginController { JSONObject userOjb = JSONObject.parseObject(userJson); String userId = userOjb.getString("UserId"); - UserBean userBean = userApi.getUserByUserStrId(userId); +// UserBean userBean = userApi.getUserByUserStrId(userId); + UserBean userBean = userApi.getUserByUserLoginName(userId); redisCache.setCacheObject("shiro:app:"+userBean.getUserId(), userBean); // todo:这里需要将转换出来的User存redis用于做权限 return thirdLoginService.szyLogin(userBean.getLoginName()); diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java index 90e5c77c..5805be76 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java @@ -100,6 +100,10 @@ public class UserInfoAndDeptTask { String userInfoJson = connect("/ebus/sfrzhqxglmk/sysPullTacc?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0"); JSONObject sourceObj = JSONObject.parseObject(userInfoJson); JSONObject tmpJsonObj = sourceObj.getJSONObject("data"); + if(null==tmpJsonObj) { + log.info("=====================> tmpJsonObj 为空"); + break; + } JSONArray dataArr = tmpJsonObj.getJSONArray("data"); if (null == dataArr || dataArr.size()==0) { break; } Map resMap = userService.addSrzUser(dataArr); @@ -132,6 +136,10 @@ public class UserInfoAndDeptTask { String deptInfoJson = connect("/ebus/sfrzhqxglmk/sysPullOrg?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0"); JSONObject sourceObj = JSONObject.parseObject(deptInfoJson); JSONObject tmpJsonObj = sourceObj.getJSONObject("data"); + if(null==tmpJsonObj) { + log.info("=====================> tmpJsonObj 为空"); + break; + } JSONArray dataArr = tmpJsonObj.getJSONArray("data"); if (null == dataArr || dataArr.size()==0) { break; } // 插入更新数据库 diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java index b75ceed0..e047d1f5 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java @@ -618,6 +618,7 @@ public class UserServiceImpl implements IUserService { if (StringUtils.isEmpty(jsonObject.getString("username"))) { continue; } User user = new User(); + user.setDeptId(jsonObject.getString("organizationId")); user.setOrganizationId(jsonObject.getString("organizationId")); user.setStrUserId(jsonObject.getString("userId")); user.setSrzUserid(jsonObject.getString("srzUserId")); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml index 25240bbb..92fa74ce 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml @@ -149,7 +149,7 @@ order by d.parent_id, d.order_num - select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0' @@ -165,7 +165,7 @@ where dept_name=#{deptName} and parent_id = #{parentId} - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.dept_type, (select dept_name from sys_dept where dept_id = d.parent_id) parent_name from sys_dept d @@ -181,7 +181,7 @@ where d.organizationId = #{organizationId} - select * from sys_dept where find_in_set(#{deptId}, ancestors) @@ -203,7 +203,7 @@ - select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors) @@ -362,10 +362,10 @@ - + update sys_dept set del_flag = '2' where dept_id = #{deptId} - + delete from sys_dept where dept_id = #{deptId} diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index c0a0efb7..8ef6d5f2 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -135,7 +135,7 @@ AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') - + AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) )) @@ -154,7 +154,7 @@ left join sys_dept d on u.dept_id = d.dept_id left join sys_tenant t on t.tenant_code = u.tenant_code where u.del_flag = '0' - + AND (u.dept_id = #{deptId}) @@ -189,7 +189,7 @@ AND u.create_time <= to_date(#{params.endTime},'yyyy-MM-dd HH24:mi:ss') - + AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) ]]> 0 )) @@ -318,7 +318,7 @@ update sys_user - dept_id = #{deptId}, + dept_id = #{deptId}, login_name = #{loginName}, user_name = #{userName}, law_certificate_num = #{lawCertificateNum}, @@ -365,7 +365,7 @@ - dept_id = #{deptId}, + dept_id = #{deptId}, login_name = #{loginName}, user_name = #{userName}, email = #{email}, @@ -391,7 +391,7 @@ insert into sys_user( user_id, - dept_id, + dept_id, login_name, user_name, email, diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml index dd9b555d..2ebf3d4b 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml @@ -9,8 +9,8 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: C:/ruoyi/uploadPath -# profile: /usr/local/uploadPath +# profile: C:/ruoyi/uploadPath + profile: /usr/local/uploadPath # profile: /Users/kylin_stone/Workspaces/uploads # 获取ip地址开关 addressEnabled: false @@ -99,12 +99,12 @@ spring: # redis配置 redis: database: 0 -# host: 10.76.108.1 -# port: 6379 -# password: zfjd@123 - host: 43.136.51.161 + host: 10.76.108.1 port: 6379 - password: meiyoumima + password: zfjd@123 +# host: 43.136.51.161 +# port: 6379 +# password: meiyoumima timeout: 6000ms # 连接超时时长（毫秒） lettuce: pool: @@ -208,7 +208,7 @@ security: allowed: - servernames: 10.132.108.3,10.76.108.1,192.168.110.36,192.168.244.1,192.168.1.101,139.186.135.156,192.168.1.102,192.168.1.105,192.168.8.129,192.168.1.100,192.168.1.104,192.168.1.103,10.76.108.3,10.132.108.3,192.168.93.1 + servernames: 10.76.108.1,10.76.108.3,10.132.108.3,139.186.135.156,127.0.0.1 excel: export: true @@ -236,10 +236,14 @@ siq: #深圳易平台对接密钥 测试环境 szypt: - agentid: 1000067 - url: https://szytest.sz.gov.cn:30443/ - corpid: wwefa4043a6b5cf4f3 - corpsecret: qYf-NIgyRKG-5eybrclvnBogATPfOhpnAVp6yBas7RU + agentid: 1000015 + url: https://zwwx-hlht.sz.gov.cn:30443/ + corpid: wwf62d6d16d1182b4f + corpsecret: VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0 +# agentid: 1000067 +# url: https://szytest.sz.gov.cn:30443/ +# corpid: wwefa4043a6b5cf4f3 +# corpsecret: qYf-NIgyRKG-5eybrclvnBogATPfOhpnAVp6yBas7RU #市认证网关 srnwg: diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java index fd259798..b4f62947 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java @@ -1,5 +1,6 @@ package com.zdxt.code.domain; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.zdxt.common.BaseDomain; import java.util.Date; @@ -11,6 +12,7 @@ import java.util.List; * @author chenrui * @date 2024-02-23 */ +@JsonIgnoreProperties(ignoreUnknown = true) public class EnforceRegCount { private static final long serialVersionUID = 1L; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java index 6d160d2a..b7edb7df 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java @@ -78,7 +78,29 @@ public class EnterpriseInformation extends BaseDomain */ private String enterpriseTel; - public void setId(String id) + /** 企业联系人 */ + private String enterprise; + + /** 证件号 */ + private String idNumbe; + + public String getEnterprise() { + return enterprise; + } + + public void setEnterprise(String enterprise) { + this.enterprise = enterprise; + } + + public String getIdNumbe() { + return idNumbe; + } + + public void setIdNumbe(String idNumbe) { + this.idNumbe = idNumbe; + } + + public void setId(String id) { this.id = id; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SiqLogin.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SiqLogin.java index 20a0691d..7f54c364 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SiqLogin.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SiqLogin.java @@ -1,5 +1,8 @@ package com.zdxt.code.domain; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class SiqLogin { /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzcfajjbxx026705.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzcfajjbxx026705.java index 39de4316..4f3d6ebb 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzcfajjbxx026705.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzcfajjbxx026705.java @@ -1,8 +1,11 @@ package com.zdxt.code.domain; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + /** * 行政处罚案件 */ +@JsonIgnoreProperties(ignoreUnknown = true) public class Xzcfajjbxx026705 { /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzqzjbxx173774.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzqzjbxx173774.java index 44bc3aba..cb0d971c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzqzjbxx173774.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzqzjbxx173774.java @@ -1,8 +1,11 @@ package com.zdxt.code.domain; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + /** * 案件强制信息 */ +@JsonIgnoreProperties(ignoreUnknown = true) public class Xzqzjbxx173774 { /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index a93b8d7e..fe5fa3e9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java @@ -83,8 +83,8 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi //文件后缀 zdxtFileCommon.setFileSuffix("JPG"); zdxtFileCommon.setUploadPath(res); - zdxtFileCommon.setUploadPersonId(user.getUserId().toString()); - zdxtFileCommon.setUploadPersonName(user.getUserName()); + zdxtFileCommon.setUploadPersonId(null==user.getUserId()?"":user.getUserId().toString()); + zdxtFileCommon.setUploadPersonName(null==user.getUserName()?"":user.getUserName()); zdxtFileCommonApi.addZdxtFileCommon(zdxtFileCommon); });