场景上传覆盖

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

@@ -52,10 +52,9 @@ public class SceneGeneralController {
 
     //查询列表
     @PostMapping("/querySceneGeneralTemplateList")
-    public ResponseBodyVO<List<SceneGeneralTemplatePO>> querySceneGeneralTemplateList(@RequestBody SceneGeneralTemplateParam po) {
+    public ResponseBodyVO<PageInfo<SceneGeneralTemplatePO>> querySceneGeneralTemplateList(@RequestBody SceneGeneralTemplateParam po) {
         PageUtil.setPageInfo(po);
-        List<SceneGeneralTemplatePO> list = sceneGeneralTemplateService.querySceneGeneralTemplateList(po);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, new PageInfo<>(list));
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, new PageInfo<>(sceneGeneralTemplateService.querySceneGeneralTemplateList(po)));
     }
 
     //查模板详情
@@ -63,9 +62,9 @@ public class SceneGeneralController {
     public ResponseBodyVO<SceneGeneralTemplateVO> querySceneGeneralTemplateById(@RequestBody SceneGeneralTemplateParam param) {
         if (param != null && ObjectUtil.isNotNull(param.getId())) {
             SceneGeneralTemplateVO po = sceneGeneralTemplateService.querySceneGeneralTemplateById(param.getId());
-            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, po);
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, po);
         }
-        return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数id不能为空，请检查");
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数id不能为空，请检查");
 
     }
 
@@ -207,9 +206,6 @@ public class SceneGeneralController {
     /**
      * 对象转Map
      *
-     * @param object
-     * @return
-     * @throws IllegalAccessException
      */
     public static Map beanToMap(Object object) throws IllegalAccessException {
         Map<String, Object> map = new HashMap<String, Object>();

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

@@ -32,6 +32,20 @@ public class SceneNaturalController {
     @Resource
     private SceneImportService sceneImportService;
 
+    //* -------------------------------- 场景上传 --------------------------------
+
+    @PostMapping("/saveSceneNaturalBatch")
+    public ResponseBodyVO<String> saveSceneNaturalBatch(@RequestBody SceneImportParam sceneImportParam) {
+        SceneImportPO sceneImportPO = new SceneImportPO();
+        sceneImportPO.setId(sceneImportParam.getId());
+        sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
+        sceneImportService.updateStatus(sceneImportPO);
+        // 解析参数
+        sceneImportPO = sceneNaturalService.importMiNio(sceneImportParam);
+        sceneImportService.updateInfo(sceneImportPO);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
+    }
+
     //* -------------------------------- 删除自然驾驶 --------------------------------
     @PostMapping("/deleteSceneNatural")
     public ResponseBodyVO<String> deleteSceneNatural(@RequestBody SceneNaturalPO params) {
@@ -40,8 +54,6 @@ public class SceneNaturalController {
     }
     //* -------------------------------- Comment --------------------------------
 
-
-
     /**
      * 查询自然驾驶数据
      */
@@ -77,20 +89,7 @@ public class SceneNaturalController {
 
 
 
-    /**
-     * 解析已经上传好的数据
-     */
-    @PostMapping("/saveSceneNaturalBatch")
-    public ResponseBodyVO<String> saveSceneNaturalBatch(@RequestBody SceneImportParam sceneImportParam) {
-        SceneImportPO sceneImportPO = new SceneImportPO();
-        sceneImportPO.setId(sceneImportParam.getId());
-        sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
-        sceneImportService.updateStatus(sceneImportPO);
-        // 解析参数
-        sceneImportPO = sceneNaturalService.importMiNio(sceneImportParam);
-        sceneImportService.updateInfo(sceneImportPO);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
-    }
+
 
 
     //分享

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

@@ -722,7 +722,8 @@ public class SceneAccidentService {
                                     }
 
                                     sceneAccidentPO.setSceneName(sceneName);
-                                    sceneAccidentPO.setShare("0");
+                                    sceneAccidentPO.setShare(null);// 覆盖全部场景，包括share为0、1、2
+//                                    sceneAccidentPO.setShare("0");
                                     SceneAccidentPO sceneAccidentPOByName = sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPO);
                                     if (ObjectUtil.isNull(sceneAccidentPOByName)) { // 新增数据
                                         isupdate = "0";

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

@@ -494,7 +494,8 @@ public class SceneNaturalService {
                                         checkFileName.put(fileName, address);
                                     }
                                     sceneNaturalPO.setNaturalName(fileName);
-                                    sceneNaturalPO.setShare("0");
+//                                    sceneNaturalPO.setShare("0");
+                                    sceneNaturalPO.setShare(null); // 覆盖全部场景，包括share为0、1、2
                                     SceneNaturalPO sceneNaturalPOByName = sceneNaturalMapper.querySceneNaturaByName(sceneNaturalPO);
                                     String osgbAdress = OsgbPath + "/" + root.path("osgb").asText();
                                     String xodrAdress = XodrPath + "/" + root.path("xodr").asText();

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

@@ -283,7 +283,8 @@ public class StandardsRegulationsService {
                                     }
                                     String osgbAdress = OsgbPath + "/" + osgb;
                                     String xodrAdress = XodrPath + "/" + xodr;
-                                    standardsRegulationsPO.setShare("0");
+//                                    standardsRegulationsPO.setShare("0");
+                                    standardsRegulationsPO.setShare(null);// 覆盖全部场景，包括share为0、1、2
                                     standardsRegulationsPO.setSceneName(sceneName);
                                     StandardsRegulationsPO PoByName = standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPO);
                                     if (ObjectUtil.isNull(PoByName)) {  // 新增数据

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

@@ -148,18 +148,16 @@
         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!= '' and share!=0">
-                and share !='0'
-            </if>
-        </where>
+        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!= '' and share!=0">
+            and share !='0'
+        </if>
     </select>
 
     <update id="updateStandardsRegulations" parameterType="api.common.pojo.po.scene.StandardsRegulationsPO">
@@ -295,4 +293,4 @@
      where regulations_id=#{id}
     </select>
     <select id="queryRegulationType" resultType="java.lang.String"></select>
-</mapper>
+</mapper>