场景上传覆盖

simulation-resource-server/src/main/java/com/css/simulation/resource/home/controller/HomePageController.java

@@ -10,7 +10,7 @@ import com.css.simulation.resource.algorithm.service.AlgorithmService;
 import com.css.simulation.resource.home.service.HomePageService;
 import com.css.simulation.resource.model.service.ConfigService;
 import com.css.simulation.resource.project.service.SimulationProjectService;
-import com.css.simulation.resource.scene.service.SceneNaturalService;
+import com.css.simulation.resource.scene.service.scene.SceneNaturalService;
 import com.css.simulation.resource.system.service.ClusterService;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -140,4 +140,4 @@ public class HomePageController {
     public ResponseBodyVO<PageInfo<SystemServerVO>> selectServer(PageVO pageVO) {
         return homePageService.selectServer(pageVO);
     }
-}
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneAccidentController.java

@@ -9,7 +9,7 @@ import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneAccidentVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.scene.service.SceneAccidentService;
+import com.css.simulation.resource.scene.service.scene.SceneAccidentService;
 import com.css.simulation.resource.system.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneGeneralController.java

@@ -14,8 +14,8 @@ import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.scene.service.SceneGeneralExampleService;
-import com.css.simulation.resource.scene.service.SceneGeneralTemplateService;
+import com.css.simulation.resource.scene.service.scene.SceneGeneralExampleService;
+import com.css.simulation.resource.scene.service.scene.SceneGeneralTemplateService;
 import com.css.simulation.resource.system.service.DictService;
 import com.css.simulation.resource.system.service.SceneImportService;
 import com.github.pagehelper.PageInfo;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneNaturalController.java

@@ -9,7 +9,7 @@ import api.common.pojo.po.scene.SceneNaturalPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneNaturalVO;
 import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.scene.service.SceneNaturalService;
+import com.css.simulation.resource.scene.service.scene.SceneNaturalService;
 import com.css.simulation.resource.system.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneStandardsController.java

@@ -9,7 +9,7 @@ import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.StandardsRegulationsVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.scene.service.StandardsRegulationsService;
+import com.css.simulation.resource.scene.service.scene.SceneStandardsService;
 import com.css.simulation.resource.system.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
