泛化加上传日志

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

@@ -4,24 +4,21 @@ import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.scene.SceneGeneralTemplateParam;
-import api.common.pojo.po.scene.SceneGeneralDataPO;
 import api.common.pojo.po.scene.SceneGeneralExamplePO;
 import api.common.pojo.po.scene.SceneGeneralTemplatePO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
-import api.common.util.HttpUtil;
-import api.common.util.JsonUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.feign.FileDownService;
+import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.scene.service.SceneGeneralExampleService;
 import com.css.simulation.resource.scene.service.SceneGeneralTemplateService;
+import com.css.simulation.resource.system.service.DictService;
 import com.css.simulation.resource.system.service.SceneImportService;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
-import org.apache.http.client.config.RequestConfig;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
@@ -29,9 +26,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -50,7 +44,10 @@ public class SceneGeneralTemplateController {
     private FileDownService fileDownService;
     @Resource
     SceneImportService sceneImportService;
-
+    @Autowired
+    LogService logService;
+    @Autowired
+    DictService dictService;
     //查询列表
     @PostMapping("/querySceneGeneralTemplateList")
     @ResponseBody
@@ -232,6 +229,13 @@ public class SceneGeneralTemplateController {
         sceneImportPO.setName(taskName);
         sceneImportPO.setSceneType("4");
        sceneImportPO=sceneImportService.saveTask(sceneImportPO);
+       //记录日志
+        Map<String,String>  mapType= dictService.getDictMapByType(DictConstants.SCENE_TYPE);
+        String type= mapType.get(DictConstants.SCENE_GENERAL);
+        String content="创建"+type+"上传任务:"+sceneImportPO.getName()+"(ID:"+sceneImportPO.getId()+")";
+        logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_TASK_INSERT,content);
+
+
         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
 
         File file = null;

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

@@ -21,14 +21,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.fileupload.FileItem;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
 
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -761,11 +758,6 @@ public class SceneAccidentService {
             sceneImportPO.setFalseNum(falseNum);
             sceneImportPO.setErrorMessage(errorMessage);
            // sceneImportTaskService.updateSceneImportTask(sceneImportTaskPO);
-            //记录日志
-            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_INSERT,content);
 
             return sceneImportPO;
         }catch (Exception e){

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

@@ -613,11 +613,6 @@ public class SceneNaturalService {
             sceneImportPO.setSuccessNum(successNum);
             sceneImportPO.setFalseNum(falseNum);
             sceneImportPO.setErrorMessage(errorMessage);
-            //记录日志
-            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_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

@@ -100,10 +100,7 @@ public class StandardsRegulationsService {
             standardsRegulationsPO.setModifyTime(TimeUtil.getNowForMysql());
             standardsRegulationsPO.setModifyUserId(AuthUtil.getCurrentUserId());
             standardsRegulationsMapper.updateStandardsRegulations(standardsRegulationsPO);
-
         }
-
-
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
@@ -117,8 +114,6 @@ public class StandardsRegulationsService {
             params.setBq("1");
         }
         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")){
@@ -307,11 +302,6 @@ public class StandardsRegulationsService {
             sceneImportPO.setSuccessNum(successNum);
             sceneImportPO.setFalseNum(falseNum);
             sceneImportPO.setErrorMessage(errorMessage);
-            //记录日志
-            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_INSERT,content);
             return sceneImportPO;
         }catch (Exception e){
             sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);