Merge remote-tracking branch 'origin/master'

api-common/src/main/java/api/common/pojo/constants/LogConstants.java

@@ -38,6 +38,7 @@ public class LogConstants {
     public static final String SYS_LOG_VEHICLE_UPDATE = "0402";//车辆模板管理-修改
     public static final String SYS_LOG_VEHICLE_DEL = "0403";//车辆模板管理-删除
     public static final String SYS_LOG_SCENE_TASK = "05";//场景上传
+    public static final String SYS_LOG_SCENE_TASK_INSERT = "0501";//上传场景
     public static final String SYS_LOG_SCENE = "06";//场景库管理
     public static final String SYS_LOG_SCENE_INSERT = "0601";//场景库管理-编辑即新增
     public static final String SYS_LOG_SCENE_DELETE = "0602";//场景库管理-删除

simulation-resource-server/src/main/java/com/css/simulation/resource/log/service/LogService.java

@@ -289,4 +289,4 @@ public class LogService {
             e.printStackTrace();
         }
     }
-    }
+}

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

@@ -765,7 +765,7 @@ public class SceneAccidentService {
             Map<String,String>  mapType= dictService.getDictMapByType(DictConstants.SCENE_TYPE);
             String type= mapType.get(DictConstants.SCENE_ACCIDENT);
             String content="创建"+type+"上传任务:"+sceneImportPO.getName()+"(ID:"+sceneImportPO.getId()+")";
-            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK,content);
+            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT,content);
 
             return sceneImportPO;
         }catch (Exception e){

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

@@ -617,7 +617,7 @@ public class SceneNaturalService {
             Map<String,String>  mapType= dictService.getDictMapByType(DictConstants.SCENE_TYPE);
             String type= mapType.get(DictConstants.SCENE_NATURAL);
             String content="创建"+type+"上传任务:"+sceneImportPO.getName()+"(ID:"+sceneImportPO.getId()+")";
-            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK,content);
+            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT,content);
             return sceneImportPO;
         }catch (Exception e){
             sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);

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

@@ -311,7 +311,7 @@ public class StandardsRegulationsService {
             Map<String,String>  mapType= dictService.getDictMapByType(DictConstants.SCENE_TYPE);
             String type= mapType.get(DictConstants.SCENE_STANDARD);
             String content="创建"+type+"上传任务:"+sceneImportPO.getName()+"(ID:"+sceneImportPO.getId()+")";
-            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK,content);
+            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT,content);
             return sceneImportPO;
         }catch (Exception e){
             sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);

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

@@ -1,6 +1,7 @@
 package com.css.simulation.resource.system.service;
 
 import api.common.pojo.constants.DictConstants;
+import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.system.SceneImportPageParam;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
@@ -9,6 +10,7 @@ import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.common.utils.PoUtil;
+import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.system.mapper.SceneImportMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,9 @@ public class SceneImportService {
     @Autowired
     DictService dictService;
 
+    @Autowired
+    LogService logService;
+
     @Autowired
     SceneImportMapper sceneImportMapper;
 
@@ -40,6 +45,11 @@ public class SceneImportService {
         if(ObjectUtil.isNull(id)) {//新增
             po.setId(StringUtil.getRandomUUID());
             sceneImportMapper.insert(po);
+            //记录日志
+            Map<String,String>  dictMap = dictService.getDictMapByType(DictConstants.SCENE_TYPE);
+            String type= dictMap.get(DictConstants.SCENE_ACCIDENT);
+            String content = "创建" + type + "上传任务:" + po.getName() + "(ID:" + po.getId() + ")";
+            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT,content);
         }else{
             sceneImportMapper.update(po);
         }