账户权限

simulation-oauth-client/src/main/java/com/css/simulation/oauth/client/controller/SignController.java

@@ -185,8 +185,8 @@ public class SignController {
             newUser.setOpenid(openid);
             newUser.setPassword(password);
             newUser.setCompany("国汽");
-            newUser.setRoleCode(DictConstants.ROLE_CODE_SUBUESR);//默认为国汽账户子账户
-            newUser.setUseType(DictConstants.USER_TYPE_EXCLUSIVE);//占用类型
+            newUser.setRoleCode(DictConstants.ROLE_CODE_SUBUESR);// 默认为索为普通账户的子账户
+            newUser.setUseType(DictConstants.USER_TYPE_PUBLIC);// 索为账户默认为共享用户
             newUser.setVisible("1");//启用登录功能
             newUser.setCreateUserId(oauthParameter.getSimulationZoogooyUserId());
             newUser.setModifyUserId(oauthParameter.getSimulationZoogooyUserId());

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/serviceImpl/AlgorithmServiceImpl.java

@@ -1,34 +1,29 @@
 package com.css.simulation.resource.algorithm.serviceImpl;
+
 import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.MinioParameter;
 import api.common.pojo.param.algorithm.AlgorithmParameter;
 import api.common.pojo.param.system.DictParam;
 import api.common.pojo.po.algorithm.AlgorithmPO;
-import api.common.pojo.constants.DictConstants;
-import api.common.util.*;
 import api.common.pojo.vo.algorithm.AlgorithmVO;
 import api.common.pojo.vo.algorithm.RunningProjectVO;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
+import api.common.util.*;
 import com.css.simulation.resource.algorithm.mapper.AlgorithmMapper;
 import com.css.simulation.resource.algorithm.service.AlgorithmService;
+import com.css.simulation.resource.common.utils.AuthUtil;
+import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.common.utils.PoUtil;
 import com.css.simulation.resource.feign.AlgoPlatformService;
 import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.feign.SchedulerService;
 import com.css.simulation.resource.system.service.DictService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.github.pagehelper.PageInfo;
-import feign.Response;
 import org.eclipse.jgit.lib.Ref;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

simulation-resource-server/src/main/java/com/css/simulation/resource/common/utils/AuthUtil.java

@@ -18,7 +18,7 @@ public class AuthUtil {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
         String userId = userDetails.getId();
-        log.info("AuthUtil--getCurrentUserId 当前 userId 为：" + userId);
+        log.info("AuthUtil--getCurrentUserId 当前用户的 userId 为：" + userId);
         return userId;
     }
 
@@ -29,6 +29,7 @@ public class AuthUtil {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
         String roleCode = userDetails.getRoleCode();
+        log.info("AuthUtil--getCurrentUserId 当前用户的 roleCode 为：" + roleCode);
         return roleCode;
     }
 
@@ -39,6 +40,7 @@ public class AuthUtil {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
         String useType = userDetails.getUseType();
+        log.info("AuthUtil--getCurrentUserId 当前用户的 useType 为：" + useType);
         return useType;
     }
 
@@ -49,6 +51,7 @@ public class AuthUtil {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
         String username = userDetails.getUsername();
+        log.info("AuthUtil--getCurrentUserId 当前用户的 username 为：" + username);
         return username;
     }
 
@@ -59,6 +62,7 @@ public class AuthUtil {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
         String createUserId = userDetails.getCreateUserId();
+        log.info("AuthUtil--getCurrentUserId 当前用户的 createUserId 为：" + createUserId);
         return createUserId;
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/SystemScenePackageController.java

@@ -13,6 +13,7 @@ import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.scene.service.SystemScenePackageService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
@@ -28,11 +29,11 @@ public class SystemScenePackageController {
     //查询列表
     @PostMapping("/querySystemScenePackageList")
     @ResponseBody
-    public ResponseBodyVO<List<SystemScenePackageVO> > querySystemScenePackageList(@RequestBody SystemScenePackageParam parms) {
+    public ResponseBodyVO<List<SystemScenePackageVO>> querySystemScenePackageList(@RequestBody SystemScenePackageParam parms) {
         PageUtil.setPageInfo(parms);
-        List<SystemScenePackageVO>  list = systemScenePackageService.querySystemScenePackageList(parms);
+        List<SystemScenePackageVO> list = systemScenePackageService.querySystemScenePackageList(parms);
 
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,  new PageInfo(list));
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, new PageInfo(list));
     }
 
     //查询场景包详情
@@ -51,10 +52,10 @@ public class SystemScenePackageController {
     @PostMapping("/saveSystemScenePackage")
     @ResponseBody
     public ResponseBodyVO<String> saveSystemScenePackage(@RequestBody SystemScenePackageNewPO parms) {
-        if(ObjectUtil.isNotNull(parms.getId())){
+        if (ObjectUtil.isNotNull(parms.getId())) {
             systemScenePackageService.updateSystemScenePackage(parms);
-        }else{
-         return   systemScenePackageService.saveSystemScenePackage(parms);
+        } else {
+            return systemScenePackageService.saveSystemScenePackage(parms);
         }
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
@@ -80,16 +81,18 @@ public class SystemScenePackageController {
     @PostMapping("/queryUserByPackageId")
     @ResponseBody
     public ResponseBodyVO<SystemUserSceneVO> queryUserByPackageId(@RequestBody SystemScenePackageNewPO params) {
-        SystemUserSceneVO vo=  systemScenePackageService.queryUserByPackageId(params);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,vo);
+        SystemUserSceneVO vo = systemScenePackageService.queryUserByPackageId(params);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, vo);
     }
+
     //场景包配置账号添加
     @PostMapping("/saveUserByPackageId")
     @ResponseBody
     public ResponseBodyVO<String> saveUserByPackageId(@RequestBody SystemUserSceneParam params) {
-         systemScenePackageService.saveUserByPackageId(params);
+        systemScenePackageService.saveUserByPackageId(params);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
+
     //场景包配置账号删除
     @PostMapping("/deleteUserByPackageId")
     @ResponseBody
@@ -102,9 +105,9 @@ public class SystemScenePackageController {
     @PostMapping("/queryPackageByUserId")
     @ResponseBody
     public ResponseBodyVO<List<Map>> queryPackageByUserId(@RequestBody SystemScenePackageParam parms) {
-       // PageUtil.setPageInfo(parms);
-       Map map=  systemScenePackageService.queryPackageByUserId(parms);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,map);
+        // PageUtil.setPageInfo(parms);
+        Map map = systemScenePackageService.queryPackageByUserId(parms);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, map);
     }
 
     //人员添加场景包
@@ -119,11 +122,11 @@ public class SystemScenePackageController {
     //人员场景包列表
     @PostMapping("/queryPackageByUserIdList")
     @ResponseBody
-    public ResponseBodyVO<String> queryPackageByUserIdList(@RequestBody SystemScenePackageParam parms) {
-                 PageUtil.setPageInfo(parms);
-            List<SystemScenePackageVO>  list = systemScenePackageService.queryPackageByUserIdList(parms);
+    public ResponseBodyVO<String> queryPackageByUserIdList(@RequestBody SystemScenePackageParam param) {
+        PageUtil.setPageInfo(param);
+        List<SystemScenePackageVO> list = systemScenePackageService.queryPackageByUserIdList(param);
 
-            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, new PageInfo<SystemScenePackageVO>(list));
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, new PageInfo<>(list));
     }
 
     // 查询勾选场景数量
@@ -134,6 +137,6 @@ public class SystemScenePackageController {
             return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数packageNames不能为空，请检查");
         }
 
-        return  systemScenePackageService.querySystemScenePackageListByTJ(parms);
+        return systemScenePackageService.querySystemScenePackageListByTJ(parms);
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SystemScenePackageService.java

@@ -423,8 +423,7 @@ public class SystemScenePackageService {
     //配置人员场景包列表
     @SneakyThrows
     public List<SystemScenePackageVO> queryPackageByUserIdList(SystemScenePackageParam params) {
-        List<SystemScenePackageVO> list = systemScenePackageMapper.queryPackageByUserIdList(params);
-        return list;
+        return systemScenePackageMapper.queryPackageByUserIdList(params);
     }
 
 

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

@@ -61,7 +61,7 @@ public class UserInfoCtrl {
 
 
     /**
-     * 根据user_id查询参数配置信息
+     * 根据 user_id 查询参数配置信息
      */
     @RequestMapping("/getParameterByUserId")
     @ResponseBody

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

@@ -38,7 +38,7 @@ public class ParameterService {
 
     public ParameterPO saveParameter(ParameterPO paramPO) {
         String id = paramPO.getId();
-        if(ObjectUtil.isNotNull(id)){
+        if (ObjectUtil.isNotNull(id)) {
             // 更新，将原纪录is_deleted置为1
             ParameterPO deleteParamPo = new ParameterPO();
             deleteParamPo.setId(id);
@@ -59,13 +59,13 @@ public class ParameterService {
         return new PageInfo<>(list);
     }
 
-    public HashMap<String, Integer> getSceneParam(){
+    public HashMap<String, Integer> getSceneParam() {
         String roleCode = AuthUtil.getCurrentUserRoleCode();
         String userId = AuthUtil.getCurrentUserId();
-        HashMap<String, Integer>  map=new HashMap<>();
-        if(DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)){ //管理员账户
+        HashMap<String, Integer> map = new HashMap<>();
+        if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { //管理员账户
             return map;
-        }else if(DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)){
+        } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
             //查询父账户
             userId = AuthUtil.getCreateUserId();
         }
@@ -77,14 +77,14 @@ public class ParameterService {
     public ParameterVO getParameterByUserId() {
         String roleCode = AuthUtil.getCurrentUserRoleCode();
         String userId = AuthUtil.getCurrentUserId();
-        if(DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)){ //管理员账户
+        if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { //管理员账户
             return null;
-        }else if(DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)){
+        } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
             //查询父账户
             userId = AuthUtil.getCreateUserId();
         }
         ParameterVO param = parameterMapper.getParameterByUserId(userId);
-        if(DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)){ //普通账户子账户设置可创建子账号数量为0
+        if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) { //普通账户子账户设置可创建子账号数量为0
             param.setNumCreateUser(0);
         }
 

simulation-resource-server/src/main/resources/mapper/scene/SystemScenePackageMapper.xml

@@ -58,8 +58,7 @@
         GROUP BY t.id   order by create_time desc
     </select>
 
-    <select id="queryPackageByUserIdList" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
-            resultType="api.common.pojo.vo.scene.SystemScenePackageVO">
+    <select id="queryPackageByUserIdList" parameterType="api.common.pojo.param.scene.SystemScenePackageParam" resultType="api.common.pojo.vo.scene.SystemScenePackageVO">
         select a.*,GROUP_CONCAT(DISTINCT(p.package_name)) as package_name from (select u.id user_id,s.is_deleted  ,username userName, company,s.package_id,s.modify_time
         from system_user  u left join system_user_scene s
         on u.id=s.user_id where u.is_deleted = '0'  and  u.role_code ='2') a

simulation-resource-server/src/main/resources/mapper/system/ClusterMapper.xml

@@ -114,7 +114,7 @@
         </if>
     </select>
 
-    <!--查询根据userId未到期的仿真软件license数量-->
+    <!--查询根据 userId 未到期的仿真软件license数量-->
     <select id="getSimulationLicenseNum" parameterType="java.lang.String" resultType="java.lang.Integer">
         select num_simulation_license from system_cluster
         where is_deleted = '0' and DATE(date_simulation_license) >= DATE(NOW()) and user_id = #{userId,jdbcType=VARCHAR}