userId 修改

takai-admin/src/main/java/com/takai/web/controller/system/SysLoginController.java

@@ -119,7 +119,7 @@ public class SysLoginController
     @GetMapping("/getRouters")
     public AjaxResult getRouters()
     {
-        Long userId = SecurityUtils.getUserId();
+        String userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
@@ -179,7 +179,7 @@ public class SysLoginController
     public AjaxResult getInfoByDeepSeek(@PathVariable("userId") String userId)
     {
         SysUser user = new SysUser();
-        user.setUserId(Long.valueOf(userId));
+        user.setUserId(userId);
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合

takai-admin/src/main/java/com/takai/web/controller/system/SysRoleController.java

@@ -241,7 +241,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+    public AjaxResult selectAuthUserAll(Long roleId, String[] userIds)
     {
         roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));

takai-admin/src/main/java/com/takai/web/controller/system/SysUserController.java

@@ -99,7 +99,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = { "/", "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) String userId)
     {
         userService.checkUserDataScope(userId);
         AjaxResult ajax = AjaxResult.success();
@@ -110,7 +110,7 @@ public class SysUserController extends BaseController
         {
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
-            ajax.put("postIds", postService.selectPostListByUserId(userId));
+            ajax.put("postIds", postService.selectPostListByUserId(Long.valueOf(userId)));
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
         return ajax;
@@ -173,7 +173,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
+    public AjaxResult remove(@PathVariable String[] userIds)
     {
         if (ArrayUtils.contains(userIds, getUserId()))
         {
@@ -216,7 +216,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId)
+    public AjaxResult authRole(@PathVariable("userId") String userId)
     {
         AjaxResult ajax = AjaxResult.success();
         SysUser user = userService.selectUserById(userId);
@@ -232,7 +232,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
+    public AjaxResult insertAuthRole(String userId, Long[] roleIds)
     {
         userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);

takai-admin/src/main/java/com/takai/web/controller/takaiai/TakaiAiController.java

@@ -600,8 +600,8 @@ public class TakaiAiController extends BaseController {
      * 应用类型列表
      * @return
      */
-    @GetMapping("/appType/{userId}")
-    public AjaxResult appType(@PathVariable String userId) {
+    @GetMapping("/appType")
+    public AjaxResult appType() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (loginUser != null) {
             SysDictData dictData = new SysDictData();
@@ -697,7 +697,7 @@ public class TakaiAiController extends BaseController {
         }else{
             // 角色集合
             SysUser user = new SysUser();
-            user.setUserId(Long.valueOf(userId));
+            user.setUserId(userId);
             Set<String> permissions = permissionService.getMenuPermission(user);
             if (permissions.contains("deepseek:application:create") || permissions.contains("deepseek:application:update")) {
                 return returnParams(userId, typeId, projectId, "1");

takai-ai/src/main/java/com/takai/ai/service/impl/TakaiAiServiceImpl.java

@@ -808,7 +808,7 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
                     .nodeOrder(String.valueOf(vo.getNodeOrder()))
                     .comment(null)
                     .build();
-            info.setCreateBy(params.getUserId());
+            info.setUpdateBy(params.getUserId());
             int i = takaiApplicationMapper.updateApplication(info);
             if (1 > 0) {
                 TakaiAppInfo appInfo = new TakaiAppInfo();
@@ -1101,34 +1101,27 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
         List<Object> result =  new ArrayList();
         if (dictDataList!= null && dictDataList.size() > 0) {
             for (SysDictData dictData : dictDataList){
+                List<TakaiApplicationResult> list = null;
                 Map<String, Object> map = new HashMap();
-                List<TakaiApplicationResult> list = takaiApplicationMapper.selectApplicationList(TakaiApplication.builder().approver(userId).flag("0").typeId(dictData.getDictCode()).build());
-                if(list!= null && list.size() > 0){
-                    if(dictData.getDictCode() == 41){ // 项目级应用
-                        List<Object> l = new ArrayList<>();
-                        map.put("title", dictData.getDictLabel());
-                        for (TakaiApplicationResult application : list){
-                            Map<String, Object> infoProjectMap = new HashMap();
-                            List<TakaiApplicationResult> projectList = takaiApplicationMapper.selectApplicationListByProjectType(application.getAppId());
-                            if(projectList != null && projectList.size() > 0){
-                                List<TakaiApplicationResult> uniqueAppList = projectList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TakaiApplicationResult :: getAppId))), ArrayList::new)); // 去重
-                                List<Object> projectInfoList = new ArrayList();
-                                for (TakaiApplicationResult project : uniqueAppList){
-                                    SysDictData vo = sysDictDataMapper.selectDictDataById(Long.valueOf(project.getTypeId()));
-                                    infoProjectMap.put("title", vo.getDictLabel());
-                                    Map<String, Object> projectMap = new HashMap();
-                                    projectMap.put("appId", project.getAppId());
-                                    projectMap.put("showMenu", "false");
-                                    projectMap.put("chatMode", "LOCAL");
-                                    projectMap.put("title", vo.getDictLabel());
-                                    projectInfoList.add(projectMap);
-                                }
-                                infoProjectMap.put("children", projectInfoList);
-                                l.add(infoProjectMap);
-                            }
-                            map.put("children", l);
-                        }
-                    }else{
+                TakaiApplication paramsVo = TakaiApplication.builder().approver(userId).flag("0").build();
+                if(dictData.getDictCode() == 41){
+                    paramsVo.setTypeId(Long.valueOf(42));
+                    list = takaiApplicationMapper.selectApplicationList(paramsVo);
+                    if(list != null && list.size() > 0){
+                        Map<String, Object> l = searchAppTypeGroupList(list, dictData, map);
+                        result.add(l);
+                    }
+                    list = null;
+                    paramsVo.setTypeId(Long.valueOf(43));
+                    list = takaiApplicationMapper.selectApplicationList(paramsVo);
+                    if (list != null && list.size() > 0){
+                        Map<String, Object> l2 = searchAppTypeGroupList(list, dictData, map);
+                        result.add(l2);
+                    }
+                }else{
+                    paramsVo.setTypeId(Long.valueOf(dictData.getDictCode()));
+                    list = takaiApplicationMapper.selectApplicationList(paramsVo);
+                    if(list != null && list.size() > 0){
                         List<Object> appInfoList = new ArrayList();
                         map.put("title", dictData.getDictLabel());
                         for (TakaiApplicationResult application : list){
@@ -1140,14 +1133,61 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
                             appInfoList.add(infoMap);
                         }
                         map.put("children", appInfoList);
+                        result.add(map);
                     }
-                    result.add(map);
                 }
+//                if(list!= null && list.size() > 0){
+//                    if(dictData.getDictCode() == 41 ){ // 项目级应用
+//
+//                    }else{
+//                        List<Object> appInfoList = new ArrayList();
+//                        map.put("title", dictData.getDictLabel());
+//                        for (TakaiApplicationResult application : list){
+//                            Map<String, Object> infoMap = new HashMap();
+//                            infoMap.put("title", application.getName());
+//                            infoMap.put("appId", application.getAppId());
+//                            infoMap.put("showMenu", "false");
+//                            infoMap.put("chatMode", "LOCAL");
+//                            appInfoList.add(infoMap);
+//                        }
+//                        map.put("children", appInfoList);
+//                    }
+//                    result.add(map);
+//                }
             }
         }
         return result;
     }
 
+    private Map<String, Object> searchAppTypeGroupList(List<TakaiApplicationResult> list, SysDictData dictData, Map<String, Object> map) {
+        if (list!= null && list.size() > 0) {
+            List<Object> l = new ArrayList<>();
+            map.put("title", dictData.getDictLabel());
+            for (TakaiApplicationResult application : list){
+                Map<String, Object> infoProjectMap = new HashMap();
+                List<TakaiApplicationResult> projectList = takaiApplicationMapper.selectApplicationListByProjectType(application.getAppId());
+                if(projectList != null && projectList.size() > 0){
+                    List<TakaiApplicationResult> uniqueAppList = projectList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TakaiApplicationResult :: getAppId))), ArrayList::new)); // 去重
+                    List<Object> projectInfoList = new ArrayList();
+                    for (TakaiApplicationResult project : uniqueAppList){
+                        SysDictData vo = sysDictDataMapper.selectDictDataById(Long.valueOf(project.getTypeId()));
+                        infoProjectMap.put("title", vo.getDictLabel());
+                        Map<String, Object> projectMap = new HashMap();
+                        projectMap.put("appId", project.getAppId());
+                        projectMap.put("showMenu", "false");
+                        projectMap.put("chatMode", "LOCAL");
+                        projectMap.put("title", project.getName());
+                        projectInfoList.add(projectMap);
+                    }
+                    infoProjectMap.put("children", projectInfoList);
+                    l.add(infoProjectMap);
+                }
+                map.put("children", l);
+            }
+        }
+        return map;
+    }
+
     @Override
     public List<TakaiApplication> applicationListByApprover(TakaiApplicationParams takaiApplicationParams) {
         TakaiApplication vo = TakaiApplication.builder().approver(takaiApplicationParams.getApprover())

takai-ai/src/main/resources/mapper/takaiai/TakaiApplicationMapper.xml

@@ -164,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND (
 				<choose>
 					<when test="flag == 1">
-						(bl.status  = '1' OR bl.status  = '2' OR bl.status  = '3' OR bl.status  = '4' OR bl.status  = '5') AND bl.create_by = #{approver}
+						(bl.status  = '1' OR bl.status  = '2' OR bl.status  = '3' OR bl.status  = '4' OR bl.status  = '5') AND (bl.create_by = #{approver} OR bl.update_by = #{approver})
 					</when>
 					<otherwise>
 						bl.status = '3' OR bl.status = '' OR bl.status IS NULL
@@ -327,13 +327,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			bm.create_time,
 			bm.status,
 			bm.comment,
-			sp.project_type as type_id
+			bm.type_id
 		from
 			bm_application bm
 				LEFT JOIN sys_project_app pa ON bm.appId = pa.app_id
 				LEFT JOIN sys_project sp on pa.project_id = sp.project_id
 		where bm.appId = #{appId}
-		  and (sp.project_type = '42' or sp.project_type = '43')
+		  and (bm.type_id = 42 or bm.type_id = 43)
 	</select>
 
 </mapper>

takai-common/src/main/java/com/takai/common/core/controller/BaseController.java

@@ -179,7 +179,7 @@ public class BaseController
     /**
      * 获取登录用户id
      */
-    public Long getUserId()
+    public String getUserId()
     {
         return getLoginUser().getUserId();
     }

takai-common/src/main/java/com/takai/common/core/domain/entity/SysUser.java

@@ -23,7 +23,7 @@ public class SysUser extends BaseEntity
 
     /** 用户ID */
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
-    private Long userId;
+    private String userId;
 
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
@@ -100,17 +100,17 @@ public class SysUser extends BaseEntity
 
     }
 
-    public SysUser(Long userId)
+    public SysUser(String userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }
@@ -120,9 +120,9 @@ public class SysUser extends BaseEntity
         return isAdmin(this.userId);
     }
 
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(String userId)
     {
-        return userId != null && 1L == userId;
+        return userId != null && "1" == userId;
     }
 
     public Long getDeptId()

takai-common/src/main/java/com/takai/common/core/domain/model/LoginUser.java

@@ -19,7 +19,7 @@ public class LoginUser implements UserDetails
     /**
      * 用户ID
      */
-    private Long userId;
+    private String userId;
 
     /**
      * 部门ID
@@ -81,7 +81,7 @@ public class LoginUser implements UserDetails
         this.permissions = permissions;
     }
 
-    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+    public LoginUser(String userId, Long deptId, SysUser user, Set<String> permissions)
     {
         this.userId = userId;
         this.deptId = deptId;
@@ -89,12 +89,12 @@ public class LoginUser implements UserDetails
         this.permissions = permissions;
     }
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }

takai-common/src/main/java/com/takai/common/utils/SecurityUtils.java

@@ -17,7 +17,7 @@ public class SecurityUtils
     /**
      * 用户ID
      **/
-    public static Long getUserId()
+    public static String getUserId()
     {
         try
         {

takai-framework/src/main/java/com/takai/framework/web/service/JkLoginService.java

@@ -74,7 +74,7 @@ public class JkLoginService
      *
      * @param userId 用户ID
      */
-    public void recordLoginInfo(Long userId)
+    public void recordLoginInfo(String userId)
     {
         SysUser sysUser = new SysUser();
         sysUser.setUserId(userId);

takai-framework/src/main/java/com/takai/framework/web/service/SysLoginService.java

@@ -120,7 +120,7 @@ public class SysLoginService
         }
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
-        recordLoginInfo(loginUser.getUserId());
+        recordLoginInfo(Long.valueOf(loginUser.getUserId()));
         // 生成token
         return tokenService.createToken(loginUser);
     }
@@ -198,7 +198,7 @@ public class SysLoginService
     public void recordLoginInfo(Long userId)
     {
         SysUser sysUser = new SysUser();
-        sysUser.setUserId(userId);
+        sysUser.setUserId(String.valueOf(userId));
         sysUser.setLoginIp(IpUtils.getIpAddr());
         sysUser.setLoginDate(DateUtils.getNowDate());
         userService.updateUserProfile(sysUser);
@@ -244,7 +244,7 @@ public class SysLoginService
         }
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
-        recordLoginInfo(loginUser.getUserId());
+        recordLoginInfo(Long.valueOf(loginUser.getUserId()));
 
         // 生成token
         String login_token = tokenService.createToken(loginUser);

takai-system/src/main/java/com/takai/system/domain/SysProjectStaff.java

@@ -52,8 +52,6 @@ public class SysProjectStaff extends BaseEntity
 
     private String roleName;
 
-    private List<String> approvers;
-
     public void setId(String id)
     {
         this.id = id;
@@ -141,14 +139,6 @@ public class SysProjectStaff extends BaseEntity
         this.roleName = roleName;
     }
 
-    public List<String> getApprovers() {
-        return approvers;
-    }
-
-    public void setApprovers(List<String> approvers) {
-        this.approvers = approvers;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

takai-system/src/main/java/com/takai/system/domain/SysUserPost.java

@@ -11,17 +11,17 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class SysUserPost
 {
     /** 用户ID */
-    private Long userId;
+    private String userId;
     
     /** 岗位ID */
     private Long postId;
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }

takai-system/src/main/java/com/takai/system/domain/SysUserRole.java

@@ -11,17 +11,17 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class SysUserRole
 {
     /** 用户ID */
-    private Long userId;
+    private String userId;
     
     /** 角色ID */
     private Long roleId;
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }

takai-system/src/main/java/com/takai/system/mapper/SysMenuMapper.java

@@ -48,7 +48,7 @@ public interface SysMenuMapper
      * @param userId 用户ID
      * @return 权限列表
      */
-    public List<String> selectMenuPermsByUserId(Long userId);
+    public List<String> selectMenuPermsByUserId(String userId);
 
     /**
      * 根据用户ID查询菜单
@@ -63,7 +63,7 @@ public interface SysMenuMapper
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeByUserId(String userId);
 
     /**
      * 根据角色ID查询菜单树信息

takai-system/src/main/java/com/takai/system/mapper/SysRoleMapper.java

@@ -24,7 +24,7 @@ public interface SysRoleMapper
      * @param userId 用户ID
      * @return 角色列表
      */
-    public List<SysRole> selectRolePermissionByUserId(Long userId);
+    public List<SysRole> selectRolePermissionByUserId(String userId);
 
     /**
      * 查询所有角色

takai-system/src/main/java/com/takai/system/mapper/SysUserMapper.java

@@ -49,7 +49,7 @@ public interface SysUserMapper
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(String userId);
 
     /**
      * 新增用户信息
@@ -91,7 +91,7 @@ public interface SysUserMapper
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(String userId);
 
     /**
      * 批量删除用户信息
@@ -99,7 +99,7 @@ public interface SysUserMapper
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    public int deleteUserByIds(String[] userIds);
 
     /**
      * 校验用户名称是否唯一
@@ -130,5 +130,5 @@ public interface SysUserMapper
      * @param userId
      * @return
      */
-    public int checkUserExist(Long userId);
+    public int checkUserExist(String userId);
 }

takai-system/src/main/java/com/takai/system/mapper/SysUserPostMapper.java

@@ -16,7 +16,7 @@ public interface SysUserPostMapper
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserPostByUserId(Long userId);
+    public int deleteUserPostByUserId(String userId);
 
     /**
      * 通过岗位ID查询岗位使用数量
@@ -32,7 +32,7 @@ public interface SysUserPostMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteUserPost(Long[] ids);
+    public int deleteUserPost(String[] ids);
 
     /**
      * 批量新增用户岗位信息

takai-system/src/main/java/com/takai/system/mapper/SysUserRoleMapper.java

@@ -17,7 +17,7 @@ public interface SysUserRoleMapper
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserRoleByUserId(Long userId);
+    public int deleteUserRoleByUserId(String userId);
 
     /**
      * 批量删除用户和角色关联
@@ -25,7 +25,7 @@ public interface SysUserRoleMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteUserRole(Long[] ids);
+    public int deleteUserRole(String[] ids);
 
     /**
      * 通过角色ID查询角色使用数量

takai-system/src/main/java/com/takai/system/service/ISysMenuService.java

@@ -19,7 +19,7 @@ public interface ISysMenuService
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(Long userId);
+    public List<SysMenu> selectMenuList(String userId);
 
     /**
      * 根据用户查询系统菜单列表
@@ -28,7 +28,7 @@ public interface ISysMenuService
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
+    public List<SysMenu> selectMenuList(SysMenu menu, String userId);
 
     /**
      * 根据用户ID查询权限
@@ -36,7 +36,7 @@ public interface ISysMenuService
      * @param userId 用户ID
      * @return 权限列表
      */
-    public Set<String> selectMenuPermsByUserId(Long userId);
+    public Set<String> selectMenuPermsByUserId(String userId);
 
     /**
      * 根据角色ID查询权限
@@ -52,7 +52,7 @@ public interface ISysMenuService
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeByUserId(String userId);
 
     /**
      * 根据角色ID查询菜单树信息

takai-system/src/main/java/com/takai/system/service/ISysRoleService.java

@@ -26,7 +26,7 @@ public interface ISysRoleService
      * @param userId 用户ID
      * @return 角色列表
      */
-    public List<SysRole> selectRolesByUserId(Long userId);
+    public List<SysRole> selectRolesByUserId(String userId);
 
     /**
      * 根据用户ID查询角色权限
@@ -34,7 +34,7 @@ public interface ISysRoleService
      * @param userId 用户ID
      * @return 权限列表
      */
-    public Set<String> selectRolePermissionByUserId(Long userId);
+    public Set<String> selectRolePermissionByUserId(String userId);
 
     /**
      * 查询所有角色
@@ -169,5 +169,5 @@ public interface ISysRoleService
      * @param userIds 需要删除的用户数据ID
      * @return 结果
      */
-    public int insertAuthUsers(Long roleId, Long[] userIds);
+    public int insertAuthUsers(Long roleId, String[] userIds);
 }

takai-system/src/main/java/com/takai/system/service/ISysUserService.java

@@ -48,7 +48,7 @@ public interface ISysUserService
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(String userId);
 
     /**
      * 根据用户ID查询用户所属角色组
@@ -102,7 +102,7 @@ public interface ISysUserService
      * 
      * @param userId 用户id
      */
-    public void checkUserDataScope(Long userId);
+    public void checkUserDataScope(String userId);
 
     /**
      * 新增用户信息
@@ -142,7 +142,7 @@ public interface ISysUserService
      * @param userId 用户ID
      * @param roleIds 角色组
      */
-    public void insertUserAuth(Long userId, Long[] roleIds);
+    public void insertUserAuth(String userId, Long[] roleIds);
 
     /**
      * 修改用户状态
@@ -192,7 +192,7 @@ public interface ISysUserService
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(String userId);
 
     /**
      * 批量删除用户信息
@@ -200,7 +200,7 @@ public interface ISysUserService
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    public int deleteUserByIds(String[] userIds);
 
     /**
      * 导入用户数据

takai-system/src/main/java/com/takai/system/service/impl/JkApiServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 import com.auth0.jwt.JWT;
 
@@ -128,7 +129,7 @@ public class JkApiServiceImpl implements IJkApiService {
         for(int i = 0; i < jsonArray.size(); i++) {
             SysUser sysUser = new SysUser();
             JSONObject json = jsonArray.getJSONObject(i);
-            sysUser.setUserId(json.getLong("app_account__id"));
+            sysUser.setUserId(json.getString("app_account__id"));
             sysUser.setUserName(json.getString("app_account__account_no"));
             sysUser.setNickName(json.getString("app_account__account_name"));
             //建科用户状态，启用：1，停用：0，删除：-1
@@ -224,6 +225,7 @@ public class JkApiServiceImpl implements IJkApiService {
 
             Request request = buildRequest(url,page);
             // 执行请求并获取响应
+//            OkHttpClient client = buildOkHttpClient();
             try {
                 Response response = client.newCall(request).execute();
                 String responseBody = response.body().string();
@@ -274,6 +276,7 @@ public class JkApiServiceImpl implements IJkApiService {
                 if(i > 0) {
                     Thread.sleep(i*1000);
                 }
+//                OkHttpClient client = buildOkHttpClient();
                 Response response = client.newCall(request).execute();
                 String responseBody = response.body().string();
                 logger.info("回调建科用户接口返回：" + responseBody);
@@ -304,29 +307,30 @@ public class JkApiServiceImpl implements IJkApiService {
             Request request = buildTokenRequest(code, redirectUrl);
             Response response = client.newCall(request).execute();
             String responseBody = response.body().string();
-            logger.info("获取建科token返回信息：" + responseBody);
+            logger.info("获取建科token返回信息：{}", responseBody);
             if (!response.isSuccessful()) {
                 throw new IOException("获取建科token信息失败 " + responseBody);
             }
-            JSONObject jsonObject =JSON.parseObject(responseBody);
+            JSONObject jsonObject = JSON.parseObject(responseBody);
 
             token = jsonObject.getString("access_token");
-            if(!StringUtils.isEmpty(token)) {
-                //token 换取用户信息
+            if (!StringUtils.isEmpty(token)) {
+                // token 换取用户信息
                 Request pReq = buildProfileRequest(token);
                 Response pResp = client.newCall(pReq).execute();
                 String pRespBody = pResp.body().string();
                 if (!pResp.isSuccessful()) {
                     throw new IOException("token换取建科用户信息失败 " + pRespBody);
                 }
-                userJson =JSON.parseObject(pRespBody);
-                logger.info("获取建科用户返回信息：" + userJson.toJSONString());
+                userJson = JSON.parseObject(pRespBody);
+                logger.info("获取建科用户返回信息：{}", userJson.toJSONString());
             }
         } catch (IOException e) {
-            throw new IOException(code + "获取建科token息失败 ", e);
+            logger.error("获取建科token失败，code:{}", code, e);
+            throw new IOException("获取建科token信息失败 ", e);
         }
 
-        if(userJson == null) {
+        if (userJson == null) {
             return null;
         }
         JSONObject attrs = userJson.getJSONObject("attributes");
@@ -432,4 +436,12 @@ public class JkApiServiceImpl implements IJkApiService {
         }
     }
 
+    private OkHttpClient buildOkHttpClient() {
+        return new OkHttpClient.Builder()
+                .connectTimeout(10, TimeUnit.SECONDS)
+                .writeTimeout(50, TimeUnit.SECONDS)
+                .readTimeout(10, TimeUnit.MINUTES)
+                .build();
+    }
+
 }

takai-system/src/main/java/com/takai/system/service/impl/SysMenuServiceImpl.java

@@ -51,7 +51,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(Long userId)
+    public List<SysMenu> selectMenuList(String userId)
     {
         return selectMenuList(new SysMenu(), userId);
     }
@@ -63,7 +63,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
+    public List<SysMenu> selectMenuList(SysMenu menu, String userId)
     {
         List<SysMenu> menuList = null;
         // 管理员显示所有菜单信息
@@ -86,7 +86,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectMenuPermsByUserId(Long userId)
+    public Set<String> selectMenuPermsByUserId(String userId)
     {
         List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
         Set<String> permsSet = new HashSet<>();
@@ -128,10 +128,10 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId)
+    public List<SysMenu> selectMenuTreeByUserId(String userId)
     {
         List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId))
+        if (SecurityUtils.isAdmin(Long.valueOf(userId)))
         {
             menus = menuMapper.selectMenuTreeAll();
         }

takai-system/src/main/java/com/takai/system/service/impl/SysProjectStaffServiceImpl.java

@@ -55,10 +55,10 @@ public class SysProjectStaffServiceImpl implements ISysProjectStaffService
     @Override
     public int insertSysProjectStaff(SysProjectStaff sysProjectStaff)
     {
-        List<String> approvers = sysProjectStaff.getApprovers();
-        String userids = String.join(",", approvers);
+//        List<String> approvers = sysProjectStaff.getApprovers();
+//        String userids = String.join(",", approvers);
         SnowflakeDigitGenerator snowflakeDigitGenerator = new SnowflakeDigitGenerator(1, 1);
-        sysProjectStaff.setUserId(userids);
+//        sysProjectStaff.setUserId(userids);
         sysProjectStaff.setCreateTime(DateUtils.getNowDate());
         sysProjectStaff.setId(String.valueOf(snowflakeDigitGenerator.nextId()));
         return sysProjectStaffMapper.insertSysProjectStaff(sysProjectStaff);
@@ -73,9 +73,9 @@ public class SysProjectStaffServiceImpl implements ISysProjectStaffService
     @Override
     public int updateSysProjectStaff(SysProjectStaff sysProjectStaff)
     {
-        List<String> approvers = sysProjectStaff.getApprovers();
-        String userids = String.join(",", approvers);
-        sysProjectStaff.setUserId(userids);
+//        List<String> approvers = sysProjectStaff.getApprovers();
+//        String userids = String.join(",", approvers);
+//        sysProjectStaff.setUserId(userids);
         sysProjectStaff.setUpdateTime(DateUtils.getNowDate());
         return sysProjectStaffMapper.updateSysProjectStaff(sysProjectStaff);
     }

takai-system/src/main/java/com/takai/system/service/impl/SysRoleServiceImpl.java

@@ -65,7 +65,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色列表
      */
     @Override
-    public List<SysRole> selectRolesByUserId(Long userId)
+    public List<SysRole> selectRolesByUserId(String userId)
     {
         List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
         List<SysRole> roles = selectRoleAll();
@@ -90,7 +90,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectRolePermissionByUserId(Long userId)
+    public Set<String> selectRolePermissionByUserId(String userId)
     {
         List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
         Set<String> permsSet = new HashSet<>();
@@ -408,11 +408,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public int insertAuthUsers(Long roleId, Long[] userIds)
+    public int insertAuthUsers(Long roleId, String[] userIds)
     {
         // 新增用户与角色管理
         List<SysUserRole> list = new ArrayList<SysUserRole>();
-        for (Long userId : userIds)
+        for (String userId : userIds)
         {
             SysUserRole ur = new SysUserRole();
             ur.setUserId(userId);

takai-system/src/main/java/com/takai/system/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
+import com.takai.common.utils.SnowflakeDigitGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -119,7 +121,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId)
+    public SysUser selectUserById(String userId)
     {
         return userMapper.selectUserById(userId);
     }
@@ -167,9 +169,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public boolean checkUserNameUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        String userId = StringUtils.isNull(user.getUserId()) ? "-1" : user.getUserId();
         SysUser info = userMapper.checkUserNameUnique(user.getUserName());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getUserId() != userId)
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -185,9 +187,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public boolean checkPhoneUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        String userId = StringUtils.isNull(user.getUserId()) ? "-1" : user.getUserId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getUserId() != userId)
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -203,9 +205,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public boolean checkEmailUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        String userId = StringUtils.isNull(user.getUserId()) ? "-1" : user.getUserId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getUserId() != userId)
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -232,7 +234,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @param userId 用户id
      */
     @Override
-    public void checkUserDataScope(Long userId)
+    public void checkUserDataScope(String userId)
     {
         if (!SysUser.isAdmin(SecurityUtils.getUserId()))
         {
@@ -257,6 +259,8 @@ public class SysUserServiceImpl implements ISysUserService
     public int insertUser(SysUser user)
     {
         // 新增用户信息
+        SnowflakeDigitGenerator snowflakeDigitGenerator = new SnowflakeDigitGenerator(1, 1);
+        user.setUserId(String.valueOf(snowflakeDigitGenerator.nextId()));
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
         insertUserPost(user);
@@ -314,7 +318,7 @@ public class SysUserServiceImpl implements ISysUserService
     @Transactional
     public int updateUser(SysUser user)
     {
-        Long userId = user.getUserId();
+        String userId = user.getUserId();
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 新增用户与角色管理
@@ -334,7 +338,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public void insertUserAuth(Long userId, Long[] roleIds)
+    public void insertUserAuth(String userId, Long[] roleIds)
     {
         userRoleMapper.deleteUserRoleByUserId(userId);
         insertUserRole(userId, roleIds);
@@ -441,7 +445,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @param userId 用户ID
      * @param roleIds 角色组
      */
-    public void insertUserRole(Long userId, Long[] roleIds)
+    public void insertUserRole(String userId, Long[] roleIds)
     {
         if (StringUtils.isNotEmpty(roleIds))
         {
@@ -466,7 +470,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserById(Long userId)
+    public int deleteUserById(String userId)
     {
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
@@ -483,9 +487,9 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserByIds(Long[] userIds)
+    public int deleteUserByIds(String[] userIds)
     {
-        for (Long userId : userIds)
+        for (String userId : userIds)
         {
             checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);

takai-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -73,7 +73,7 @@
 		order by m.parent_id, m.order_num
 	</select>
     
-    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
+    <select id="selectMenuTreeByUserId" parameterType="String" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -102,7 +102,7 @@
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 	</select>
 
-	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
+	<select id="selectMenuPermsByUserId" parameterType="String" resultType="String">
 		select distinct m.perms
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id

takai-system/src/main/resources/mapper/system/SysProjectStaffMapper.xml

@@ -18,9 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userName"    column="user_name"    />
         <result property="projectName"    column="project_name"    />
         <result property="roleName"    column="role_name"    />
-        <collection property="approvers" ofType="java.lang.String" javaType="list" >
-            <result column="approvers" />
-        </collection>
+<!--        <collection property="approvers" ofType="java.lang.String" javaType="list" >-->
+<!--            <result column="approvers" />-->
+<!--        </collection>-->
     </resultMap>
 
     <sql id="selectSysProjectStaffVo">
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSysProjectStaffList" parameterType="SysProjectStaff" resultMap="SysProjectStaffResult">
         select sps.id,
         sps.project_pid,
-        sps.user_id as approvers,
+        sps.user_id,
         sps.role_id,
         sps.m_bdate,
         sps.m_edate,
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSysProjectStaffById" parameterType="Long" resultMap="SysProjectStaffResult">
         select sps.id,
                sps.project_pid,
-               sps.user_id as approvers,
+               sps.user_id,
                sps.role_id,
                sps.m_bdate,
                sps.m_edate,

takai-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by r.role_sort
 	</select>
     
-	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+	<select id="selectRolePermissionByUserId" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		WHERE r.del_flag = '0' and ur.user_id = #{userId}
 	</select>
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectRoleVo"/>
 	</select>
 	
-	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
+	<select id="selectRoleListByUserId" parameterType="String" resultType="Long">
 		select r.role_id
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id

takai-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where u.user_name = #{userName} and u.del_flag = '0'
 	</select>
 	
-	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
+	<select id="selectUserById" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
 
-	<select id="checkUserExist" parameterType="Long" resultType="Integer">
+	<select id="checkUserExist" parameterType="String" resultType="Integer">
 		select count(1) from sys_user where user_id = #{userId}
 	</select>
 	
@@ -218,11 +218,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
 	
-	<delete id="deleteUserById" parameterType="Long">
+	<delete id="deleteUserById" parameterType="String">
  		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
  	
- 	<delete id="deleteUserByIds" parameterType="Long">
+ 	<delete id="deleteUserByIds" parameterType="String">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}