场景分享

api-common/src/main/java/api/common/pojo/param/scene/SceneNaturalNewParam.java

@@ -35,6 +35,6 @@ public class SceneNaturalNewParam extends PageVO implements Serializable {
     private String[][] turnAround;//掉头
 
     private String[] allSceneNames ; //场景名集合
-
+    private String userId;//用户id
     private String share;
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/VehicleCtrl.java

@@ -66,7 +66,7 @@ public class VehicleCtrl {
         if(ObjectUtil.isNull(vehicleVO)){
             return new ResponseBodyVO(false, 500, "参数必传！",null);
         }
-        ResponseBodyVO<VehiclePO> response = new ResponseBodyVO<VehiclePO>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<VehiclePO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         VehiclePO po = vehicleService.saveVehicle(vehicleVO);
         if(ObjectUtil.isNull(po.getId())){
             return new ResponseBodyVO(false, 500, "车辆名称重复！",null);

simulation-resource-server/src/main/java/com/css/simulation/resource/model/mapper/VehicleMapper.java

@@ -18,6 +18,7 @@ public interface VehicleMapper {
 
     VehicleVO getVehicleInfo(VehicleParam vehicleParam);
 
+
     List<VehicleVO> checkVehicleName(VehiclePO vehiclePO);
 
     void insert(VehiclePO vehiclePO);

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/ConfigService.java

@@ -4,10 +4,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.*;
 import api.common.pojo.po.model.*;
 import api.common.pojo.vo.model.*;
-import api.common.util.LogUtil;
-import api.common.util.ObjectUtil;
-import api.common.util.StringUtil;
-import api.common.util.TimeUtil;
+import api.common.util.*;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.model.mapper.CameraMapper;
@@ -246,6 +243,7 @@ public class ConfigService {
             VehicleParam vehicleParam = new VehicleParam();
             vehicleParam.setId(configPO.getVehicleId());
             VehicleVO vehicleInfo = vehicleMapper.getVehicleInfo(vehicleParam);
+            vehicleInfo.setVehicleType(vehicleInfo.getVehicleTypeStr().split(","));
             VehiclePO po = vehicleService.shareVehicle(vehicleInfo);
         }
 
@@ -253,8 +251,9 @@ public class ConfigService {
 
         //构建字表新数据
         Map<String, List<ConfigSensorVO>> configSensors = configVO.getConfigSensors();
+        System.out.println("  //构建字表新数据---------"+configSensors);
         List<ConfigSensorPO> configSensorPOs = new ArrayList<>();
-        if(ObjectUtil.isNotNull(configSensors)){
+        if(CollectionUtil.isNotEmpty(configSensors)){
             configSensors.forEach((sensorType,configSensorVOs)->{
 
                 if(ObjectUtil.isNotNull(configSensorVOs)){
@@ -274,7 +273,7 @@ public class ConfigService {
                         switch (sensorType) {
                             case "camera": {
                                 CameraParam cameraParam = new CameraParam();
-                                cameraParam.setId(vo.getId());
+                                cameraParam.setId(vo.getSensorId());
                                 CameraVO cameraVO = cameraService.getCameraInfo(cameraParam);
                                 CameraPO cameraPO = new CameraPO();
                                 ObjectUtil.voToPo(cameraVO,cameraPO);
@@ -283,7 +282,7 @@ public class ConfigService {
                             }
                             case "lidar":{
                                 LidarParam lidarParam = new LidarParam();
-                                lidarParam.setId(vo.getId());
+                                lidarParam.setId(vo.getSensorId());
                                 LidarVO lidarVO = lidarService.getLidarInfo(lidarParam);
                                 LidarPO lidarPO = new LidarPO();
                                 ObjectUtil.voToPo(lidarVO,lidarPO);
@@ -292,7 +291,7 @@ public class ConfigService {
                             }
                             case "ogt":{
                                 OgtParam ogtParam = new OgtParam();
-                                ogtParam.setId(vo.getId());
+                                ogtParam.setId(vo.getSensorId());
                                 OgtVO ogtVO = ogtService.getOgtInfo(ogtParam);
                                 OgtPO ogtPO = new OgtPO();
                                 ObjectUtil.voToPo(ogtVO,ogtPO);
@@ -301,7 +300,7 @@ public class ConfigService {
                             }
                             case "gps":{
                                 GpsParam gpsParam = new GpsParam();
-                                gpsParam.setId(vo.getId());
+                                gpsParam.setId(vo.getSensorId());
                                 GpsVO gpsVO = gpsService.getGpsInfo(gpsParam);
                                 GpsPO gpsPO = new GpsPO();
                                 ObjectUtil.voToPo(gpsVO,gpsPO);

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

@@ -270,5 +270,14 @@ public class SceneGeneralTemplateController {
 
     }
 
+    //分享·
+    @PostMapping("/instShareSceneGeneralTemplate")
+    @ResponseBody
+    public ResponseBodyVO<String> instShareSceneGeneralTemplate(@RequestBody SceneGeneralTemplatePO po) {
+        sceneGeneralTemplateService.instShareSceneGeneralTemplate(po);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+
+    }
+
 
 }

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

@@ -89,4 +89,14 @@ public class StandardsRegulationsController {
         return standardsRegulationsService.queryRegulationType();
 
     }
+
+    //分享·
+    @PostMapping("/instStandardsRegulation")
+    @ResponseBody
+    public ResponseBodyVO<String> instStandardsRegulation(@RequestBody StandardsRegulationsPO po) {
+        standardsRegulationsService.instStandardsRegulation(po);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+
+    }
+
 }

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

@@ -55,7 +55,8 @@ public class SystemScenePackageController {
         if (ObjectUtil.isNotNull(parms.getId())) {
             systemScenePackageService.updateSystemScenePackage(parms);
         } else {
-            return systemScenePackageService.saveSystemScenePackage(parms);
+           // return systemScenePackageService.saveSystemScenePackage(parms);
+            return systemScenePackageService.saveSystemScenePackageNew(parms);
         }
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }

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

@@ -196,21 +196,31 @@ public class SceneAccidentService {
     public List<SceneAccidentPO> querySceneAccidentList(SceneAccidentParam params) {
 
         List<SceneAccidentPO> list = new ArrayList<>();
-
         String roleCode = AuthUtil.getCurrentUserRoleCode();
+        log.info("交通事故查询------" +roleCode);
         String userId = AuthUtil.getCurrentUserId();
         if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { //管理员账户
-                list = SceneAccidentMapper.querySceneAccidentList(params);
+            list = SceneAccidentMapper.querySceneAccidentList(params);
+            log.info("泛华----list--" +list.size()+"----------"+params);
         } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
             //查询父账户
             userId = AuthUtil.getCreateUserId();
             params.setUserId(userId);
+            if(params.getShare().equals("0")){
+                list = SceneAccidentMapper.querySceneAccidentList(params);
+            }else{
                 list = SceneAccidentMapper.querySceneAccidentListByQx(params);
+            }
 
         } else if (DictConstants.ROLE_CODE_UESR.equals(roleCode)) {
             //查询普通账户
             params.setUserId(userId);
+            if(params.getShare().equals("0")){
+                list = SceneAccidentMapper.querySceneAccidentList(params);
+            }else{
                 list = SceneAccidentMapper.querySceneAccidentListByQx(params);
+            }
+
         }
 
      /*   if ((params.getXlk().equals("1") && params.getBq().equals(1)) || (params.getXlk().equals("0") && params.getBq().equals(0)) || (params.getXlk().equals("1") && params.getBq().equals(0))) {
@@ -673,8 +683,7 @@ public class SceneAccidentService {
                                     if (ObjectUtil.isNull(selfDriving)
                                             && ObjectUtil.isNull(conflictType)
                                             && ObjectUtil.isNull(conflictBehavior)
-                                            && ObjectUtil.isNull(selfReaction))
-                                    {
+                                            && ObjectUtil.isNull(selfReaction)) {
                                         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
                                         sceneImportPO.setErrorMessage("文件 " + adress + " 内容不符合标准格式，解析失败。");
 //                                        sceneImportPO.setErrorMessage("文件 " + adress + " 与交通事故场景类型不匹配，解析失败，请检查");
@@ -768,23 +777,24 @@ public class SceneAccidentService {
      * 分享
      */
     public void instShareSceneAccident(SceneAccidentPO po) {
-        SceneAccidentPO syPO=SceneAccidentMapper.querySceneAccidentById(po.getAccidentId());
+        SceneAccidentPO syPO = SceneAccidentMapper.querySceneAccidentById(po.getAccidentId());
         syPO.setShare("1");
         SceneAccidentPO sceneAccidentPOByName = SceneAccidentMapper.querySceneAccidentByNmae(syPO);
-        if(ObjectUtil.isNull(sceneAccidentPOByName)){
-                                // -------------------------------- 保存数据到 mysql --------------------------------
-                                syPO.setCreateTime(TimeUtil.getNowForMysql());
-                                syPO.setCreateUserId(AuthUtil.getCurrentUserId());
-                                syPO.setModifyTime(TimeUtil.getNowForMysql());
-                                syPO.setModifyUserId("");
-                                SceneAccidentMapper.saveSceneAccident(syPO);
-                            } else {
-                                // -------------------------------- 修改数据到 mysql --------------------------------
-                                syPO.setModifyTime(TimeUtil.getNowForMysql());
-                                syPO.setModifyUserId(AuthUtil.getCurrentUserId());
-                                syPO.setAccidentId(sceneAccidentPOByName.getAccidentId());
-                                SceneAccidentMapper.updateSceneAccident(syPO);
-                            }
+        if (ObjectUtil.isNull(sceneAccidentPOByName)) {
+            // -------------------------------- 保存数据到 mysql --------------------------------
+            syPO.setCreateTime(TimeUtil.getNowForMysql());
+            syPO.setCreateUserId(AuthUtil.getCurrentUserId());
+            syPO.setModifyTime(TimeUtil.getNowForMysql());
+            syPO.setModifyUserId("");
+            syPO.setAccidentId(StringUtil.getRandomUUID());
+            SceneAccidentMapper.saveSceneAccident(syPO);
+        } else {
+            // -------------------------------- 修改数据到 mysql --------------------------------
+            syPO.setModifyTime(TimeUtil.getNowForMysql());
+            syPO.setModifyUserId(AuthUtil.getCurrentUserId());
+            syPO.setAccidentId(sceneAccidentPOByName.getAccidentId());
+            SceneAccidentMapper.updateSceneAccident(syPO);
+        }
 
     }
 }

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

@@ -240,19 +240,28 @@ public class SceneGeneralTemplateService {
         List<SceneGeneralTemplatePO> list=new ArrayList<>();
         //添加权限
         String roleCode = AuthUtil.getCurrentUserRoleCode();
+        log.info("泛华------" +roleCode);
         String userId = AuthUtil.getCurrentUserId();
         if(DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)){ //管理员账户
              list=mapper.querySceneGeneralTemplateList(po);
+            log.info("泛华----list--" +list.size()+"----------"+po);
         }else if(DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)){
             //查询父账户
             userId = AuthUtil.getCreateUserId();
             po.setUserId(userId);
-           list=mapper.querySceneGeneralTemplateListByQx(po);
+            if(po.getShare().equals("0")){
+                list=mapper.querySceneGeneralTemplateList(po);
+            }else {
+                list = mapper.querySceneGeneralTemplateListByQx(po);
+            }
         }else if(DictConstants.ROLE_CODE_UESR.equals(roleCode)){
             //查询普通账户
             po.setUserId(userId);
-            list=mapper.querySceneGeneralTemplateListByQx(po);
-        }
+            if(po.getShare().equals("0")){
+                list=mapper.querySceneGeneralTemplateList(po);
+            }else {
+                list = mapper.querySceneGeneralTemplateListByQx(po);
+            }        }
         Map<String,String>  scenarioRoadTypeMap= dictService.getDictMapByType("scenarioRoadType");
         Map<String,String>  scenarioWeatherMap= dictService.getDictMapByType("scenarioWeather");
         for (SceneGeneralTemplatePO vo : list) {
@@ -343,4 +352,28 @@ public class SceneGeneralTemplateService {
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
+    /**
+     * 分享
+     */
+    public void instShareSceneGeneralTemplate(SceneGeneralTemplatePO po) {
+        SceneGeneralTemplatePO syPO = mapper.querySceneGeneralTemplateById(po.getId());
+        syPO.setShare("1");
+        SceneGeneralTemplatePO sceneGeneralTemplatePOByName =mapper.querySceneGeneralTemplateByName(syPO);
+        if (ObjectUtil.isNull(sceneGeneralTemplatePOByName)) {
+            // -------------------------------- 保存数据到 mysql --------------------------------
+            syPO.setCreateTime(TimeUtil.getNowForMysql());
+            syPO.setCreateUserId(AuthUtil.getCurrentUserId());
+            syPO.setModifyTime(TimeUtil.getNowForMysql());
+            syPO.setModifyUserId("");
+            syPO.setId(StringUtil.getRandomUUID());
+            mapper.saveSceneGeneralTemplate(syPO);
+        } else {
+            // -------------------------------- 修改数据到 mysql --------------------------------
+            syPO.setModifyTime(TimeUtil.getNowForMysql());
+            syPO.setModifyUserId(AuthUtil.getCurrentUserId());
+            syPO.setId(sceneGeneralTemplatePOByName.getId());
+            mapper.updateSceneGeneralTemplate(syPO);
+        }
+
+    }
 }

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

@@ -207,6 +207,7 @@ public class SceneNaturalService {
 
     public List<SceneNaturalPO> querySceneNaturalList(SceneNaturalNewParam params) {
         SceneNaturalParam po = new SceneNaturalParam();
+        po.setShare(params.getShare());
         String naturalName = params.getNaturalName();      // 场景编号
         String[][] naturalEnvironment = params.getNaturalEnvironment(); //自然环境
         String[][] road = params.getRoad(); //道路
@@ -335,6 +336,7 @@ public class SceneNaturalService {
             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{
@@ -347,7 +349,11 @@ public class SceneNaturalService {
             po.setUserId(userId);
             // poBq.setUserId(userId);
             //if((po.getXlk().equals("0")&&po.getBq().equals("0"))||(po.getXlk().equals("1")&&po.getBq().equals("0"))){
-            list = sceneNaturalMapper.querySceneNaturalListByQx(po);
+            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{
@@ -359,8 +365,11 @@ public class SceneNaturalService {
             po.setUserId(userId);
             // poBq.setUserId(userId);
             //  if((po.getXlk().equals("0")&&po.getBq().equals("0"))||(po.getXlk().equals("1")&&po.getBq().equals("0"))){
-            list = sceneNaturalMapper.querySceneNaturalListByQx(po);
-           /* }else if((po.getXlk().equals("0")&&po.getBq().equals("1"))) {
+            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);
@@ -643,11 +652,13 @@ public class SceneNaturalService {
             syPo.setCreateUserId(AuthUtil.getCurrentUserId());
             syPo.setModifyTime(TimeUtil.getNowForMysql());
             syPo.setModifyUserId("");
+            syPo.setNaturalId(api.common.util.StringUtil.getRandomUUID());
             sceneNaturalMapper.saveSceneNatural(syPo);
         } else {
             // -------------------------------- 修改数据到 mysql --------------------------------
             syPo.setModifyTime(TimeUtil.getNowForMysql());
             syPo.setModifyUserId(AuthUtil.getCurrentUserId());
+            syPo.setNaturalId(sceneNaturalPOByName.getNaturalId());
             sceneNaturalMapper.updateSceneNatural(syPo);
         }
 

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

@@ -116,19 +116,28 @@ public class StandardsRegulationsService {
 
         //添加权限
         String roleCode = AuthUtil.getCurrentUserRoleCode();
+        log.info("标准法规------" +roleCode);
         String userId = AuthUtil.getCurrentUserId();
         if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { //管理员账户
-                list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
+            list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
+            log.info("标准法规---list---" +list.size()+"----------"+params);
         } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
             //查询父账户
             userId = AuthUtil.getCreateUserId();
             params.setUserId(userId);
-            list = standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
+            if(params.getShare().equals("0")){
+                list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
+            }else {
+                list = standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
+            }
         } else if (DictConstants.ROLE_CODE_UESR.equals(roleCode)) {
             //查询普通账户
             params.setUserId(userId);
-            list = standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
-        }
+            if(params.getShare().equals("0")){
+                list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
+            }else {
+                list = standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
+            }        }
        /* if(params.getLabel()!=null&&params.getLabel().size()>0){
             if(params.getRegulationType()!=null&&params.getRegulationType().size()>0){
                 List<String> regulationType= params.getRegulationType();
@@ -168,18 +177,17 @@ public class StandardsRegulationsService {
     }
 
 
-
     public ResponseBodyVO<List<String>> queryRegulationType() {
         //添加权限
         String roleCode = AuthUtil.getCurrentUserRoleCode();
         String userId = AuthUtil.getCurrentUserId();
         if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { //管理员账户
-            userId="";
+            userId = "";
         } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
             //查询父账户
             userId = AuthUtil.getCreateUserId();
         }
-       List<String> list=  standardsRegulationsMapper.queryRegulationType(userId);
+        List<String> list = standardsRegulationsMapper.queryRegulationType(userId);
 
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, list);
 
@@ -314,4 +322,30 @@ public class StandardsRegulationsService {
             return sceneImportPO;
         }
     }
+
+    /**
+     * 获取标准法规场景数据：
+     */
+    public void instStandardsRegulation(StandardsRegulationsPO po) {
+        StandardsRegulationsPO syPo = standardsRegulationsMapper.queryStandardsRegulationsById(po.getRegulationsId());
+        syPo.setShare("1");
+        StandardsRegulationsPO PoByName = standardsRegulationsMapper.queryStandardsRegulationsByName(syPo);
+
+        if (ObjectUtil.isNull(PoByName)) {
+            // -------------------------------- 保存数据到 mysql --------------------------------
+            syPo.setCreateTime(TimeUtil.getNowForMysql());
+            syPo.setCreateUserId(AuthUtil.getCurrentUserId());
+            syPo.setModifyTime(TimeUtil.getNowForMysql());
+            syPo.setModifyUserId("");
+            syPo.setRegulationsId(api.common.util.StringUtil.getRandomUUID());
+            standardsRegulationsMapper.saveStandardsRegulations(syPo);
+        } else {
+            // -------------------------------- 修改数据到 mysql --------------------------------
+            syPo.setModifyTime(TimeUtil.getNowForMysql());
+            syPo.setModifyUserId(AuthUtil.getCurrentUserId());
+            syPo.setRegulationsId(PoByName.getRegulationsId());
+            standardsRegulationsMapper.updateStandardsRegulations(syPo);
+        }
+
+    }
 }

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

@@ -13,9 +13,7 @@ import api.common.util.StringUtil;
 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.SystemScenePackageMapper;
-import com.css.simulation.resource.scene.mapper.SystemScenePackageSublistMapper;
-import com.css.simulation.resource.scene.mapper.SystemUserSceneMapper;
+import com.css.simulation.resource.scene.mapper.*;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -40,6 +38,14 @@ public class SystemScenePackageService {
     private SystemUserSceneMapper systemUserSceneMapper;
     @Autowired
     LogService logService;
+    @Resource
+    SceneAccidentMapper sceneAccidentMapper;
+    @Resource
+    SceneGeneralTemplateMapper sceneGeneralTemplateMapper;
+    @Resource
+    SceneNaturalMapper sceneNaturalMapper;
+    @Resource
+    StandardsRegulationsMapper standardsRegulationsMapper;
     /**
      * 场景包录入
      */
@@ -214,6 +220,34 @@ public class SystemScenePackageService {
         if(ObjectUtil.isNotNull(zrIds)){
             List<SystemScenePackageSublistPO> zrList=new ArrayList<>();
             for (String id:zrIds) {
+                //加共有
+                SceneNaturalPO paramPo=new SceneNaturalPO();
+                paramPo.setShare("0");
+                paramPo.setNaturalName(id);
+                SceneNaturalPO syPo = sceneNaturalMapper.querySceneNaturaByName(paramPo);
+                syPo.setShare("2");
+                SceneNaturalPO gyPo = sceneNaturalMapper.querySceneNaturaByName(syPo);
+                if (ObjectUtil.isNull(gyPo)) {
+                    log.info("场景包新增场景----"+syPo.getShare());
+                    // -------------------------------- 保存数据到 mysql --------------------------------
+                    syPo.setCreateTime(TimeUtil.getNowForMysql());
+                    syPo.setCreateUserId(AuthUtil.getCurrentUserId());
+                    syPo.setModifyTime(TimeUtil.getNowForMysql());
+                    syPo.setModifyUserId("");
+                    syPo.setNaturalId( StringUtil.getRandomUUID());
+                    sceneNaturalMapper.saveSceneNatural(syPo);
+                } else {
+
+                    // -------------------------------- 修改数据到 mysql --------------------------------
+                    syPo.setModifyTime(TimeUtil.getNowForMysql());
+                    syPo.setModifyUserId(AuthUtil.getCurrentUserId());
+                    syPo.setShare(gyPo.getShare());
+                    syPo.setNaturalId(gyPo.getNaturalId());
+                    sceneNaturalMapper.updateSceneNatural(syPo);
+                    log.info("场景包修改场景----"+syPo.getShare());
+                }
+
+
                 SystemScenePackageSublistPO zrPo=new SystemScenePackageSublistPO();
                 zrPo.setSublistId(StringUtil.getRandomUUID());
                 zrPo.setSceneType("1");
@@ -232,6 +266,30 @@ public class SystemScenePackageService {
         if(ObjectUtil.isNotNull(bzIds)){
             List<SystemScenePackageSublistPO> bzList=new ArrayList<>();
             for (String id:bzIds) {
+                StandardsRegulationsPO standardsRegulationsPO=new StandardsRegulationsPO();
+                standardsRegulationsPO.setSceneName(id);
+                standardsRegulationsPO.setShare("0");
+                StandardsRegulationsPO standardsRegulationsPOSy= standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPO);
+                standardsRegulationsPOSy.setShare("2");
+                StandardsRegulationsPO StandardsRegulationsByName= standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPOSy);
+               // standardsRegulationsPOSy.setShare("1");
+                //是否已存在
+                if(ObjectUtil.isNotNull(StandardsRegulationsByName)){
+                    standardsRegulationsPOSy.setRegulationsId(StandardsRegulationsByName.getRegulationsId());
+                    standardsRegulationsPOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    standardsRegulationsPOSy.setModifyUserId(AuthUtil.getCurrentUserId());
+                    standardsRegulationsPOSy.setShare(StandardsRegulationsByName.getShare());
+                    standardsRegulationsMapper.updateStandardsRegulations(standardsRegulationsPOSy);
+                }else{
+                    standardsRegulationsPOSy.setRegulationsId(StringUtil.getRandomUUID());
+                    standardsRegulationsPOSy.setCreateTime(TimeUtil.getNowForMysql());
+                    standardsRegulationsPOSy.setCreateUserId(AuthUtil.getCurrentUserId());
+                    standardsRegulationsPOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    standardsRegulationsPOSy.setModifyUserId("");
+                    standardsRegulationsMapper.saveStandardsRegulations(standardsRegulationsPOSy);
+                }
+
+
                 SystemScenePackageSublistPO bzPo=new SystemScenePackageSublistPO();
                 bzPo.setSublistId(StringUtil.getRandomUUID());
                 bzPo.setSceneType("2");
@@ -250,6 +308,29 @@ public class SystemScenePackageService {
         if(ObjectUtil.isNotNull(jtIds)){
             List<SystemScenePackageSublistPO> jtList=new ArrayList<>();
             for (String id:jtIds) {
+                SceneAccidentPO sceneAccidentPO=new SceneAccidentPO();
+                sceneAccidentPO.setSceneName(id);
+                sceneAccidentPO.setShare("0");
+                SceneAccidentPO sceneAccidentPOSy=  sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPO);
+                sceneAccidentPOSy.setShare("2");
+                SceneAccidentPO sceneAccidentPOByName=  sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPOSy);
+                //sceneAccidentPOSy.setShare("1");
+                //是否已存在
+                if(ObjectUtil.isNotNull(sceneAccidentPOByName)){
+                    sceneAccidentPOSy.setAccidentId(sceneAccidentPOByName.getAccidentId());
+                    sceneAccidentPOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    sceneAccidentPOSy.setModifyUserId(AuthUtil.getCurrentUserId());
+                    sceneAccidentPOSy.setShare(sceneAccidentPOByName.getShare());
+                    sceneAccidentMapper.updateSceneAccident(sceneAccidentPOSy);
+                }else{
+                    sceneAccidentPOSy.setAccidentId(StringUtil.getRandomUUID());
+                    sceneAccidentPOSy.setCreateTime(TimeUtil.getNowForMysql());
+                    sceneAccidentPOSy.setCreateUserId(AuthUtil.getCurrentUserId());
+                    sceneAccidentPOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    sceneAccidentPOSy.setModifyUserId("");
+                    sceneAccidentMapper.saveSceneAccident(sceneAccidentPOSy);
+                }
+
                 SystemScenePackageSublistPO jtPo=new SystemScenePackageSublistPO();
                 jtPo.setSublistId(StringUtil.getRandomUUID());
                 jtPo.setSceneType("3");
@@ -268,6 +349,30 @@ public class SystemScenePackageService {
         if(ObjectUtil.isNotNull(fhIds)){
             List<SystemScenePackageSublistPO> fhList=new ArrayList<>();
             for (String id:fhIds) {
+                SceneGeneralTemplatePO sceneGeneralTemplatePO=new SceneGeneralTemplatePO();
+                sceneGeneralTemplatePO.setSceneId(id);
+                sceneGeneralTemplatePO.setShare("0");
+                SceneGeneralTemplatePO sceneGeneralTemplatePOSy=  sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePO);
+                sceneGeneralTemplatePOSy.setShare("2");
+                SceneGeneralTemplatePO sceneGeneralTemplatePOByName=  sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePOSy);
+               // sceneGeneralTemplatePOSy.setShare("1");
+                //是否已存在
+                if(ObjectUtil.isNotNull(sceneGeneralTemplatePOByName)){
+                    sceneGeneralTemplatePOSy.setShare(sceneGeneralTemplatePOByName.getShare());
+                    sceneGeneralTemplatePOSy.setId(sceneGeneralTemplatePOByName.getId());
+                    sceneGeneralTemplatePOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    sceneGeneralTemplatePOSy.setModifyUserId(AuthUtil.getCurrentUserId());
+                    sceneGeneralTemplateMapper.updateSceneGeneralTemplate(sceneGeneralTemplatePOSy);
+                }else{
+                    sceneGeneralTemplatePOSy.setId(StringUtil.getRandomUUID());
+                    sceneGeneralTemplatePOSy.setCreateTime(TimeUtil.getNowForMysql());
+                    sceneGeneralTemplatePOSy.setCreateUserId(AuthUtil.getCurrentUserId());
+                    sceneGeneralTemplatePOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    sceneGeneralTemplatePOSy.setModifyUserId("");
+                    sceneGeneralTemplateMapper.saveSceneGeneralTemplate(sceneGeneralTemplatePOSy);
+                }
+
+
                 SystemScenePackageSublistPO fhPo=new SystemScenePackageSublistPO();
                 fhPo.setSublistId(StringUtil.getRandomUUID());
                 fhPo.setSceneType("4");
@@ -456,4 +561,204 @@ public class SystemScenePackageService {
         list.add(map);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, list);
     }
+
+
+    /**
+     * 场景包录入
+     */
+    @SneakyThrows
+    public ResponseBodyVO<String>  saveSystemScenePackageNew(SystemScenePackageNewPO params) {
+
+        SystemScenePackagePO  po=new SystemScenePackagePO();
+        //场景包名称不允许重复
+        String packageId=  systemScenePackageMapper.queryScenePackageByPackageName(params);
+        if(ObjectUtil.isNotNull(packageId)){
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该场景包名称已存在，请检查");
+        }
+        po.setPackageName(params.getPackageName());
+        po.setSceneDescribe(params.getSceneDescribe());
+        String packId=StringUtil.getRandomUUID();
+        po.setId(packId);
+        po.setCreateTime(TimeUtil.getNowForMysql());
+        po.setModifyTime(TimeUtil.getNowForMysql());
+        po.setCreateUserId(AuthUtil.getCurrentUserId());
+        po.setIsDeleted("0");
+        //zr
+        List<String> zrSceneNames=params.getZrSceneNames();
+        if(ObjectUtil.isNotNull(zrSceneNames)){
+            List<SystemScenePackageSublistPO> zrList=new ArrayList<>();
+            for (String zrSceneName:zrSceneNames) {
+                //加共有
+                SceneNaturalPO paramPo=new SceneNaturalPO();
+                paramPo.setShare("0");
+                paramPo.setNaturalName(zrSceneName);
+                SceneNaturalPO syPo = sceneNaturalMapper.querySceneNaturaByName(paramPo);
+                syPo.setShare("2");
+                SceneNaturalPO gyPo = sceneNaturalMapper.querySceneNaturaByName(syPo);
+                if (ObjectUtil.isNull(gyPo)) {
+                    // -------------------------------- 保存数据到 mysql --------------------------------
+                    syPo.setCreateTime(TimeUtil.getNowForMysql());
+                    syPo.setCreateUserId(AuthUtil.getCurrentUserId());
+                    syPo.setModifyTime(TimeUtil.getNowForMysql());
+                    syPo.setModifyUserId("");
+                    syPo.setNaturalId( StringUtil.getRandomUUID());
+                    sceneNaturalMapper.saveSceneNatural(syPo);
+                    log.info("场景包新增场景1----"+syPo.getShare());
+                } else {
+                    // -------------------------------- 修改数据到 mysql --------------------------------
+                    syPo.setModifyTime(TimeUtil.getNowForMysql());
+                    syPo.setModifyUserId(AuthUtil.getCurrentUserId());
+                    syPo.setShare(gyPo.getShare());
+                    syPo.setNaturalId(gyPo.getNaturalId());
+                    sceneNaturalMapper.updateSceneNatural(syPo);
+                    log.info("场景包修改场景1----"+syPo.getShare());
+                }
+
+
+                SystemScenePackageSublistPO zrPo=new SystemScenePackageSublistPO();
+                zrPo.setSublistId(StringUtil.getRandomUUID());
+                zrPo.setSceneType("1");
+                zrPo.setSceneName(syPo.getNaturalName());
+                zrPo.setSceneAndPackage(packId);
+                zrPo.setCreateTime(TimeUtil.getNowForMysql());
+                zrPo.setModifyTime(TimeUtil.getNowForMysql());
+                zrPo.setCreateUserId(AuthUtil.getCurrentUserId());
+                zrPo.setIsDeleted("0");
+                zrList.add(zrPo);
+            }
+            systemScenePackageSublistMapper.saveSystemScenePackageSublist(zrList);
+        }
+//zr
+        List<String> bzSceneNames=params.getBzSceneNames();
+        if(ObjectUtil.isNotNull(bzSceneNames)){
+            List<SystemScenePackageSublistPO> bzList=new ArrayList<>();
+            for (String bzSceneName:bzSceneNames) {
+                StandardsRegulationsPO standardsRegulationsPO=new StandardsRegulationsPO();
+                standardsRegulationsPO.setSceneName(bzSceneName);
+                standardsRegulationsPO.setShare("0");
+                StandardsRegulationsPO standardsRegulationsPOSy= standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPO);
+                standardsRegulationsPOSy.setShare("2");
+                StandardsRegulationsPO StandardsRegulationsByName= standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPOSy);
+              //  standardsRegulationsPOSy.setShare("1");
+                //是否已存在
+                if(ObjectUtil.isNotNull(StandardsRegulationsByName)){
+                    standardsRegulationsPOSy.setRegulationsId(StandardsRegulationsByName.getRegulationsId());
+                    standardsRegulationsPOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    standardsRegulationsPOSy.setModifyUserId(AuthUtil.getCurrentUserId());
+                    standardsRegulationsPOSy.setShare(StandardsRegulationsByName.getShare());
+                    standardsRegulationsMapper.updateStandardsRegulations(standardsRegulationsPOSy);
+                }else{
+                    standardsRegulationsPOSy.setRegulationsId(StringUtil.getRandomUUID());
+                    standardsRegulationsPOSy.setCreateTime(TimeUtil.getNowForMysql());
+                    standardsRegulationsPOSy.setCreateUserId(AuthUtil.getCurrentUserId());
+                    standardsRegulationsPOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    standardsRegulationsPOSy.setModifyUserId("");
+                    standardsRegulationsMapper.saveStandardsRegulations(standardsRegulationsPOSy);
+                }
+
+
+                SystemScenePackageSublistPO bzPo=new SystemScenePackageSublistPO();
+                bzPo.setSublistId(StringUtil.getRandomUUID());
+                bzPo.setSceneType("2");
+                bzPo.setSceneName(standardsRegulationsPOSy.getSceneName());
+                bzPo.setSceneAndPackage(packId);
+                bzPo.setCreateTime(TimeUtil.getNowForMysql());
+                bzPo.setModifyTime(TimeUtil.getNowForMysql());
+                bzPo.setIsDeleted("0");
+                bzPo.setCreateUserId(AuthUtil.getCurrentUserId());
+                bzList.add(bzPo);
+            }
+            systemScenePackageSublistMapper.saveSystemScenePackageSublist(bzList);
+        }
+        //zr
+        List<String> jtSceneNames=params.getJtSceneNames();
+        if(ObjectUtil.isNotNull(jtSceneNames)){
+            List<SystemScenePackageSublistPO> jtList=new ArrayList<>();
+            for (String jtSceneName:jtSceneNames) {
+                SceneAccidentPO sceneAccidentPO=new SceneAccidentPO();
+                sceneAccidentPO.setSceneName(jtSceneName);
+                sceneAccidentPO.setShare("0");
+                SceneAccidentPO sceneAccidentPOSy=  sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPO);
+                sceneAccidentPOSy.setShare("2");
+                SceneAccidentPO sceneAccidentPOByName=  sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPOSy);
+               // sceneAccidentPOSy.setShare("1");
+                //是否已存在
+                if(ObjectUtil.isNotNull(sceneAccidentPOByName)){
+                    sceneAccidentPOSy.setAccidentId(sceneAccidentPOByName.getAccidentId());
+                    sceneAccidentPOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    sceneAccidentPOSy.setModifyUserId(AuthUtil.getCurrentUserId());
+                    sceneAccidentPOSy.setShare(sceneAccidentPOByName.getShare());
+                    sceneAccidentMapper.updateSceneAccident(sceneAccidentPOSy);
+                }else{
+                    sceneAccidentPOSy.setAccidentId(StringUtil.getRandomUUID());
+                    sceneAccidentPOSy.setCreateTime(TimeUtil.getNowForMysql());
+                    sceneAccidentPOSy.setCreateUserId(AuthUtil.getCurrentUserId());
+                    sceneAccidentPOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    sceneAccidentPOSy.setModifyUserId("");
+                    sceneAccidentMapper.saveSceneAccident(sceneAccidentPOSy);
+                }
+
+
+                SystemScenePackageSublistPO jtPo=new SystemScenePackageSublistPO();
+                jtPo.setSublistId(StringUtil.getRandomUUID());
+                jtPo.setSceneType("3");
+                jtPo.setSceneName(sceneAccidentPOSy.getSceneName());
+                jtPo.setSceneAndPackage(packId);
+                jtPo.setCreateTime(TimeUtil.getNowForMysql());
+                jtPo.setModifyTime(TimeUtil.getNowForMysql());
+                jtPo.setCreateUserId(AuthUtil.getCurrentUserId());
+                jtPo.setIsDeleted("0");
+                jtList.add(jtPo);
+            }
+            systemScenePackageSublistMapper.saveSystemScenePackageSublist(jtList);
+        }
+        //zr
+        List<String> fhSceneNames=params.getFhSceneNames();
+        if(ObjectUtil.isNotNull(fhSceneNames)){
+            List<SystemScenePackageSublistPO> fhList=new ArrayList<>();
+            for (String fhSceneName:fhSceneNames) {
+                SceneGeneralTemplatePO sceneGeneralTemplatePO=new SceneGeneralTemplatePO();
+                sceneGeneralTemplatePO.setSceneId(fhSceneName);
+                sceneGeneralTemplatePO.setShare("0");
+                SceneGeneralTemplatePO sceneGeneralTemplatePOSy=  sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePO);
+                sceneGeneralTemplatePOSy.setShare("2");
+                SceneGeneralTemplatePO sceneGeneralTemplatePOByName=  sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePOSy);
+               // sceneGeneralTemplatePOSy.setShare("1");
+                //是否已存在
+                if(ObjectUtil.isNotNull(sceneGeneralTemplatePOByName)){
+                    sceneGeneralTemplatePOSy.setShare(sceneGeneralTemplatePOByName.getShare());
+                    sceneGeneralTemplatePOSy.setId(sceneGeneralTemplatePOByName.getId());
+                    sceneGeneralTemplatePOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    sceneGeneralTemplatePOSy.setModifyUserId(AuthUtil.getCurrentUserId());
+                    sceneGeneralTemplateMapper.updateSceneGeneralTemplate(sceneGeneralTemplatePOSy);
+                }else{
+                    sceneGeneralTemplatePOSy.setId(StringUtil.getRandomUUID());
+                    sceneGeneralTemplatePOSy.setCreateTime(TimeUtil.getNowForMysql());
+                    sceneGeneralTemplatePOSy.setCreateUserId(AuthUtil.getCurrentUserId());
+                    sceneGeneralTemplatePOSy.setModifyTime(TimeUtil.getNowForMysql());
+                    sceneGeneralTemplatePOSy.setModifyUserId("");
+                    sceneGeneralTemplateMapper.saveSceneGeneralTemplate(sceneGeneralTemplatePOSy);
+                }
+
+
+                SystemScenePackageSublistPO fhPo=new SystemScenePackageSublistPO();
+                fhPo.setSublistId(StringUtil.getRandomUUID());
+                fhPo.setIsDeleted("0");
+                fhPo.setSceneType("4");
+                fhPo.setSceneName(sceneGeneralTemplatePOSy.getShare());
+                fhPo.setSceneAndPackage(packId);
+                fhPo.setCreateTime(TimeUtil.getNowForMysql());
+                fhPo.setModifyTime(TimeUtil.getNowForMysql());
+                fhPo.setCreateUserId(AuthUtil.getCurrentUserId());
+                fhList.add(fhPo);
+            }
+            systemScenePackageSublistMapper.saveSystemScenePackageSublist(fhList);
+        }
+        systemScenePackageMapper.saveSystemScenePackage(po);
+
+        //记录场景包新增
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_INSERT, po,null);
+
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+    }
 }

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

@@ -22,22 +22,26 @@
         (accident_id,scene_name,self_driving,target_driving,
         self_reaction,conflict_behavior,conflict_type,
         scence_resume,scene_time,scene_weather,
-       create_user_id,create_time,modify_user_id,modify_time,
-         is_deleted,share,video_preview,video_address,osgb_address,xml_address,xodr_address,
+        create_user_id,create_time,modify_user_id,modify_time,
+        is_deleted,share,video_preview,video_address,osgb_address,xml_address,xodr_address,
         json_address,max_time)
         values
         <foreach collection="list" index="index" item="item" separator=",">
-            (#{item.accidentId,jdbcType=VARCHAR},#{item.sceneName,jdbcType=VARCHAR},#{item.selfDriving,jdbcType=VARCHAR}, #{item.targetDriving,jdbcType=VARCHAR},
-            #{item.selfReaction,jdbcType=VARCHAR}, #{item.conflictBehavior,jdbcType=VARCHAR},#{item.conflictType,jdbcType=VARCHAR},
-            #{item.scenceResume,jdbcType=VARCHAR}, #{item.sceneTime,jdbcType=VARCHAR},#{item.sceneWeather,jdbcType=VARCHAR},
+            (#{item.accidentId,jdbcType=VARCHAR},#{item.sceneName,jdbcType=VARCHAR},#{item.selfDriving,jdbcType=VARCHAR},
+            #{item.targetDriving,jdbcType=VARCHAR},
+            #{item.selfReaction,jdbcType=VARCHAR},
+            #{item.conflictBehavior,jdbcType=VARCHAR},#{item.conflictType,jdbcType=VARCHAR},
+            #{item.scenceResume,jdbcType=VARCHAR},
+            #{item.sceneTime,jdbcType=VARCHAR},#{item.sceneWeather,jdbcType=VARCHAR},
             #{item.createUserId,jdbcType=VARCHAR},#{item.createTime},#{item.modifyUserId,jdbcType=VARCHAR},#{item.modifyTime},
-            #{item.isDeleted,jdbcType=VARCHAR}, #{item.share,jdbcType=VARCHAR},#{item.videoPreview,jdbcType=VARCHAR},#{item.videoAddress,jdbcType=VARCHAR},#{item.osgbAddress,jdbcType=VARCHAR},
-            #{item.xmlAddress,jdbcType=VARCHAR}, #{item.xodrAddress,jdbcType=VARCHAR},#{item.jsonAddress,jdbcType=VARCHAR},#{item.maxTime,jdbcType=VARCHAR})
+            #{item.isDeleted,jdbcType=VARCHAR},
+            #{item.share,jdbcType=VARCHAR},#{item.videoPreview,jdbcType=VARCHAR},#{item.videoAddress,jdbcType=VARCHAR},#{item.osgbAddress,jdbcType=VARCHAR},
+            #{item.xmlAddress,jdbcType=VARCHAR},
+            #{item.xodrAddress,jdbcType=VARCHAR},#{item.jsonAddress,jdbcType=VARCHAR},#{item.maxTime,jdbcType=VARCHAR})
         </foreach>
     </insert>
 
 
-
     <select id="querySceneAccidentList" parameterType="api.common.pojo.param.scene.SceneAccidentParam"
             resultType="api.common.pojo.po.scene.SceneAccidentPO">
         select
@@ -50,12 +54,18 @@
         from simulation.scene_accident
         <where>
             is_deleted=0
+            <if test="userId != null and userId != ''">
+                and create_user_id =#{userId}
+            </if>
             <if test="sceneName != null and sceneName != ''">
                 and scene_name like CONCAT('%',#{sceneName,jdbcType=VARCHAR},'%')
             </if>
-            <if test="share != null and share != ''">
+            <if test="share != null and share==0">
                 and share =#{share}
             </if>
+            <if test="share != null and share==1">
+                and share !='0'
+            </if>
             <if test="selfDriving != null and selfDriving.size()>0 ">
                 and self_driving in
                 <foreach collection="selfDriving" item="item" index="index"
@@ -246,21 +256,27 @@
     </update>
 
 
-    <select id="querySceneAccidentByNmae" parameterType="api.common.pojo.po.scene.SceneAccidentPO" resultType="api.common.pojo.po.scene.SceneAccidentPO">
+    <select id="querySceneAccidentByNmae" parameterType="api.common.pojo.po.scene.SceneAccidentPO"
+            resultType="api.common.pojo.po.scene.SceneAccidentPO">
         select
-        accident_id ,share
+        accident_id,scene_name,self_driving,target_driving,
+        self_reaction,conflict_behavior,conflict_type,
+        scence_resume,scene_time,scene_weather,
+        create_user_id,create_time,modify_user_id,modify_time,
+        is_deleted,share,video_preview,video_address,osgb_address,xml_address,xodr_address,
+        json_address,max_time
         from simulation.scene_accident
         <where>
-        is_deleted = '0'
-        <if test="sceneName != null and sceneName != ''">
-            and scene_name =#{sceneName,jdbcType=VARCHAR}
-        </if>
-        <if test="share != null and share=='0'">
-            and share =#{share}
-        </if>
-        <if test="share != null and share!='0'">
-            and share !='0'
-        </if>
+            is_deleted = '0'
+            <if test="sceneName != null and sceneName != ''">
+                and scene_name =#{sceneName,jdbcType=VARCHAR}
+            </if>
+            <if test="share != null and share==0">
+                and share =#{share}
+            </if>
+            <if test="share != null and share!= '' and share!=0">
+                and share !='0'
+            </if>
 
         </where>
     </select>
@@ -281,7 +297,7 @@
 
     <update id="updateSceneAccidentList" parameterType="java.util.List">
         <foreach collection="list" index="index" item="item" separator=";">
-        update simulation.scene_accident
+            update simulation.scene_accident
             set scene_name=#{item.sceneName},self_driving=#{item.selfDriving},
             target_driving=#{item.targetDriving},self_reaction=#{item.selfReaction},
             conflict_behavior=#{item.conflictBehavior},conflict_type=#{item.conflictType},
@@ -295,8 +311,6 @@
     </update>
 
 
-
-
     <select id="querySceneAccidentListByQx" parameterType="api.common.pojo.param.scene.SceneAccidentParam"
             resultType="api.common.pojo.po.scene.SceneAccidentPO">
 
@@ -311,7 +325,8 @@
         FROM system_scene_package p
         JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
         JOIN system_scene_package_sublist s on p.id = s.scene_and_package
-        where scene_type='3' and  s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join  scene_accident jt on qx.scene_name=jt.scene_name) cc
+        where scene_type='3' and s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_accident
+        jt on qx.scene_name=jt.scene_name  and jt.share='2' union select jtNew.* from scene_accident jtNew where jtNew.share='1' and is_deleted='0') cc
         <where>
             <if test="sceneName != null and sceneName != ''">
                 and scene_name like CONCAT('%',#{sceneName,jdbcType=VARCHAR},'%')
@@ -365,13 +380,13 @@
                     #{item}
                 </foreach>
             </if>
-        <if test="AllIds != null and AllIds.size()>0">
-            and a.accident_id in
-            <foreach collection="AllIds" item="item" index="index"
-                     separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
+            <if test="AllIds != null and AllIds.size()>0">
+                and a.accident_id in
+                <foreach collection="AllIds" item="item" index="index"
+                         separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by cc.modify_time desc
     </select>
@@ -396,7 +411,8 @@
         FROM system_scene_package p
         JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
         JOIN system_scene_package_sublist s on p.id = s.scene_and_package
-        where scene_type='3' and  s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join  scene_accident jt on qx.scene_name=jt.scene_name) dd
+        where scene_type='3' and s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_accident
+        jt on qx.scene_name=jt.scene_name) dd
         <where>
             <if test="rearEndCollision != null and rearEndCollision!=''">
                 conflict_behavior =#{rearEndCollision}
@@ -423,7 +439,8 @@
     </select>
 
 
-    <select id="querySceneAccidentById" parameterType="java.lang.String" resultType="api.common.pojo.po.scene.SceneAccidentPO">
+    <select id="querySceneAccidentById" parameterType="java.lang.String"
+            resultType="api.common.pojo.po.scene.SceneAccidentPO">
         select
        accident_id,scene_name,self_driving,target_driving,
         self_reaction,conflict_behavior,conflict_type,
@@ -434,4 +451,6 @@
         from simulation.scene_accident
         where accident_id=#{id}
     </select>
+
+
 </mapper>

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

@@ -96,8 +96,11 @@
             <if test="obsType != null and obsType != ''">
                 and obs_type= #{obsType}
             </if>
-            <if test="share != null and share != ''">
-                and share= #{share}
+            <if test="share != null and share==0">
+                and share =#{share}
+            </if>
+            <if test="share != null and share!= '' and share!=0">
+                and share !='0'
             </if>
             <if test="allSceneNames != null and allSceneNames.length>0">
                 and scene_id in
@@ -113,6 +116,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="userId != null and userId != ''">
+                and create_user_id =#{userId}
+            </if>
         order by modify_time desc
         </where>
     </select>
@@ -198,7 +204,7 @@
         FROM system_scene_package p
         JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
         JOIN system_scene_package_sublist s on p.id = s.scene_and_package
-        where scene_type='4' and  s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_general_template  fh on qx.scene_name=fh.scene_id and fh.is_deleted = '0') dd
+        where scene_type='4' and  s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_general_template  fh on qx.scene_name=fh.scene_id and fh.is_deleted = '0' and fh.share='2' union select jtNew.* from scene_general_template jtNew where jtNew.share='1' and is_deleted='0') dd
         <where>
             is_deleted = '0'
             <if test="id != null and id != ''">
@@ -227,8 +233,11 @@
             <if test="version != null and version != ''">
                 and version= #{version}
             </if>
-            <if test="share != null and share != ''">
-                and share= #{share}
+            <if test="share != null and share==0">
+                and share =#{share}
+            </if>
+            <if test="share != null and share!= '' and share!=0">
+                and share !='0'
             </if>
             <if test="allSceneNames != null and allSceneNames.length>0">
                 and scene_id in
@@ -249,17 +258,26 @@
     </select>
 
     <select id="querySceneGeneralTemplateByName" parameterType="api.common.pojo.po.scene.SceneGeneralTemplatePO" resultType="api.common.pojo.po.scene.SceneGeneralTemplatePO">
-        select id,share
+        select id,scene_id,scenario_name,scenario_weather,scenario_time,
+        scenario_vehicle_model,scenario_road_type,scenario_radius_curvature,ego_start_x,ego_start_y,
+        ego_start_velocity,ego_heading_angle,ego_velocity_status,ego_trajectory,ego_duration_time,
+        ego_velocity_time,ego_trajectory_time,obs_start_x,obs_start_y,obs_start_velocity,
+        obs_lateral_acceleration,obs_longitudinal_acceleration,
+        obs_heading_angle_rel,obs_velocity_status,obs_trajectory,obs_duration_time,obs_velocity_time,
+        obs_trail_time,generalization_type,scenario_resume,scene_detailed_description,evaluating_indicator,
+        video_link,file_name,version,share,
+        create_user_id,create_time,modify_time,
+        is_deleted,obs_type
         from simulation.scene_general_template
         <where >
             is_deleted = '0'
             <if test="sceneId != null and sceneId!=''">
                 and scene_id =#{sceneId}
             </if>
-            <if test="share != null and share=='0'">
+            <if test="share != null and share==0">
                 and share =#{share}
             </if>
-            <if test="share != null and share!='0'">
+            <if test="share != null and share!= '' and share!=0">
                 and share !='0'
             </if>
         </where>

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

@@ -359,9 +359,15 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="share != null and share != ''">
+            <if test="share != null and share==0">
                 and share =#{share}
             </if>
+            <if test="share != null and share!= '' and share!=0">
+                and share !='0'
+            </if>
+            <if test="userId != null and userId != ''">
+                and create_user_id =#{userId}
+            </if>
             order by modify_time desc
         </where>
     </select>
@@ -384,17 +390,28 @@
 
 
     <select id="querySceneNaturaByName" parameterType="api.common.pojo.po.scene.SceneNaturalPO" resultType="api.common.pojo.po.scene.SceneNaturalPO">
-        select natural_id,share
+        select natural_id,natural_name,weather,backlight,
+        light_change,road_type,road_matrrial,driveway_num,
+        driveway_type,road_flatness,road_curvature,ramp,
+        intersection_type,plane_intersection,bridge,tunnel,
+        speed_limit,min_speed_limit,no_entry,no_stopping,
+        left_lane_line,right_lane_line,conductor_marking,pedestrian_crossing,
+        traffic_light,deceleration_marking,pavement_condition,natural_disaster,
+        road_safety_signs,safety_warning_board,traffic_accident,patency,
+        special_vehicle_yield,violation,double_flashing_car,self_behavior,
+        target_behavior,create_user_id,create_time,modify_user_id,modify_time,
+        is_deleted,share,video_preview,video_address,osgb_address,xodr_address,xosc_address,
+        json_address,max_time
         from simulation.scene_natural
         <where >
             is_deleted = '0'
             <if test="naturalName != null and naturalName!=''">
                 and natural_name =#{naturalName}
             </if>
-            <if test="share != null and share=='0'">
+            <if test="share != null and share==0">
                 and share =#{share}
             </if>
-            <if test="share != null and share!='0'">
+            <if test="share != null and share!= '' and share!=0">
                 and share !='0'
             </if>
         </where>
@@ -1378,7 +1395,8 @@
         FROM system_scene_package p
         JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
         JOIN system_scene_package_sublist s on p.id = s.scene_and_package
-        where scene_type='1' and  s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_natural  zr on qx.scene_name=zr.natural_name) dd
+        where scene_type='1' and  s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join scene_natural  zr on qx.scene_name=zr.natural_name
+        and zr.share='2' union select jtNew.* from scene_natural jtNew where jtNew.share='1' and is_deleted='0') dd
         <where>
             is_deleted = '0'
             <if test="naturalName != null and naturalName != ''">
@@ -1658,9 +1676,12 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="share != null and share != ''">
+            <if test="share != null and share==0">
                 and share =#{share}
             </if>
+            <if test="share != null and share!= '' and share!=0">
+                and share !='0'
+            </if>
             order by modify_time desc
         </where>
     </select>

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

@@ -39,7 +39,10 @@
                 and a.package_name like CONCAT('%',#{packageName,jdbcType=VARCHAR},'%')
             </if>
             <if test="yearMax != null and yearMax != ''">
-                and #{yearMax,jdbcType=VARCHAR} &gt; a.CREATE_TIME and #{yearMin,jdbcType=VARCHAR} &lt; a.CREATE_TIME
+                and #{yearMax,jdbcType=VARCHAR} &gt; a.CREATE_TIME
+            </if>
+            <if test="yearMin != null and yearMin != ''">
+                and #{yearMin,jdbcType=VARCHAR} &lt; a.CREATE_TIME
             </if>
             <if test="createUserId != null and createUserId != ''">
                 and create_user_id=#{createUserId,jdbcType=VARCHAR}
@@ -70,7 +73,10 @@
                 and a.package_name like CONCAT('%',#{packageName,jdbcType=VARCHAR},'%')
             </if>
             <if test="yearMax != null and yearMax != ''">
-                and #{yearMax,jdbcType=VARCHAR} &gt; a.CREATE_TIME and #{yearMin,jdbcType=VARCHAR} &lt; a.CREATE_TIME
+                and #{yearMax,jdbcType=VARCHAR} &gt; a.CREATE_TIME
+            </if>
+            <if test="yearMin != null and yearMin != ''">
+                and #{yearMin,jdbcType=VARCHAR} &lt; a.CREATE_TIME
             </if>
             <if test="createUserId != null and createUserId != ''">
                 and create_user_id=#{createUserId,jdbcType=VARCHAR}

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

@@ -38,7 +38,10 @@
                 and rule_description like CONCAT('%',#{ruleDescription},'%')
             </if>
             <if test="yearMax != null and yearMax != ''">
-                and #{yearMax,jdbcType=VARCHAR} &gt; create_time and #{yearMin,jdbcType=VARCHAR} &lt; create_time
+                and #{yearMax,jdbcType=VARCHAR} &gt; create_time
+            </if>
+            <if test="yearMin != null and yearMin != ''">
+                and #{yearMin,jdbcType=VARCHAR} &lt; create_time
             </if>
             <if test="createUserId != null and createUserId != ''">
                 and create_user_id=#{createUserId,jdbcType=VARCHAR}

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

@@ -82,8 +82,14 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="share != null and share != ''">
-               and share=#{share}
+            <if test="share != null and share==0">
+                and share =#{share}
+            </if>
+            <if test="share != null and share==1">
+                and share !='0'
+            </if>
+            <if test="userId != null and userId != ''">
+                and create_user_id =#{userId}
             </if>
         </where>
         order by modify_time desc
@@ -137,19 +143,22 @@
 
     <select id="queryStandardsRegulationsByName" parameterType="api.common.pojo.po.scene.StandardsRegulationsPO"
             resultType="api.common.pojo.po.scene.StandardsRegulationsPO">
-        select regulations_id,share
+        select regulations_id, scene_name, regulation_type, standard_type,
+        create_user_id, create_time, modify_user_id, modify_time,
+        is_deleted, share, video_preview, video_address, osgb_address, xml_address, xodr_address,
+        json_address, max_time
         from simulation.scene_standards_regulations
         <where>
-        is_deleted = '0'
-        <if test="sceneName != null and sceneName!=''">
-          and scene_name = #{sceneName,jdbcType=VARCHAR}
-        </if>
-        <if test="share != null and share=='0'">
-             and share =#{share}
-        </if>
-        <if test="share != null and share!='0'">
-           and share !='0'
-        </if>
+            is_deleted = '0'
+            <if test="sceneName != null and sceneName!=''">
+                and scene_name = #{sceneName,jdbcType=VARCHAR}
+            </if>
+            <if test="share != null and share==0">
+                and share =#{share}
+            </if>
+            <if test="share != null and share!= '' and share!=0">
+                and share !='0'
+            </if>
         </where>
     </select>
 
@@ -192,7 +201,7 @@
         JOIN system_user_scene u on p.id = u.package_id and u.is_deleted = '0' and p.is_deleted = '0'
         JOIN system_scene_package_sublist s on p.id = s.scene_and_package
         where scene_type='2' and s.is_deleted = '0' and user_id=#{userId} group by s.scene_name)qx join
-        scene_standards_regulations bz on qx.scene_name=bz.scene_name) dd
+        scene_standards_regulations bz on qx.scene_name=bz.scene_name and bz.share='2' union select jtNew.* from scene_standards_regulations jtNew where jtNew.share='1' and is_deleted='0') dd
         <where>
             is_deleted = '0'
             <if test="sceneName != null and sceneName != ''">
@@ -229,10 +238,12 @@
                     #{item}
                 </foreach>
             </if>
-
-            <if test="share != null and share != ''">
+            <if test="share != null and share==0">
                 and share =#{share}
             </if>
+            <if test="share != null and share!= '' and share!=0">
+                and share !='0'
+            </if>
         </where>
         order by modify_time desc
 

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

@@ -44,7 +44,10 @@
                 and t.package_name like CONCAT('%',#{packageName,jdbcType=VARCHAR},'%')
             </if>
             <if test="yearMax != null and yearMax != ''">
-                and #{yearMax,jdbcType=VARCHAR} &gt; t.create_time and #{yearMin,jdbcType=VARCHAR} &lt; t.create_time
+                and #{yearMax,jdbcType=VARCHAR} &gt; t.create_time
+            </if>
+            <if test="yearMin != null and yearMin != ''">
+                and #{yearMin,jdbcType=VARCHAR} &lt; t.create_time
             </if>
             <if test="packageNames != null and packageNames.length>0">
                 and t.package_name in
@@ -72,10 +75,13 @@
         </if>
         <if test="yearMax != null and yearMax != ''">
             and #{yearMax,jdbcType=VARCHAR} &gt; modify_time
+        </if>
+        <if test="yearMin != null and yearMin != ''">
             and #{yearMin,jdbcType=VARCHAR} &lt; modify_time
         </if>
+
         GROUP BY a.username
-        ORDER BY modify_time DESC
+        ORDER BY a.modify_time DESC
     </select>
     <select id="querySystemScenePackageById" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="api.common.pojo.po.scene.SystemScenePackagePO">