mlx

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

@@ -31,7 +31,7 @@ public class StandardsRegulationsController {
 
     //查询列表
     @PostMapping("/queryStandardsRegulationsList")
-    public ResponseBodyVO<List<StandardsRegulationsVO>> queryStandardsRegulationsList(@RequestBody StandardsRegulationsParam params) {
+    public ResponseBodyVO<PageInfo<StandardsRegulationsVO>> queryStandardsRegulationsList(@RequestBody StandardsRegulationsParam params) {
         PageUtil.setPageInfo(params);
         List<StandardsRegulationsPO> list = standardsRegulationsService.queryStandardsRegulationsList(params);
         PageInfo<StandardsRegulationsPO> objectPageInfo = new PageInfo<>(list);
@@ -41,21 +41,26 @@ public class StandardsRegulationsController {
             BeanUtils.copyProperties(po, vo);
             list1.add(vo);
         }
-        PageInfo pageInfo = new PageInfo<>(list1);
+        PageInfo<StandardsRegulationsVO> pageInfo = new PageInfo<>(list1);
         pageInfo.setTotal(objectPageInfo.getTotal());
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, pageInfo);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, pageInfo);
     }
 
 
-    //新增标准法规
+    /**
+     * 新增标准法规
+     * @param params
+     * @return
+     */
     @PostMapping("/saveStandardsRegulations")
     public ResponseBodyVO<String> saveStandardsRegulations(@RequestBody StandardsRegulationsParam params) {
-
         return standardsRegulationsService.importBzFg(params);
-
     }
 
