评分细则加字段

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

@@ -14,6 +14,7 @@ import com.css.simulation.resource.system.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,22 +62,23 @@ public class StandardsRegulationsController {
     @ResponseBody
     public ResponseBodyVO<String> deleteStandardsRegulations(@RequestBody StandardsRegulationsPO params) {
         if (ObjectUtil.isNull(params.getRegulationsId())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数场景Id不能为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数场景Id不能为空，请检查");
         }
         standardsRegulationsService.deleteStandardsRegulations(params);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
+
     //测试批量导入
     @PostMapping("/saveStandardsRegulationsBatch")
     @ResponseBody
     public ResponseBodyVO<String> saveStandardsRegulationsBatch(@RequestBody SceneImportParam sceneImportParam) {
-        SceneImportPO sceneImportPO=new  SceneImportPO();
+        SceneImportPO sceneImportPO = new SceneImportPO();
         sceneImportPO.setId(sceneImportParam.getId());
         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_3);
         sceneImportService.updateStatus(sceneImportPO);
-        sceneImportPO= standardsRegulationsService.importMiNio(sceneImportParam);
+        sceneImportPO = standardsRegulationsService.importMinio(sceneImportParam);
         sceneImportService.updateInfo(sceneImportPO);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
 }

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

@@ -23,6 +23,7 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -43,6 +44,7 @@ public class StandardsRegulationsService {
 
     @Autowired
     DictService dictService;
+
     /**
      * 获取标准法规场景数据：
      */
@@ -56,7 +58,7 @@ public class StandardsRegulationsService {
         ObjectMapper objMap = new ObjectMapper();
         JsonNode root = objMap.readTree(json);
         String sceneName = root.path("场景名称").asText();
-       String sceneId = standardsRegulationsMapper.queryStandardsRegulationsByName(sceneName);
+        String sceneId = standardsRegulationsMapper.queryStandardsRegulationsByName(sceneName);
 
         StandardsRegulationsPO standardsRegulationsPO = new StandardsRegulationsPO();
         standardsRegulationsPO = standardsRegulationsPO.builder()
@@ -93,8 +95,8 @@ public class StandardsRegulationsService {
             standardsRegulationsPO.setCreateUserId(AuthUtil.getCurrentUserId());
             standardsRegulationsMapper.saveStandardsRegulations(standardsRegulationsPO);
 
-           // return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该场景名称" + sceneName + "已存在，请检查");
-        }else{
+            // return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该场景名称" + sceneName + "已存在，请检查");
+        } else {
             // -------------------------------- 修改数据到 mysql --------------------------------
             standardsRegulationsPO.setRegulationsId(sceneId);
             standardsRegulationsPO.setModifyTime(TimeUtil.getNowForMysql());
@@ -106,14 +108,14 @@ public class StandardsRegulationsService {
 
     //查看列表
     public List<StandardsRegulationsPO> queryStandardsRegulationsList(StandardsRegulationsParam params) {
-        if(ObjectUtil.isNotNull(params.getSceneName()) || (params.getRegulationType()!=null&&params.getRegulationType().size()>0)||ObjectUtil.isNotNull(params.getStandardType())||ObjectUtil.isNotNull(params.getStandardType())
-                ||(params.getIds()!=null&&params.getIds().length>0)){
+        if (ObjectUtil.isNotNull(params.getSceneName()) || (params.getRegulationType() != null && params.getRegulationType().size() > 0) || ObjectUtil.isNotNull(params.getStandardType()) || ObjectUtil.isNotNull(params.getStandardType())
+                || (params.getIds() != null && params.getIds().length > 0)) {
             params.setXlk("1");
         }
-        if(params.getLabel()!=null&&params.getLabel().size()>0){
+        if (params.getLabel() != null && params.getLabel().size() > 0) {
             params.setBq("1");
         }
-        List<StandardsRegulationsPO> list =new ArrayList<>();
+        List<StandardsRegulationsPO> list = new ArrayList<>();
         /*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"))){
             list =  standardsRegulationsMapper.queryStandardsRegulationsList(params);
         }*//*else if(params.getXlk().equals("1")&&params.getBq().equals("0")){
@@ -125,30 +127,30 @@ public class StandardsRegulationsService {
         //添加权限
         String roleCode = AuthUtil.getCurrentUserRoleCode();
         String userId = AuthUtil.getCurrentUserId();
-        if(DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)){ //管理员账户
-            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"))){
-                list =  standardsRegulationsMapper.queryStandardsRegulationsList(params);
-            }else if(params.getXlk().equals("0")&&params.getBq().equals("1")){
-                list =  standardsRegulationsMapper.queryStandardsRegulationsListByBq(params);
+        if (DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)) { //管理员账户
+            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"))) {
+                list = standardsRegulationsMapper.queryStandardsRegulationsList(params);
+            } else if (params.getXlk().equals("0") && params.getBq().equals("1")) {
+                list = standardsRegulationsMapper.queryStandardsRegulationsListByBq(params);
             }
 
-        }else if(DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)){
+        } else if (DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)) {
             //查询父账户
             userId = AuthUtil.getCreateUserId();
             params.setUserId(userId);
-            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"))){
-                list =  standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
-            }else if(params.getXlk().equals("0")&&params.getBq().equals("1")){
-                list =  standardsRegulationsMapper.queryStandardsRegulationsListByBqAndQx(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"))) {
+                list = standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
+            } else if (params.getXlk().equals("0") && params.getBq().equals("1")) {
+                list = standardsRegulationsMapper.queryStandardsRegulationsListByBqAndQx(params);
             }
 
-        }else if(DictConstants.ROLE_CODE_UESR.equals(roleCode)){
+        } else if (DictConstants.ROLE_CODE_UESR.equals(roleCode)) {
             //查询普通账户
             params.setUserId(userId);
-            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"))){
-                list =  standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
-            }else if(params.getXlk().equals("0")&&params.getBq().equals("1")){
-                list =  standardsRegulationsMapper.queryStandardsRegulationsListByBqAndQx(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"))) {
+                list = standardsRegulationsMapper.queryStandardsRegulationsListByQx(params);
+            } else if (params.getXlk().equals("0") && params.getBq().equals("1")) {
+                list = standardsRegulationsMapper.queryStandardsRegulationsListByBqAndQx(params);
             }
         }
        /* if(params.getLabel()!=null&&params.getLabel().size()>0){
@@ -181,20 +183,20 @@ public class StandardsRegulationsService {
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         standardsRegulationsMapper.deleteStandardsRegulations(params);
 
-        Map map=new HashMap();
-        map.put("sceneId",params.getRegulationsId());
-        map.put("sceneName",params.getSceneName());
-        map.put("type",DictConstants.SCENE_STANDARD);
+        Map 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());
+        // systemUserSceneService.deleteSystemUserSceneBySceneId(params.getRegulationsId());
     }
 
 
     /**
      * 获取交通事故场景数据：
      */
-    public SceneImportPO importMiNio(SceneImportParam parms) {
-        SceneImportPO sceneImportPO=new  SceneImportPO();
+    public SceneImportPO importMinio(SceneImportParam parms) {
+        SceneImportPO sceneImportPO = new SceneImportPO();
         sceneImportPO.setId(parms.getId());
         try {
             MinioParameter MI = new MinioParameter();
@@ -206,14 +208,14 @@ public class StandardsRegulationsService {
             int falseNum = 0;
             String errorMessage = "";
             for (String filePath : list) {
-                if (filePath.indexOf("/OSGB") != -1) {
+                if (filePath.contains("/OSGB")) {
                     OsgbPath = filePath;
-                } else if (filePath.indexOf("/XODR") != -1) {
+                } else if (filePath.contains("/XODR")) {
                     XodrPath = filePath;
                 }
             }
             for (String filePath : list) {
-                if (filePath.indexOf("/Scenarios") != -1) {
+                if (filePath.contains("/Scenarios")) {
                     MI.setObjectName(filePath);
                     List<String> listScene = fileDownService.listDeepOne(MI).getInfo();
                     for (String scenePath : listScene) {
@@ -223,7 +225,7 @@ public class StandardsRegulationsService {
                             StandardsRegulationsPO standardsRegulationsPO = new StandardsRegulationsPO();
                             String isupdate = null;
                             for (String adress : listAderss) {
-                                if (adress.indexOf(".json") != -1) {
+                                if (adress.contains(".json")) {
                                     MI.setObjectName(adress);
                                     Response download = fileDownService.download(MI);
                                     // -------------------------------- label.json --------------------------------
@@ -232,11 +234,11 @@ public class StandardsRegulationsService {
                                     JsonNode root = objMap.readTree(json);
                                     //判断场景名称唯一
                                     String sceneName = root.path("场景名称").asText();
-                                    String regulationType=root.path("法规类型").asText();
-                                    String standardType=root.path("标准类型").asText();
-                                    if(ObjectUtil.isNull(regulationType)&&ObjectUtil.isNull(standardType)){
+                                    String regulationType = root.path("法规类型").asText();
+                                    String standardType = root.path("标准类型").asText();
+                                    if (ObjectUtil.isNull(regulationType) && ObjectUtil.isNull(standardType)) {
                                         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
-                                        sceneImportPO.setErrorMessage("该文件："+adress+"与标准法规场景类型不匹配，解析失败，请检查");
+                                        sceneImportPO.setErrorMessage("文件" + adress + " 与标准法规场景类型不匹配，解析失败。");
                                         return sceneImportPO;
                                     }
                                     String sceneId = standardsRegulationsMapper.queryStandardsRegulationsByName(sceneName);
@@ -249,10 +251,10 @@ public class StandardsRegulationsService {
                                     standardsRegulationsPO.setMaxTime(root.path("max_time").asText());
                                     standardsRegulationsPO.setIsDeleted("0");
 
-                                    if(ObjectUtil.isNull(standardsRegulationsPO.getOsgbAddress())){
+                                    if (ObjectUtil.isNull(standardsRegulationsPO.getOsgbAddress())) {
                                         standardsRegulationsPO.setOsgbAddress(osgbAdress);
                                     }
-                                    if(ObjectUtil.isNull(standardsRegulationsPO.getXodrAddress())){
+                                    if (ObjectUtil.isNull(standardsRegulationsPO.getXodrAddress())) {
                                         standardsRegulationsPO.setXodrAddress(xodrAdress);
                                     }
                                     if (ObjectUtil.isNull(sceneId)) {
@@ -262,15 +264,15 @@ public class StandardsRegulationsService {
                                         standardsRegulationsPO.setRegulationsId(sceneId);
                                     }
                                 }
-                                if (adress.indexOf(".json") != -1) {
+                                if (adress.contains(".json")) {
                                     standardsRegulationsPO.setJsonAddress(adress);
-                                } else if (adress.indexOf(".xml") != -1 || adress.indexOf(".xosc") != -1) {
+                                } else if (adress.contains(".xml") || adress.contains(".xosc")) {
                                     standardsRegulationsPO.setXmlAddress(adress);
-                                } else if (adress.indexOf(".xodr") != -1) {
+                                } else if (adress.contains(".xodr")) {
                                     standardsRegulationsPO.setXodrAddress(adress);
-                                } else if (adress.indexOf(".osgb") != -1) {
+                                } else if (adress.contains(".osgb")) {
                                     standardsRegulationsPO.setOsgbAddress(adress);
-                                } else if (adress.indexOf(".mp4") != -1) {
+                                } else if (adress.contains(".mp4")) {
                                     standardsRegulationsPO.setVideoAddress(adress);
                                 }
                             }
@@ -303,9 +305,9 @@ public class StandardsRegulationsService {
             sceneImportPO.setFalseNum(falseNum);
             sceneImportPO.setErrorMessage(errorMessage);
             return sceneImportPO;
-        }catch (Exception e){
+        } catch (Exception e) {
             sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
-            sceneImportPO.setErrorMessage("该文件地址："+parms.getMinioDirectory()+"解析失败，请检查");
+            sceneImportPO.setErrorMessage("该文件地址：" + parms.getMinioDirectory() + "解析失败，请检查");
             return sceneImportPO;
         }
     }

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

@@ -32,25 +32,25 @@ public class SceneImportService {
     SceneImportMapper sceneImportMapper;
 
     public SceneImportPO saveTask(SceneImportPO po) {
-        //名称校验
+        // 名称校验
         List<SceneImportPO> list = sceneImportMapper.checkName(po);
-        if(ObjectUtil.isNotNull(list)){
+        if (ObjectUtil.isNotNull(list)) {
             po.setId(null);
             return po;
         }
-        //常规字段赋值
+        // 常规字段赋值
         PoUtil.initAddPo(po);
         String id = po.getId();
-        po.setStatus(DictConstants.SCENE_IMPORT_STATUS_0);//重置状态
-        if(ObjectUtil.isNull(id)) {//新增
+        po.setStatus(DictConstants.SCENE_IMPORT_STATUS_0); //重置状态
+        if (ObjectUtil.isNull(id)) { // 新增
             po.setId(StringUtil.getRandomUUID());
             sceneImportMapper.insert(po);
-            //记录日志
-            Map<String,String>  dictMap = dictService.getDictMapByType(DictConstants.SCENE_TYPE);
-            String type= dictMap.get(po.getSceneType());
+            // 记录日志
+            Map<String, String> dictMap = dictService.getDictMapByType(DictConstants.SCENE_TYPE);
+            String type = dictMap.get(po.getSceneType());
             String content = "创建" + type + "上传任务:" + po.getName() + "(ID:" + po.getId() + ")";
-            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT,content);
-        }else{
+            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT, content);
+        } else {
             sceneImportMapper.update(po);
         }
         return po;
@@ -68,6 +68,7 @@ public class SceneImportService {
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         sceneImportMapper.update(params);
     }
+
     public void updateInfo(SceneImportPO params) {
         params.setModifyTime(TimeUtil.getNowForMysql());
         params.setModifyUserId(AuthUtil.getCurrentUserId());
@@ -79,7 +80,7 @@ public class SceneImportService {
         List<SceneImportPO> list = sceneImportMapper.getSceneImporPagetList(param);
         //字典翻译
         Map<String, Map<String, String>> dictMaps = dictService.getDictMapsByTypes(DictConstants.SCENE_TYPE + "," + DictConstants.SCENE_IMPORT_STATUS);
-        list.forEach(po ->{
+        list.forEach(po -> {
             po.setSceneType(dictMaps.get(DictConstants.SCENE_TYPE).get(po.getSceneType()));
             po.setStatus(dictMaps.get(DictConstants.SCENE_IMPORT_STATUS).get(po.getStatus()));
         });

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

@@ -5,30 +5,35 @@
 
     <insert id="saveStandardsRegulations" parameterType="api.common.pojo.po.scene.StandardsRegulationsPO">
         insert into simulation.scene_standards_regulations
-        (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)
-        values (#{regulationsId,jdbcType=VARCHAR},#{sceneName,jdbcType=VARCHAR},#{regulationType,jdbcType=VARCHAR}, #{standardType,jdbcType=VARCHAR},
-
-       #{createUserId,jdbcType=VARCHAR},#{createTime},#{modifyUserId,jdbcType=VARCHAR},#{modifyTime},
-        #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR},#{videoPreview,jdbcType=VARCHAR},#{videoAddress,jdbcType=VARCHAR},#{osgbAddress,jdbcType=VARCHAR},
-        #{xmlAddress,jdbcType=VARCHAR}, #{xodrAddress,jdbcType=VARCHAR},#{jsonAddress,jdbcType=VARCHAR},#{maxTime,jdbcType=VARCHAR})
+        (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)
+        values (#{regulationsId,jdbcType=VARCHAR}, #{sceneName,jdbcType=VARCHAR}, #{regulationType,jdbcType=VARCHAR},
+                #{standardType,jdbcType=VARCHAR},
+                #{createUserId,jdbcType=VARCHAR}, #{createTime}, #{modifyUserId,jdbcType=VARCHAR}, #{modifyTime},
+                #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{videoPreview,jdbcType=VARCHAR},
+                #{videoAddress,jdbcType=VARCHAR}, #{osgbAddress,jdbcType=VARCHAR},
+                #{xmlAddress,jdbcType=VARCHAR}, #{xodrAddress,jdbcType=VARCHAR}, #{jsonAddress,jdbcType=VARCHAR},
+                #{maxTime,jdbcType=VARCHAR})
     </insert>
 
     <insert id="saveStandardsRegulationsList" parameterType="java.util.List">
         insert into simulation.scene_standards_regulations
         (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,
+        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.regulationsId,jdbcType=VARCHAR},#{item.sceneName,jdbcType=VARCHAR},#{item.regulationType,jdbcType=VARCHAR}, #{item.standardType,jdbcType=VARCHAR},
+            (#{item.regulationsId,jdbcType=VARCHAR},#{item.sceneName,jdbcType=VARCHAR},#{item.regulationType,jdbcType=VARCHAR},
+            #{item.standardType,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>
 
@@ -42,9 +47,9 @@
         xml_address,xodr_address,json_address,video_preview,max_time
         from simulation.scene_standards_regulations
         <where>
-        (is_deleted = '0'
-        <if test=
-            "sceneName != null and sceneName != ''">
+            (is_deleted = '0'
+            <if test=
+                        "sceneName != null and sceneName != ''">
                 and scene_name like CONCAT('%',#{sceneName,jdbcType=VARCHAR},'%')
             </if>
             <if test="regulationType != null and regulationType.size()>0">
@@ -78,7 +83,7 @@
                     #{item}
                 </foreach>
             </if>
-           )
+            )
             <if test="label != null and label.size()>0">
                 or (regulation_type in
                 <foreach collection="label" item="item" index="index"
@@ -88,7 +93,7 @@
                 and is_deleted = '0')
             </if>
         </where>
-            order by modify_time desc
+        order by modify_time desc
 
     </select>
 
@@ -111,7 +116,7 @@
             </if>
 
             <if test="label != null and label.size()>0">
-               and regulation_type in
+                and regulation_type in
                 <foreach collection="label" item="item" index="index"
                          separator="," open="(" close=")">
                     #{item}
@@ -139,26 +144,31 @@
 
     <select id="queryStandardsRegulationsByName" parameterType="java.lang.String"
             resultType="java.lang.String">
-        select
-        regulations_id
+        select regulations_id
         from simulation.scene_standards_regulations
         where is_deleted = '0'
-     and scene_name =#{sceneName,jdbcType=VARCHAR}
+          and scene_name = #{sceneName,jdbcType=VARCHAR}
 
     </select>
 
     <update id="updateStandardsRegulations" parameterType="api.common.pojo.po.scene.StandardsRegulationsPO">
         update simulation.scene_standards_regulations
-        set scene_name=#{sceneName},regulation_type=#{regulationType},
-        standard_type=#{standardType},modify_user_id=#{modifyUserId},
-        modify_time=#{modifyTime},video_address=#{videoAddress},
-        osgb_address=#{osgbAddress},xml_address=#{xmlAddress},
-        xodr_address=#{xodrAddress},json_address=#{jsonAddress},max_time=#{maxTime}
+        set scene_name=#{sceneName},
+            regulation_type=#{regulationType},
+            standard_type=#{standardType},
+            modify_user_id=#{modifyUserId},
+            modify_time=#{modifyTime},
+            video_address=#{videoAddress},
+            osgb_address=#{osgbAddress},
+            xml_address=#{xmlAddress},
+            xodr_address=#{xodrAddress},
+            json_address=#{jsonAddress},
+            max_time=#{maxTime}
         where regulations_id = #{regulationsId,jdbcType=VARCHAR}
     </update>
     <update id="updateStandardsRegulationsList" parameterType="java.util.List">
         <foreach collection="list" index="index" item="item" separator=";">
-        update simulation.scene_standards_regulations
+            update simulation.scene_standards_regulations
             set scene_name=#{item.sceneName},regulation_type=#{item.regulationType},
             standard_type=#{item.standardType},modify_user_id=#{item.modifyUserId},
             modify_time=#{item.modifyTime},video_address=#{item.videoAddress},
@@ -179,7 +189,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='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
+        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
         <where>
             (is_deleted = '0'
             <if test=
@@ -231,7 +242,8 @@
 
     </select>
 
-    <select id="queryStandardsRegulationsListByBqAndQx" parameterType="api.common.pojo.param.scene.StandardsRegulationsParam"
+    <select id="queryStandardsRegulationsListByBqAndQx"
+            parameterType="api.common.pojo.param.scene.StandardsRegulationsParam"
             resultType="api.common.pojo.po.scene.StandardsRegulationsPO">
         select
         regulations_id,scene_name,regulation_type,standard_type,
@@ -242,7 +254,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='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
+        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
         <where>
             is_deleted = '0'
             <if test="AllIds != null and AllIds.size()>0">