From 0a1807a695cf1e7a2db24ff9fce25f1d8a9a65b1 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 22 May 2024 16:24:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=B1=E5=9C=B3=E6=98=93=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zdxt/domain/auth/Dept.java | 30 +++++++++++++++---- .../system/dept/service/DeptServiceImpl.java | 6 ++-- .../system/user/service/UserServiceImpl.java | 1 + .../resources/mapper/system/DeptMapper.xml | 6 ++++ 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java index a3778ec5..508ecc15 100644 --- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java +++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java @@ -107,16 +107,34 @@ public class Dept extends BaseDomain { private String description; private String effectOn; private String sequence; - private Integer isDeleted; + private String isDeleted; + private String isDisabled; private String zzDisplayPath; private String name; private String guid; private String zzIsLeaf; - private Integer isDisabled; private String fullname; private String isMappingUnit; private String srzUnitId; private String taskId; + private String systemId; + private String creditcode; + + public String getSystemId() { + return systemId; + } + + public void setSystemId(String systemId) { + this.systemId = systemId; + } + + public String getCreditcode() { + return creditcode; + } + + public void setCreditcode(String creditcode) { + this.creditcode = creditcode; + } public String getOrganizationParentId() { return organizationParentId; @@ -190,11 +208,11 @@ public class Dept extends BaseDomain { this.sequence = sequence; } - public Integer getIsDeleted() { + public String getIsDeleted() { return isDeleted; } - public void setIsDeleted(Integer isDeleted) { + public void setIsDeleted(String isDeleted) { this.isDeleted = isDeleted; } @@ -230,11 +248,11 @@ public class Dept extends BaseDomain { this.zzIsLeaf = zzIsLeaf; } - public Integer getIsDisabled() { + public String getIsDisabled() { return isDisabled; } - public void setIsDisabled(Integer isDisabled) { + public void setIsDisabled(String isDisabled) { this.isDisabled = isDisabled; } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java index b8badf00..2df452d1 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java @@ -437,16 +437,18 @@ public class DeptServiceImpl implements IDeptService dept.setDescription(jsonObject.getString("description")); dept.setEffectOn(jsonObject.getString("effectOn")); dept.setSequence(jsonObject.getString("sequence")); - dept.setIsDeleted("true".equals(jsonObject.getString("isDeleted"))?1:0); + dept.setIsDeleted(jsonObject.getString("isDeleted")); dept.setZzDisplayPath(jsonObject.getString("zzDisplayPath")); dept.setName(jsonObject.getString("name")); dept.setGuid(jsonObject.getString("guid")); dept.setZzIsLeaf(jsonObject.getString("zzIsLeaf")); - dept.setIsDisabled("true".equals(jsonObject.getString("isDisabled"))?1:0); + dept.setIsDisabled(jsonObject.getString("isDisabled")); dept.setFullname(jsonObject.getString("fullname")); dept.setIsMappingUnit(jsonObject.getString("isMappingUnit")); dept.setSrzUnitId(jsonObject.getString("srzUnitId")); dept.setTaskId(jsonObject.getString("taskId")); + dept.setSystemId(jsonObject.getString("systemId")); + dept.setCreditcode(jsonObject.getString("creditcode")); Dept uniqueDept = deptMapper.selectDeptByOrganizationId(jsonObject.getString("organizationId")); if (null != uniqueDept && uniqueDept.getOrganizationId() != null) { 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 dc244f57..ebdc5b95 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 @@ -636,6 +636,7 @@ public class UserServiceImpl implements IUserService { user.setCertificateTypeId(jsonObject.getString("certificateTypeId")); user.setCertificateTypeIdCode(jsonObject.getString("certificateTypeIdCode")); user.setCertificateNumber(jsonObject.getString("certificateNumber")); + user.setIsMappingPerson(jsonObject.getString("isMappingPerson")); user.setUnits(jsonObject.getString("units")); user.randomSalt(); 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 d38dfa1c..25240bbb 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml @@ -242,6 +242,8 @@ isMappingUnit, srzUnitId, taskId, + systemId, + creditcode, create_time )values( #{deptId}, @@ -277,6 +279,8 @@ #{isMappingUnit}, #{srzUnitId}, #{taskId}, + #{systemId}, + #{creditcode}, sysdate() ) @@ -338,6 +342,8 @@ isMappingUnit = #{isMappingUnit}, srzUnitId = #{srzUnitId}, taskId = #{taskId}, + systemId = #{systemId}, + creditcode = #{creditcode}, update_time = sysdate() where organizationId = #{organizationId} From 6a2c84a16561c12fd0ec118d409488b3c67c5c92 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Thu, 23 May 2024 17:17:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=B1=E5=9C=B3=E6=98=93=E7=99=BB?= =?UTF-8?q?=E5=85=A5=E5=8A=A0=E5=85=A5=E7=94=A8=E6=88=B7ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zdxt/domain/auth/User.java | 10 ++++++++++ .../zdxt/app/controller/AppThirdLoginController.java | 4 ++-- .../src/main/java/com/zdxt/auth/feign/UserApiImpl.java | 8 ++++++++ .../auth/project/system/user/mapper/UserMapper.java | 1 + .../project/system/user/service/UserServiceImpl.java | 3 ++- .../src/main/resources/mapper/system/UserMapper.xml | 7 +++++++ .../src/main/java/com/zdxt/auth/dto/UserBean.java | 10 ++++++++++ .../src/main/java/com/zdxt/auth/feign/UserApi.java | 1 + 8 files changed, 41 insertions(+), 3 deletions(-) diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java index dacb6642..23986560 100644 --- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java +++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java @@ -161,6 +161,8 @@ public class User extends BaseDomain { /** 部门id */ private String organizationId; + /** 用户ID */ + private String strUserId; /** 姓名 */ private String fullname; /** 任务ID */ @@ -194,6 +196,14 @@ public class User extends BaseDomain { /** 人员所在部门（包括主岗和兼岗部门） */ private String units; + public String getStrUserId() { + return strUserId; + } + + public void setStrUserId(String strUserId) { + this.strUserId = strUserId; + } + public String getCertificateTypeId() { return certificateTypeId; } 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 35772196..00e5d6dc 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 @@ -88,8 +88,8 @@ public class AppThirdLoginController { JSONObject userOjb = JSONObject.parseObject(userJson); String userId = userOjb.getString("UserId"); - UserBean userBean = userApi.getUserByUserId(Long.valueOf(userId)); - redisCache.setCacheObject("shiro:app:1731", userBean); // todo:这里需要将转换出来的User存redis用于做权限 + UserBean userBean = userApi.getUserByUserStrId(userId); + redisCache.setCacheObject("shiro:app:"+userBean.getStrUserId(), userBean); // todo:这里需要将转换出来的User存redis用于做权限 return thirdLoginService.szyLogin(userBean.getLoginName()); } catch (Exception e) { e.printStackTrace(); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java index 86c1756b..93bf38db 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java @@ -125,6 +125,14 @@ public class UserApiImpl implements UserApi { return userBean; } + @Override + public UserBean getUserByUserStrId(String userId) { + User user = userMapper.selectUserByStrId(userId); + UserBean userBean = new UserBean(); + BeanUtil.copyProperties(user, userBean); + return userBean; + } + @Override public List getUserByDeptId(Long deptId, String loginName) { List userList = userMapper.selectUserByOrgId(deptId); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java index 91c45448..592a91e2 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java @@ -86,6 +86,7 @@ public interface UserMapper * @return 用户对象信息 */ public User selectUserById(Long userId); + public User selectUserByStrId(String userId); public List selectUserByDeptId(@Param("deptId") Long deptId, @Param("loginName") String loginName); /** 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 ebdc5b95..b75ceed0 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 @@ -619,7 +619,8 @@ public class UserServiceImpl implements IUserService { if (StringUtils.isEmpty(jsonObject.getString("username"))) { continue; } User user = new User(); user.setOrganizationId(jsonObject.getString("organizationId")); - user.setSrzUserid(jsonObject.getString("userId")); + user.setStrUserId(jsonObject.getString("userId")); + user.setSrzUserid(jsonObject.getString("srzUserId")); user.setFullname(jsonObject.getString("fullname")); user.setUserName(jsonObject.getString("fullname")); user.setTaskId(jsonObject.getString("taskId")); 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 ffaa4c54..38fa5685 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -45,6 +45,7 @@ + @@ -80,6 +81,7 @@ select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password,u.law_certificate_num, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.kingdee_org_id,u.kingdee_user_id, u.type, + u.strUserId, d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.tenant_code, t.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address @@ -289,6 +291,11 @@ where u.user_id = #{userId} + +