mlx

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

@@ -55,7 +55,7 @@ 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);
@@ -133,9 +133,9 @@ public class SystemScenePackageController {
     // 查询勾选场景数量
     @PostMapping("/querySystemScenePackageListByTJ")
     @ResponseBody
-    public ResponseBodyVO<List<Map>> querySystemScenePackageListByTJ(@RequestBody SystemScenePackageParam parms) {
+    public ResponseBodyVO<List<Map<String, String>>> querySystemScenePackageListByTJ(@RequestBody SystemScenePackageParam parms) {
         if (ObjectUtil.isNull(parms.getPackageNames())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数packageNames不能为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数packageNames不能为空，请检查");
         }
 
         return systemScenePackageService.querySystemScenePackageListByTJ(parms);

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

@@ -8,6 +8,7 @@ import api.common.pojo.po.scene.*;
 import api.common.pojo.vo.scene.SystemScenePackageVO;
 import api.common.pojo.vo.scene.SystemUserSceneVO;
 import api.common.pojo.vo.scene.UserSceneVO;
+import api.common.util.CollectionUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
@@ -46,32 +47,33 @@ public class SystemScenePackageService {
     SceneNaturalMapper sceneNaturalMapper;
     @Resource
     StandardsRegulationsMapper standardsRegulationsMapper;
+
     /**
      * 场景包录入
      */
     @SneakyThrows
-    public ResponseBodyVO<String>  saveSystemScenePackage(SystemScenePackageNewPO params) {
+    public ResponseBodyVO<String> saveSystemScenePackage(SystemScenePackageNewPO params) {
 
-        SystemScenePackagePO  po=new SystemScenePackagePO();
+        SystemScenePackagePO po = new SystemScenePackagePO();
         //场景包名称不允许重复
-      String packageId=  systemScenePackageMapper.queryScenePackageByPackageName(params);
-      if(ObjectUtil.isNotNull(packageId)){
-          return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该场景包名称已存在，请检查");
-      }
+        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();
+        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) {
-                SystemScenePackageSublistPO zrPo=new SystemScenePackageSublistPO();
+        List<String> zrSceneNames = params.getZrSceneNames();
+        if (ObjectUtil.isNotNull(zrSceneNames)) {
+            List<SystemScenePackageSublistPO> zrList = new ArrayList<>();
+            for (String zrSceneName : zrSceneNames) {
+                SystemScenePackageSublistPO zrPo = new SystemScenePackageSublistPO();
                 zrPo.setSublistId(StringUtil.getRandomUUID());
                 zrPo.setSceneType("1");
                 zrPo.setSceneName(zrSceneName);
@@ -85,11 +87,11 @@ public class SystemScenePackageService {
             systemScenePackageSublistMapper.saveSystemScenePackageSublist(zrList);
         }
 //zr
-        List<String> bzSceneNames=params.getBzSceneNames();
-        if(ObjectUtil.isNotNull(bzSceneNames)){
-            List<SystemScenePackageSublistPO> bzList=new ArrayList<>();
-            for (String bzSceneName:bzSceneNames) {
-                SystemScenePackageSublistPO bzPo=new SystemScenePackageSublistPO();
+        List<String> bzSceneNames = params.getBzSceneNames();
+        if (ObjectUtil.isNotNull(bzSceneNames)) {
+            List<SystemScenePackageSublistPO> bzList = new ArrayList<>();
+            for (String bzSceneName : bzSceneNames) {
+                SystemScenePackageSublistPO bzPo = new SystemScenePackageSublistPO();
                 bzPo.setSublistId(StringUtil.getRandomUUID());
                 bzPo.setSceneType("2");
                 bzPo.setSceneName(bzSceneName);
@@ -103,11 +105,11 @@ public class SystemScenePackageService {
             systemScenePackageSublistMapper.saveSystemScenePackageSublist(bzList);
         }
         //zr
-        List<String> jtSceneNames=params.getJtSceneNames();
-        if(ObjectUtil.isNotNull(jtSceneNames)){
-            List<SystemScenePackageSublistPO> jtList=new ArrayList<>();
-            for (String jtSceneName:jtSceneNames) {
-                SystemScenePackageSublistPO jtPo=new SystemScenePackageSublistPO();
+        List<String> jtSceneNames = params.getJtSceneNames();
+        if (ObjectUtil.isNotNull(jtSceneNames)) {
+            List<SystemScenePackageSublistPO> jtList = new ArrayList<>();
+            for (String jtSceneName : jtSceneNames) {
+                SystemScenePackageSublistPO jtPo = new SystemScenePackageSublistPO();
                 jtPo.setSublistId(StringUtil.getRandomUUID());
                 jtPo.setSceneType("3");
                 jtPo.setSceneName(jtSceneName);
@@ -121,11 +123,11 @@ public class SystemScenePackageService {
             systemScenePackageSublistMapper.saveSystemScenePackageSublist(jtList);
         }
         //zr
-        List<String> fhSceneNames=params.getFhSceneNames();
-        if(ObjectUtil.isNotNull(fhSceneNames)){
-            List<SystemScenePackageSublistPO> fhList=new ArrayList<>();
-            for (String fhSceneName:fhSceneNames) {
-                SystemScenePackageSublistPO fhPo=new SystemScenePackageSublistPO();
+        List<String> fhSceneNames = params.getFhSceneNames();
+        if (ObjectUtil.isNotNull(fhSceneNames)) {
+            List<SystemScenePackageSublistPO> fhList = new ArrayList<>();
+            for (String fhSceneName : fhSceneNames) {
+                SystemScenePackageSublistPO fhPo = new SystemScenePackageSublistPO();
                 fhPo.setSublistId(StringUtil.getRandomUUID());
                 fhPo.setIsDeleted("0");
                 fhPo.setSceneType("4");
@@ -141,25 +143,26 @@ public class SystemScenePackageService {
         systemScenePackageMapper.saveSystemScenePackage(po);
 
         //记录场景包新增
-        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_INSERT, po,null);
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_INSERT, po, null);
 
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
+
     //场景包列表
     @SneakyThrows
     public List<SystemScenePackageVO> querySystemScenePackageList(SystemScenePackageParam params) {
         List<SystemScenePackageVO> list = systemScenePackageMapper.querySystemScenePackageList(params);
-        for (SystemScenePackageVO vo:list) {
-            SystemScenePackageSublistPO sublistPo=new SystemScenePackageSublistPO();
+        for (SystemScenePackageVO vo : list) {
+            SystemScenePackageSublistPO sublistPo = new SystemScenePackageSublistPO();
             sublistPo.setSceneAndPackage(vo.getId());
             sublistPo.setSceneType("1");
-            List<String>  zrList=systemScenePackageSublistMapper.querySceneNaturalList(sublistPo);
+            List<String> zrList = systemScenePackageSublistMapper.querySceneNaturalList(sublistPo);
             sublistPo.setSceneType("2");
-            List<String>  bzList=systemScenePackageSublistMapper.querySceneStandardsRegulationsList(sublistPo);
+            List<String> bzList = systemScenePackageSublistMapper.querySceneStandardsRegulationsList(sublistPo);
             sublistPo.setSceneType("3");
-            List<String>  jtList=systemScenePackageSublistMapper.querySceneAccidentList(sublistPo);
+            List<String> jtList = systemScenePackageSublistMapper.querySceneAccidentList(sublistPo);
             sublistPo.setSceneType("4");
-            List<String>  fhList=systemScenePackageSublistMapper.querySceneGeneralTemplateList(sublistPo);
+            List<String> fhList = systemScenePackageSublistMapper.querySceneGeneralTemplateList(sublistPo);
             vo.setZrCount(zrList.size());
             vo.setBzCount(bzList.size());
             vo.setJtCount(jtList.size());
@@ -169,21 +172,22 @@ public class SystemScenePackageService {
 
         return list;
     }
+
     //
     @SneakyThrows
     public SystemScenePackageNewPO querySystemScenePackageById(SystemScenePackageParam params) {
-        SystemScenePackageNewPO newPo=new SystemScenePackageNewPO();
+        SystemScenePackageNewPO newPo = new SystemScenePackageNewPO();
         SystemScenePackagePO po = systemScenePackageMapper.querySystemScenePackageById(params);
-        SystemScenePackageSublistPO sublistPo=new SystemScenePackageSublistPO();
+        SystemScenePackageSublistPO sublistPo = new SystemScenePackageSublistPO();
         sublistPo.setSceneAndPackage(params.getId());
         sublistPo.setSceneType("1");
-       List<String>  zrList=systemScenePackageSublistMapper.querySceneNaturalList(sublistPo);
+        List<String> zrList = systemScenePackageSublistMapper.querySceneNaturalList(sublistPo);
         sublistPo.setSceneType("2");
-        List<String>  bzList=systemScenePackageSublistMapper.querySceneStandardsRegulationsList(sublistPo);
+        List<String> bzList = systemScenePackageSublistMapper.querySceneStandardsRegulationsList(sublistPo);
         sublistPo.setSceneType("3");
-        List<String>  jtList=systemScenePackageSublistMapper.querySceneAccidentList(sublistPo);
+        List<String> jtList = systemScenePackageSublistMapper.querySceneAccidentList(sublistPo);
         sublistPo.setSceneType("4");
-        List<String>  fhList=systemScenePackageSublistMapper.querySceneGeneralTemplateList(sublistPo);
+        List<String> fhList = systemScenePackageSublistMapper.querySceneGeneralTemplateList(sublistPo);
         BeanUtils.copyProperties(po, newPo);
         newPo.setZrSceneNames(zrList);
         newPo.setBzSceneNames(bzList);
@@ -191,50 +195,51 @@ public class SystemScenePackageService {
         newPo.setFhSceneNames(fhList);
 
         //场景包多少用户
-        List<UserSceneVO> userIds=systemUserSceneMapper.queryUserByPackageId(params.getId());
+        List<UserSceneVO> userIds = systemUserSceneMapper.queryUserByPackageId(params.getId());
         newPo.setUserIds(userIds);
         return newPo;
     }
+
     //编辑场景包
     @SneakyThrows
-    public ResponseBodyVO<String>  updateSystemScenePackage(SystemScenePackageNewPO params) {
+    public ResponseBodyVO<String> updateSystemScenePackage(SystemScenePackageNewPO params) {
         //场景包名称不允许重复
-        String packageId=  systemScenePackageMapper.queryScenePackageByPackageName(params);
-        if(ObjectUtil.isNotNull(packageId)){
+        String packageId = systemScenePackageMapper.queryScenePackageByPackageName(params);
+        if (ObjectUtil.isNotNull(packageId)) {
             return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该场景包名称已存在，请检查");
         }
-        SystemScenePackagePO  po=new SystemScenePackagePO();
+        SystemScenePackagePO po = new SystemScenePackagePO();
         po.setPackageName(params.getPackageName());
         po.setSceneDescribe(params.getSceneDescribe());
-        String packId=params.getId();
+        String packId = params.getId();
         po.setId(packId);
         //删除之前的子表
-        SystemScenePackageSublistPO sublistPO=new SystemScenePackageSublistPO();
+        SystemScenePackageSublistPO sublistPO = new SystemScenePackageSublistPO();
         sublistPO.setModifyTime(TimeUtil.getNowForMysql());
         sublistPO.setModifyUserId(AuthUtil.getCurrentUserId());
         sublistPO.setSceneAndPackage(packId);
         sublistPO.setIsDeleted("1");
         systemScenePackageSublistMapper.deleteSystemScenePackageSublist(sublistPO);
         //zr
-        List<String> zrIds=params.getZrSceneNames();
-        if(ObjectUtil.isNotNull(zrIds)){
-            List<SystemScenePackageSublistPO> zrList=new ArrayList<>();
-            for (String id:zrIds) {
+        List<String> zrIds = params.getZrSceneNames();
+        if (ObjectUtil.isNotNull(zrIds)) {
+            List<SystemScenePackageSublistPO> zrList = new ArrayList<>();
+            for (String id : zrIds) {
                 //加共有
-                SceneNaturalPO paramPo=new SceneNaturalPO();
+                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());
+                    log.info("场景包新增场景----" + syPo.getShare());
                     // -------------------------------- 保存数据到 mysql --------------------------------
                     syPo.setCreateTime(TimeUtil.getNowForMysql());
                     syPo.setCreateUserId(AuthUtil.getCurrentUserId());
                     syPo.setModifyTime(TimeUtil.getNowForMysql());
                     syPo.setModifyUserId("");
-                    syPo.setNaturalId( StringUtil.getRandomUUID());
+                    syPo.setNaturalId(StringUtil.getRandomUUID());
                     sceneNaturalMapper.saveSceneNatural(syPo);
                 } else {
 
@@ -244,11 +249,11 @@ public class SystemScenePackageService {
                     syPo.setShare(gyPo.getShare());
                     syPo.setNaturalId(gyPo.getNaturalId());
                     sceneNaturalMapper.updateSceneNatural(syPo);
-                    log.info("场景包修改场景----"+syPo.getShare());
+                    log.info("场景包修改场景----" + syPo.getShare());
                 }
 
 
-                SystemScenePackageSublistPO zrPo=new SystemScenePackageSublistPO();
+                SystemScenePackageSublistPO zrPo = new SystemScenePackageSublistPO();
                 zrPo.setSublistId(StringUtil.getRandomUUID());
                 zrPo.setSceneType("1");
                 zrPo.setSceneName(id);
@@ -262,25 +267,25 @@ public class SystemScenePackageService {
             systemScenePackageSublistMapper.saveSystemScenePackageSublist(zrList);
         }
 //zr
-        List<String> bzIds=params.getBzSceneNames();
-        if(ObjectUtil.isNotNull(bzIds)){
-            List<SystemScenePackageSublistPO> bzList=new ArrayList<>();
-            for (String id:bzIds) {
-                StandardsRegulationsPO standardsRegulationsPO=new StandardsRegulationsPO();
+        List<String> bzIds = params.getBzSceneNames();
+        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);
+                StandardsRegulationsPO standardsRegulationsPOSy = standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPO);
                 standardsRegulationsPOSy.setShare("2");
-                StandardsRegulationsPO StandardsRegulationsByName= standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPOSy);
-               // standardsRegulationsPOSy.setShare("1");
+                StandardsRegulationsPO StandardsRegulationsByName = standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPOSy);
+                // standardsRegulationsPOSy.setShare("1");
                 //是否已存在
-                if(ObjectUtil.isNotNull(StandardsRegulationsByName)){
+                if (ObjectUtil.isNotNull(StandardsRegulationsByName)) {
                     standardsRegulationsPOSy.setRegulationsId(StandardsRegulationsByName.getRegulationsId());
                     standardsRegulationsPOSy.setModifyTime(TimeUtil.getNowForMysql());
                     standardsRegulationsPOSy.setModifyUserId(AuthUtil.getCurrentUserId());
                     standardsRegulationsPOSy.setShare(StandardsRegulationsByName.getShare());
                     standardsRegulationsMapper.updateStandardsRegulations(standardsRegulationsPOSy);
-                }else{
+                } else {
                     standardsRegulationsPOSy.setRegulationsId(StringUtil.getRandomUUID());
                     standardsRegulationsPOSy.setCreateTime(TimeUtil.getNowForMysql());
                     standardsRegulationsPOSy.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -290,7 +295,7 @@ public class SystemScenePackageService {
                 }
 
 
-                SystemScenePackageSublistPO bzPo=new SystemScenePackageSublistPO();
+                SystemScenePackageSublistPO bzPo = new SystemScenePackageSublistPO();
                 bzPo.setSublistId(StringUtil.getRandomUUID());
                 bzPo.setSceneType("2");
                 bzPo.setIsDeleted("0");
@@ -304,25 +309,25 @@ public class SystemScenePackageService {
             systemScenePackageSublistMapper.saveSystemScenePackageSublist(bzList);
         }
         //zr
-        List<String> jtIds=params.getJtSceneNames();
-        if(ObjectUtil.isNotNull(jtIds)){
-            List<SystemScenePackageSublistPO> jtList=new ArrayList<>();
-            for (String id:jtIds) {
-                SceneAccidentPO sceneAccidentPO=new SceneAccidentPO();
+        List<String> jtIds = params.getJtSceneNames();
+        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);
+                SceneAccidentPO sceneAccidentPOSy = sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPO);
                 sceneAccidentPOSy.setShare("2");
-                SceneAccidentPO sceneAccidentPOByName=  sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPOSy);
+                SceneAccidentPO sceneAccidentPOByName = sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPOSy);
                 //sceneAccidentPOSy.setShare("1");
                 //是否已存在
-                if(ObjectUtil.isNotNull(sceneAccidentPOByName)){
+                if (ObjectUtil.isNotNull(sceneAccidentPOByName)) {
                     sceneAccidentPOSy.setAccidentId(sceneAccidentPOByName.getAccidentId());
                     sceneAccidentPOSy.setModifyTime(TimeUtil.getNowForMysql());
                     sceneAccidentPOSy.setModifyUserId(AuthUtil.getCurrentUserId());
                     sceneAccidentPOSy.setShare(sceneAccidentPOByName.getShare());
                     sceneAccidentMapper.updateSceneAccident(sceneAccidentPOSy);
-                }else{
+                } else {
                     sceneAccidentPOSy.setAccidentId(StringUtil.getRandomUUID());
                     sceneAccidentPOSy.setCreateTime(TimeUtil.getNowForMysql());
                     sceneAccidentPOSy.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -331,7 +336,7 @@ public class SystemScenePackageService {
                     sceneAccidentMapper.saveSceneAccident(sceneAccidentPOSy);
                 }
 
-                SystemScenePackageSublistPO jtPo=new SystemScenePackageSublistPO();
+                SystemScenePackageSublistPO jtPo = new SystemScenePackageSublistPO();
                 jtPo.setSublistId(StringUtil.getRandomUUID());
                 jtPo.setSceneType("3");
                 jtPo.setIsDeleted("0");
@@ -345,25 +350,25 @@ public class SystemScenePackageService {
             systemScenePackageSublistMapper.saveSystemScenePackageSublist(jtList);
         }
         //zr
-        List<String> fhIds=params.getFhSceneNames();
-        if(ObjectUtil.isNotNull(fhIds)){
-            List<SystemScenePackageSublistPO> fhList=new ArrayList<>();
-            for (String id:fhIds) {
-                SceneGeneralTemplatePO sceneGeneralTemplatePO=new SceneGeneralTemplatePO();
+        List<String> fhIds = params.getFhSceneNames();
+        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);
+                SceneGeneralTemplatePO sceneGeneralTemplatePOSy = sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePO);
                 sceneGeneralTemplatePOSy.setShare("2");
-                SceneGeneralTemplatePO sceneGeneralTemplatePOByName=  sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePOSy);
-               // sceneGeneralTemplatePOSy.setShare("1");
+                SceneGeneralTemplatePO sceneGeneralTemplatePOByName = sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePOSy);
+                // sceneGeneralTemplatePOSy.setShare("1");
                 //是否已存在
-                if(ObjectUtil.isNotNull(sceneGeneralTemplatePOByName)){
+                if (ObjectUtil.isNotNull(sceneGeneralTemplatePOByName)) {
                     sceneGeneralTemplatePOSy.setShare(sceneGeneralTemplatePOByName.getShare());
                     sceneGeneralTemplatePOSy.setId(sceneGeneralTemplatePOByName.getId());
                     sceneGeneralTemplatePOSy.setModifyTime(TimeUtil.getNowForMysql());
                     sceneGeneralTemplatePOSy.setModifyUserId(AuthUtil.getCurrentUserId());
                     sceneGeneralTemplateMapper.updateSceneGeneralTemplate(sceneGeneralTemplatePOSy);
-                }else{
+                } else {
                     sceneGeneralTemplatePOSy.setId(StringUtil.getRandomUUID());
                     sceneGeneralTemplatePOSy.setCreateTime(TimeUtil.getNowForMysql());
                     sceneGeneralTemplatePOSy.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -373,7 +378,7 @@ public class SystemScenePackageService {
                 }
 
 
-                SystemScenePackageSublistPO fhPo=new SystemScenePackageSublistPO();
+                SystemScenePackageSublistPO fhPo = new SystemScenePackageSublistPO();
                 fhPo.setSublistId(StringUtil.getRandomUUID());
                 fhPo.setSceneType("4");
                 fhPo.setIsDeleted("0");
@@ -392,10 +397,11 @@ public class SystemScenePackageService {
         systemScenePackageMapper.updateSystemScenePackage(po);
 
         //记录场景包修改
-        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_UPDATE, po,null);
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_UPDATE, po, null);
 
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
+
     //删除场景包
     @SneakyThrows
     public void deleteSystemScenePackage(SystemScenePackagePO params) {
@@ -403,23 +409,23 @@ public class SystemScenePackageService {
         params.setModifyTime(TimeUtil.getNowForMysql());
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         systemScenePackageMapper.deleteSystemScenePackage(params);
-        SystemUserScenePO po=new SystemUserScenePO();
+        SystemUserScenePO po = new SystemUserScenePO();
         po.setPackageId(params.getId());
         po.setIsDeleted("1");
         po.setModifyTime(TimeUtil.getNowForMysql());
         po.setModifyUserId(AuthUtil.getCurrentUserId());
         systemUserSceneMapper.deleteSystemUserScene(po);
         //记录场景包删除
-        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DELETE, params,null);
-
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DELETE, params, null);
 
 
     }
+
     //根据场景包查询配置账号
     @SneakyThrows
     public SystemUserSceneVO queryUserByPackageId(SystemScenePackageNewPO params) {
-        SystemUserSceneVO VO=new SystemUserSceneVO();
-        List<UserSceneVO> userIds=systemUserSceneMapper.queryUserByPackageId(params.getId());
+        SystemUserSceneVO VO = new SystemUserSceneVO();
+        List<UserSceneVO> userIds = systemUserSceneMapper.queryUserByPackageId(params.getId());
         VO.setPackageId(params.getId());
         VO.setUserIds(userIds);
         return VO;
@@ -428,10 +434,10 @@ public class SystemScenePackageService {
     //根据场景包添加配置账号
     @SneakyThrows
     public void saveUserByPackageId(SystemUserSceneParam params) {
-        List<UserSceneVO> userIds=params.getUserIds();
-        List<SystemUserScenePO>  list=new ArrayList<>();
-        for (UserSceneVO userScene:userIds){
-            SystemUserScenePO po=new SystemUserScenePO();
+        List<UserSceneVO> userIds = params.getUserIds();
+        List<SystemUserScenePO> list = new ArrayList<>();
+        for (UserSceneVO userScene : userIds) {
+            SystemUserScenePO po = new SystemUserScenePO();
             po.setPackageId(params.getPackageId());
             po.setId(StringUtil.getRandomUUID());
             po.setCreateTime(TimeUtil.getNowForMysql());
@@ -443,14 +449,15 @@ public class SystemScenePackageService {
         }
         systemUserSceneMapper.saveSystemUserScene(list);
         //记录日志
-       logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION, null,params);
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION, null, params);
     }
+
     //根据场景包删除配置账号
     @SneakyThrows
     public void deleteUserByPackageId(SystemUserSceneParam params) {
-        List<UserSceneVO> userIds=params.getUserIds();
-        for (UserSceneVO userScene:userIds){
-            SystemUserScenePO po=new SystemUserScenePO();
+        List<UserSceneVO> userIds = params.getUserIds();
+        for (UserSceneVO userScene : userIds) {
+            SystemUserScenePO po = new SystemUserScenePO();
             po.setPackageId(params.getPackageId());
             po.setModifyTime(TimeUtil.getNowForMysql());
             po.setModifyUserId(AuthUtil.getCurrentUserId());
@@ -459,19 +466,20 @@ public class SystemScenePackageService {
             systemUserSceneMapper.deleteSystemUserScene(po);
         }
         //记录日志
-        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION_DELETE, null,params);
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION_DELETE, null, params);
     }
+
     //人员表查询测试包详情
     @SneakyThrows
-    public  Map queryPackageByUserId(SystemScenePackageParam param ) {
-       Map map=systemScenePackageMapper.queryPackageByUserId(param);
-       if(ObjectUtil.isNotNull(map.get("packageNames"))){
-           String ids=map.get("packageNames").toString();
-           if(ObjectUtil.isNotNull(ids)){
-               String[] idss=ids.split(",");
-               map.put("packageNames",idss);
-           }
-       }
+    public Map queryPackageByUserId(SystemScenePackageParam param) {
+        Map map = systemScenePackageMapper.queryPackageByUserId(param);
+        if (ObjectUtil.isNotNull(map.get("packageNames"))) {
+            String ids = map.get("packageNames").toString();
+            if (ObjectUtil.isNotNull(ids)) {
+                String[] idss = ids.split(",");
+                map.put("packageNames", idss);
+            }
+        }
 
         return map;
     }
@@ -483,15 +491,15 @@ public class SystemScenePackageService {
         //先删除后添加
         deletePackageByUserId(params);
 
-        List<String> packageNames=params.getPackageNames();
-        List<SystemUserScenePO>  list=new ArrayList<>();
-        SystemScenePackageNewPO systemScenePackageNewPO=new SystemScenePackageNewPO();
-        String packageCount=null;
-        for (String packageName:packageNames){
+        List<String> packageNames = params.getPackageNames();
+        List<SystemUserScenePO> list = new ArrayList<>();
+        SystemScenePackageNewPO systemScenePackageNewPO = new SystemScenePackageNewPO();
+        String packageCount = null;
+        for (String packageName : packageNames) {
             //
             systemScenePackageNewPO.setPackageName(packageName);
-            String packageId=  systemScenePackageMapper.queryScenePackageByPackageName(systemScenePackageNewPO);
-            SystemUserScenePO po=new SystemUserScenePO();
+            String packageId = systemScenePackageMapper.queryScenePackageByPackageName(systemScenePackageNewPO);
+            SystemUserScenePO po = new SystemUserScenePO();
             po.setPackageId(packageId);
             po.setId(StringUtil.getRandomUUID());
             po.setCreateTime(TimeUtil.getNowForMysql());
@@ -501,28 +509,28 @@ public class SystemScenePackageService {
             po.setUserId(params.getUserId());
             list.add(po);
 
-            if (ObjectUtil.isNull(packageCount)){
-                packageCount= packageName +"(ID:"+packageId+")";
-            }else{
-                packageCount= packageCount+"、"+packageName +"(ID:"+packageId+")";
+            if (ObjectUtil.isNull(packageCount)) {
+                packageCount = packageName + "(ID:" + packageId + ")";
+            } else {
+                packageCount = packageCount + "、" + packageName + "(ID:" + packageId + ")";
             }
         }
         systemUserSceneMapper.saveSystemUserScene(list);
 
         //记录场景包
-        logService.logSystemUserSceneByPackageId(LogConstants.SYS_LOG_PACKAGE_GRANT_INSERT, params,packageCount);
+        logService.logSystemUserSceneByPackageId(LogConstants.SYS_LOG_PACKAGE_GRANT_INSERT, params, packageCount);
     }
 
     //根据人员删除配置账号
     @SneakyThrows
     public void deletePackageByUserId(SystemUserSceneParam params) {
 
-            SystemUserScenePO po=new SystemUserScenePO();
-            po.setModifyTime(TimeUtil.getNowForMysql());
-            po.setModifyUserId(AuthUtil.getCurrentUserId());
-            po.setIsDeleted("1");
-            po.setUserId(params.getUserId());
-            systemUserSceneMapper.deleteSystemUserScene(po);
+        SystemUserScenePO po = new SystemUserScenePO();
+        po.setModifyTime(TimeUtil.getNowForMysql());
+        po.setModifyUserId(AuthUtil.getCurrentUserId());
+        po.setIsDeleted("1");
+        po.setUserId(params.getUserId());
+        systemUserSceneMapper.deleteSystemUserScene(po);
     }
 
     //配置人员场景包列表
@@ -534,32 +542,25 @@ public class SystemScenePackageService {
 
     //查询勾选场景数量
     @SneakyThrows
-    public ResponseBodyVO<List<Map>> querySystemScenePackageListByTJ(SystemScenePackageParam params) {
-       // List<Map> list = systemScenePackageMapper.querySystemScenePackageListByTJ(params);
-
-        List<String>  zrList=systemScenePackageMapper.querySceneNaturalListByTJ(params);
-        List<String>  bzList=systemScenePackageMapper.querySceneStandardsRegulationsListByTJ(params);
-        List<String>  jtList=systemScenePackageMapper.querySceneAccidentListByTJ(params);
-        List<String>  fhList=systemScenePackageMapper.querySceneGeneralTemplateListByTJ(params);
-
-        List<Map> list=new ArrayList<>();
-        Map map=new HashMap();
-        map.put("scene_type","1");
-        map.put("aaa",zrList.size());
-        Map map1=new HashMap();
-        map1.put("scene_type","2");
-        map1.put("aaa",bzList.size());
-        Map map2=new HashMap();
-        map2.put("scene_type","3");
-        map2.put("aaa",jtList.size());
-        Map map3=new HashMap();
-        map3.put("scene_type","4");
-        map3.put("aaa",fhList.size());
-        list.add(map1);
-        list.add(map2);
-        list.add(map3);
-        list.add(map);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, list);
+    public ResponseBodyVO<List<Map<String, String>>> querySystemScenePackageListByTJ(SystemScenePackageParam params) {
+        List<String> zrList = systemScenePackageMapper.querySceneNaturalListByTJ(params);
+        List<String> bzList = systemScenePackageMapper.querySceneStandardsRegulationsListByTJ(params);
+        List<String> jtList = systemScenePackageMapper.querySceneAccidentListByTJ(params);
+        List<String> fhList = systemScenePackageMapper.querySceneGeneralTemplateListByTJ(params);
+        Map<String, String> map = new HashMap<>();
+        map.put("scene_type", "1");
+        map.put("aaa", zrList.size() + "");
+        Map<String, String> map1 = new HashMap<>();
+        map1.put("scene_type", "2");
+        map1.put("aaa", bzList.size() + "");
+        Map<String, String> map2 = new HashMap<>();
+        map2.put("scene_type", "3");
+        map2.put("aaa", jtList.size() + "");
+        Map<String, String> map3 = new HashMap<>();
+        map3.put("scene_type", "4");
+        map3.put("aaa", fhList.size() + "");
+        ArrayList<Map<String, String>> arrayList = CollectionUtil.createArrayList(map1, map2, map3, map);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, arrayList);
     }
 
 
@@ -567,29 +568,29 @@ public class SystemScenePackageService {
      * 场景包录入
      */
     @SneakyThrows
-    public ResponseBodyVO<String>  saveSystemScenePackageNew(SystemScenePackageNewPO params) {
+    public ResponseBodyVO<String> saveSystemScenePackageNew(SystemScenePackageNewPO params) {
 
-        SystemScenePackagePO  po=new SystemScenePackagePO();
+        SystemScenePackagePO po = new SystemScenePackagePO();
         //场景包名称不允许重复
-        String packageId=  systemScenePackageMapper.queryScenePackageByPackageName(params);
-        if(ObjectUtil.isNotNull(packageId)){
+        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();
+        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) {
+        List<String> zrSceneNames = params.getZrSceneNames();
+        if (ObjectUtil.isNotNull(zrSceneNames)) {
+            List<SystemScenePackageSublistPO> zrList = new ArrayList<>();
+            for (String zrSceneName : zrSceneNames) {
                 //加共有
-                SceneNaturalPO paramPo=new SceneNaturalPO();
+                SceneNaturalPO paramPo = new SceneNaturalPO();
                 paramPo.setShare("0");
                 paramPo.setNaturalName(zrSceneName);
                 SceneNaturalPO syPo = sceneNaturalMapper.querySceneNaturaByName(paramPo);
@@ -601,9 +602,9 @@ public class SystemScenePackageService {
                     syPo.setCreateUserId(AuthUtil.getCurrentUserId());
                     syPo.setModifyTime(TimeUtil.getNowForMysql());
                     syPo.setModifyUserId("");
-                    syPo.setNaturalId( StringUtil.getRandomUUID());
+                    syPo.setNaturalId(StringUtil.getRandomUUID());
                     sceneNaturalMapper.saveSceneNatural(syPo);
-                    log.info("场景包新增场景1----"+syPo.getShare());
+                    log.info("场景包新增场景1----" + syPo.getShare());
                 } else {
                     // -------------------------------- 修改数据到 mysql --------------------------------
                     syPo.setModifyTime(TimeUtil.getNowForMysql());
@@ -611,11 +612,11 @@ public class SystemScenePackageService {
                     syPo.setShare(gyPo.getShare());
                     syPo.setNaturalId(gyPo.getNaturalId());
                     sceneNaturalMapper.updateSceneNatural(syPo);
-                    log.info("场景包修改场景1----"+syPo.getShare());
+                    log.info("场景包修改场景1----" + syPo.getShare());
                 }
 
 
-                SystemScenePackageSublistPO zrPo=new SystemScenePackageSublistPO();
+                SystemScenePackageSublistPO zrPo = new SystemScenePackageSublistPO();
                 zrPo.setSublistId(StringUtil.getRandomUUID());
                 zrPo.setSceneType("1");
                 zrPo.setSceneName(syPo.getNaturalName());
@@ -629,25 +630,25 @@ public class SystemScenePackageService {
             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();
+        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);
+                StandardsRegulationsPO standardsRegulationsPOSy = standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPO);
                 standardsRegulationsPOSy.setShare("2");
-                StandardsRegulationsPO StandardsRegulationsByName= standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPOSy);
-              //  standardsRegulationsPOSy.setShare("1");
+                StandardsRegulationsPO StandardsRegulationsByName = standardsRegulationsMapper.queryStandardsRegulationsByName(standardsRegulationsPOSy);
+                //  standardsRegulationsPOSy.setShare("1");
                 //是否已存在
-                if(ObjectUtil.isNotNull(StandardsRegulationsByName)){
+                if (ObjectUtil.isNotNull(StandardsRegulationsByName)) {
                     standardsRegulationsPOSy.setRegulationsId(StandardsRegulationsByName.getRegulationsId());
                     standardsRegulationsPOSy.setModifyTime(TimeUtil.getNowForMysql());
                     standardsRegulationsPOSy.setModifyUserId(AuthUtil.getCurrentUserId());
                     standardsRegulationsPOSy.setShare(StandardsRegulationsByName.getShare());
                     standardsRegulationsMapper.updateStandardsRegulations(standardsRegulationsPOSy);
-                }else{
+                } else {
                     standardsRegulationsPOSy.setRegulationsId(StringUtil.getRandomUUID());
                     standardsRegulationsPOSy.setCreateTime(TimeUtil.getNowForMysql());
                     standardsRegulationsPOSy.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -657,7 +658,7 @@ public class SystemScenePackageService {
                 }
 
 
-                SystemScenePackageSublistPO bzPo=new SystemScenePackageSublistPO();
+                SystemScenePackageSublistPO bzPo = new SystemScenePackageSublistPO();
                 bzPo.setSublistId(StringUtil.getRandomUUID());
                 bzPo.setSceneType("2");
                 bzPo.setSceneName(standardsRegulationsPOSy.getSceneName());
@@ -671,25 +672,25 @@ public class SystemScenePackageService {
             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();
+        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);
+                SceneAccidentPO sceneAccidentPOSy = sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPO);
                 sceneAccidentPOSy.setShare("2");
-                SceneAccidentPO sceneAccidentPOByName=  sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPOSy);
-               // sceneAccidentPOSy.setShare("1");
+                SceneAccidentPO sceneAccidentPOByName = sceneAccidentMapper.querySceneAccidentByNmae(sceneAccidentPOSy);
+                // sceneAccidentPOSy.setShare("1");
                 //是否已存在
-                if(ObjectUtil.isNotNull(sceneAccidentPOByName)){
+                if (ObjectUtil.isNotNull(sceneAccidentPOByName)) {
                     sceneAccidentPOSy.setAccidentId(sceneAccidentPOByName.getAccidentId());
                     sceneAccidentPOSy.setModifyTime(TimeUtil.getNowForMysql());
                     sceneAccidentPOSy.setModifyUserId(AuthUtil.getCurrentUserId());
                     sceneAccidentPOSy.setShare(sceneAccidentPOByName.getShare());
                     sceneAccidentMapper.updateSceneAccident(sceneAccidentPOSy);
-                }else{
+                } else {
                     sceneAccidentPOSy.setAccidentId(StringUtil.getRandomUUID());
                     sceneAccidentPOSy.setCreateTime(TimeUtil.getNowForMysql());
                     sceneAccidentPOSy.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -699,7 +700,7 @@ public class SystemScenePackageService {
                 }
 
 
-                SystemScenePackageSublistPO jtPo=new SystemScenePackageSublistPO();
+                SystemScenePackageSublistPO jtPo = new SystemScenePackageSublistPO();
                 jtPo.setSublistId(StringUtil.getRandomUUID());
                 jtPo.setSceneType("3");
                 jtPo.setSceneName(sceneAccidentPOSy.getSceneName());
@@ -713,25 +714,25 @@ public class SystemScenePackageService {
             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();
+        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);
+                SceneGeneralTemplatePO sceneGeneralTemplatePOSy = sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePO);
                 sceneGeneralTemplatePOSy.setShare("2");
-                SceneGeneralTemplatePO sceneGeneralTemplatePOByName=  sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePOSy);
-               // sceneGeneralTemplatePOSy.setShare("1");
+                SceneGeneralTemplatePO sceneGeneralTemplatePOByName = sceneGeneralTemplateMapper.querySceneGeneralTemplateByName(sceneGeneralTemplatePOSy);
+                // sceneGeneralTemplatePOSy.setShare("1");
                 //是否已存在
-                if(ObjectUtil.isNotNull(sceneGeneralTemplatePOByName)){
+                if (ObjectUtil.isNotNull(sceneGeneralTemplatePOByName)) {
                     sceneGeneralTemplatePOSy.setShare(sceneGeneralTemplatePOByName.getShare());
                     sceneGeneralTemplatePOSy.setId(sceneGeneralTemplatePOByName.getId());
                     sceneGeneralTemplatePOSy.setModifyTime(TimeUtil.getNowForMysql());
                     sceneGeneralTemplatePOSy.setModifyUserId(AuthUtil.getCurrentUserId());
                     sceneGeneralTemplateMapper.updateSceneGeneralTemplate(sceneGeneralTemplatePOSy);
-                }else{
+                } else {
                     sceneGeneralTemplatePOSy.setId(StringUtil.getRandomUUID());
                     sceneGeneralTemplatePOSy.setCreateTime(TimeUtil.getNowForMysql());
                     sceneGeneralTemplatePOSy.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -741,7 +742,7 @@ public class SystemScenePackageService {
                 }
 
 
-                SystemScenePackageSublistPO fhPo=new SystemScenePackageSublistPO();
+                SystemScenePackageSublistPO fhPo = new SystemScenePackageSublistPO();
                 fhPo.setSublistId(StringUtil.getRandomUUID());
                 fhPo.setIsDeleted("0");
                 fhPo.setSceneType("4");
@@ -757,7 +758,7 @@ public class SystemScenePackageService {
         systemScenePackageMapper.saveSystemScenePackage(po);
 
         //记录场景包新增
-        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_INSERT, po,null);
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_INSERT, po, null);
 
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }

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

@@ -263,14 +263,16 @@
 
     <select id="querySceneAccidentListByTJ" parameterType="api.common.pojo.param.scene.SystemScenePackageParam"
             resultType="java.lang.String">
-        select DISTINCT(a.scene_name) scene_name
-        FROM system_scene_package_sublist a join scene_accident s on a.scene_name=s.scene_name join system_scene_package
-        b on a.scene_and_package=b.id
-        where
-        a.is_deleted='0' and s.is_deleted='0' and b.is_deleted='0' and a.scene_type='3'
-        and b.package_name in
-        <foreach collection="packageNames" item="item" index="index"
-                 separator="," open="(" close=")">
+        select distinct(ssps.scene_name)
+        from system_scene_package_sublist ssps
+        join system_scene_package ssp on ssps.scene_and_package = ssp.id
+        join scene_accident sa on ssps.scene_name = sa.scene_name
+        where ssps.scene_type = '3'
+        and ssps.is_deleted = '0'
+        and ssp.is_deleted = '0'
+        and sa.is_deleted = '0'
+        and ssp.package_name in
+        <foreach collection="packageNames" item="item" index="index" separator="," open="(" close=")">
             #{item}
         </foreach>
     </select>