系统管理，场景模块代码

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

@@ -45,8 +45,10 @@ public class LogConstants {
     public static final String SYS_LOG_PACKAGE_INSERT = "0701";//场景包管理-新增
     public static final String SYS_LOG_PACKAGE_UPDATE = "0702";//场景包管理-修改
     public static final String SYS_LOG_PACKAGE_DELETE = "0703";//场景包管理-删除
+    public static final String SYS_LOG_PACKAGE_DISTRIBUTION = "0704";//场景包管理-分配场景包
+    public static final String SYS_LOG_PACKAGE_DISTRIBUTION_DELETE = "0705";//场景包管理-分配场景包移除人员
     public static final String SYS_LOG_PACKAGE_GRANT = "08";//场景包分配
-    public static final String SYS_LOG_PACKAGE_GRANT_INSERT = "0801";//场景包分配-编辑即新增
-    public static final String SYS_LOG_PACKAGE_GRANT_DELETE = "0802";//场景包分配-删除
+    public static final String SYS_LOG_PACKAGE_GRANT_INSERT = "0801";//场景包分配-分配
+
 
 }

api-common/src/main/java/api/common/pojo/param/scene/SystemUserSceneParam.java

@@ -22,5 +22,6 @@ public class SystemUserSceneParam  implements Serializable {
     private List<UserSceneVO> userIds;//用户集合
     private List<String> packageNames;//场景包集合
     private String userId;//人分配包时用
+    private String userName;//人分配包时用
     private String type;
 }

api-common/src/main/java/api/common/pojo/param/system/SceneImportPageParam.java

@@ -12,10 +12,9 @@ public class SceneImportPageParam extends PageVO {
     //任务名称
     private String name;
     //开始时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Timestamp timeBegin;
+
+    private String timeBegin;
     //结束时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Timestamp timeEnd;
+    private String  timeEnd;
 
 }

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

@@ -184,21 +184,50 @@ public class LogService {
     /**
      * 记录场景包模块日志
      */
-    public void logScenePackage(String operationType, SystemScenePackagePO systemScenePackagePO) {
+    public void logScenePackage(String operationType, SystemScenePackagePO systemScenePackagePO,Map map) {
             try {
                 LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_PACKAGE, operationType);
                 //获取当前登录人姓名
-                String userName= AuthUtil.getCurrentUsername();
+                //String userName= AuthUtil.getCurrentUsername();
                 String content=null;
                 if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_DELETE)){
-                    content = userName+"删除场景包："+systemScenePackagePO.getPackageName();                }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_UPDATE)){
-                    content = userName+"修改场景包："+systemScenePackagePO.getPackageName();
+                    content = "删除场景包："+systemScenePackagePO.getPackageName()+"(ID:"+systemScenePackagePO.getId()+")";
+                }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_UPDATE)){
+                    content = "编辑场景包："+systemScenePackagePO.getPackageName()+"(ID:"+systemScenePackagePO.getId()+")";
                 }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_INSERT)){
-                    content = userName+"新增场景包："+systemScenePackagePO.getPackageName();
+                    content = "创建场景包："+systemScenePackagePO.getPackageName()+"(ID:"+systemScenePackagePO.getId()+")";
+                }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION)){
+                    SystemUserSceneParam params=(SystemUserSceneParam)map.get("params");
+                   List<UserSceneVO> userIds= params.getUserIds();
+                   String userCount=null;
+                    for (UserSceneVO vo:userIds) {
+                        if (ObjectUtil.isNull(userCount)){
+                            userCount= vo.getUserName() +"(ID:"+vo.getUserId()+")";
+                        }else{
+                            userCount= userCount+"、"+vo.getUserName() +"(ID:"+vo.getUserId()+")";
+                        }
+
+                    }
+                    userCount=userCount+")";
+                    content = "分配场景包："+params.getPackageName()+"(ID:"+params.getPackageId()+")给用户："+userCount;
+                }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION_DELETE)){
+                    SystemUserSceneParam params=(SystemUserSceneParam)map.get("params");
+                    List<UserSceneVO> userIds= params.getUserIds();
+                    String userCount=null;
+                    for (UserSceneVO vo:userIds) {
+                        if (ObjectUtil.isNull(userCount)){
+                            userCount= vo.getUserName() +"(ID:"+vo.getUserId()+")";
+                        }else{
+                            userCount= userCount+"、"+vo.getUserName() +"(ID:"+vo.getUserId()+")";
+                        }
+
+                    }
+                    userCount=userCount+")";
+                    content = "分配场景包："+params.getPackageName()+"(ID:"+params.getPackageId()+")时移除用户："+userCount;
                 }
