git

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/MultiSimulationProjectServiceImpl.java

@@ -96,6 +96,11 @@ public class MultiSimulationProjectServiceImpl implements MultiSimulationProject
     @Override
     @SneakyThrows
     public ResponseBodyVO<PageInfo<MultiSimulationProjectVO>> selectMultiSimulationProject(MultiSimulationProjectParam param) {
+        String currentUserId = AuthUtil.getCurrentUserId();
+        if (StringUtils.isBlank(currentUserId)){
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前角色为空");
+        }
+        param.setProjectUserId(currentUserId);
         if (Objects.isNull(param.getPageNum())) {
             param.setPageNum(1);
         }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/SimulationMapServiceImpl.java

@@ -62,6 +62,12 @@ public class SimulationMapServiceImpl implements SimulationMapService {
     @Override
     @SneakyThrows
     public ResponseBodyVO<PageInfo<SimulationMapVO>> selectMultiSimulationMap(SimulationMapParam param){
+        String currentUserId = AuthUtil.getCurrentUserId();
+        if (StringUtils.isBlank(currentUserId)){
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前角色为空");
+        }
+        param.setProjectUserId(currentUserId);
+
         if (Objects.isNull(param.getPageNum())){
             param.setPageNum(1);
         }
@@ -83,6 +89,11 @@ public class SimulationMapServiceImpl implements SimulationMapService {
     @Override
     @SneakyThrows
     public ResponseBodyVO<List<SimulationMapVO>> selectAllSimulationMapList(SimulationMapParam param){
+        String currentUserId = AuthUtil.getCurrentUserId();
+        if (StringUtils.isBlank(currentUserId)){
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前角色为空");
+        }
+        param.setProjectUserId(currentUserId);
         List<SimulationMapVO> simulationMapVOS = mapMapper.selectSimulationMapList(param);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, simulationMapVOS);
     }
@@ -186,6 +197,12 @@ public class SimulationMapServiceImpl implements SimulationMapService {
         if (!StringUtils.equals(DictConstants.ROLE_CODE_ADMIN, currentUserRoleCode) && !StringUtils.equals(DictConstants.ROLE_CODE_SYSADMIN, currentUserRoleCode)){
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前用户无该权限");
         }
+        String currentUserId = AuthUtil.getCurrentUserId();
+        if (StringUtils.isBlank(currentUserId)){
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前角色为空");
+        }
+        param.setProjectUserId(currentUserId);
+
         String mapName = param.getMapName();
         String mapJson = new String(fileJson.getBytes(), StandardCharsets.UTF_8);
         if (StringUtils.isBlank(mapJson) || param.getPathNum() == null || StringUtils.isBlank(mapName)){
@@ -223,6 +240,7 @@ public class SimulationMapServiceImpl implements SimulationMapService {
 
         SimulationMapPO simulationMapPO = new SimulationMapPO();
         simulationMapPO.setMapPath(mapUrl).setMapOsgbPath(osMinioUrl).setMapName(param.getMapName()).setMapDescription(param.getMapDescription())
+            .setProjectUserId(param.getProjectUserId())
             .setMapJson(object.toJSONString()).setPathNum(param.getPathNum()).setMapCode("").setId(StringUtil.getRandomUUID());
         int i = mapMapper.addSimulationMap(simulationMapPO);
         if (i <= 0){

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/MultiSimulationProjectMapper.java

@@ -29,6 +29,9 @@ public interface MultiSimulationProjectMapper {
         "<if test='projectId != null'> " +
         " AND id = #{projectId}" +
         "</if>" +
+        "<if test='projectUserId != null'> " +
+        " AND project_user_id = #{projectUserId}" +
+        "</if>" +
         "order by create_time desc" +
         "</script>")
     List<MultiSimulationProjectVO> selectProjectList(MultiSimulationProjectParam param);

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/SimulationMapMapper.java

@@ -11,8 +11,8 @@ import java.util.List;
 
 @Mapper
 public interface SimulationMapMapper {
-    @Insert("insert into simulation_map (id,map_code,map_name,map_json,map_osgb_path,map_path,map_description,path_num) values" +
-        "(#{id},#{mapCode},#{mapName},#{mapJson},#{mapOsgbPath},#{mapPath},#{mapDescription},#{pathNum})")
+    @Insert("insert into simulation_map (id,map_code,map_name,map_json,map_osgb_path,map_path,map_description,path_num,project_user_id) values" +
+        "(#{id},#{mapCode},#{mapName},#{mapJson},#{mapOsgbPath},#{mapPath},#{mapDescription},#{pathNum},#{projectUserId})")
     int addSimulationMap(SimulationMapPO scenePO);
 
     @Select("select id,path_num,map_name,map_osgb_path,map_path,map_description,create_time from simulation_map where id = #{id} and deleted = 0")
@@ -41,6 +41,9 @@ public interface SimulationMapMapper {
         "<if test='mapDescription != null'> " +
         " AND map_description = #{mapDescription}" +
         "</if>" +
+        "<if test='projectUserId != null'> " +
+        " AND project_user_id = #{projectUserId}" +
+        "</if>" +
         "order by create_time desc" +
         "</script>")
     List<SimulationMapVO> selectSimulationMapList(SimulationMapParam param);