联调bug修复

commons/src/main/java/com/jzg/commons/entity/dto/SysUserAddParam.java

@@ -35,5 +35,5 @@ public class SysUserAddParam {
 
     @NotEmpty(message = "角色列表不能为空")
     @Schema(description = "角色列表")
-    private List<SysUserVo.SysRoleVo> roleVoList;
+    private List<String> roleIdList;
 }

commons/src/main/java/com/jzg/commons/entity/dto/SysUserEditParam.java

@@ -39,5 +39,5 @@ public class SysUserEditParam {
 
     @NotEmpty(message = "角色列表不能为空")
     @Schema(description = "角色列表")
-    private List<SysUserVo.SysRoleVo> roleVoList;
+    private List<String> roleIdList;
 }

commons/src/main/java/com/jzg/commons/entity/enums/BusinessStatus.java

@@ -1,20 +0,0 @@
-package com.jzg.commons.entity.enums;
-
-/**
- * 操作状态
- * 
- * @author dongxin
- *
- */
-public enum BusinessStatus
-{
-    /**
-     * 成功
-     */
-    SUCCESS,
-
-    /**
-     * 失败
-     */
-    FAIL,
-}

commons/src/main/java/com/jzg/commons/entity/enums/BusinessType.java

@@ -1,59 +0,0 @@
-package com.jzg.commons.entity.enums;
-
-/**
- * 业务操作类型
- * 
- * @author dongxin
- */
-public enum BusinessType
-{
-    /**
-     * 其它
-     */
-    OTHER,
-
-    /**
-     * 新增
-     */
-    INSERT,
-
-    /**
-     * 修改
-     */
-    UPDATE,
-
-    /**
-     * 删除
-     */
-    DELETE,
-
-    /**
-     * 授权
-     */
-    GRANT,
-
-    /**
-     * 导出
-     */
-    EXPORT,
-
-    /**
-     * 导入
-     */
-    IMPORT,
-
-    /**
-     * 强退
-     */
-    FORCE,
-
-    /**
-     * 生成代码
-     */
-    GENCODE,
-    
-    /**
-     * 清空数据
-     */
-    CLEAN,
-}

commons/src/main/java/com/jzg/commons/entity/enums/OperatorType.java

@@ -1,24 +0,0 @@
-package com.jzg.commons.entity.enums;
-
-/**
- * 操作人类别
- * 
- * @author dongxin
- */
-public enum OperatorType
-{
-    /**
-     * 租户用户
-     */
-    OTHER,
-
-    /**
-     * 平台用户
-     */
-    MANAGE,
-
-    /**
-     * 手机端用户
-     */
-    MOBILE
-}

gateway/src/main/resources/application.yml

@@ -16,7 +16,7 @@ spring:
         - id: platform_route
           uri: http://localhost:8083/
           predicates:
-            - Path=/userRole/**,/system/**,/file/**
+            - Path=/userRole/**,/system/**,/file/**,/user/**
 
         - id: tenant_route
           uri: http://localhost:8084/

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -12,11 +12,13 @@ import com.jzg.commons.entity.dto.SysUserParam;
 import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.po.SysRole;
 import com.jzg.commons.entity.po.SysUser;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.po.SysUserRole;
 import com.jzg.commons.entity.vo.SysUserVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.mapper.SysRoleMapper;
+import com.jzg.mapper.SysUserJzgInfoMapper;
 import com.jzg.mapper.SysUserMapper;
 import com.jzg.mapper.SysUserRoleMapper;
 import com.jzg.service.SysUserService;
@@ -44,6 +46,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     private SysRoleMapper sysRoleMapper;
     @Autowired
     private SysUserRoleMapper sysUserRoleMapper;
+    @Autowired
+    private SysUserJzgInfoMapper sysUserJzgInfoMapper;
 
     @Override
     public Page<SysUserVo> queryPage(Page page, SysUserParam param) {
@@ -93,13 +97,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         user.setSalt(salt);
         user.setPassword(encryptedPassword);
         this.save(user);
+        SysUserJzgInfo info = new SysUserJzgInfo();
+        info.setUserId(user.getId());
+        info.setSystemCode("PLATFORM");
+        info.setStatus(6);
+        sysUserJzgInfoMapper.insert(info);
         // 角色信息关联
-        List<SysUserVo.SysRoleVo> roleList = param.getRoleVoList();
+        List<String> roleIdList = param.getRoleIdList();
         List<SysUserRole> userRoles = new ArrayList<>();
-        roleList.forEach(role -> {
+        roleIdList.forEach(id -> {
             SysUserRole sysUserRole = new SysUserRole();
             sysUserRole.setUserId(user.getId());
-            sysUserRole.setRoleId(role.getId());
+            sysUserRole.setRoleId(id);
             userRoles.add(sysUserRole);
         });
         sysUserRoleMapper.insert(userRoles);
@@ -118,12 +127,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         sysUserRoleMapper.delete(updateWrapper);
 
         // 角色信息关联
-        List<SysUserVo.SysRoleVo> roleList = param.getRoleVoList();
+        List<String> roleList = param.getRoleIdList();
         List<SysUserRole> userRoles = new ArrayList<>();
-        roleList.forEach(role -> {
+        roleList.forEach(id -> {
             SysUserRole sysUserRole = new SysUserRole();
             sysUserRole.setUserId(user.getId());
-            sysUserRole.setRoleId(role.getId());
+            sysUserRole.setRoleId(id);
             userRoles.add(sysUserRole);
         });
         sysUserRoleMapper.insert(userRoles);

platform/src/main/resources/mapper/SysRoleMapper.xml

@@ -36,7 +36,7 @@
     </select>
     <select id="queryByUserIds" resultType="com.jzg.commons.entity.po.SysRole">
         SELECT
-            sur.user_id, sur.`name`
+            sur.user_id, sr.`name`
         FROM
             sys_user_role sur
                 LEFT JOIN sys_role sr ON sur.role_id = sr.id

platform/src/main/resources/mapper/SysUserMapper.xml

@@ -16,27 +16,32 @@
             <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
             <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
             <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>
-            <result property="systemCode" column="system_code" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="selectUserVo">
         SELECT id,username,password,
         salt,mobile,account_status,
         create_by,create_time,update_by,
-        update_time,is_delete,system_code
+        update_time,is_delete
         FROM sys_user
     </sql>
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.SysUserVo">
-        <include refid="selectUserVo"/>
+        SELECT sr.id,sr.username,sr.password,
+        sr.salt,sr.mobile,sr.account_status,
+        sr.create_by,sr.create_time,sr.update_by,
+        sr.update_time,sr.is_delete
+        FROM sys_user sr
+        LEFT JOIN sys_user_jzg_info si on sr.id = si.user_id
         <where>
             <if test="param.accountStatus != null and param.accountStatus != ''">
-                and account_status = #{param.accountStatus}
+                and sr.account_status = #{param.accountStatus}
             </if>
             <if test="param.searchValue != null and param.searchValue != ''">
-                and ( username = #{param.searchValue} or mobile = #{param.searchValue} or id = #{param.searchValue})
+                and ( sr.username = #{param.searchValue} or sr.mobile = #{param.searchValue} or sr.id = #{param.searchValue})
             </if>
-            and system_code = 'PLATFORM' and is_delete = 0
+            and si.system_code = 'PLATFORM' and sr.is_delete = 0
         </where>
+        GROUP BY sr.id
         ORDER BY create_time DESC
     </select>
 </mapper>