+                System.out.println("记录场景包模块日志：---"+content);
                 po.setContent(content);
                 logMapper.insertSystemLog(po);
-                logMapper.insertSystemLog(po);
             }catch (Exception e){
                 e.printStackTrace();
             }
@@ -206,19 +235,15 @@ public class LogService {
     /**
      * 记录场景包分配模块日志
      */
-    public void logSystemUserSceneByPackageId(String operationType, SystemUserSceneParam param) {
+    public void logSystemUserSceneByPackageId(String operationType, SystemUserSceneParam param,String packageCount) {
         try {
             LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_PACKAGE_GRANT, operationType);
-            //获取当前登录人姓名
-            String userName= AuthUtil.getCurrentUsername();
+            /*//获取当前登录人姓名
+            String userName= AuthUtil.getCurrentUsername();*/
             String content=null;
-            if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_GRANT_INSERT)){
-                 content = userName+"操作场景包："+param.getPackageName()+"新增配置用户:"+param.getUserIds().stream().map(UserSceneVO::getUserName).collect(Collectors.toList());
-            }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_GRANT_DELETE)){
-                content = userName+"操作场景包："+param.getPackageName()+"删除配置用户:"+param.getUserIds().stream().map(UserSceneVO::getUserName).collect(Collectors.toList());
+            content = param.getUserName()+"(ID"+param.getUserId()+")"+"分配场景包："+packageCount;
 
-            }
-            System.out.println("测试日子记录"+content);
+            System.out.println("记录场景包分配模块日志：----"+content);
             po.setContent(content);
             logMapper.insertSystemLog(po);
         }catch (Exception e){
@@ -233,11 +258,10 @@ public class LogService {
         try {
             LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_SCENE, operationType);
             Map<String,String>  mapType= dictService.getDictMapByType(DictConstants.SCENE_TYPE);
-
             //获取当前登录人姓名
             String userName= AuthUtil.getCurrentUsername();
             String content=null;
-            content = userName+"在："+mapType.get(map.get("type"))+"中删除场景:"+map.get("sceneName")+"("+map.get("sceneId")+")" ;
+            content = "删除"+mapType.get(map.get("type"))+":"+map.get("sceneName")+"(ID："+map.get("sceneId")+")" ;
             po.setContent(content);
             logMapper.insertSystemLog(po);
         }catch (Exception e){
@@ -248,15 +272,10 @@ public class LogService {
     /**
      * 记录场景上传模块日志
      */
-    public void logSceneUpload(String operationType, Map map) {
+    public void logSceneUpload(String operationType, String content) {
         try {
             LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_SCENE_TASK, operationType);
-            Map<String,String>  mapType= dictService.getDictMapByType(DictConstants.SCENE_TYPE);
-
             //获取当前登录人姓名
-            String userName= AuthUtil.getCurrentUsername();
-            String content=null;
-            content = userName+"在："+mapType.get(map.get("type"))+"模块上传:"+map.get("sceneName") ;
             po.setContent(content);
             logMapper.insertSystemLog(po);
         }catch (Exception e){

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

@@ -2,6 +2,7 @@ package com.css.simulation.resource.scene.ctrl;
 
 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;
@@ -24,6 +25,7 @@ import org.apache.http.client.config.RequestConfig;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -218,4 +220,49 @@ public class SceneGeneralTemplateController {
         return map;
     }
 
+
+    //新增泛化模板
+    @PostMapping("/saveSceneGeneralTemplateAll")
+    @ResponseBody
+    public ResponseBodyVO<String> saveSceneGeneralTemplateAll(@RequestParam("file") MultipartFile multipartFile, HttpServletRequest request) {
+
+        SceneImportPO sceneImportPO=new SceneImportPO();
+        //获取文件类型
+        String taskName = request.getParameter("taskName");
+        sceneImportPO.setName(taskName);
+        sceneImportPO.setSceneType("4");
+        SceneImportPO  sceneImportPO1=sceneImportService.saveTask(sceneImportPO);
+        sceneImportPO1.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
+        sceneImportService.updateStatus(sceneImportPO1);
+        File file = null;
+        String originalFilename = multipartFile.getOriginalFilename();
+        if (originalFilename.indexOf(".xls") == -1 && originalFilename.indexOf(".xlsx") == -1) {
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "文件格式错误，请检查模板.");
+
+        }
+        //版本号
+        String version = TimeUtil.getToStringDate(new Date(), 5);
+        try {
+            ResponseBodyVO<String> respon;
+            // Integer nowTime = TimeUtil.getRq(new Date(), 0);
+            String fileName = "泛化场景/" + version + "/" + originalFilename;
+            respon = fileDownService.upload(multipartFile, fileName);
+
+            String[] filename = originalFilename.split("\\.");
+            file = File.createTempFile(filename[0], filename[1]);
+            multipartFile.transferTo(file);
+            file.deleteOnExit();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "模板解析失败，请检查模板.");
+
+        }
+
+        sceneGeneralTemplateService.saveSceneGeneralTemplateNew(file, version,sceneImportPO);
+       sceneImportService.updateInfo(sceneImportPO);
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+
+    }
+
+
 }

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

@@ -13,6 +13,7 @@ import com.css.simulation.resource.system.service.ParameterService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -87,6 +88,7 @@ public class ScenePackageController {
 
     //测试包分享
     @PostMapping("/instShareList")
+    @PreAuthorize("@AuthorityCheck.admin()")
     @ResponseBody
     public ResponseBodyVO<String> instShareList(@RequestBody ScenePackageParam parms) {
         if (ObjectUtil.isNull(parms.getPackageId())) {
@@ -124,7 +126,11 @@ public class ScenePackageController {
         ScenePackageParam parms=new ScenePackageParam();
         parms.setShare("0");
         List<ScenePackagePO> list = scenePackageService.queryScenePackageList(parms);
-        map.put("creatNum",list.size());
+        Integer creatNum=0;
+        if(ObjectUtil.isNotNull(list)){
+            creatNum=list.size();
+        }
+        map.put("creatNum",creatNum);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,map);
     }
 }

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

@@ -11,6 +11,7 @@ import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.scene.service.ScoringRulesService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -89,6 +90,7 @@ public class ScoringRulesController {
 
     //分享
     @PostMapping("/fxScoringRules")
+    @PreAuthorize("@AuthorityCheck.admin()")
     @ResponseBody
     public ResponseBodyVO<String> fxScoringRules(@RequestBody ScoringRulesParam params) {
         if (ObjectUtil.isNull(params.getRulesId())) {

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

@@ -15,6 +15,7 @@ import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.log.service.LogService;
+import com.css.simulation.resource.system.service.DictService;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;
@@ -45,6 +46,8 @@ public class SceneAccidentService {
 
     @Autowired
     LogService logService;
+    @Autowired
+    DictService dictService;
     /**
      * 获取交通事故场景数据：
      */
@@ -115,9 +118,9 @@ public class SceneAccidentService {
 
     }
 
-    /**
+  /*  *//**
      * 获取交通事故场景数据：
-     */
+     *//*
     @SneakyThrows
     public void testCS(SceneAccidentParam param) {
         //1 获取所有目录下所有场景
@@ -185,7 +188,7 @@ public class SceneAccidentService {
             log.error("标准法规场景" + fileName + " 解析出错：", e);
         }
     }
-
+*/
     public List<SceneAccidentPO> querySceneAccidentList(SceneAccidentParam params) {
         if (ObjectUtil.isNotNull(params.getSceneName()) || (params.getSelfDriving() != null && params.getSelfDriving().size() > 0) || (params.getTargetDriving() != null && params.getTargetDriving().size() > 0)
                 || (params.getSelfReaction() != null && params.getSelfReaction().size() > 0) || (params.getConflictType() != null && params.getConflictType().size() > 0) || (params.getConflictBehavior() != null && params.getConflictBehavior().size() > 0) || (params.getIds() != null && params.getIds().length > 0)) {
@@ -380,14 +383,14 @@ public class SceneAccidentService {
         Map map=new HashMap();
         map.put("sceneId",params.getAccidentId());
         map.put("sceneName",params.getSceneName());
-        map.put("type",DictConstants.SCENE_NATURAL);
+        map.put("type",DictConstants.SCENE_ACCIDENT);
         logService.logSceneDelete(LogConstants.SYS_LOG_SCENE_DELETE, map);
         //systemUserSceneService.deleteSystemUserSceneBySceneId(params.getAccidentId());
     }
 
     /*
      * 获取交通事故场景数据：
-     */
+     *//*
     @SneakyThrows
     public ResponseBodyVO<String> saveAll(SceneAccidentParam param) {
         //1 获取所有目录下所有场景
@@ -416,9 +419,9 @@ public class SceneAccidentService {
                     // File pdfFile = new File(dataUrl);
                     fileName = scene.getName();
                     //文件上传测试1  遍历拿到的文件scene
-                   /* FileInputStream inputStream = new FileInputStream(scene);
+                   *//* FileInputStream inputStream = new FileInputStream(scene);
                     MultipartFile multipartFile = new MockMultipartFile("file", fileName, "text/plain", IOUtils.toByteArray(inputStream));
-                 */
+                 *//*
                     FileItem fileItem = XmlParse.createFileItem(scene.getPath(), scene.getName());
                     MultipartFile multipartFile = new CommonsMultipartFile(fileItem);
                     fileItem.delete();
@@ -498,7 +501,7 @@ public class SceneAccidentService {
         }
 
     }
-
+*/
     /*
      * 获取交通事故场景数据：最新的自己获取路径
      */
@@ -758,6 +761,12 @@ 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,content);
+
             return sceneImportPO;
         }catch (Exception e){
             sceneImportPO.setErrorMessage("该文件地址："+parms.getMinioDirectory()+"解析失败，请检查");

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

@@ -42,83 +42,6 @@ public class SceneGeneralTemplateService {
     DictService dictService;
     @Autowired
     LogService logService;
-    /**
-     * 泛化模板导入：
-     *//*
-    @SneakyThrows
-    public ResponseBodyVO<String> saveSceneGeneralTemplate1() {
-            //同时支持Excel 2003、2007
-            File excelFile = new File("D:\\配置参数表样例0415.xlsx"); //创建文件对象
-            String fileName=    excelFile.getName();//文件名
-        //  String fileName=   excelFile.getAbsolutePath();//文件地址
-            // File excelFile = new File("D:\\0414.xlsx"); //创建文件对象
-            FileInputStream is = new FileInputStream(excelFile); //文件流
-            Workbook workbook = WorkbookFactory.create(is); //这种方式 Excel 2003/2007/2010 都是可以处理的
-            int sheetCount = workbook.getNumberOfSheets();  //Sheet的数量
-        List<SceneGeneralTemplatePO> list=new ArrayList<>();
-        //遍历每个Sheet
-            for (int s = 0; s < sheetCount; s++) {
-                Sheet sheet = workbook.getSheetAt(s);
-              // String aqq=sheet.getSheetName();  //文件Sheet的名称
-                int rowCount = sheet.getPhysicalNumberOfRows(); //获取总行数
-                //效验sheet页是否符合标准
-                Cell ce00 = sheet.getRow(0).getCell(0);
-                ce00.setCellType(Cell.CELL_TYPE_STRING);
-                 String   c00Value = ce00.getStringCellValue();
-                 System.out.println("测试是否符合---"+c00Value);
-                 if(c00Value!=null&&c00Value.equals("场景编号")) {
-                     //遍历每一行
-                     for (int r = 0; r < rowCount; r++) {
-                         Row row = sheet.getRow(r);
-                         int cellCount = row.getPhysicalNumberOfCells(); //获取总列数
-                         SceneGeneralTemplatePO po = new SceneGeneralTemplatePO();
-                         Field[] field = po.getClass().getDeclaredFields();
-                         //遍历每一个单元格
-                         for (int c = 0; c < cellCount; c++) {
-                             int a = c + 1;
-                             Cell cell = row.getCell(c);
-                             String cellValue = null;
-                             //在读取单元格内容前,设置所有单元格中内容都是字符串类型
-                             cell.setCellType(Cell.CELL_TYPE_STRING);
-                             //按照字符串类型读取单元格内数据
-                             cellValue = cell.getStringCellValue();
-                             *//*在这里可以对每个单元格中的值进行二次操作转化*//*
-                             //    System.out.print(cellValue + "    ");
-                             if (r > 0) {
-                                 //获取属性的名字
-                                 String name = field[a].getName();
-                                 //将属性名的第一位字母大写
-                                 name = name.substring(0, 1).toUpperCase() + name.substring(1);
-                                 //调用setter方法设属性值
-                                 Class[] parameterTypes = new Class[1];
-                                 parameterTypes[0] = field[a].getType();
-                                 Method getOrSet = po.getClass().getDeclaredMethod("set" + name, parameterTypes);
-                                 getOrSet.invoke(po, cellValue);
-                             }
-                         }
-                         System.out.println();
-                         if (r > 0) {
-                             po.setCreateTime(TimeUtil.getNowForMysql());
-                             po.setCreateUserId(AuthUtil.getCurrentUserId());
-                             po.setModifyUserId(AuthUtil.getCurrentUserId());
-                             po.setModifyTime(TimeUtil.getNowForMysql());
-                             po.setIsDeleted("0");
-                             po.setId(StringUtil.getRandomUUID());
-                             po.setFileName(fileName);
-                             list.add(po);
-                         }
-                     }
-                 }
-            }
-            if(ObjectUtil.isNotNull(list)){
-                mapper.deleteSceneGeneralTemplateAll(list.get(0));
-                mapper.saveSceneGeneralTemplateAll(list);
-                return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-            }
-        return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, fileName+"模板解析失败，请检查模板");
-    }
-
-*/
     /**
      * 泛化模板导入：
      */
@@ -405,12 +328,12 @@ public class SceneGeneralTemplateService {
     public  ResponseBodyVO<String> deleteSceneGeneralTemplateById(SceneGeneralTemplatePO po) {
         po.setModifyUserId(AuthUtil.getCurrentUserId());
         po.setModifyTime(TimeUtil.getNowForMysql());
-        mapper.deleteSceneGeneralTemplateAll(po);
+        mapper.deleteSceneGeneralTemplateById(po);
 
         Map map=new HashMap();
         map.put("sceneId",po.getId());
         map.put("sceneName",po.getSceneId());
-        map.put("type",DictConstants.SCENE_NATURAL);
+        map.put("type",DictConstants.SCENE_GENERAL);
         logService.logSceneDelete(LogConstants.SYS_LOG_SCENE_DELETE, map);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
 

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

@@ -17,6 +17,7 @@ import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.scene.mapper.SceneNaturalMapper;
 import com.css.simulation.resource.scene.mapper.SystemScenePackageMapper;
+import com.css.simulation.resource.system.service.DictService;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.util.StringUtil;
@@ -43,6 +44,8 @@ public class SceneNaturalService {
     LogService logService;
     @Resource
     private FileDownService fileDownService;
+    @Autowired
+    DictService dictService;
 
     /**
      * 获取自然驾驶场景数据：包括切分数据和标注数据
@@ -421,7 +424,7 @@ public class SceneNaturalService {
         sceneNaturalMapper.deleteSceneNatural(params);
         Map map=new HashMap();
         map.put("sceneId",params.getNaturalId());
-        map.put("sceneName",params.getNaturalId());
+        map.put("sceneName",params.getNaturalName());
         map.put("type",DictConstants.SCENE_NATURAL);
         logService.logSceneDelete(LogConstants.SYS_LOG_SCENE_DELETE, map);
 
@@ -610,12 +613,11 @@ public class SceneNaturalService {
             sceneImportPO.setSuccessNum(successNum);
             sceneImportPO.setFalseNum(falseNum);
             sceneImportPO.setErrorMessage(errorMessage);
-
             //记录日志
-            Map map=new HashMap();
-            map.put("sceneName",listLog);
-            map.put("type",DictConstants.SCENE_NATURAL);
-            logService.logSceneUpload(LogConstants.SYS_LOG_SCENE_DELETE, map);
+            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);
             return sceneImportPO;
         }catch (Exception e){
             sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);

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

@@ -6,6 +6,7 @@ import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.vo.scene.ScenePackageNewVO;
 import api.common.pojo.vo.scene.ScenePackageSublistVO;
+import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
@@ -84,6 +85,7 @@ public class ScenePackageService {
         }
         scenePackageMapper.saveScenePackage(po);
         scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
+        LogUtil.insert();
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
@@ -146,6 +148,7 @@ public class ScenePackageService {
         scenePackageMapper.updateScenePackage(po);
         scenePackageSublistMapper.deleteScenePackageSublist(po.getPackageId());
         scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
+        LogUtil.update();
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 
@@ -159,6 +162,7 @@ public class ScenePackageService {
         po.setPackageId(params.getPackageId());
         scenePackageSublistMapper.deleteScenePackageSublist(params.getPackageId());
         scenePackageMapper.deleteScenePackage(po);
+        LogUtil.delete();
     }
 
     //查询一个测试包的指标列表
@@ -288,6 +292,7 @@ public class ScenePackageService {
         }
         scenePackageMapper.saveScenePackage(po);
         scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
+        LogUtil.insert();
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
 

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

@@ -2,6 +2,7 @@ package com.css.simulation.resource.scene.service;
 
 import api.common.pojo.param.scene.ScoringRulesParam;
 import api.common.pojo.po.scene.ScoringRulesPO;
+import api.common.util.LogUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
@@ -31,6 +32,7 @@ public class ScoringRulesService {
         params.setCreateUserId(AuthUtil.getCurrentUserId());
         params.setIsDeleted("0");
         scoringRulesMapper.saveScoringRules(params);
+        LogUtil.insert();
     }
 
     @SneakyThrows
@@ -61,6 +63,7 @@ public class ScoringRulesService {
         params.setModifyTime(TimeUtil.getNowForMysql());
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         scoringRulesMapper.updateScoringRules(params);
+        LogUtil.update();
     }
 
     @SneakyThrows
@@ -69,5 +72,6 @@ public class ScoringRulesService {
         params.setModifyTime(TimeUtil.getNowForMysql());
         params.setModifyUserId(AuthUtil.getCurrentUserId());
         scoringRulesMapper.updateScoringRules(params);
+        LogUtil.delete();
     }
 }

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

@@ -15,6 +15,7 @@ import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.feign.FileDownService;
 import com.css.simulation.resource.log.service.LogService;
 import com.css.simulation.resource.scene.mapper.StandardsRegulationsMapper;
+import com.css.simulation.resource.system.service.DictService;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;
@@ -39,6 +40,9 @@ public class StandardsRegulationsService {
     private FileDownService fileDownService;
     @Autowired
     LogService logService;
+
+    @Autowired
+    DictService dictService;
     /**
      * 获取标准法规场景数据：
      */
@@ -185,7 +189,7 @@ public class StandardsRegulationsService {
         Map map=new HashMap();
         map.put("sceneId",params.getRegulationsId());
         map.put("sceneName",params.getSceneName());
-        map.put("type",DictConstants.SCENE_NATURAL);
+        map.put("type",DictConstants.SCENE_STANDARD);
         logService.logSceneDelete(LogConstants.SYS_LOG_SCENE_DELETE, map);
        // systemUserSceneService.deleteSystemUserSceneBySceneId(params.getRegulationsId());
     }
@@ -303,6 +307,11 @@ 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,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/SystemScenePackageService.java

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -53,7 +54,7 @@ public class SystemScenePackageService {
         SystemScenePackagePO  po=new SystemScenePackagePO();
         //场景包名称不允许重复
       String packageId=  systemScenePackageMapper.queryScenePackageByPackageName(params);
-      if(ObjectUtil.isNull(packageId)){
+      if(ObjectUtil.isNotNull(packageId)){
           return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该场景包名称已存在，请检查");
       }
         po.setPackageName(params.getPackageName());
@@ -139,7 +140,7 @@ public class SystemScenePackageService {
         systemScenePackageMapper.saveSystemScenePackage(po);
 
         //记录场景包新增
-        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_INSERT, po);
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_INSERT, po,null);
 
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
@@ -180,7 +181,7 @@ public class SystemScenePackageService {
     public ResponseBodyVO<String>  updateSystemScenePackage(SystemScenePackageNewPO params) {
         //场景包名称不允许重复
         String packageId=  systemScenePackageMapper.queryScenePackageByPackageName(params);
-        if(ObjectUtil.isNull(packageId)){
+        if(ObjectUtil.isNotNull(packageId)){
             return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该场景包名称已存在，请检查");
         }
         SystemScenePackagePO  po=new SystemScenePackagePO();
@@ -273,7 +274,7 @@ public class SystemScenePackageService {
         systemScenePackageMapper.updateSystemScenePackage(po);
 
         //记录场景包修改
-        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_UPDATE, po);
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_UPDATE, po,null);
 
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
     }
@@ -291,7 +292,7 @@ public class SystemScenePackageService {
         po.setModifyUserId(AuthUtil.getCurrentUserId());
         systemUserSceneMapper.deleteSystemUserScene(po);
         //记录场景包删除
-        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DELETE, params);
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DELETE, params,null);
 
 
 
@@ -323,9 +324,11 @@ public class SystemScenePackageService {
             list.add(po);
         }
         systemUserSceneMapper.saveSystemUserScene(list);
+        Map map=new HashMap();
+        map.put("params",params);
 
         //记录场景包
-       logService.logSystemUserSceneByPackageId(LogConstants.SYS_LOG_PACKAGE_GRANT_INSERT, params);
+       logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION, null,map);
     }
     //根据场景包删除配置账号
     @SneakyThrows
@@ -342,9 +345,11 @@ public class SystemScenePackageService {
         }
        // systemUserSceneMapper.deleteSystemUserSceneList(list);
         //记录场景包删除
-        logService.logSystemUserSceneByPackageId(LogConstants.SYS_LOG_PACKAGE_GRANT_DELETE, params);
+        Map map=new HashMap();
+        map.put("params",params);
+        //记录场景包
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION_DELETE, null,map);
     }
-
     //人员表查询测试包详情
     @SneakyThrows
     public  Map queryPackageByUserId(SystemScenePackageParam param ) {
@@ -370,8 +375,9 @@ public class SystemScenePackageService {
         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();
@@ -383,11 +389,17 @@ public class SystemScenePackageService {
             po.setIsDeleted("0");
             po.setUserId(params.getUserId());
             list.add(po);
+
+            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);
+        logService.logSystemUserSceneByPackageId(LogConstants.SYS_LOG_PACKAGE_GRANT_INSERT, params,packageCount);
     }
 
     //根据人员删除配置账号

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

@@ -62,8 +62,9 @@ public class ParameterService {
     public HashMap<String, Integer> getSceneParam(){
         String roleCode = AuthUtil.getCurrentUserRoleCode();
         String userId = AuthUtil.getCurrentUserId();
+        HashMap<String, Integer>  map=new HashMap<>();
         if(DictConstants.ROLE_CODE_ADMIN.equals(roleCode) || DictConstants.ROLE_CODE_SYSADMIN.equals(roleCode)){ //管理员账户
-            return null;
+            return map;
         }else if(DictConstants.ROLE_CODE_SUBUESR.equals(roleCode)){
             //查询父账户
             userId = AuthUtil.getCreateUserId();

simulation-resource-server/src/main/resources/mapper/system/SceneImportMapper.xml

@@ -64,8 +64,8 @@
                 success_num = #{successNum},
                 error_message = #{errorMessage},
                 modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
-                total_time = TIMESTAMPDIFF(SECOND,create_time,NOW()),
-                modify_time=NOW()
+                total_time = TIMESTAMPDIFF(SECOND,create_time,#{modifyTime}),
+                modify_time=#{modifyTime}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
@@ -88,11 +88,11 @@
         <if test="name != null and name != ''">
             and name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
         </if>
-        <if test="timeBegin != null">
-            and create_time &gt;= #{timeBegin,jdbcType=TIMESTAMP}
+        <if test="timeBegin != null and timeBegin != ''">
+            and  DATE(create_time) &gt;= #{timeBegin}
         </if>
-        <if test="timeEnd != null">
-            and create_time &lt;= #{timeEnd,jdbcType=TIMESTAMP}
+        <if test="timeEnd != null and timeEnd != ''">
+            and  DATE(create_time) &lt;= #{timeEnd}
         </if>
         order by create_time desc
     </select>