用户占用类型获取bug

simulation-oauth-client/src/main/java/com/css/simulation/oauth/client/mapper/UserMapper.java

@@ -35,11 +35,11 @@ public interface UserMapper {
 
     //* -------------------------------- insert --------------------------------
     @Insert("insert into system_user(" +
-            " id,username,nickname,openid,password," +
-            " company,role_code,visible," +
+            " id,use_type,username,nickname,openid,password,company,role_code,visible," +
             " create_time,modify_time,create_user_id,modify_user_id,is_deleted)" +
             " values (" +
             " #{user.id}," +
+            " #{user.useType}," +
             " #{user.username}," +
             " #{user.nickname}," +
             " #{user.openid}," +

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/ClusterCtrl.java

@@ -31,7 +31,7 @@ public class ClusterCtrl {
      */
     @RequestMapping("/getClusterList")
     @ResponseBody
-    public ResponseBodyVO<PageInfo<ClusterVO>> getClusterList(@RequestBody ClusterParam clusterParam){
+    public ResponseBodyVO<PageInfo<ClusterVO>> getClusterList(@RequestBody ClusterParam clusterParam) {
         ResponseBodyVO<PageInfo<ClusterVO>> response = new ResponseBodyVO<PageInfo<ClusterVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(clusterService.getClusterList(clusterParam));
         return response;
@@ -43,8 +43,8 @@ public class ClusterCtrl {
     @RequestMapping("/saveCluster")
     @ResponseBody
     public ResponseBodyVO<ClusterPO> saveCluster(@RequestBody ClusterPO clusterPO) {
-        if(ObjectUtil.isNull(clusterPO)){
-            return new ResponseBodyVO(false, 400, "参数必传！",null);
+        if (ObjectUtil.isNull(clusterPO)) {
+            return new ResponseBodyVO(false, 400, "参数必传！", null);
         }
         ResponseBodyVO<ClusterPO> response = new ResponseBodyVO<ClusterPO>(ResponseBodyVO.Response.SUCCESS);
         clusterPO = clusterService.saveCluster(clusterPO);
@@ -57,24 +57,20 @@ public class ClusterCtrl {
      */
     @RequestMapping("/getClusterHistory")
     @ResponseBody
-    public ResponseBodyVO<PageInfo<ClusterVO>> getClusterHistory(@RequestBody ClusterParam clusterParam){
+    public ResponseBodyVO<PageInfo<ClusterVO>> getClusterHistory(@RequestBody ClusterParam clusterParam) {
         ResponseBodyVO<PageInfo<ClusterVO>> response = new ResponseBodyVO<PageInfo<ClusterVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(clusterService.getClusterHistory(clusterParam));
         return response;
     }
 
 
-
     /**
      * 查询已分配未到期节点数量
      */
     @RequestMapping("/getClusterNum")
     @ResponseBody
     public ResponseBodyVO<HashMap<String, Integer>> getClusterNum() {
-        ResponseBodyVO<HashMap<String, Integer>> response = new ResponseBodyVO<HashMap<String, Integer>>(ResponseBodyVO.Response.SUCCESS);
-        HashMap<String, Integer> resMap = clusterService.getClusterNum();
-        response.setInfo(resMap);
-        return response;
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, clusterService.getClusterNum());
     }
 
     /**
@@ -83,10 +79,7 @@ public class ClusterCtrl {
     @RequestMapping("/getLicenseNum")
     @ResponseBody
     public ResponseBodyVO<Integer> getLicenseNum() {
-        ResponseBodyVO<Integer> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
-        Integer simulationLicenseNum = clusterService.getLicenseNum();
-        response.setInfo(simulationLicenseNum);
-        return response;
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, clusterService.getLicenseNum());
     }
 
 
@@ -95,7 +88,7 @@ public class ClusterCtrl {
      */
     @RequestMapping("/getValidClusterInfo")
     @ResponseBody
-    public ResponseBodyVO<ClusterVO> getValidClusterInfo(@RequestBody ClusterParam clusterParam){
+    public ResponseBodyVO<ClusterVO> getValidClusterInfo(@RequestBody ClusterParam clusterParam) {
         ResponseBodyVO<ClusterVO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(clusterService.getValidClusterInfo(clusterParam));
         return response;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/ClusterService.java

@@ -107,7 +107,7 @@ public class ClusterService {
             totalSimulationAll = clusterMapper.getSimulationLicenseNum(userId);
             totalDynamicAll = clusterMapper.getDynamicLicenseNum(userId);
         } else {
-            return null;
+            throw new RuntimeException("用户类型获取失败。");
         }
 
         HashMap<String, Integer> resMap = clusterMapper.getClusterNum(clusterParam);
@@ -123,7 +123,7 @@ public class ClusterService {
         String roleCode = AuthUtil.getCurrentUserRoleCode();
         String userType = AuthUtil.getCurrentUseType();
         String userId = AuthUtil.getCurrentUserId();
-        log.info("ClusterService--getLicenseNum 当前用户信息为 roleCode:" + roleCode + ", userType:" + userType + "userId:" + userId);
+        log.info("当前用户信息为：roleCode - " + roleCode + "，userType - " + userType + "，userId - " + userId);
 
         //2 获取当前用户使用的集群账户 id
         if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { // 管理
@@ -142,7 +142,7 @@ public class ClusterService {
             } else if (DictConstants.USER_TYPE_PUBLIC.equals(userType)) {
                 return licenseTotal;
             } else {
-                throw new RuntimeException("ClusterService--getLicenseNum 获取失败1！");
+                throw new RuntimeException("普通用户占用类型获取失败。");
             }
 
         } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
@@ -158,11 +158,11 @@ public class ClusterService {
                 clusterParam.setCreateUserId(userId);
                 licenseTotal = clusterMapper.getSimulationLicenseNum(userId);   // 拥有节点
             } else {
-                throw new RuntimeException("ClusterService--getLicenseNum 获取失败2！");
+                throw new RuntimeException("普通用户子账户占用类型获取失败。");
             }
             return licenseTotal;
         } else {
-            throw new RuntimeException("ClusterService--getLicenseNum 获取失败3！");
+            throw new RuntimeException("用户类型获取失败。");
         }
     }