Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -4,12 +4,14 @@ package com.ozs.web.controller.accountmanagment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.annotation.Log;
 import com.ozs.common.config.BaseConfig;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.enums.BusinessType;
 import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.ApiTokenUtils;
 import com.ozs.common.utils.AppendUtils;
@@ -103,6 +105,7 @@ public class BaseCameraManagementController extends BaseController {
      */
     @ApiOperation(value = "相机台账管理")
     @GetMapping("/selectCameraAll")
+    @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult selectCameraAll() {
         BaseCameraManagementVo baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), new BaseCameraManagementVo());
         List<BaseCameraManagementHomeVo> baseCameraManagements = baseCameraManagementService.selectCameraAll(baseCameraManagementVo);
@@ -111,6 +114,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @PostMapping(value = "/homeGetInfo")
     @ApiOperation("根据相机ID、是否解除 获取相机信息、未解除信息")
+    @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult homeGetInfo(@RequestBody BaseCameraManagementHomeVo baseCameraManagementHomeVo) {
         Integer isLock = baseCameraManagementHomeVo.getIsLock();
         Long id = baseCameraManagementHomeVo.getId();
@@ -172,6 +176,7 @@ public class BaseCameraManagementController extends BaseController {
      */
     @ApiOperation(value = "相机台账管理分页")
     @PostMapping("/list")
+    @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
         IPage<BaseCameraManagement> page = baseCameraManagementService.queryPage(baseCameraManagementVo);
@@ -209,6 +214,7 @@ public class BaseCameraManagementController extends BaseController {
      */
     @DeleteMapping("/{accountManagementIds}")
     @ApiOperation("删除相机台账管理信息")
+    @Log(title = "相机台账管理", businessType = BusinessType.DELETE)
     @Transactional
     public AjaxResult removeAccountManagement(@PathVariable List<Long> accountManagementIds) {
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
@@ -232,6 +238,7 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/saveAccountManagement")
     @ApiOperation("新增相机台账管理信息")
     @Transactional
+    @Log(title = "相机台账管理", businessType = BusinessType.INSERT)
     public AjaxResult saveAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
         String idempotence = idempotenceUtils.getIdempotence(baseCameraManagement.getCameraCode());
         if (StringUtils.isNotEmpty(idempotence)) {
@@ -303,6 +310,7 @@ public class BaseCameraManagementController extends BaseController {
      */
     @PutMapping("/editAccountManagement")
     @ApiOperation("修改相机台账管理信息")
+    @Log(title = "相机台账管理", businessType = BusinessType.UPDATE)
     public AjaxResult editAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
@@ -345,6 +353,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @GetMapping(value = "/{id}")
     @ApiOperation("根据相机ID获取相机台账管理信息")
+    @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
         LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -366,6 +375,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @GetMapping("/getDate/{cameraCode}")
     @ApiOperation("视频上方显示的数据")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult getDate(@PathVariable String cameraCode) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(cameraCode)) {
@@ -419,6 +429,7 @@ public class BaseCameraManagementController extends BaseController {
      */
     @ApiOperation("相机台账管理信息导入")
     @PostMapping("/importBaseAccountManagement")
+    @Log(title = "相机台账管理", businessType = BusinessType.IMPORT)
     public AjaxResult importBaseAccountManagement(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<BaseCameraManagementVos> util = new ExcelUtil<BaseCameraManagementVos>(BaseCameraManagementVos.class);
         List<BaseCameraManagementVos> accountManageList = util.importExcel(file.getInputStream());
@@ -433,6 +444,7 @@ public class BaseCameraManagementController extends BaseController {
      */
     @ApiOperation("导出相机台账管理信息")
     @PostMapping("/exportBaseAccountManagement")
+    @Log(title = "相机台账管理", businessType = BusinessType.EXPORT)
     public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseAccountManagementVo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(baseAccountManagementVo.getLineDir())) {
@@ -474,6 +486,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @ApiOperation("相机台账管理信息模板下载")
     @GetMapping("/downloaExcel")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
         try {
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/baseCameraManagement.xlsx");
@@ -487,6 +500,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @ApiOperation("查询录像")
     @GetMapping("/api/records/{cameraCode}")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult apiRecords(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
@@ -499,6 +513,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @ApiOperation("查询录像")
     @GetMapping("/api/records/{cameraCode}/{flay}")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult apiRecords(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode,
                                  @PathVariable @NotNull(message = "条件不能为空") boolean flay) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -512,6 +527,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @ApiOperation("批量查询录像")
     @GetMapping("/api/recordsList")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult apiRecordsList(@RequestBody
                                      @NotNull(message = "相机编码不能为空")
                                              List<String> cameraCodes) {
@@ -551,6 +567,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @ApiOperation("播放回放")
     @PostMapping("/api/play")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult play(@Validated @RequestBody BaseCameraResVo vo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         lw.eq(BaseCameraManagement::getCameraCode, vo.getCameraCode());
@@ -568,6 +585,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @ApiOperation("视频服务设备数量")
     @GetMapping("/totalNumberOfDevices")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult totalNumberOfDevices() {
         long count = baseCameraManagementService.count();
         return success(count);
@@ -583,6 +601,7 @@ public class BaseCameraManagementController extends BaseController {
      */
     @ApiOperation("视频服务树形结构")
     @GetMapping("/cameraTree")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult cameraTree(@RequestParam(value = "name", required = false) String name,
                                  @RequestParam(value = "lineDir", required = false) Integer lineDir,
                                  @RequestParam(value = "beginMile", required = false) String mils) {
@@ -635,6 +654,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @ApiOperation("关闭视频录制")
     @GetMapping("/endRecording/{id}")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult endRecording(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
         log.info("endRecording------------" + baseCameraManagement.getTaskId());
@@ -654,6 +674,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @ApiOperation("开启视频录制")
     @GetMapping("/startRecording/{id}")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult startRecording(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
         log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
@@ -677,6 +698,7 @@ public class BaseCameraManagementController extends BaseController {
 
     @GetMapping(value = "/getAlarm/{cameraCode}")
     @ApiOperation("根据视频ID获取详细信息")
+    @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getAlarm(@PathVariable String cameraCode) {
         LambdaQueryWrapper<MsgAlarm> queryWrapper = new LambdaQueryWrapper<MsgAlarm>();
         if (!ObjectUtils.isEmpty(cameraCode)) {

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -4,10 +4,12 @@ package com.ozs.web.controller.accountmanagment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
+import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.IdempotenceUtils;
 import com.ozs.common.utils.StringUtils;
@@ -70,6 +72,7 @@ public class BaseRailwayManagementController extends BaseController {
      */
     @ApiOperation(value = "线路管理表分页")
     @PostMapping("/list")
+    @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseLineManagement(@RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
         LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
         if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayCode())) {
@@ -102,6 +105,7 @@ public class BaseRailwayManagementController extends BaseController {
      */
     @DeleteMapping("/{lineIds}")
     @ApiOperation("删除线路管理表信息")
+    @Log(title = "线路台账管理", businessType = BusinessType.DELETE)
     public AjaxResult removeLineManagement(@PathVariable List<Long> lineIds) {
         for (Long lineId : lineIds) {
             BaseRailwayManagement baseRailwayManagement1 = baseRailwayManagementService.getById(lineId);
@@ -129,6 +133,7 @@ public class BaseRailwayManagementController extends BaseController {
      */
     @PostMapping("/saveRailwayManagement")
     @ApiOperation("新增线路管理表信息")
+    @Log(title = "线路台账管理", businessType = BusinessType.INSERT)
     public AjaxResult saveLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         String idempotence = idempotenceUtils.getIdempotence(baseRailwayManagement.getRailwayCode());
         if (StringUtils.isNotEmpty(idempotence)) {
@@ -172,6 +177,7 @@ public class BaseRailwayManagementController extends BaseController {
      */
     @PutMapping("/editRailwayManagement")
     @ApiOperation("修改线路管理表信息")
+    @Log(title = "线路台账管理", businessType = BusinessType.UPDATE)
     public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         BaseRailwayManagement baseRailwayManagement1 = baseRailwayManagementService.getById(baseRailwayManagement.getId());
         if (ObjectUtils.isEmpty(baseRailwayManagement1)) {
@@ -209,6 +215,7 @@ public class BaseRailwayManagementController extends BaseController {
 
     @GetMapping(value = "/{id}")
     @ApiOperation("根据台账ID获取线路管理表详细信息")
+    @Log(title = "线路台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getById(id);
         List<SysDictData> data = dictTypeService.selectDictDataByType("railway_type");
@@ -230,6 +237,7 @@ public class BaseRailwayManagementController extends BaseController {
      */
     @ApiOperation("线路管理表信息导入")
     @PostMapping("/importBaseLineManagement")
+    @Log(title = "线路台账管理", businessType = BusinessType.IMPORT)
     public AjaxResult importBaseLineManagement(MultipartFile file, boolean updateSupport) throws Exception {
         String message = null;
         ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<BaseRailwayManagement>(BaseRailwayManagement.class);
@@ -247,6 +255,7 @@ public class BaseRailwayManagementController extends BaseController {
      */
     @ApiOperation("导出线路管理表信息")
     @PostMapping("/exportBaseLineManagement")
+    @Log(title = "线路台账管理", businessType = BusinessType.EXPORT)
     public void exportBaseLineManagement(HttpServletResponse response, @RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
         LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
         if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayCode())) {
@@ -262,6 +271,7 @@ public class BaseRailwayManagementController extends BaseController {
 
     @ApiOperation("线路管理表信息模板下载")
     @GetMapping("/downloaExcel")
+    @Log(title = "线路台账管理", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
         try {
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/baseRailwayManagement.xlsx");
@@ -278,6 +288,7 @@ public class BaseRailwayManagementController extends BaseController {
      */
     @ApiOperation(value = "线路下拉")
     @GetMapping("/query")
+    @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
     public AjaxResult query() {
         return AjaxResult.success(baseRailwayManagementService.list());
     }

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -10,6 +10,7 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
@@ -89,6 +90,7 @@ public class MsgAlarmController extends BaseController {
      */
     @PostMapping("/messageMoreNum")
     @ApiOperation("更多消息--总数，已读数")
+    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult messageMoreNum(@RequestBody MsgAlarmVo msgAlarmVo) {
         MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         Map<String, Integer> messageMore = msgWebPushService.messageMoreNum(msgAlarmVo1);
@@ -100,6 +102,7 @@ public class MsgAlarmController extends BaseController {
      */
     @PostMapping("/messageMore")
     @ApiOperation("更多消息")
+    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult messageMore(@RequestBody MsgAlarmVo msgAlarmVo) {
         MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         IPage<MsgAlarm> messageMore = msgWebPushService.messageMore(msgAlarmVo1);
@@ -111,6 +114,7 @@ public class MsgAlarmController extends BaseController {
      */
     @GetMapping("/webAlarm")
     @ApiOperation("app报警推送次数")
+    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult webAlarmNum() {
         MsgAlarmVo msgAlarm = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
         Map webAlarm = msgWebPushService.webAlarm(msgAlarm);
@@ -121,7 +125,8 @@ public class MsgAlarmController extends BaseController {
      * web消息已读
      */
     @PostMapping("/read")
-    @ApiOperation(value = "web消息已读")
+    @ApiOperation(value = "web消息已读")  
+    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult read(@RequestBody MsgWebPush msgWebPush) {
         if (StringUtils.isEmpty(msgWebPush) || StringUtils.isEmpty(msgWebPush.getId())) {
             return AjaxResult.error("主键ID不能为空！");
@@ -137,6 +142,7 @@ public class MsgAlarmController extends BaseController {
      */
     @ApiOperation(value = "报警信息分页")
     @PostMapping("/list")
+    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
         msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         IPage<MsgAlarm> page = msgAlarmService.queryPage(msgAlarmVo);
@@ -180,6 +186,7 @@ public class MsgAlarmController extends BaseController {
 
     @GetMapping(value = "/getByAlarmId/{alarmId}")
     @ApiOperation("根据报警信息ID获取详细信息-app")
+    @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getByAlarmId(@PathVariable String alarmId) {
         MsgAlarm msgAlarm = msgAlarmService.getByAlarmId(alarmId);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
@@ -212,6 +219,7 @@ public class MsgAlarmController extends BaseController {
 
     @GetMapping(value = "/{id}")
     @ApiOperation("根据报警信息ID获取详细信息")
+    @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
@@ -244,6 +252,7 @@ public class MsgAlarmController extends BaseController {
 
     @PutMapping(value = "/{id}")
     @ApiOperation("根据报警信息ID解除报警")
+    @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
     public AjaxResult updateIsLock(@PathVariable Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         msgAlarm.setIsLock(1);
@@ -255,6 +264,7 @@ public class MsgAlarmController extends BaseController {
 
     @GetMapping(value = "/alarmHistoricalAlarm/{alarmId}")
     @ApiOperation("报警消息详情历史报警次数信息")
+    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult alarmHistoricalAlarm(@PathVariable Long alarmId) {
         QueryWrapper<MsgAlarmFrequency> wrapper = new QueryWrapper<>();
         wrapper.eq("alarm_id", alarmId);
@@ -265,6 +275,7 @@ public class MsgAlarmController extends BaseController {
 
     @GetMapping(value = "/videoHistoricalAlarm/{cameraCode}")
     @ApiOperation("视频服务历史报警信息")
+    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult videoHistoricalAlarm(@PathVariable String cameraCode) {
         QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();
         wrapper.eq("camera_code", cameraCode);
@@ -279,7 +290,7 @@ public class MsgAlarmController extends BaseController {
      * @param alarmStatisticResVo
      * @return
      */
-    @Log(title = "web数据统计-报警数据详情")
+    @Log(title = "报警信息管理", businessType = BusinessType.OTHER)
     @PostMapping("/dataStatistic")
     @ApiOperation(value = "web数据统计 报警数据详情")
     @ApiImplicitParams(value = {
@@ -307,7 +318,7 @@ public class MsgAlarmController extends BaseController {
      * @param
      * @return
      */
-    @Log(title = "web数据统计-报警月统计数据")
+    @Log(title = "报警信息管理", businessType = BusinessType.OTHER)
     @PostMapping("/alarmMonthStatistic")
     @ApiOperation(value = "web数据统计 报警月统计数据")
     @ApiImplicitParams(value = {
@@ -360,7 +371,7 @@ public class MsgAlarmController extends BaseController {
      * @param
      * @return
      */
-    @Log(title = "web数据统计-报警数据详情导出")
+    @Log(title = "报警信息管理", businessType = BusinessType.EXPORT)
     @PostMapping("/exportDataStatistic")
     @ApiOperation(value = "web数据统计-数据导出")
     @ApiImplicitParams(value = {
@@ -404,7 +415,7 @@ public class MsgAlarmController extends BaseController {
      * @param
      * @return
      */
-    @Log(title = "web数据统计-报警月统计数据导出")
+    @Log(title = "报警信息管理", businessType = BusinessType.EXPORT)
     @PostMapping("/exportDataStatisticMonth")
     @ApiOperation(value = "报警月统计数据导出")
     @ApiImplicitParams(value = {

hazard-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -86,6 +86,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @PostMapping("/list")
     @ApiOperation("根据条件分页查询角色数据")
+    @Log(title = "角色管理", businessType = BusinessType.SELECT)
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody SysRoleRequestVo vo) {
         vo= (SysRoleRequestVo) dataScoreUtil.setDataScore(getUserId(),vo);
@@ -112,6 +113,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
+    @Log(title = "角色管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long roleId)
     {
 //        roleService.checkRoleDataScope(roleId);
@@ -221,6 +223,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
+    @Log(title = "角色管理", businessType = BusinessType.OTHER)
     public AjaxResult optionselect()
     {
         return success(roleService.selectRoleAll());
@@ -231,6 +234,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/allocatedList")
+    @Log(title = "角色管理", businessType = BusinessType.SELECT)
     public TableDataInfo allocatedList(SysUser user)
     {
         startPage();
@@ -243,6 +247,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
+    @Log(title = "角色管理", businessType = BusinessType.SELECT)
     public TableDataInfo unallocatedList(SysUser user)
     {
         startPage();
@@ -289,6 +294,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/deptTree/{roleId}")
+    @Log(title = "角色管理", businessType = BusinessType.OTHER)
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
     {
         AjaxResult ajax = AjaxResult.success();

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -102,6 +102,7 @@ public class SysUserController extends BaseController {
     @ApiOperation(value = "获取用户列表")
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @Log(title = "用户管理", businessType = BusinessType.SELECT)
     public AjaxResult list(@RequestBody SysUserVo sysUserVo) {
         sysUserVo = (SysUserVo) dataScoreUtil.setDataScore(getUserId(), sysUserVo);
         IPage<SysUser> page = userService.queryPage(sysUserVo);
@@ -173,6 +174,7 @@ public class SysUserController extends BaseController {
     }
 
     @PostMapping("/importTemplate")
+    @Log(title = "用户管理", businessType = BusinessType.SELECT)
     public void importTemplate(HttpServletResponse response) {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.importTemplateExcel(response, "用户数据");
@@ -180,6 +182,7 @@ public class SysUserController extends BaseController {
 
     @ApiOperation("用户管理信息模板下载")
     @GetMapping("/downloaExcel")
+    @Log(title = "用户管理", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
         try {
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/SysUser.xlsx");
@@ -196,6 +199,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = {"/", "/{id}"})
+    @Log(title = "用户管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable(value = "id", required = false) Long id) {
 //        userService.checkUserDataScope(id);
         AjaxResult ajax = AjaxResult.success();
@@ -384,6 +388,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
+    @Log(title = "用户管理", businessType = BusinessType.MESSAGE)
     public AjaxResult authRole(@PathVariable("userId") Long id) {
         AjaxResult ajax = AjaxResult.success();
         SysUser user = userService.selectUserById(id);
@@ -410,6 +415,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
+    @Log(title = "用户管理", businessType = BusinessType.OTHER)
     public AjaxResult deptTree(SysDept dept) {
         return success(deptService.selectDeptTreeList(dept));
     }
@@ -419,6 +425,7 @@ public class SysUserController extends BaseController {
      */
     @GetMapping("/dataPermission/{id}/{dataPermission}")
     @ApiOperation("数据权限分配")
+    @Log(title = "用户管理", businessType = BusinessType.GRANT)
     public AjaxResult dataPermission(@PathVariable("id") Long id, @PathVariable("dataPermission") Integer dataPermission) {
         if (userService.dataPermission(id, dataPermission)) {
             return success();