-    //删除
+
+    /**
+     * 删除
+     */
     @PostMapping("/deleteStandardsRegulations")
     public ResponseBodyVO<String> deleteStandardsRegulations(@RequestBody StandardsRegulationsPO params) {
         if (ObjectUtil.isNull(params.getRegulationsId())) {
@@ -65,7 +70,9 @@ public class StandardsRegulationsController {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
-    //测试批量导入
+    /**
+     * 测试批量导入
+     */
     @PostMapping("/saveStandardsRegulationsBatch")
     public ResponseBodyVO<String> saveStandardsRegulationsBatch(@RequestBody SceneImportParam sceneImportParam) {
         SceneImportPO sceneImportPO = new SceneImportPO();
@@ -88,7 +95,7 @@ public class StandardsRegulationsController {
     @PostMapping("/instStandardsRegulation")
     public ResponseBodyVO<String> instStandardsRegulation(@RequestBody StandardsRegulationsPO po) {
         standardsRegulationsService.instStandardsRegulation(po);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/SceneNaturalMapper.java

@@ -51,7 +51,7 @@ public interface SceneNaturalMapper {
     @Delete("update scene_natural\n" +
             "set is_deleted  = '1',\n" +
             "    modify_time = now(),\n" +
-            "    modify_user = #{modifyUserId}) \n" +
-            "where natural_name = '#{sceneName}'\n")
+            "    modify_user_id = #{modifyUserId}\n" +
+            "where natural_name = #{sceneName}")
     void deleteByName(@Param("sceneName") String sceneName, @Param("modifyUserId") String modifyUserId);
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageMapper.java

@@ -42,5 +42,14 @@ public interface ScenePackageMapper {
     @Update("update scene_package\n" +
             "set is_unavailable = #{isUnavailable}\n" +
             "where package_id in (select root_id from scene_package_sublist where scene_natural_ids like concat('%', #{sceneId}, '%'))")
-    void updateIsUnavailableByPackageId(@Param("isUnavailable")String isUnavailable,@Param("sceneId")String sceneId);
+    void  updateIsUnavailableByNaturalId(@Param("isUnavailable")String isUnavailable,@Param("sceneId")String sceneId);
+    @Update("update scene_package\n" +
+            "set is_unavailable = #{isUnavailable}\n" +
+            "where package_id in (select root_id from scene_package_sublist where scene_statue_ids like concat('%', #{sceneId}, '%'))")
+    void  updateIsUnavailableByStandardsId(@Param("isUnavailable")String isUnavailable,@Param("sceneId")String sceneId);
+    @Update("update scene_package\n" +
+            "set is_unavailable = #{isUnavailable}\n" +
+            "where package_id in (select root_id from scene_package_sublist where scene_traffic_ids like concat('%', #{sceneId}, '%'))")
+    void  updateIsUnavailableByAccidentId(@Param("isUnavailable")String isUnavailable,@Param("sceneId")String sceneId);
+
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/StandardsRegulationsMapper.java

@@ -2,8 +2,12 @@ package com.css.simulation.resource.scene.mapper;
 
 import api.common.pojo.param.scene.StandardsRegulationsParam;
 import api.common.pojo.po.scene.StandardsRegulationsPO;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
+
 import java.util.List;
 
 
@@ -30,4 +34,16 @@ public interface StandardsRegulationsMapper {
     List<String> queryRegulationType(String userId);
 
     StandardsRegulationsPO queryStandardsRegulationsById(String id);
+
+    @Select("select regulations_id\n" +
+            "from scene_standards_regulations\n" +
+            "where scene_name = #{sceneName}")
+    List<String> selectIdByName(@Param("sceneName") String sceneName);
+
+    @Delete("update scene_standards_regulations\n" +
+            "set is_deleted  = '1',\n" +
+            "    modify_time = now(),\n" +
+            "    modify_user_id = #{modifyUserId} \n" +
+            "where scene_name = #{sceneName}")
+    void deleteByName(@Param("sceneName") String sceneName, @Param("modifyUserId") String modifyUserId);
 }

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

@@ -4,10 +4,12 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.MinioParameter;
+import api.common.pojo.param.scene.SceneDeleteParam;
 import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.param.scene.SceneNaturalNewParam;
 import api.common.pojo.param.scene.SceneNaturalParam;
 import api.common.pojo.po.scene.SceneNaturalPO;
+import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
 import api.common.util.ParamUtil;
@@ -218,48 +220,6 @@ public class SceneNaturalService {
         String[][] selfBehavior = params.getSelfBehavior();//自车行为
         String[][] targetBehavior = params.getTargetBehavior(); //目标行为
         //判断下拉选项是否为空
-     /*   if(ObjectUtil.isNotNull(naturalName)||(naturalEnvironment!=null&&naturalEnvironment.length>0)||(road!=null&&road.length>0)
-        ||(infrastructure!=null&&infrastructure.length>0)||(temporaryOperation!=null&&temporaryOperation.length>0)||(trafficCondition!=null&&trafficCondition.length>0)||
-         (selfBehavior!=null&&selfBehavior.length>0)||(targetBehavior!=null&&targetBehavior.length>0)||(params.getIds()!=null&&params.getIds().length>0)){
-            po.setXlk("1");
-        }*/
-    /*    SceneNaturalParam poBq = new SceneNaturalParam();
-        String[][] highSpeed=params.getHighSpeed() ;//高速
-        String[][] ramp=params.getRamp();//匝道
-        String[][] tunnel=params.getTunnel();//隧道
-        String[][] cutIn=params.getCutIn();//切入
-        String[][] cutOut=params.getCutOut();//切出
-        String[][] laneChange=params.getLaneChange();//变道
-        String[][] turnAround=params.getTurnAround();//掉头
-        //判断标签是否为空
-        if((highSpeed!=null&&highSpeed.length>0)||(ramp!=null&&ramp.length>0)
-                ||(tunnel!=null&&tunnel.length>0)||(cutIn!=null&&cutIn.length>0)||(cutOut!=null&&cutOut.length>0)||
-                (laneChange!=null&&laneChange.length>0)||(turnAround!=null&&turnAround.length>0)){
-            po.setBq("1");
-        }
-
-        if (highSpeed != null && highSpeed.length > 0) {
-            ParamUtil.arrConvertObj(highSpeed, poBq);
-        }
-        if (ramp != null && ramp.length > 0) {
-            ParamUtil.arrConvertObj(ramp, poBq);
-        }
-        if (tunnel != null && tunnel.length > 0) {
-            ParamUtil.arrConvertObj(tunnel, poBq);
-        }
-        if (cutIn != null && cutIn.length > 0) {
-            ParamUtil.arrConvertObj(cutIn, poBq);
-        }
-        if (cutOut != null && cutOut.length > 0) {
-            ParamUtil.arrConvertObj(cutOut, poBq);
-        } if (turnAround != null && turnAround.length > 0) {
-            ParamUtil.arrConvertObj(turnAround, poBq);
-        }
-        if (laneChange != null && laneChange.length > 0) {
-            ParamUtil.arrConvertObj(laneChange, poBq);
-        }*/
-
-
         if (ObjectUtil.isNotNull(params.getIds())) {
             po.setIds(params.getIds());
         }
@@ -306,43 +266,16 @@ public class SceneNaturalService {
         }
 
         //获取权限并赋值
-     /* List<String> listType=  systemUserSceneService.querySystemUserSceneByType(DictConstants.SCENE_NATURAL);
-        if(listType!=null&&listType.size()>0){
-            po.setAllIds(listType);
-        }else{
-            List<String> listA=new ArrayList<>();
-            listA.add("没有权限");
-            po.setAllIds(listA);
-        }*/
-     /*    Map<String,SceneNaturalParam> map=new HashMap<String,SceneNaturalParam>();
-         map.put("po",po);
-         map.put("poBq",poBq);*/
-        //List<SceneNaturalPO> list = sceneNaturalMapper.querySceneNaturalList(po);
-        //只有标签,或下拉框，或者两者都为空
         List<SceneNaturalPO> list = new ArrayList<>();
-     /*   if((po.getXlk().equals("0")&&po.getBq().equals("0"))||(po.getXlk().equals("1")&&po.getBq().equals("0"))){
-            list = sceneNaturalMapper.querySceneNaturalList(po);
-        }else if((po.getXlk().equals("0")&&po.getBq().equals("1"))) {
-             list = sceneNaturalMapper.querySceneNaturalListByBq(map);
-        }else{
-            list = sceneNaturalMapper.querySceneNaturalListByBqAndXlk(map);
-        }*/
 
         //添加权限
         String roleCode = AuthUtil.getCurrentUserRoleCode();
         String userId = AuthUtil.getCurrentUserId();
         if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { //管理员账户
-/*
-            if((po.getXlk().equals("0")&&po.getBq().equals("0"))||(po.getXlk().equals("1")&&po.getBq().equals("0"))){
-*/
+
             list = sceneNaturalMapper.querySceneNaturalList(po);
             System.out.println(" //添加权限------" + list.size() + "------" + po);
-            /*}else if((po.getXlk().equals("0")&&po.getBq().equals("1"))) {
-                list = sceneNaturalMapper.querySceneNaturalListByBq(map);
-            }else{
-                list = sceneNaturalMapper.querySceneNaturalListByBqAndXlk(map);
-            }
-*/
+
         } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
             //查询父账户
             userId = AuthUtil.getCreateUserId();
@@ -354,29 +287,16 @@ public class SceneNaturalService {
             } else {
                 list = sceneNaturalMapper.querySceneNaturalListByQx(po);
             }
-           /* }else if((po.getXlk().equals("0")&&po.getBq().equals("1"))) {
-                list = sceneNaturalMapper.querySceneNaturalListByBqAndQx(map);
-            }else{
-                list = sceneNaturalMapper.querySceneNaturalListByBqAndXlkAndQx(map);
-            }
-*/
+
         } else if (DictConstants.ROLE_CODE_UESR.equals(roleCode)) {
             //查询普通账户
             po.setUserId(userId);
-            // poBq.setUserId(userId);
-            //  if((po.getXlk().equals("0")&&po.getBq().equals("0"))||(po.getXlk().equals("1")&&po.getBq().equals("0"))){
             if (po.getShare().equals("0")) {
                 list = sceneNaturalMapper.querySceneNaturalList(po);
             } else {
                 list = sceneNaturalMapper.querySceneNaturalListByQx(po);
-            }           /* }else if((po.getXlk().equals("0")&&po.getBq().equals("1"))) {
-                list = sceneNaturalMapper.querySceneNaturalListByBqAndQx(map);
-            }else{
-                list = sceneNaturalMapper.querySceneNaturalListByBqAndXlkAndQx(map);
-            }*/
+            }
         }
-        //list = sceneNaturalMapper.querySceneNaturalListByBq(map);
-        //List<SceneNaturalPO> list = sceneNaturalMapper.querySceneNaturalList(map);
         for (SceneNaturalPO vo : list) {
             if (vo.getRoadType().equals("高速")) {
                 if (ObjectUtil.isNull(vo.getLabel())) {
@@ -433,21 +353,24 @@ public class SceneNaturalService {
 
     @SneakyThrows
     public void deleteSceneNatural(SceneNaturalPO params) {
-
         //1 获取参数
         String sceneName = params.getNaturalName(); // 场景名称
         //2 根据场景名称查询出同名的所有场景id，包括公有和私有
         List<String> sceneIdList = sceneNaturalMapper.selectIdByName(sceneName);
         for (String sceneId : sceneIdList) {
             //3 将所有场景测试包指标中的该场景删除
-//            scenePackageSublistMapper.updateSceneNaturalIdsBySceneId()
+            SceneDeleteParam param = new SceneDeleteParam();
+            param.setModifyTime(TimeUtil.getNowForMysql());
+            param.setSceneZrId(sceneId);
+            param.setModifyUserId(AuthUtil.getCurrentUserId());
+            scenePackageSublistMapper.updateScenePackageSublistById(param);
             //4 将所有包含该场景的场景测试包状态为已禁用
             scenePackageMapper.updateIsUnavailableByPackageId("1", sceneId);
         }
         //5 将所有场景包中的该场景删除
         systemScenePackageSublistMapper.deleteBySceneName(sceneName);
         //6 删除所有同名场景（包括公有和私有）
-//        sceneNaturalMapper.deleteByName(sceneName);
+        sceneNaturalMapper.deleteByName(sceneName, AuthUtil.getCreateUserId());
         //7 记录日志
         Map<String, String> map = new HashMap<>();
         map.put("sceneId", params.getNaturalId());

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

@@ -4,6 +4,7 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.MinioParameter;
+import api.common.pojo.param.scene.SceneDeleteParam;
 import api.common.pojo.param.scene.SceneImportParam;
 import api.common.pojo.param.scene.StandardsRegulationsParam;
 import api.common.pojo.po.scene.StandardsRegulationsPO;
@@ -14,14 +15,15 @@ import api.common.util.TimeUtil;
 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.ScenePackageMapper;
+import com.css.simulation.resource.scene.mapper.ScenePackageSublistMapper;
 import com.css.simulation.resource.scene.mapper.StandardsRegulationsMapper;
-import com.css.simulation.resource.system.service.DictService;
+import com.css.simulation.resource.scene.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -36,15 +38,18 @@ public class StandardsRegulationsService {
 
     @Resource
     private StandardsRegulationsMapper standardsRegulationsMapper;
+    @Resource
+    private ScenePackageSublistMapper scenePackageSublistMapper;
+    @Resource
+    private ScenePackageMapper scenePackageMapper;
+    @Resource
+    private SystemScenePackageSublistMapper systemScenePackageSublistMapper;
 
     @Resource
     private FileDownService fileDownService;
-    @Autowired
+    @Resource
     LogService logService;
 
-    @Autowired
-    DictService dictService;
-
     /**
      * 获取标准法规场景数据：
      */
@@ -164,17 +169,30 @@ public class StandardsRegulationsService {
     }
 
     public void deleteStandardsRegulations(StandardsRegulationsPO params) {
-        params.setIsDeleted("1");
-        params.setModifyTime(TimeUtil.getNowForMysql());
-        params.setModifyUserId(AuthUtil.getCurrentUserId());
-        standardsRegulationsMapper.deleteStandardsRegulations(params);
-
-        Map map = new HashMap();
+        //1 获取参数
+        String sceneName = params.getSceneName(); // 场景名称
+        //2 根据场景名称查询出同名的所有场景id，包括公有和私有
+        List<String> sceneIdList = standardsRegulationsMapper.selectIdByName(sceneName);
+        for (String sceneId : sceneIdList) {
+            //3 将所有场景测试包指标中的该场景删除
+            SceneDeleteParam param = new SceneDeleteParam();
+            param.setModifyTime(TimeUtil.getNowForMysql());
+            param.setSceneBzId(sceneId);
+            param.setModifyUserId(AuthUtil.getCurrentUserId());
+            scenePackageSublistMapper.updateScenePackageSublistById(param);
+            //4 将所有包含该场景的场景测试包状态为已禁用
+            scenePackageMapper.updateIsUnavailableByStandardsId("1", sceneId);
+        }
+        //5 将所有场景包中的该场景删除
+        systemScenePackageSublistMapper.deleteBySceneName(sceneName);
+        //6 删除所有同名场景（包括公有和私有）
+        standardsRegulationsMapper.deleteByName(sceneName, AuthUtil.getCreateUserId());
+        //7 记录日志
+        Map<String,String> map = new HashMap<>();
         map.put("sceneId", params.getRegulationsId());
         map.put("sceneName", params.getSceneName());
         map.put("type", DictConstants.SCENE_STANDARD);
         logService.logSceneDelete(LogConstants.SYS_LOG_SCENE_DELETE, map);
-        // systemUserSceneService.deleteSystemUserSceneBySceneId(params.getRegulationsId());
     }
 
 
@@ -190,7 +208,7 @@ public class StandardsRegulationsService {
         }
         List<String> list = standardsRegulationsMapper.queryRegulationType(userId);
 
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, list);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, list);
 
     }
 

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

@@ -294,4 +294,5 @@
         from simulation.scene_standards_regulations
      where regulations_id=#{id}
     </select>
+    <select id="queryRegulationType" resultType="java.lang.String"></select>
 </mapper>