日志接入

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

@@ -3,23 +3,22 @@ package api.common.pojo.constants;
 public class LogConstants {
 
     //字典类型
-    public static final String MODULE_TYPE = "moduleType";//模块
+    public static final String MODULE_TYPE = "moduleType";//菜单模块
     public static final String OPERATION_TYPE = "operationType";//操作类型
     public static final String SYS_LOG_TYPE = "sysLogType";//系统日志类型
 
     //字典项
-    public static final String MODULE_VEHICLE = "1";//模块-车辆模型
-    public static final String MODULE_CAMERA = "2";//模块-传感器模型-摄像头
-    public static final String MODULE_OGT = "3";//模块-传感器模型-完美传感器
-    public static final String MODULE_LIDAR = "4";//模块-传感器模型-激光雷达
-    public static final String MODULE_GPS = "5";//模块-传感器模型-GPS
-    public static final String MODULE_CONFIG = "6";//模块-车辆配置
-    public static final String MODULE_ALGORITH = "7";//模块-算法库
-    public static final String MODULE_SCENE_TEST_PACKAGE = "8";//模块-场景库-场景测试包
-    public static final String MODULE_SCORING = "9";//模块-场景库-评分规则
-    public static final String MODULE_SCENE_NATURAL = "10";//模块-场景库-自然驾驶场景
-    public static final String MODULE_SCENE_STANDARDS = "11";//模块-场景库-标准法规场景
-    public static final String MODULE_SCENE_ACCIDENT = "12";//模块-场景库-交通事故场景
+    public static final String MODULE_VEHICLE = "01";//模块-车辆模型
+    public static final String MODULE_CAMERA = "02";//模块-传感器模型-摄像头
+    public static final String MODULE_OGT = "03";//模块-传感器模型-完美传感器
+    public static final String MODULE_LIDAR = "04";//模块-传感器模型-激光雷达
+    public static final String MODULE_GPS = "05";//模块-传感器模型-GPS
+    public static final String MODULE_CONFIG = "06";//模块-车辆配置
+    public static final String MODULE_ALGORITH = "07";//模块-算法库
+    public static final String MODULE_SCENE_TEST_PACKAGE = "08";//模块-场景库-场景测试包
+    public static final String MODULE_SCORING = "09";//模块-场景库-评分规则
+    public static final String MODULE_PROJECT_MANUAL = "10";//模块-工作管理-手动运行项目
+    public static final String MODULE_PROJECT_AUTO = "11";//模块-工作管理-自动运行项目
 
 
     public static final String SYS_LOG_USER = "01";//用户管理
@@ -28,5 +27,15 @@ public class LogConstants {
     public static final String SYS_LOG_USER_RESET = "0103";//用户管理-重置密码
     public static final String SYS_LOG_USER_START = "0104";//用户管理-启用
     public static final String SYS_LOG_USER_STOP = "0105";//用户管理-停用
+    public static final String SYS_LOG_PARAM = "02";//参数管理
+    public static final String SYS_LOG_CLUSTER = "03";//集群管理
+    public static final String SYS_LOG_VEHICLE = "04";//车辆模板管理
+    public static final String SYS_LOG_VEHICLE_INSERT = "0401";//车辆模板管理-新增
+    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 = "06";//场景管理
+    public static final String SYS_LOG_PACKAGE = "07";//场景包管理
+    public static final String SYS_LOG_PACKAGE_GRANT = "08";//场景包分配
 
 }

api-common/src/main/java/api/common/util/LogUtil.java

@@ -5,15 +5,15 @@ public abstract class LogUtil {
     protected static final ThreadLocal<String> OPERATION_TYPE = new ThreadLocal();
 
     public static void insert(){
-        OPERATION_TYPE.set("1");
+        OPERATION_TYPE.set("01");
     };
 
     public static void update(){
-        OPERATION_TYPE.set("2");
+        OPERATION_TYPE.set("02");
     };
 
     public static void delete(){
-        OPERATION_TYPE.set("0");
+        OPERATION_TYPE.set("00");
     };
 
     public static String getOperationType(){
@@ -25,7 +25,7 @@ public abstract class LogUtil {
     };
 
     public static void share() {
-        OPERATION_TYPE.set("3");
+        OPERATION_TYPE.set("03");
     }
 
 }

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

@@ -5,6 +5,7 @@ import api.common.pojo.param.log.LogPageParam;
 import api.common.pojo.po.log.LogLoginPO;
 import api.common.pojo.po.log.LogOperationPO;
 import api.common.pojo.po.log.LogSystemPO;
+import api.common.pojo.po.model.VehicleTempPO;
 import api.common.pojo.po.system.UserPO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
@@ -31,6 +32,9 @@ public class LogService {
     @Autowired
     DictService dictService;
 
+    /**
+     * 保存普通操作日志（异步）
+     */
     @Async
     public void saveOperationLog(LogOperationPO po) {
         po.setId(StringUtil.getRandomUUID());
@@ -38,12 +42,18 @@ public class LogService {
         logMapper.insertOperationLog(po);
     }
 
+    /**
+     * 查询登录日志
+     */
     public PageInfo<LogLoginPO> getLoginLogPageList(LogPageParam pageParam) {
         PageUtil.setPageInfo(pageParam);
         List<LogLoginPO> list = logMapper.getLoginLogPageList(pageParam);
         return new PageInfo<>(list);
     }
 
+    /**
+     * 查询普通操作日志
+     */
     public PageInfo<LogOperationPO> getOperationLogPageList(LogPageParam pageParam) {
         PageUtil.setPageInfo(pageParam);
         List<LogOperationPO> list = logMapper.getOperationLogPageList(pageParam);
@@ -56,6 +66,9 @@ public class LogService {
         return new PageInfo<>(list);
     }
 
+    /**
+     * 查询系统管理日志
+     */
     public PageInfo<LogSystemPO> getSystemLogPageList(LogPageParam pageParam) {
         PageUtil.setPageInfo(pageParam);
         List<LogSystemPO> list = logMapper.getSystemLogPageList(pageParam);
@@ -68,15 +81,12 @@ public class LogService {
         return new PageInfo<>(list);
     }
 
+    /**
+     * 记录用户管理模块日志
+     */
     public void logUser(String operationType, UserPO userPO) {
         try {
-            LogSystemPO po = new LogSystemPO();
-            po.setId(StringUtil.getRandomUUID());
-            po.setCreateTime(TimeUtil.getNowForMysql());
-            po.setUserId(AuthUtil.getCurrentUserId());
-            po.setUsername(AuthUtil.getCurrentUsername());
-            po.setRoleCode(AuthUtil.getCurrentUserRoleCode());
-            po.setModule(LogConstants.SYS_LOG_USER);
+            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_USER, operationType);
             String userId = userPO.getId();
             String username = userPO.getUsername();
             if(ObjectUtil.isNull(username)){
@@ -84,10 +94,45 @@ public class LogService {
             }
             String content = username + " ( ID: " + userId + " )";
             po.setContent(content);
-            po.setOperationType(operationType);
             logMapper.insertSystemLog(po);
         }catch (Exception e){
             e.printStackTrace();
         }
     }
+
+    /**
+     * 记录车辆模板管理模块日志
+     */
+    public void logVehicle(String operationType, VehicleTempPO vehicleTempPO) {
+        try {
+            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_VEHICLE, operationType);
+            String vehicleTempId = vehicleTempPO.getId();
+            String vehicleName = vehicleTempPO.getVehicleName();
+            String content = vehicleName + " ( ID: " + vehicleTempId + " )";
+            po.setContent(content);
+            logMapper.insertSystemLog(po);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
+
+
+
+
+    /**
+     * 获取系统管理日志对象
+     */
+    private LogSystemPO getLogSystemPO(String module, String operationType) {
+        LogSystemPO po = new LogSystemPO();
+        po.setId(StringUtil.getRandomUUID());
+        po.setCreateTime(TimeUtil.getNowForMysql());
+        po.setUserId(AuthUtil.getCurrentUserId());
+        po.setUsername(AuthUtil.getCurrentUsername());
+        po.setRoleCode(AuthUtil.getCurrentUserRoleCode());
+        po.setModule(module);
+        po.setOperationType(operationType);
+        return po;
+    }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/CameraCtrl.java

@@ -1,6 +1,7 @@
 package com.css.simulation.resource.model.ctrl;
 
 import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.model.CameraParam;
 import api.common.pojo.po.model.CameraPO;
 import api.common.pojo.vo.model.CameraVO;
@@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 
 @Controller
-@RequestMapping("/camera")
+@RequestMapping(value = "/camera" , name = LogConstants.MODULE_CAMERA)
 public class CameraCtrl {
 
     @Autowired

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/ConfigCtrl.java

@@ -2,6 +2,7 @@ package com.css.simulation.resource.model.ctrl;
 
 
 import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.model.ConfigPageParam;
 import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.vo.model.ConfigSensorVO;
@@ -20,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 
 @Controller
-@RequestMapping("/config")
+@RequestMapping(value = "/config",name = LogConstants.MODULE_CONFIG)
 public class ConfigCtrl {
 
     @Autowired

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/GpsCtrl.java

@@ -2,6 +2,7 @@ package com.css.simulation.resource.model.ctrl;
 
 
 import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.model.GpsParam;
 import api.common.pojo.po.model.GpsPO;
 import api.common.pojo.vo.model.GpsVO;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 
 @Controller
-@RequestMapping("/gps")
+@RequestMapping(value = "/gps",name = LogConstants.MODULE_GPS)
 public class GpsCtrl {
 
     @Autowired

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/LidarCtrl.java

@@ -2,6 +2,7 @@ package com.css.simulation.resource.model.ctrl;
 
 
 import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.model.LidarParam;
 import api.common.pojo.po.model.LidarPO;
 import api.common.pojo.vo.model.LidarVO;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 
 @Controller
-@RequestMapping("/lidar")
+@RequestMapping(value = "/lidar",name = LogConstants.MODULE_LIDAR)
 public class LidarCtrl {
 
     @Autowired

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/OgtCtrl.java

@@ -1,6 +1,7 @@
 package com.css.simulation.resource.model.ctrl;
 
 import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.model.OgtParam;
 import api.common.pojo.po.model.OgtPO;
 import api.common.pojo.vo.model.OgtVO;
@@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 
 @Controller
-@RequestMapping("/ogt")
+@RequestMapping(value = "/ogt",name = LogConstants.MODULE_OGT)
 public class OgtCtrl {
 
     @Autowired

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/CameraService.java

@@ -4,6 +4,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.CameraParam;
 import api.common.pojo.po.model.CameraPO;
 import api.common.pojo.vo.model.CameraVO;
+import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
@@ -61,8 +62,10 @@ public class CameraService {
             cameraPO.setId(StringUtil.getRandomUUID());
             cameraPO.setSensorCode(StringUtil.getRandomCode());
             cameraMapper.insert(cameraPO);
+            LogUtil.insert();
         }else{//修改
             cameraMapper.update(cameraPO);
+            LogUtil.update();
         }
         return cameraPO;
     }
@@ -89,6 +92,7 @@ public class CameraService {
         cameraPO.setId(StringUtil.getRandomUUID());
         cameraPO.setSensorCode(StringUtil.getRandomCode());
         cameraMapper.insert(cameraPO);
+        LogUtil.share();
         return cameraPO;
     }
 
@@ -97,6 +101,7 @@ public class CameraService {
         cameraPO.setModifyUserId(AuthUtil.getCurrentUserId());
         cameraPO.setModifyTime(TimeUtil.getNowForMysql());
         int i = cameraMapper.delCameraById(cameraPO);
+        LogUtil.delete();
         return i;
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/ConfigService.java

@@ -6,6 +6,7 @@ import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.po.model.ConfigSensorPO;
 import api.common.pojo.vo.model.ConfigSensorVO;
 import api.common.pojo.vo.model.ConfigVO;
+import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
@@ -83,8 +84,10 @@ public class ConfigService {
             configPO.setId(configId);
             configPO.setConfigCode(StringUtil.getRandomCode());
             configMapper.insertConfig(configPO);
+            LogUtil.insert();
         }else{//修改
             configMapper.updateConfig(configPO);
+            LogUtil.update();
         }
         //删除子表旧数据
         configMapper.delConfigSensors(configPO);
@@ -124,6 +127,7 @@ public class ConfigService {
         po.setModifyUserId(AuthUtil.getCurrentUserId());
         po.setModifyTime(TimeUtil.getNowForMysql());
         int i = configMapper.delConfigById(po);
+        LogUtil.delete();
         return i;
     }
 
@@ -186,6 +190,7 @@ public class ConfigService {
     public ConfigPO shareConfigById(ConfigVO configVO) {
         configVO = getConfigInfo(configVO);
         ConfigPO configPO = shareConfigByInfo(configVO);
+        LogUtil.share();
         return configPO;
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/GpsService.java

@@ -4,6 +4,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.GpsParam;
 import api.common.pojo.po.model.GpsPO;
 import api.common.pojo.vo.model.GpsVO;
+import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
@@ -54,8 +55,10 @@ public class GpsService {
             gpsPO.setId(StringUtil.getRandomUUID());
             gpsPO.setSensorCode(StringUtil.getRandomCode());
             gpsMapper.insert(gpsPO);
+            LogUtil.insert();
         }else{//修改
             gpsMapper.update(gpsPO);
+            LogUtil.update();
         }
         return gpsPO;
     }
@@ -76,12 +79,14 @@ public class GpsService {
         gpsPO.setId(StringUtil.getRandomUUID());
         gpsPO.setSensorCode(StringUtil.getRandomCode());
         gpsMapper.insert(gpsPO);
+        LogUtil.share();
         return gpsPO;
     }
 
     public int delGpsById(GpsPO gpsPO) {
         PoUtil.initDelPo(gpsPO);
         int i = gpsMapper.delGpsById(gpsPO);
+        LogUtil.delete();
         return i;
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/LidarService.java

@@ -4,6 +4,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.LidarParam;
 import api.common.pojo.po.model.LidarPO;
 import api.common.pojo.vo.model.LidarVO;
+import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
@@ -60,8 +61,10 @@ public class LidarService {
             lidarPO.setId(StringUtil.getRandomUUID());
             lidarPO.setSensorCode(StringUtil.getRandomCode());
             lidarMapper.insert(lidarPO);
+            LogUtil.insert();
         }else{//修改
             lidarMapper.update(lidarPO);
+            LogUtil.update();
         }
         return lidarPO;
     }
@@ -88,6 +91,7 @@ public class LidarService {
         lidarPO.setId(StringUtil.getRandomUUID());
         lidarPO.setSensorCode(StringUtil.getRandomCode());
         lidarMapper.insert(lidarPO);
+        LogUtil.share();
         return lidarPO;
     }
 
@@ -96,6 +100,7 @@ public class LidarService {
         lidarPO.setModifyUserId(AuthUtil.getCurrentUserId());
         lidarPO.setModifyTime(TimeUtil.getNowForMysql());
         int i = lidarMapper.delLidarById(lidarPO);
+        LogUtil.delete();
         return i;
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/OgtService.java

@@ -5,6 +5,7 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.OgtParam;
 import api.common.pojo.po.model.OgtPO;
 import api.common.pojo.vo.model.OgtVO;
+import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
@@ -62,8 +63,10 @@ public class OgtService {
             ogtPO.setId(StringUtil.getRandomUUID());
             ogtPO.setSensorCode(StringUtil.getRandomCode());
             ogtMapper.insert(ogtPO);
+            LogUtil.insert();
         }else{//修改
             ogtMapper.update(ogtPO);
+            LogUtil.update();
         }
         return ogtPO;
     }
@@ -90,6 +93,7 @@ public class OgtService {
         ogtPO.setId(StringUtil.getRandomUUID());
         ogtPO.setSensorCode(StringUtil.getRandomCode());
         ogtMapper.insert(ogtPO);
+        LogUtil.share();
         return ogtPO;
     }
 
@@ -98,6 +102,7 @@ public class OgtService {
         ogtPO.setModifyUserId(AuthUtil.getCurrentUserId());
         ogtPO.setModifyTime(TimeUtil.getNowForMysql());
         int i = ogtMapper.delOgtById(ogtPO);
+        LogUtil.delete();
         return i;
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/VehicleTempService.java

@@ -1,5 +1,6 @@
 package com.css.simulation.resource.model.service;
 
+import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.model.VehiclePageParam;
 import api.common.pojo.po.model.VehicleTempPO;
 import api.common.pojo.vo.model.VehicleDefaultValueVO;
@@ -8,6 +9,7 @@ import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 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.model.mapper.VehicleTempMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,9 @@ public class VehicleTempService {
     @Autowired
     VehicleTempMapper vehicleTempMapper;
 
+    @Autowired
+    LogService logService;
+
     public List getVehicleTempTree() {
         List<VehicleTempVO> list = vehicleTempMapper.getVehicleTempTree();
         List<Map> treeList = new ArrayList<>();
@@ -80,14 +85,17 @@ public class VehicleTempService {
             po.setId(StringUtil.getRandomUUID());
             po.setVehicleCode(StringUtil.getRandomCode());
             vehicleTempMapper.insert(po);
+            logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_INSERT,po);
         }else{//修改
             vehicleTempMapper.update(po);
+            logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_UPDATE,po);
         }
         return po;
     }
 
     public int delVehicleTempById(VehicleTempPO po) {
         PoUtil.initDelPo(po);
+        logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_DEL,po);
         return vehicleTempMapper.delVehicleTempById(po);
     }
 }

simulation-resource-server/src/main/resources/mapper/log/LogMapper.xml

@@ -50,7 +50,7 @@
           username,
           ip,
           module,
-          operationType,
+          operation_type,
           create_time
         FROM log_operation
         WHERE 1=1