@@ -28,7 +28,7 @@ import java.util.List;
 public class SceneStandardsController {
 
     @Resource
-    private StandardsRegulationsService standardsRegulationsService;
+    private SceneStandardsService sceneStandardsService;
     @Resource
     private SceneImportService sceneImportService;
 
@@ -41,7 +41,7 @@ public class SceneStandardsController {
         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
         sceneImportService.updateStatus(sceneImportPO);
         // 解析参数
-        sceneImportPO = standardsRegulationsService.importMinio(sceneImportParam);
+        sceneImportPO = sceneStandardsService.importMinio(sceneImportParam);
         sceneImportService.updateInfo(sceneImportPO);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
@@ -53,7 +53,7 @@ public class SceneStandardsController {
     @PostMapping("/batchDeleteSceneStandards")
     public ResponseBodyVO<String> batchDeleteSceneStandards(@RequestBody StandardsRegulationsParam params) {
         List<String> sceneNameList = params.getSceneNameList();
-        standardsRegulationsService.batchDeleteSceneStandards(sceneNameList);
+        sceneStandardsService.batchDeleteSceneStandards(sceneNameList);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
@@ -61,7 +61,7 @@ public class SceneStandardsController {
     @PostMapping("/queryStandardsRegulationsList")
     public ResponseBodyVO<PageInfo<StandardsRegulationsVO>> queryStandardsRegulationsList(@RequestBody StandardsRegulationsParam params) {
         PageUtil.setPageInfo(params);
-        List<StandardsRegulationsPO> list = standardsRegulationsService.queryStandardsRegulationsList(params);
+        List<StandardsRegulationsPO> list = sceneStandardsService.queryStandardsRegulationsList(params);
         PageInfo<StandardsRegulationsPO> objectPageInfo = new PageInfo<>(list);
         List<StandardsRegulationsVO> list1 = new ArrayList<>();
         for (StandardsRegulationsPO po : list) {
@@ -80,7 +80,7 @@ public class SceneStandardsController {
      */
     @PostMapping("/saveStandardsRegulations")
     public ResponseBodyVO<String> saveStandardsRegulations(@RequestBody StandardsRegulationsParam params) {
-        return standardsRegulationsService.importBzFg(params);
+        return sceneStandardsService.importBzFg(params);
     }
 
 
@@ -92,7 +92,7 @@ public class SceneStandardsController {
         if (ObjectUtil.isNull(params.getRegulationsId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数场景Id不能为空，请检查");
         }
-        standardsRegulationsService.deleteStandardsRegulations(params);
+        sceneStandardsService.deleteStandardsRegulations(params);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
@@ -103,7 +103,7 @@ public class SceneStandardsController {
      */
     @PostMapping("/queryRegulationType")
     public ResponseBodyVO<List<String>> queryRegulationType() {
-        return standardsRegulationsService.queryRegulationType();
+        return sceneStandardsService.queryRegulationType();
     }
 
 
@@ -112,7 +112,7 @@ public class SceneStandardsController {
      */
     @PostMapping("/instStandardsRegulation")
     public ResponseBodyVO<String> instStandardsRegulation(@RequestBody StandardsRegulationsPO po) {
-        standardsRegulationsService.instStandardsRegulation(po);
+        sceneStandardsService.instStandardsRegulation(po);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/ScoringRulesController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/score/ScoringRulesController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.controller;
+package com.css.simulation.resource.scene.controller.score;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/ScenePackageController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/testpackage/ScenePackageController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.controller;
+package com.css.simulation.resource.scene.controller.testpackage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -192,4 +192,4 @@ public class ScenePackageController {
 //        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
 //    }
 
-}
+}

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

@@ -88,6 +88,10 @@ public class ScoringRulesService {
         LogUtil.update();
     }
 
+    /**
+     * 删除打分规则
+     * @param params 参数
+     */
     @SneakyThrows
     public void deleteScoringRules(ScoringRulesPO params) {
         params.setIsDeleted("1");

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service;
+package com.css.simulation.resource.scene.service.scene;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -19,7 +19,7 @@ import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.scene.mapper.SceneAccidentMapper;
 import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
 import com.css.simulation.resource.scene.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.scene.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;
@@ -698,7 +698,7 @@ public class SceneAccidentService {
                             List<String> listAderss = fileDownService.listDeepOne(MI).getInfo();
                             SceneAccidentPO sceneAccidentPO = new SceneAccidentPO();
                             String isupdate = null;
-                            String sceneName = null;
+                            String sceneName;
                             List<SceneAccidentPO> scenes = new ArrayList<>();
                             for (String adress : listAderss) {
                                 if (adress.contains(".json")) {
@@ -767,7 +767,8 @@ public class SceneAccidentService {
                                 }
                             }
                             if (isupdate.equals("0")) {
-                                // -------------------------------- 保存数据到 mysql --------------------------------
+                                // -------------------------------- 新增数据到 mysql --------------------------------
+                                sceneAccidentPO.setShare(DictConstants.IS_NOT_SHARED);
                                 sceneAccidentPO.setAccidentId(StringUtil.getRandomUUID());
                                 sceneAccidentPO.setCreateTime(TimeUtil.getNowForMysql());
                                 sceneAccidentPO.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -776,6 +777,9 @@ public class SceneAccidentService {
 
                             } else if (isupdate.equals("1")) {
                                 // -------------------------------- 修改数据到 mysql --------------------------------
+                                if(StringUtil.isEmpty(sceneAccidentPO.getShare())){
+                                    sceneAccidentPO.setShare(DictConstants.IS_NOT_SHARED);
+                                }
                                 scenes.forEach(scene -> {
                                     sceneAccidentPO.setAccidentId(scene.getAccidentId());
                                     sceneAccidentPO.setModifyTime(TimeUtil.getNowForMysql());

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service;
+package com.css.simulation.resource.scene.service.scene;
 
 
 import api.common.pojo.common.ResponseBodyVO;
@@ -87,7 +87,7 @@ public class SceneGeneralExampleService {
     }
 
     @SneakyThrows
-    public ResponseBodyVO<Map<String, String>> saveSceneGeneralExample(SceneGeneralTemplateVO vo) {
+    public ResponseBodyVO saveSceneGeneralExample(SceneGeneralTemplateVO vo) {
 
         //查询泛化标志位并赋值
         SceneGeneralTemplatePO poV = templateMapper.querySceneGeneralTemplateById(vo.getTemplateId());
@@ -224,9 +224,6 @@ public class SceneGeneralExampleService {
     /**
      * 对象转Map
      *
-     * @param object
-     * @return
-     * @throws IllegalAccessException
      */
     public Map beanToMap(Object object) throws IllegalAccessException {
         Map<String, Object> map = new HashMap<>();

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

@@ -1,7 +1,6 @@
-package com.css.simulation.resource.scene.service;
+package com.css.simulation.resource.scene.service.scene;
 
 
-import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.scene.SceneDeleteParam;
@@ -19,7 +18,7 @@ import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.scene.mapper.SceneGeneralTemplateMapper;
 import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
 import com.css.simulation.resource.scene.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.scene.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
 import com.css.simulation.resource.system.service.DictService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.SneakyThrows;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service;
+package com.css.simulation.resource.scene.service.scene;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -18,6 +18,8 @@ import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.scene.mapper.*;
+import com.css.simulation.resource.system.mapper.SystemScenePackageMapper;
+import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.util.StringUtil;
@@ -581,6 +583,9 @@ public class SceneNaturalService {
                             if (update) {
                                 // -------------------------------- 修改数据到 mysql --------------------------------
                                 updateNumber++;
+                                if(api.common.util.StringUtil.isEmpty(sceneNaturalPO.getShare())){
+                                    sceneNaturalPO.setShare(DictConstants.IS_NOT_SHARED);
+                                }
                                 scenes.forEach(scene -> {
                                     sceneNaturalPO.setNaturalId(scene.getNaturalId());
                                     sceneNaturalPO.setModifyTime(TimeUtil.getNowForMysql());
@@ -590,6 +595,7 @@ public class SceneNaturalService {
                             } else {
                                 // -------------------------------- 保存数据到 mysql --------------------------------
                                 addNumber++;
+                                sceneNaturalPO.setShare(DictConstants.IS_NOT_SHARED);
                                 sceneNaturalPO.setNaturalId(api.common.util.StringUtil.getRandomUUID());
                                 sceneNaturalPO.setCreateTime(TimeUtil.getNowForMysql());
                                 sceneNaturalPO.setCreateUserId(AuthUtil.getCurrentUserId());

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/StandardsRegulationsService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/scene/SceneStandardsService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service;
+package com.css.simulation.resource.scene.service.scene;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -19,7 +19,7 @@ import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
 import com.css.simulation.resource.scene.mapper.ScenePackageSublistMapper;
 import com.css.simulation.resource.scene.mapper.StandardsRegulationsMapper;
-import com.css.simulation.resource.scene.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;
@@ -35,7 +35,7 @@ import java.util.Map;
 
 @Slf4j
 @Service
-public class StandardsRegulationsService {
+public class SceneStandardsService {
 
     @Resource
     private StandardsRegulationsMapper standardsRegulationsMapper;
@@ -319,7 +319,8 @@ public class StandardsRegulationsService {
                                 }
                             }
                             if (isupdate.equals("0")) {
-                                // -------------------------------- 保存数据到 mysql --------------------------------
+                                // -------------------------------- 新增数据到 mysql --------------------------------
+                                standardsRegulationsPO.setShare(DictConstants.IS_NOT_SHARED);
                                 standardsRegulationsPO.setRegulationsId(StringUtil.getRandomUUID());
                                 standardsRegulationsPO.setCreateTime(TimeUtil.getNowForMysql());
                                 standardsRegulationsPO.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -328,6 +329,9 @@ public class StandardsRegulationsService {
 
                             } else if (isupdate.equals("1")) {
                                 // -------------------------------- 修改数据到 mysql --------------------------------
+                                if(api.common.util.StringUtil.isEmpty(standardsRegulationsPO.getShare())){
+                                    standardsRegulationsPO.setShare(DictConstants.IS_NOT_SHARED);
+                                }
                                 scenes.forEach(scene -> {
                                     standardsRegulationsPO.setRegulationsId(scene.getRegulationsId());
                                     standardsRegulationsPO.setModifyTime(TimeUtil.getNowForMysql());

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.ctrl;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.ClusterParam;
@@ -20,7 +20,7 @@ import java.util.HashMap;
 @Controller()
 @RequestMapping("/cluster")
 @PreAuthorize("@AuthorityCheck.adminAndUser()")
-public class ClusterCtrl {
+public class ClusterController {
 
     @Autowired
     ClusterService clusterService;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/DictCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/DictController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.ctrl;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.DictParam;
@@ -21,7 +21,7 @@ import java.util.Map;
  */
 @Controller
 @RequestMapping("/dict")
-public class DictCtrl {
+public class DictController {
 
     @Autowired
     DictService dictService;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/FileController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/FileController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.ctrl;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/MenuCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/MenuController.java

@@ -1,11 +1,10 @@
-package com.css.simulation.resource.system.ctrl;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.vo.system.MenuVO;
 import com.css.simulation.resource.system.service.MenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -16,7 +15,7 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/menu")
-public class MenuCtrl {
+public class MenuController {
 
     @Autowired
     MenuService menuService;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/ParameterCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/ParameterController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.ctrl;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.ParameterParam;
@@ -20,7 +20,7 @@ import java.util.HashMap;
 @Controller()
 @RequestMapping("/parameter")
 @PreAuthorize("@AuthorityCheck.admin()")
-public class ParameterCtrl {
+public class ParameterController {
 
     @Autowired
     ParameterService parameterService;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/RoleCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/RoleController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.ctrl;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.RoleParam;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  */
 @Controller
 @RequestMapping("/role")
-public class RoleCtrl {
+public class RoleController {
 
     @Autowired
     RoleService roleService;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/SceneImportCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/SceneImportController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.ctrl;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping("/sceneImport")
 @PreAuthorize("@AuthorityCheck.admin()")
-public class SceneImportCtrl {
+public class SceneImportController {
 
     @Resource
     private SceneImportService sceneImportService;
@@ -37,6 +37,8 @@ public class SceneImportCtrl {
 //        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
 //    }
 
+    //* -------------------------------- 删除任务 --------------------------------
+
     @RequestMapping("/deleteTask")
     public ResponseBodyVO<String> deleteTask(@RequestBody SceneImportPO sceneImportPO) {
         String taskId = sceneImportPO.getId();

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/SyetemUserSceneController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/SyetemUserSceneController.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.scene.controller;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.scene.SystemUserScenePO;
-import com.css.simulation.resource.scene.service.SystemUserSceneService;
+import com.css.simulation.resource.system.service.SystemUserSceneService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;
@@ -33,4 +33,4 @@ public class SyetemUserSceneController {
     }
 
 
-}
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/SystemScenePackageController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/SystemScenePackageController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.controller;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.SystemScenePackageParam;
@@ -10,7 +10,7 @@ import api.common.pojo.vo.scene.SystemScenePackageVO;
 import api.common.pojo.vo.scene.SystemUserSceneVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.scene.service.SystemScenePackageService;
+import com.css.simulation.resource.system.service.SystemScenePackageService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
 
@@ -140,4 +140,4 @@ public class SystemScenePackageController {
 
         return systemScenePackageService.querySystemScenePackageListByTJ(parms);
     }
-}
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/UserCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/UserController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.ctrl;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.UserParam;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller()
 @RequestMapping("/user")
 @PreAuthorize("@AuthorityCheck.adminAndUser()")
-public class UserCtrl {
+public class UserController {
 
     @Autowired
     UserService userService;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.ctrl;
+package com.css.simulation.resource.system.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -11,8 +11,8 @@ import api.common.pojo.vo.system.ParameterVO;
 import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.scene.mapper.SystemScenePackageSublistMapper;
-import com.css.simulation.resource.scene.service.SystemScenePackageService;
+import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.system.service.SystemScenePackageService;
 import com.css.simulation.resource.system.service.ClusterService;
 import com.css.simulation.resource.system.service.ParameterService;
 import com.css.simulation.resource.system.service.UserService;
@@ -29,7 +29,7 @@ import java.util.List;
 
 @Controller()
 @RequestMapping("/userInfo")
-public class UserInfoCtrl {
+public class UserInfoController {
 
 
     @Autowired

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/SystemScenePackageMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/mapper/SystemScenePackageMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.mapper;
+package com.css.simulation.resource.system.mapper;
 
 import api.common.pojo.param.scene.SystemScenePackageParam;
 import api.common.pojo.po.scene.SystemScenePackageNewPO;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/SystemScenePackageSublistMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/mapper/SystemScenePackageSublistMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.mapper;
+package com.css.simulation.resource.system.mapper;
 
 import api.common.pojo.po.scene.SystemScenePackageSublistPO;
 import org.apache.ibatis.annotations.Mapper;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/SystemUserSceneMapper.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/mapper/SystemUserSceneMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.mapper;
+package com.css.simulation.resource.system.mapper;
 
 import api.common.pojo.po.scene.SystemUserScenePO;
 import api.common.pojo.vo.scene.UserSceneVO;

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

@@ -15,10 +15,10 @@ 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.log.service.LogService;
-import com.css.simulation.resource.scene.service.SceneAccidentService;
-import com.css.simulation.resource.scene.service.SceneGeneralTemplateService;
-import com.css.simulation.resource.scene.service.SceneNaturalService;
-import com.css.simulation.resource.scene.service.StandardsRegulationsService;
+import com.css.simulation.resource.scene.service.scene.SceneAccidentService;
+import com.css.simulation.resource.scene.service.scene.SceneGeneralTemplateService;
+import com.css.simulation.resource.scene.service.scene.SceneNaturalService;
+import com.css.simulation.resource.scene.service.scene.SceneStandardsService;
 import com.css.simulation.resource.system.mapper.SceneImportMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -42,7 +42,7 @@ public class SceneImportService {
     @Resource
     private SceneNaturalService sceneNaturalService;
     @Resource
-    private StandardsRegulationsService standardsRegulationsService;
+    private SceneStandardsService sceneStandardsService;
     @Resource
     private SceneAccidentService sceneAccidentService;
     @Resource
@@ -137,7 +137,7 @@ public class SceneImportService {
                 StandardsRegulationsPO standardsRegulationsPO = new StandardsRegulationsPO();
                 for (String id : listIds) {
                     standardsRegulationsPO.setSceneName(id);
-                    standardsRegulationsService.deleteStandardsRegulations(standardsRegulationsPO);
+                    sceneStandardsService.deleteStandardsRegulations(standardsRegulationsPO);
                 }
             } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
                 sceneImportMapper.deleteAccidentByTaskId(sceneImportPO);

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service;
+package com.css.simulation.resource.system.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -15,6 +15,9 @@ import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.scene.mapper.*;
+import com.css.simulation.resource.system.mapper.SystemScenePackageMapper;
+import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.system.mapper.SystemUserSceneMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SystemUserSceneService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/SystemUserSceneService.java

@@ -1,10 +1,10 @@
-package com.css.simulation.resource.scene.service;
+package com.css.simulation.resource.system.service;
 
 
 import api.common.pojo.po.scene.SystemUserScenePO;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.scene.mapper.SystemUserSceneMapper;
+import com.css.simulation.resource.system.mapper.SystemUserSceneMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -240,8 +240,8 @@
     <update id="updateIsUnavailable3" parameterType="api.common.pojo.po.scene.ScoringRulesPO">
         update simulation.scene_package
         set is_unavailable = '1',
-                modify_user_id = #{modifyUserId},
-                modify_time = #{modifyTime}
-        where is_deleted = '0' and package_id in (select root_id from scene_package_sublist where package_and_rules=#{rulesId} and is_deleted = '0' GROUP BY root_id)
+            modify_user_id = #{modifyUserId},
+            modify_time    = #{modifyTime}
+        where package_id in (select distinct root_id from scene_package_sublist where package_and_rules = #{rulesId})
     </update>
-</mapper>
+</mapper>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.scene.mapper.SystemScenePackageMapper">
+<mapper namespace="com.css.simulation.resource.system.mapper.SystemScenePackageMapper">
 
     <insert id="saveSystemScenePackage" parameterType="api.common.pojo.po.scene.SystemScenePackagePO">
         insert into simulation.system_scene_package
@@ -291,4 +291,4 @@
         </foreach>
     </select>
 
-</mapper>
+</mapper>

simulation-resource-server/src/main/resources/mapper/scene/SystemScenePackageSublistMapper.xml → simulation-resource-server/src/main/resources/mapper/system/SystemScenePackageSublistMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.scene.mapper.SystemScenePackageSublistMapper">
+<mapper namespace="com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper">
 
     <insert id="saveSystemScenePackageSublist" parameterType="java.util.List">
         insert into simulation.system_scene_package_sublist
@@ -76,4 +76,4 @@
          modify_time = #{modifyTime}
         where is_deleted='0' and scene_name=#{sceneName}
     </update>
-</mapper>
+</mapper>

simulation-resource-server/src/main/resources/mapper/scene/SystemUserSceneMapper.xml → simulation-resource-server/src/main/resources/mapper/system/SystemUserSceneMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.scene.mapper.SystemUserSceneMapper">
+<mapper namespace="com.css.simulation.resource.system.mapper.SystemUserSceneMapper">
 
     <insert id="saveSystemUserScene" parameterType="api.common.pojo.po.scene.SystemUserScenePO">
         insert into simulation.system_user_scene
@@ -92,4 +92,4 @@
             and user_id = #{item.userId}
         </foreach>
     </update>
-</mapper>
+</mapper>