log注释修改

.feisuan/rules/project_rule.md

@@ -0,0 +1,181 @@
+
+# 开发规范指南
+
+为保证代码质量、可维护性、安全性与可扩展性，请在开发过程中严格遵循以下规范。
+
+## 一、项目基本信息
+
+- **工作目录**: `D:\地址灾害\GeoHazardMonitor`
+- **项目名称**: GeoHazardMonitor
+- **开发者**: Administrator
+- **第一语言**: 中文（注释使用中文）
+
+## 二、技术栈要求
+
+- **主框架**: Spring Boot 2.5.14
+- **语言版本**: Java 1.8
+- **构建工具**: Maven
+- **数据库驱动**: MySQL Connector/J
+- **持久层框架**: MyBatis Plus
+- **缓存中间件**: Redis
+- **MQTT客户端**: Eclipse Paho Client
+- **消息队列**: RabbitMQ (AMQP)
+- **序列化库**: FastJSON
+- **其他依赖**:
+  - Lombok
+  - Druid 数据库连接池
+  - MinIO 客户端
+  - Hutool 工具类库
+
+## 三、目录结构说明
+
+```
+GeoHazardMonitor
+├── business-service
+│   └── src
+│       ├── main
+│       │   ├── java
+│       │   │   └── com
+│       │   │       └── ozs
+│       │   │           └── service
+│       │   │               ├── entity
+│       │   │               │   └── vo
+│       │   │               ├── mapper
+│       │   │               ├── params
+│       │   │               ├── service
+│       │   │               │   └── impl
+│       │   │               └── utils
+│       │   └── resources
+│       │       └── mapper
+│       │           └── service
+│       └── test
+│           └── java
+│               └── com
+│                   └── ozs
+│                       └── service
+│                           └── test
+├── hazard-admin
+│   └── src
+│       └── main
+│           ├── java
+│           │   └── com
+│           │       └── ozs
+│           │           └── web
+│           │               ├── controller
+│           │               │   ├── accountmanagment
+│           │               │   ├── app
+│           │               │   ├── common
+│           │               │   ├── home
+│           │               │   ├── monitor
+│           │               │   ├── mqtt
+│           │               │   ├── shotschedule
+│           │               │   ├── system
+│           │               │   ├── tool
+│           │               │   ├── upload
+│           │               │   └── websocket
+│           │               └── core
+│           │                   ├── config
+│           │                   ├── init
+│           │                   └── util
+│           └── resources
+│               ├── i18n
+│               ├── META-INF
+│               ├── mybatis
+│               └── template
+└── hazard-sdk
+    └── src
+        └── main
+            ├── java
+            │   └── com
+            │       └── ozs
+            │           ├── config
+            │           │   ├── datasource
+            │           │   └── properties
+            │           ├── controller
+            │           │   └── upload
+            │           ├── jpush
+            │           ├── vo
+            │           └── websocket
+            └── resources
+                ├── i18n
+                ├── META-INF
+                └── mybatis
+```
+
+## 四、分层架构规范
+
+| 层级        | 职责说明                         | 开发约束与注意事项                                               |
+|-------------|----------------------------------|----------------------------------------------------------------|
+| **Controller** | 处理 HTTP 请求与响应，定义 API 接口 | 不得直接访问数据库，必须通过 Service 层调用                  |
+| **Service**    | 实现业务逻辑、事务管理与数据校验   | 必须通过 Repository 层访问数据库；返回 DTO 而非 Entity（除非必要） |
+| **Repository** | 数据库访问与持久化操作             | 继承 `BaseMapper` 或使用 MyBatis Plus 提供的方法避免 N+1 查询问题     |
+| **Entity**     | 映射数据库表结构                   | 不得直接返回给前端（需转换为 DTO）；包名统一为 `entity`         |
+
+### 接口与实现分离
+
+- 所有接口实现类需放在接口所在包下的 `impl` 子包中。
+
+## 五、安全与性能规范
+
+### 输入校验
+
+- 使用 `@Valid` 与 JSR-303 校验注解（如 `@NotBlank`, `@Size` 等）
+  - 注意：Spring Boot 2.x 中校验注解位于 `javax.validation.constraints.*`
+
+- 禁止手动拼接 SQL 字符串，防止 SQL 注入攻击。
+
+### 事务管理
+
+- `@Transactional` 注解仅用于 **Service 层**方法。
+- 避免在循环中频繁提交事务，影响性能。
+
+## 六、代码风格规范
+
+### 命名规范
+
+| 类型       | 命名方式             | 示例                  |
+|------------|----------------------|-----------------------|
+| 类名       | UpperCamelCase       | `UserServiceImpl`     |
+| 方法/变量  | lowerCamelCase       | `saveUser()`          |
+| 常量       | UPPER_SNAKE_CASE     | `MAX_LOGIN_ATTEMPTS`  |
+
+### 注释规范
+
+- 所有类、方法、字段需添加 **Javadoc** 注释，并使用中文注释。
+
+### 类型命名规范（阿里巴巴风格）
+
+| 后缀 | 用途说明                     | 示例         |
+|------|------------------------------|--------------|
+| DTO  | 数据传输对象                 | `UserDTO`    |
+| DO   | 数据库实体对象               | `UserDO`     |
+| BO   | 业务逻辑封装对象             | `UserBO`     |
+| VO   | 视图展示对象                 | `UserVO`     |
+| Query| 查询参数封装对象             | `UserQuery`  |
+
+### 实体类简化工具
+
+- 使用 Lombok 注解替代手动编写 getter/setter/构造方法：
+  - `@Data`
+  - `@NoArgsConstructor`
+  - `@AllArgsConstructor`
+
+## 七、扩展性与日志规范
+
+### 接口优先原则
+
+- 所有业务逻辑通过接口定义（如 `UserService`），具体实现放在 `impl` 包中（如 `UserServiceImpl`）。
+
+### 日志记录
+
+- 使用 `@Slf4j` 注解代替 `System.out.println`
+
+## 八、编码原则总结
+
+| 原则       | 说明                                       |
+|------------|--------------------------------------------|
+| **SOLID**  | 高内聚、低耦合，增强可维护性与可扩展性     |
+| **DRY**    | 避免重复代码，提高复用性                   |
+| **KISS**   | 保持代码简洁易懂                           |
+| **YAGNI**  | 不实现当前不需要的功能                     |
+| **OWASP**  | 防范常见安全漏洞，如 SQL 注入、XSS 等      |

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

@@ -95,7 +95,7 @@ public class BaseCameraManagementController extends BaseController {
      * 所有相机列表+权限
      */
     @GetMapping("/selectCameraAll")
-    @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
+    @Log(title = "相机列表", businessType = BusinessType.SELECT)
     public AjaxResult selectCameraAll() {
         BaseCameraManagementVo baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), new BaseCameraManagementVo());
         List<BaseCameraManagementHomeVo> baseCameraManagements = baseCameraManagementService.selectCameraAll(baseCameraManagementVo);
@@ -103,7 +103,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @PostMapping(value = "/homeGetInfo")
-    @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
+    @Log(title = "首页地图相机信息", businessType = BusinessType.SELECT)
     public AjaxResult homeGetInfo(@RequestBody BaseCameraManagementHomeVo baseCameraManagementHomeVo) {
         Integer isLock = baseCameraManagementHomeVo.getIsLock();
         Long id = baseCameraManagementHomeVo.getId();
@@ -202,7 +202,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @PostMapping("/list")
-    @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
+    @Log(title = "相机台账分页列表", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
@@ -267,7 +267,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @RequestMapping("/remove/{accountManagementIds}")
-    @Log(title = "相机台账管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除相机台账管理信息", businessType = BusinessType.DELETE)
     @Transactional
     public AjaxResult removeAccountManagement(@PathVariable List<Long> accountManagementIds) {
         for (Long accountManagementId : accountManagementIds) {
@@ -290,7 +290,7 @@ public class BaseCameraManagementController extends BaseController {
      */
     @PostMapping("/saveAccountManagement")
     @Transactional
-    @Log(title = "相机台账管理", businessType = BusinessType.INSERT)
+    @Log(title = "新增相机台账管理信息", businessType = BusinessType.INSERT)
     public AjaxResult saveAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
         try {
             String idempotence = idempotenceUtils.getIdempotence(baseCameraManagement.getCameraCode());
@@ -372,7 +372,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @PostMapping("/editAccountManagement")
-    @Log(title = "相机台账管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改相机台账管理信息", businessType = BusinessType.UPDATE)
     public AjaxResult editAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
@@ -430,7 +430,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping(value = "/{id}")
-    @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
+    @Log(title = "根据ID获取相机信息", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
         LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -487,7 +487,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping("/getDate/{cameraCode}")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "根据相机编码获取报警信息", businessType = BusinessType.OTHER)
     public AjaxResult getDate(@PathVariable String cameraCode) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(cameraCode)) {
@@ -541,7 +541,7 @@ public class BaseCameraManagementController extends BaseController {
      * @throws Exception
      */
     @PostMapping("/importBaseAccountManagement")
-    @Log(title = "相机台账管理", businessType = BusinessType.IMPORT)
+    @Log(title = "台账管理导入", businessType = BusinessType.IMPORT)
     public AjaxResult importBaseAccountManagement(MultipartFile file, boolean updateSupport) throws Exception {
         try {
             List<BaseCameraManagementVos> accountManageList;
@@ -570,7 +570,7 @@ public class BaseCameraManagementController extends BaseController {
      * @param response
      */
     @PostMapping("/exportBaseAccountManagement")
-    @Log(title = "相机台账管理", businessType = BusinessType.EXPORT)
+    @Log(title = "导出台账管理", businessType = BusinessType.EXPORT)
     public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
@@ -621,7 +621,7 @@ public class BaseCameraManagementController extends BaseController {
 
 
     @GetMapping("/downloaExcel")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "相机台账下载模板", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
         try {
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/baseCameraManagement.xlsx");
@@ -634,7 +634,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping("/api/records/{cameraCode}")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "获取相机实时流", businessType = BusinessType.OTHER)
     public AjaxResult apiRecords(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
@@ -646,7 +646,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping("/api/records/{cameraCode}/{flay}")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "获取相机实时流", businessType = BusinessType.OTHER)
     public AjaxResult apiRecords(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode,
                                  @PathVariable @NotNull(message = "条件不能为空") boolean flay) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -659,7 +659,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping("/api/records/{cameraCode}/{flay}/{format}")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "获取相机实时流", businessType = BusinessType.OTHER)
     public AjaxResult apiRecords(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode,
                                  @PathVariable @NotNull(message = "条件不能为空") boolean flay,
                                  @PathVariable @NotNull(message = "格式不能为空") String format) {
@@ -673,7 +673,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping("/api/recordsList")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "批量获取相机实时流", businessType = BusinessType.OTHER)
     public AjaxResult apiRecordsList(@RequestBody
                                      @NotNull(message = "相机编码不能为空")
                                      List<String> cameraCodes) {
@@ -711,7 +711,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @PostMapping("/api/play")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "获取相机回放视频", businessType = BusinessType.OTHER)
     public AjaxResult play(@Validated @RequestBody BaseCameraResVo vo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         lw.eq(BaseCameraManagement::getCameraCode, vo.getCameraCode());
@@ -728,7 +728,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping("/totalNumberOfDevices")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "获取相机总条数", businessType = BusinessType.OTHER)
     public AjaxResult totalNumberOfDevices() {
         long count = baseCameraManagementService.count();
         return success(count);
@@ -743,7 +743,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @PostMapping("/cameraTree")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "相机树", businessType = BusinessType.OTHER)
     public AjaxResult cameraTree(@RequestBody CameraTreeVo cameraTreeVo) {
         cameraTreeVo = (CameraTreeVo) dataScoreUtil.setDataScore(getUserId(), cameraTreeVo);
         int count = 0;
@@ -841,7 +841,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping("/endRecording/{id}")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "关闭录制视频", businessType = BusinessType.OTHER)
     public AjaxResult endRecording(@PathVariable Long id) {
         List<SysDictData> data = dictTypeService.selectDictDataByType("management_transcribe_switch");
         if (data.get(0).getDictValue().equals("true")) {
@@ -873,7 +873,7 @@ public class BaseCameraManagementController extends BaseController {
 
 
     @GetMapping("/startRecording/{id}")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "开启录制视频", businessType = BusinessType.OTHER)
     public AjaxResult startRecording(@PathVariable Long id) throws Exception {
         List<SysDictData> data = dictTypeService.selectDictDataByType("management_transcribe_switch");
         if (data.get(0).getDictValue().equals("true")) {
@@ -905,7 +905,7 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @GetMapping(value = "/getAlarm/{cameraCode}")
-    @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
+    @Log(title = "根据相机编码获取报警信息", businessType = BusinessType.MESSAGE)
     public AjaxResult getAlarm(@PathVariable String cameraCode) {
         String dictLabel=null;
         List<SysDictData> sysAlarmType = dictDataMapper.selectDictDataByType("sys_alarm_type");
@@ -995,7 +995,7 @@ public class BaseCameraManagementController extends BaseController {
 
 
     @PostMapping("/api/record")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "获取相机回放视频", businessType = BusinessType.OTHER)
     public AjaxResult record(@Validated @RequestBody BaseCameraResVo vo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         lw.eq(BaseCameraManagement::getCameraCode, vo.getCameraCode());
@@ -1028,7 +1028,7 @@ public class BaseCameraManagementController extends BaseController {
 
 
     @GetMapping("/api/getRecordByAlarmId")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "相机回放视频", businessType = BusinessType.OTHER)
     public AjaxResult getRecordByAlarmId(@RequestParam("alarmId") String alarmId) {
 
         LambdaQueryWrapper<MsgAlarm> wrapper = new LambdaQueryWrapper<>();
@@ -1062,6 +1062,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @GetMapping("/nightVision/{code}/{mode}")
+    @Log(title = "相机夜视切换", businessType = BusinessType.OTHER)
     public AjaxResult nightVision(@PathVariable("code") String code, @PathVariable("mode") Integer mode) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(new LambdaQueryWrapper<BaseCameraManagement>()
                 .eq(BaseCameraManagement::getCameraCode, code));
@@ -1076,6 +1077,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @GetMapping("/switchFrameRate")
+    @Log(title = "相机帧率切换", businessType = BusinessType.OTHER)
     public AjaxResult switchFrameRate(@RequestParam("code") String code, @RequestParam("fps") String fps) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(new LambdaQueryWrapper<BaseCameraManagement>()
                 .eq(BaseCameraManagement::getCameraCode, code));
@@ -1090,7 +1092,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @PostMapping("/deviceState/page")
-    @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
+    @Log(title = "设备状态分页列表", businessType = BusinessType.SELECT)
     public AjaxResult deviceStatePage(@RequestBody DeviceStateResp deviceStateResp) {
         deviceStateResp = (DeviceStateResp) dataScoreUtil.setDataScore(getUserId(), deviceStateResp);
         IPage<DeviceStateResp> page = baseCameraManagementService.deviceStatePage(deviceStateResp);
@@ -1115,7 +1117,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @PostMapping("/bell/deviceState/page")
-    @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
+    @Log(title = "铃铛进去的设备状态页面", businessType = BusinessType.SELECT)
     public AjaxResult bellDeviceStatePage(@RequestBody DeviceStateResp deviceStateResp) {
         deviceStateResp = (DeviceStateResp) dataScoreUtil.setDataScore(getUserId(), deviceStateResp);
         IPage<DeviceStateResp> page = baseCameraManagementService.bellDeviceStatePage(deviceStateResp);
@@ -1139,7 +1141,7 @@ public class BaseCameraManagementController extends BaseController {
      * @param response
      */
     @PostMapping("/exportDeviceState")
-    @Log(title = "相机台账管理", businessType = BusinessType.EXPORT)
+    @Log(title = "导出设备状态", businessType = BusinessType.EXPORT)
     public void exportDeviceState(HttpServletResponse response, @RequestBody DeviceStateResp deviceStateResp) {
         deviceStateResp = (DeviceStateResp) dataScoreUtil.setDataScore(getUserId(), deviceStateResp);
         List<DeviceStateResp> deviceStateRespList = baseCameraManagementService.deviceStateRespList(deviceStateResp);
@@ -1155,6 +1157,7 @@ public class BaseCameraManagementController extends BaseController {
      * 获取离线相机和电量低的相机
      */
     @GetMapping("/getMalfunctionAndLowCameraManagement")
+    @Log(title = "获取离线相机和电量低的相机", businessType = BusinessType.SELECT)
     public AjaxResult getMalfunctionAndLowCameraManagement() {
         HashMap<String, Integer> map = new HashMap<>();
         DeviceStateResp deviceStateResp1 = new DeviceStateResp();
@@ -1195,6 +1198,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @GetMapping("cameraStateTotal")
+    @Log(title = "根据线路类型获取异常和非异常相机的数量", businessType = BusinessType.SELECT)
     public AjaxResult cameraStateTotal() {
         BaseCameraManagementVo baseCameraManagementVo = new BaseCameraManagementVo();
         BaseCameraManagementVo baseCameraManagementVos = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
@@ -1207,6 +1211,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @GetMapping("cameraStateList")
+    @Log(title = "首页设备状态列表", businessType = BusinessType.SELECT)
     public AjaxResult cameraStateList() {
         BaseCameraManagementVo baseCameraManagementVo = new BaseCameraManagementVo();
         BaseCameraManagementVo baseCameraManagementVos = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);

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

@@ -52,7 +52,7 @@ public class BaseCameraVersionController extends BaseController {
      * @return
      */
     @PostMapping("/cameraVersionUpgrade")
-    @Log(title = "相机版本管理", businessType = BusinessType.INSERT)
+    @Log(title = "版本升级", businessType = BusinessType.INSERT)
     public AjaxResult cameraVersionUpgrade(@RequestBody BaseCameraVersionVo baseCameraVersion) {
         if (StringUtils.isEmptySunhh(baseCameraVersion) || StringUtils.isEmptySunhh(baseCameraVersion.getId())) {
             return AjaxResult.error("相机版本id不能为空！");
@@ -70,7 +70,7 @@ public class BaseCameraVersionController extends BaseController {
      * @return
      */
     @PostMapping("/cameraAllList")
-    @Log(title = "相机版本管理", businessType = BusinessType.SELECT)
+    @Log(title = "相机列表", businessType = BusinessType.SELECT)
     public AjaxResult cameraAllList(@RequestBody BaseCameraManagement baseCameraManagement) {
         if (StringUtils.isEmptySunhh(baseCameraManagement) || StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
             return AjaxResult.error("相机版本id不能为空！");
@@ -86,7 +86,7 @@ public class BaseCameraVersionController extends BaseController {
      * @return
      */
     @PostMapping("/cameraVersionList")
-    @Log(title = "相机版本管理", businessType = BusinessType.SELECT)
+    @Log(title = "相机版本管理分页", businessType = BusinessType.SELECT)
     public AjaxResult cameraVersionList(@RequestBody BaseCameraVersionVo baseCameraVersionVo) {
         com.github.pagehelper.Page<BaseCameraVersion> page = baseCameraVersionService.cameraVersionList(baseCameraVersionVo);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseCameraVersionVo> pageR =
@@ -123,7 +123,7 @@ public class BaseCameraVersionController extends BaseController {
      * @return
      */
     @PostMapping("/cameraVersionAdd")
-    @Log(title = "相机版本管理", businessType = BusinessType.INSERT)
+    @Log(title = "新增相机版本", businessType = BusinessType.INSERT)
     public AjaxResult cameraVersionAdd(@RequestBody BaseCameraVersion baseCameraVersion) {
         if (StringUtils.isEmptySunhh(baseCameraVersion) || StringUtils.isEmptySunhh(baseCameraVersion.getVersionNum())
                 || StringUtils.isEmptySunhh(baseCameraVersion.getVersionName())
@@ -140,7 +140,7 @@ public class BaseCameraVersionController extends BaseController {
      * @return
      */
     @RequestMapping("/cameraVersionDelete/{ids}")
-    @Log(title = "相机版本管理", businessType = BusinessType.DELETE)
+    @Log(title = "修改相机版本", businessType = BusinessType.DELETE)
     public AjaxResult cameraVersionDelete(@PathVariable List<Long> ids) {
         if (StringUtils.isEmptySunhh(ids)) {
             return AjaxResult.error("删除ID不能为空！");

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

@@ -32,7 +32,7 @@ public class BaseDeviceResumeController extends BaseController {
      * 获取设备状态履历
      */
     @GetMapping("/getBaseDeviceResume")
-    @Log(title = "设备状态履历", businessType = BusinessType.SELECT)
+    @Log(title = "获取设备状态履历信息", businessType = BusinessType.SELECT)
     public AjaxResult getBaseDeviceResume(@RequestParam(value = "cameraCode") String cameraCode,
                                           @RequestParam(value = "startTime", required = false) String startTime,
                                           @RequestParam(value = "endTime", required = false) String endTime) {
@@ -46,7 +46,7 @@ public class BaseDeviceResumeController extends BaseController {
      * @param response
      */
     @GetMapping("/exportDeviceResume")
-    @Log(title = "设备状态履历", businessType = BusinessType.EXPORT)
+    @Log(title = "导出设备状态履历", businessType = BusinessType.EXPORT)
     public void exportDeviceResume(HttpServletResponse response, @RequestParam(value = "cameraCode") String cameraCode,
                                    @RequestParam(value ="startTime", required = false) String startTime,
                                    @RequestParam(value ="endTime", required = false) String endTime) {

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

@@ -36,7 +36,7 @@ public class BaseElectricityResumeController extends BaseController {
      * 获取电池电量状态履历
      */
     @GetMapping("/getBaseElectricityResume")
-    @Log(title = "设备状态履历", businessType = BusinessType.SELECT)
+    @Log(title = "获取设备状态履历信息", businessType = BusinessType.SELECT)
     public AjaxResult getBaseElectricityResume(@RequestParam(value = "cameraCode") String cameraCode,
                                                @RequestParam(value = "startTime", required = false) String startTime,
                                                @RequestParam(value = "endTime", required = false) String endTime) {
@@ -51,7 +51,7 @@ public class BaseElectricityResumeController extends BaseController {
      * @param response
      */
     @GetMapping("/exportElectricityResume")
-    @Log(title = "电池电量状态履历", businessType = BusinessType.EXPORT)
+    @Log(title = "导出电池电量状态履历", businessType = BusinessType.EXPORT)
     public void exportElectricityResume(HttpServletResponse response, @RequestParam(value = "cameraCode") String cameraCode,
                                    @RequestParam(value ="startTime", required = false) String startTime,
                                    @RequestParam(value ="endTime", required = false) String endTime) {

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

@@ -71,7 +71,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @return
      */
     @PostMapping("/list")
-    @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
+    @Log(title = "线路分页信息", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseLineManagement(@RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
         LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
         if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayCode())) {
@@ -103,7 +103,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @return
      */
     @RequestMapping("/remove/{lineIds}")
-    @Log(title = "线路台账管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除线路表信息", businessType = BusinessType.DELETE)
     public AjaxResult removeLineManagement(@PathVariable List<Long> lineIds) {
         for (Long lineId : lineIds) {
             BaseRailwayManagement baseRailwayManagement1 = baseRailwayManagementService.getById(lineId);
@@ -130,7 +130,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @return
      */
     @PostMapping("/saveRailwayManagement")
-    @Log(title = "线路台账管理", businessType = BusinessType.INSERT)
+    @Log(title = "新增线路表信息", businessType = BusinessType.INSERT)
     public AjaxResult saveLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         try {
             String idempotence = idempotenceUtils.getIdempotence(baseRailwayManagement.getRailwayCode());
@@ -177,7 +177,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @return
      */
     @RequestMapping("/editRailwayManagement")
-    @Log(title = "线路台账管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改线路表信息", businessType = BusinessType.UPDATE)
     public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         BaseRailwayManagement baseRailwayManagement1 = baseRailwayManagementService.getById(baseRailwayManagement.getId());
         if (ObjectUtils.isEmpty(baseRailwayManagement1)) {
@@ -215,7 +215,7 @@ public class BaseRailwayManagementController extends BaseController {
     }
 
     @GetMapping(value = "/{id}")
-    @Log(title = "线路台账管理", businessType = BusinessType.MESSAGE)
+    @Log(title = "根据主键获取线路信息", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getById(id);
         List<SysDictData> data = dictTypeService.selectDictDataByType("railway_type");
@@ -236,7 +236,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @throws Exception
      */
     @PostMapping("/importBaseLineManagement")
-    @Log(title = "线路台账管理", businessType = BusinessType.IMPORT)
+    @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);
@@ -253,7 +253,7 @@ public class BaseRailwayManagementController extends BaseController {
      * @param response
      */
     @PostMapping("/exportBaseLineManagement")
-    @Log(title = "线路台账管理", businessType = BusinessType.EXPORT)
+    @Log(title = "导出线路表信息", businessType = BusinessType.EXPORT)
     public void exportBaseLineManagement(HttpServletResponse response, @RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
         LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
         if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayCode())) {
@@ -271,7 +271,7 @@ public class BaseRailwayManagementController extends BaseController {
     }
 
     @GetMapping("/downloaExcel")
-    @Log(title = "线路台账管理", businessType = BusinessType.OTHER)
+    @Log(title = "线路台账模板", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
         try {
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/baseRailwayManagement.xlsx");
@@ -287,7 +287,7 @@ public class BaseRailwayManagementController extends BaseController {
      * 线路下拉
      */
     @GetMapping("/query")
-    @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
+    @Log(title = "相机线路下拉框信息", businessType = BusinessType.SELECT)
     public AjaxResult query() {
          List<BaseRailwayManagement> list = baseRailwayManagementService.list();
 //        List<BaseRailwayManagement> list = baseRailwayManagementService.listRailway();
@@ -308,7 +308,7 @@ public class BaseRailwayManagementController extends BaseController {
      * 相机线路下拉
      */
     @GetMapping("/pullDown")
-    @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
+    @Log(title = "相机线路下拉框信息", businessType = BusinessType.SELECT)
     public AjaxResult pullDown() {
          List<BaseRailwayManagement> list = baseRailwayManagementService.list();
         list.sort(new Comparator<BaseRailwayManagement>() {

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

@@ -82,7 +82,7 @@ public class MsgAlarmController extends BaseController {
      * web更多消息-总数，已读数
      */
     @PostMapping("/messageMoreNum")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "报警信息数量信息统计", businessType = BusinessType.SELECT)
     public AjaxResult messageMoreNum(@RequestBody MsgAlarmVo msgAlarmVo) {
         // MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         Map<String, Integer> messageMore = msgWebPushService.messageMoreNum(getUserId());
@@ -93,7 +93,7 @@ public class MsgAlarmController extends BaseController {
      * web更多消息
      */
     @PostMapping("/messageMore")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "报警信息详情", businessType = BusinessType.SELECT)
     public AjaxResult messageMore(@RequestBody MsgAlarmVo msgAlarmVo) {
         // MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         String userId = getUserId();
@@ -108,7 +108,7 @@ public class MsgAlarmController extends BaseController {
      * web报警未读消息个数+未读消息列表
      */
     @GetMapping("/webAlarm")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "web报警未读消息个数和未读消息列表", businessType = BusinessType.SELECT)
     public AjaxResult webAlarmNum() {
         // MsgAlarmVo msgAlarm = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
         Map webAlarm = msgWebPushService.webAlarm(getUserId());
@@ -119,7 +119,7 @@ public class MsgAlarmController extends BaseController {
      * web消息全部已读
      */
     @PostMapping("/readAll")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "web消息全部已读信息", businessType = BusinessType.SELECT)
     public AjaxResult readAll() {
         return toAjax(msgWebPushService.readAll(getUserId()));
     }
@@ -128,7 +128,7 @@ public class MsgAlarmController extends BaseController {
      * web消息已读
      */
     @PostMapping("/read")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "web消息已读信息", businessType = BusinessType.SELECT)
     public AjaxResult read(@RequestBody MsgWebPush msgWebPush) {
 //        if (StringUtils.isEmpty(msgWebPush) || ObjectUtils.isEmpty(msgWebPush.getPushId())) {
 //            return AjaxResult.error("PushId不能为空！");
@@ -144,7 +144,7 @@ public class MsgAlarmController extends BaseController {
      * @return
      */
     @PostMapping("/listHome")
-    @Log(title = "首页", businessType = BusinessType.SELECT)
+    @Log(title = "首页报警信息列表", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarmHome(@RequestBody MsgAlarmVo msgAlarmVo) {
         AtomicReference<String> dictLabel= new AtomicReference<>();
         List<SysDictData> sysAlarmType = dictDataMapper.selectDictDataByType("sys_alarm_type");
@@ -224,7 +224,7 @@ public class MsgAlarmController extends BaseController {
      * @return
      */
     @PostMapping("/list")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "报警信息分页", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
         AtomicReference<String> dictLabel= new AtomicReference<>();
         List<SysDictData> sysAlarmType = dictDataMapper.selectDictDataByType("sys_alarm_type");
@@ -306,7 +306,7 @@ public class MsgAlarmController extends BaseController {
      * @param response
      */
     @PostMapping("/exportMsgAlarm")
-    @Log(title = "报警信息管理", businessType = BusinessType.EXPORT)
+    @Log(title = "导出报警消息", businessType = BusinessType.EXPORT)
     public void exportMsgAlarm(HttpServletResponse response, @RequestBody MsgAlarmVo msgAlarmVo) {
         //获取字典数据
         String dictLabel=null;
@@ -403,7 +403,7 @@ public class MsgAlarmController extends BaseController {
     }
 
     @GetMapping(value = "/getByAlarmId/{alarmId}")
-    @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
+    @Log(title = "根据报警ID获取报警信息", businessType = BusinessType.MESSAGE)
     public AjaxResult getByAlarmId(@PathVariable String alarmId) {
         MsgAlarm msgAlarm = msgAlarmService.getByAlarmId(alarmId);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
@@ -447,7 +447,7 @@ public class MsgAlarmController extends BaseController {
     }
 
     @GetMapping(value = "/{id}")
-    @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
+    @Log(title = "根据主键获取报警信息", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
         String dictLabel=null;
         List<SysDictData> sysAlarmType = dictDataMapper.selectDictDataByType("sys_alarm_type");
@@ -520,7 +520,7 @@ public class MsgAlarmController extends BaseController {
 
     // todo  需要测试 验证 是否合成视频
     @RequestMapping(value = "/updateIsLock")
-    @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改报警状态", businessType = BusinessType.UPDATE)
     @Transactional
     public AjaxResult updateIsLock(@RequestParam(value = "id") Long id,
                                    @RequestParam(value = "releasedType", required = false) Integer releasedType,
@@ -575,7 +575,7 @@ public class MsgAlarmController extends BaseController {
     }
 
     @GetMapping(value = "/alarmHistoricalAlarm/{alarmId}")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "获取报警信息", businessType = BusinessType.SELECT)
     public AjaxResult alarmHistoricalAlarm(@PathVariable String alarmId) {
         QueryWrapper<MsgAlarm> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("alarm_id", alarmId);
@@ -608,7 +608,7 @@ public class MsgAlarmController extends BaseController {
     }
 
     @GetMapping(value = "/videoHistoricalAlarm/{cameraCode}")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "根据相机编码获取报警信息", businessType = BusinessType.SELECT)
     public AjaxResult videoHistoricalAlarm(@PathVariable String cameraCode) {
         QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();
         wrapper.eq("camera_code", cameraCode);
@@ -629,7 +629,7 @@ public class MsgAlarmController extends BaseController {
      * @param alarmStatisticResVo
      * @return
      */
-    @Log(title = "报警信息管理", businessType = BusinessType.OTHER)
+    @Log(title = "web报警数据统计", businessType = BusinessType.OTHER)
     @PostMapping("/dataStatistic")
     public AjaxResult dataStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         AtomicReference<String> dictLabel= new AtomicReference<>();
@@ -691,7 +691,7 @@ public class MsgAlarmController extends BaseController {
      * @param
      * @return
      */
-    @Log(title = "报警信息管理", businessType = BusinessType.OTHER)
+    @Log(title = "web报警数据统计", businessType = BusinessType.OTHER)
     @PostMapping("/alarmMonthStatistic")
     public AjaxResult alarmMonthStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         alarmStatisticResVo = (AlarmStatisticResVo) dataScoreUtil.setDataScore(getUserId(), alarmStatisticResVo);
@@ -750,7 +750,7 @@ public class MsgAlarmController extends BaseController {
      * @param
      * @return
      */
-    @Log(title = "报警信息管理", businessType = BusinessType.EXPORT)
+    @Log(title = "web数报警据统计导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportDataStatistic")
     public void exportDataStatistic(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         final String[] dictLabel = {null};
@@ -812,7 +812,7 @@ public class MsgAlarmController extends BaseController {
      * @param
      * @return
      */
-    @Log(title = "报警信息管理", businessType = BusinessType.EXPORT)
+    @Log(title = "web报警数据统计月统计导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportDataStatisticMonth")
     public void exportDataStatisticMonth(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         alarmStatisticResVo = (AlarmStatisticResVo) dataScoreUtil.setDataScore(getUserId(), alarmStatisticResVo);
@@ -879,7 +879,7 @@ public class MsgAlarmController extends BaseController {
 
 
     @GetMapping(value = "/alarmStatistics")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "获取报警信息", businessType = BusinessType.SELECT)
     public AjaxResult alarmStatistics() {
         MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
         MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo1);
@@ -887,7 +887,7 @@ public class MsgAlarmController extends BaseController {
     }
 
     @GetMapping(value = "/alarmCountSort")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "获取报警信息", businessType = BusinessType.SELECT)
     public AjaxResult alarmCountSort() {
         MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
         MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo1);

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

@@ -70,7 +70,7 @@ public class MsgAlarmMatterController extends BaseController {
      * @return
      */
     @PostMapping("/list")
-    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    @Log(title = "报警信息分页", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmMatterVo msgAlarmVo) {
         msgAlarmVo = (MsgAlarmMatterVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmMile())) {
@@ -140,7 +140,7 @@ public class MsgAlarmMatterController extends BaseController {
      * @param response
      */
     @PostMapping("/exportMsgAlarm")
-    @Log(title = "报警信息管理", businessType = BusinessType.EXPORT)
+    @Log(title = "导出报警消息", businessType = BusinessType.EXPORT)
     public void exportMsgAlarm(HttpServletResponse response, @RequestBody MsgAlarmMatterVo msgAlarmVo) {
         String dictLabel=null;
         List<SysDictData> sysAlarmType = dictDataMapper.selectDictDataByType("sys_alarm_type");

hazard-admin/src/main/java/com/ozs/web/controller/monitor/CameraUpdateLogController.java

@@ -58,6 +58,7 @@ public class CameraUpdateLogController extends BaseController {
      * @return
      */
     @PostMapping("/list")
+    @Log(title = "相机升级日志列表", businessType = BusinessType.SELECT)
     public AjaxResult list(@RequestBody CameraUpdateLogResp cameraUpdateLogResp) throws ParseException {
         LambdaQueryWrapper<CameraUpdateLog> wrapper = new LambdaQueryWrapper<CameraUpdateLog>();
         if (!ObjectUtils.isEmpty(cameraUpdateLogResp.getVersionNum())) {
@@ -98,7 +99,7 @@ public class CameraUpdateLogController extends BaseController {
         return AjaxResult.success(page);
     }
 
-    @Log(title = "相机升级日志", businessType = BusinessType.EXPORT)
+    @Log(title = "相机升级日志导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody CameraUpdateLogResVo cameraUpdateLogResVo) {
         List<CameraLogDetail> list = cameraLogDetailService.selectDetail(cameraUpdateLogResVo);

hazard-admin/src/main/java/com/ozs/web/controller/monitor/SysLoginInfoController.java

@@ -56,6 +56,7 @@ public class SysLoginInfoController extends BaseController {
      */
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @Log(title = "获取登录日志分页列表", businessType = BusinessType.SELECT)
     public AjaxResult list(@RequestBody SysLoginInfoVo sysLoginInfoVo) throws ParseException {
         LambdaQueryWrapper<SysLoginInfo> wrapper = new LambdaQueryWrapper<SysLoginInfo>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -86,7 +87,7 @@ public class SysLoginInfoController extends BaseController {
         return AjaxResult.success(info);
     }
 
-    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @Log(title = "登录日志导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody SysLoginInfoResq sysLoginInfoResq) {
@@ -96,7 +97,7 @@ public class SysLoginInfoController extends BaseController {
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
-    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @Log(title = "登录日志删除", businessType = BusinessType.DELETE)
     @PostMapping("/{infoIds}")
     public AjaxResult remove(@PathVariable Long[] infoIds)
     {
@@ -104,7 +105,7 @@ public class SysLoginInfoController extends BaseController {
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
-    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+    @Log(title = "登录日志清除", businessType = BusinessType.CLEAN)
     @PostMapping("/clean")
     public AjaxResult clean()
     {

hazard-admin/src/main/java/com/ozs/web/controller/monitor/SysOperlogController.java

@@ -54,6 +54,7 @@ public class SysOperlogController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
     @PostMapping("/list")
+    @Log(title = "获取操作日志分页列表", businessType = BusinessType.SELECT)
     public AjaxResult list(@RequestBody SysOperlogVo sysOperlogVo) {
         LambdaQueryWrapper<SysOperLog> wrapper = new LambdaQueryWrapper<SysOperLog>();
         if (!ObjectUtils.isEmpty(sysOperlogVo.getUserId())) {
@@ -86,7 +87,7 @@ public class SysOperlogController extends BaseController {
         return AjaxResult.success(sysOperLog);
     }
 
-    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @Log(title = "操作日志导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody SysOperlogResq sysOperlogResq) {
@@ -95,7 +96,7 @@ public class SysOperlogController extends BaseController {
         util.exportExcel(response, list, "操作日志");
     }
 
-    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @Log(title = "操作日志删除", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @PostMapping("/{operIds}")
     public AjaxResult remove(@PathVariable Long[] operIds)
@@ -103,7 +104,7 @@ public class SysOperlogController extends BaseController {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }
 
-    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @Log(title = "操作日志清除", businessType = BusinessType.CLEAN)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @GetMapping("/clean")
     public AjaxResult clean()

hazard-admin/src/main/java/com/ozs/web/controller/monitor/SysUserOnlineController.java

@@ -81,7 +81,7 @@ public class SysUserOnlineController extends BaseController
      * 强退用户
      */
     @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
-    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @Log(title = "强退用户", businessType = BusinessType.FORCE)
     @GetMapping("/{tokenId}")
     public AjaxResult forceLogout(@PathVariable String tokenId)
     {

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

@@ -38,6 +38,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
+    @Log(title = "获取参数配置列表列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(SysConfig config)
     {
         startPage();
@@ -45,7 +46,7 @@ public class SysConfigController extends BaseController
         return getDataTable(list);
     }
 
-    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @Log(title = "导出参数配置", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:config:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysConfig config)
@@ -78,7 +79,7 @@ public class SysConfigController extends BaseController
      * 新增参数配置
      */
     @PreAuthorize("@ss.hasPermi('system:config:add')")
-    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @Log(title = "新增参数配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysConfig config)
     {
@@ -94,7 +95,7 @@ public class SysConfigController extends BaseController
      * 修改参数配置
      */
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
-    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改参数配置", businessType = BusinessType.UPDATE)
     @RequestMapping
     public AjaxResult edit(@Validated @RequestBody SysConfig config)
     {
@@ -110,7 +111,7 @@ public class SysConfigController extends BaseController
      * 删除参数配置
      */
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
-    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除参数配置", businessType = BusinessType.DELETE)
     @PostMapping("/{configIds}")
     public AjaxResult remove(@PathVariable Long[] configIds)
     {
@@ -122,7 +123,7 @@ public class SysConfigController extends BaseController
      * 刷新参数缓存
      */
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
-    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @Log(title = "刷新参数缓存", businessType = BusinessType.CLEAN)
     @GetMapping("/refreshCache")
     public AjaxResult refreshCache()
     {

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

@@ -47,6 +47,7 @@ public class SysDeptController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
+    @Log(title = "获取部门列表", businessType = BusinessType.SELECT)
     public AjaxResult list(SysDeptVo dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         for (SysDept sysDept : depts) {
@@ -106,7 +107,7 @@ public class SysDeptController extends BaseController {
      * 新增部门
      */
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
-    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @Log(title = "新增部门", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDept dept) {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
@@ -129,7 +130,7 @@ public class SysDeptController extends BaseController {
      * 修改部门
      */
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
-    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改部门", businessType = BusinessType.UPDATE)
     @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysDept dept) {
         Long deptId = dept.getDeptId();
@@ -158,7 +159,7 @@ public class SysDeptController extends BaseController {
      * 删除部门
      */
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
-    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除部门", businessType = BusinessType.DELETE)
     @RequestMapping("/remove/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId) {
         if (deptService.hasChildByDeptId(deptId)) {

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

@@ -64,6 +64,7 @@ public class SysDictDataController extends BaseController {
      * @return
      */
     @PostMapping("/list")
+    @Log(title = "字典数据列表", businessType = BusinessType.SELECT)
     public AjaxResult list(@RequestBody SysDictDataVo sysDictDataVo) {
         LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<SysDictData>();
         if (!ObjectUtils.isEmpty(sysDictDataVo.getDictCode())) {
@@ -98,7 +99,7 @@ public class SysDictDataController extends BaseController {
         return AjaxResult.success(page);
     }
 
-    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @Log(title = "字典数据导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody SysDictData dictData) {
@@ -131,7 +132,7 @@ public class SysDictDataController extends BaseController {
      * 新增字典类型
      */
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
-    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @Log(title = "新增字典类型", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictData dict)
     {
@@ -143,7 +144,7 @@ public class SysDictDataController extends BaseController {
      * 修改保存字典类型
      */
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
-    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @Log(title = "修改保存字典类型", businessType = BusinessType.UPDATE)
     @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysDictData dict)
     {
@@ -158,7 +159,7 @@ public class SysDictDataController extends BaseController {
      * 删除字典类型
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @Log(title = "删除字典类型", businessType = BusinessType.DELETE)
     @RequestMapping("remove/{dictCodes}")
     public AjaxResult remove(@PathVariable Long[] dictCodes)
     {

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

@@ -60,6 +60,7 @@ public class SysDictTypeController extends BaseController {
      */
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @Log(title = "字典类型列表", businessType = BusinessType.SELECT)
     public AjaxResult list(@RequestBody SysDictTypeVo sysDictTypeVo) {
         LambdaQueryWrapper<SysDictType> wrapper = new LambdaQueryWrapper<SysDictType>();
         if (!ObjectUtils.isEmpty(sysDictTypeVo.getDictId())) {
@@ -81,7 +82,7 @@ public class SysDictTypeController extends BaseController {
         return AjaxResult.success(page);
     }
 
-    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @Log(title = "字典类型导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody SysDictType dictType) {
@@ -104,7 +105,7 @@ public class SysDictTypeController extends BaseController {
      * 新增字典类型
      */
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
-    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @Log(title = "新增字典类型", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictType dict)
     {
@@ -122,7 +123,7 @@ public class SysDictTypeController extends BaseController {
      * 修改字典类型
      */
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
-    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @Log(title = "修改字典类型", businessType = BusinessType.UPDATE)
     @RequestMapping("/update")
     public AjaxResult edit(@Validated @RequestBody SysDictType dict)
     {
@@ -140,7 +141,7 @@ public class SysDictTypeController extends BaseController {
      * 删除字典类型
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @Log(title = "删除字典类型", businessType = BusinessType.DELETE)
     @RequestMapping("/remove/{dictIds}")
     public AjaxResult remove(@PathVariable Long[] dictIds)
     {
@@ -152,7 +153,7 @@ public class SysDictTypeController extends BaseController {
      * 刷新字典缓存
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @Log(title = "刷新字典缓存", businessType = BusinessType.CLEAN)
     @GetMapping("/refreshCache")
     public AjaxResult refreshCache()
     {

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

@@ -41,6 +41,7 @@ public class SysMenuController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
+    @Log(title = "获取菜单列表", businessType = BusinessType.SELECT)
     public AjaxResult list(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getId());
         for (SysMenu menuA : menus) {
@@ -88,7 +89,7 @@ public class SysMenuController extends BaseController {
      * 新增菜单
      */
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
-    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @Log(title = "新增菜单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysMenu menu) {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
@@ -102,7 +103,7 @@ public class SysMenuController extends BaseController {
      * 修改菜单
      */
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
-    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改菜单", businessType = BusinessType.UPDATE)
     @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
@@ -118,7 +119,7 @@ public class SysMenuController extends BaseController {
      * 删除菜单
      */
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
-    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除菜单", businessType = BusinessType.DELETE)
     @RequestMapping("/remove/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId) {
         if (menuService.hasChildByMenuId(menuId)) {

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

@@ -55,7 +55,7 @@ public class SysProfileController extends BaseController
     /**
      * 修改用户
      */
-    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @Log(title = "修改用户", businessType = BusinessType.UPDATE)
     @RequestMapping("/update")
     public AjaxResult updateProfile(@RequestBody SysUser user)
     {
@@ -90,7 +90,7 @@ public class SysProfileController extends BaseController
     /**
      * 重置密码
      */
-    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @Log(title = "重置密码", businessType = BusinessType.UPDATE)
     @RequestMapping("/updatePwd")
     public AjaxResult updatePwd(String oldPassword, String newPassword)
     {
@@ -118,7 +118,7 @@ public class SysProfileController extends BaseController
     /**
      * 头像上传
      */
-    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @Log(title = "头像上传", businessType = BusinessType.UPDATE)
     @PostMapping("/avatar")
     public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
     {

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

@@ -92,7 +92,7 @@ public class SysRoleController extends BaseController {
 
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @PostMapping("/list")
-    @Log(title = "角色管理", businessType = BusinessType.SELECT)
+    @Log(title = "角色管理列表", businessType = BusinessType.SELECT)
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody SysRoleRequestVo vo) {
         LambdaQueryWrapper<SysRole> lw = new LambdaQueryWrapper<SysRole>();
@@ -107,7 +107,7 @@ public class SysRoleController extends BaseController {
         return success(page);
     }
 
-    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @Log(title = "角色管理导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysRole role) {
@@ -121,7 +121,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
-    @Log(title = "角色管理", businessType = BusinessType.MESSAGE)
+    @Log(title = "根据角色编号获取详细信息", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long roleId) {
 //        roleService.checkRoleDataScope(roleId);
         SysRole sysRole = roleService.selectRoleById(roleId);
@@ -142,7 +142,7 @@ public class SysRoleController extends BaseController {
      * 新增角色
      */
     @PreAuthorize("@ss.hasPermi('system:role:add')")
-    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @Log(title = "新增角色", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysRole role) {
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
@@ -160,7 +160,7 @@ public class SysRoleController extends BaseController {
      * 修改保存角色
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改保存角色", businessType = BusinessType.UPDATE)
     @RequestMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysRole role) {
 //        roleService.checkRoleAllowed(role);
@@ -206,7 +206,7 @@ public class SysRoleController extends BaseController {
      * 修改保存数据权限
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改保存数据权限", businessType = BusinessType.UPDATE)
     @RequestMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
@@ -218,7 +218,7 @@ public class SysRoleController extends BaseController {
      * 状态修改
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @Log(title = "状态修改", businessType = BusinessType.UPDATE)
     @RequestMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
@@ -231,7 +231,7 @@ public class SysRoleController extends BaseController {
      * 删除角色
      */
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
-    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除角色", businessType = BusinessType.DELETE)
     @RequestMapping("/remove/{roleIds}")
     public AjaxResult remove(@PathVariable Long[] roleIds) {
         return toAjax(roleService.deleteRoleByIds(roleIds));
@@ -242,7 +242,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
-    @Log(title = "角色管理", businessType = BusinessType.OTHER)
+    @Log(title = "获取角色选择框列表", businessType = BusinessType.OTHER)
     public AjaxResult optionselect() {
         return success(roleService.selectRoleAll());
     }
@@ -264,7 +264,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
-    @Log(title = "角色管理", businessType = BusinessType.SELECT)
+    @Log(title = "查询未分配用户角色列表", businessType = BusinessType.SELECT)
     public TableDataInfo unallocatedList(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectUnallocatedList(user);
@@ -275,7 +275,7 @@ public class SysRoleController extends BaseController {
      * 取消授权用户
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @Log(title = "取消授权用户", businessType = BusinessType.GRANT)
     @RequestMapping("/authUser/cancel")
     public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
@@ -285,7 +285,7 @@ public class SysRoleController extends BaseController {
      * 批量取消授权用户
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @Log(title = "批量取消授权用户", businessType = BusinessType.GRANT)
     @RequestMapping("/authUser/cancelAll")
     public AjaxResult cancelAuthUserAll(Long roleId,@RequestBody Long[] userIds) {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
@@ -295,7 +295,7 @@ public class SysRoleController extends BaseController {
      * 批量选择用户授权
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @Log(title = "批量选择用户授权", businessType = BusinessType.GRANT)
     @RequestMapping("/authUser/selectAll")
     public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) {
         roleService.checkRoleDataScope(roleId);
@@ -307,7 +307,7 @@ public class SysRoleController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/deptTree/{roleId}")
-    @Log(title = "角色管理", businessType = BusinessType.OTHER)
+    @Log(title = "获取对应角色部门树列表", businessType = BusinessType.OTHER)
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId) {
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));

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

@@ -113,7 +113,7 @@ public class SysUserController extends BaseController {
      */
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
-    @Log(title = "用户管理", businessType = BusinessType.SELECT)
+    @Log(title = "获取用户列表", businessType = BusinessType.SELECT)
     public AjaxResult list(@RequestBody SysUserVo sysUserVo) {
         sysUserVo = (SysUserVo) dataScoreUtil.setDataScore(getUserId(), sysUserVo);
         IPage<SysUser> page = userService.queryPage(sysUserVo);
@@ -144,7 +144,7 @@ public class SysUserController extends BaseController {
         return AjaxResult.success(page);
     }
 
-    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @Log(title = "用户管理导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody SysUserVo sysUserVo) {
@@ -176,7 +176,7 @@ public class SysUserController extends BaseController {
         util.exportExcel(response, usetList, "用户数据");
     }
 
-    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @Log(title = "用户管理导入", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
@@ -195,14 +195,14 @@ public class SysUserController extends BaseController {
     }
 
     @PostMapping("/importTemplate")
-    @Log(title = "用户管理", businessType = BusinessType.SELECT)
+    @Log(title = "用户管理导入模板", businessType = BusinessType.SELECT)
     public void importTemplate(HttpServletResponse response) {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.importTemplateExcel(response, "用户数据");
     }
 
     @GetMapping("/downloaExcel")
-    @Log(title = "用户管理", businessType = BusinessType.OTHER)
+    @Log(title = "下载用户管理模板", businessType = BusinessType.OTHER)
     public void downloadZip(HttpServletResponse response) {
         try {
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/SysUser.xlsx");
@@ -219,7 +219,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = {"/", "/{id}"})
-    @Log(title = "用户管理", businessType = BusinessType.MESSAGE)
+    @Log(title = "根据用户编号获取详细信息", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable(value = "id", required = false) Long id) {
 //        userService.checkUserDataScope(id);
         AjaxResult ajax = AjaxResult.success();
@@ -242,7 +242,7 @@ public class SysUserController extends BaseController {
      * 新增用户
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @Log(title = "新增用户", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody SysUser user) {
         String password = null;
@@ -265,7 +265,7 @@ public class SysUserController extends BaseController {
      * 修改用户
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改用户", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult edit(@RequestBody SysUser user) {
 //        userService.checkUserAllowed(user);
@@ -285,7 +285,7 @@ public class SysUserController extends BaseController {
      * 修改用户-web修改个人信息
      */
 //    @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "web修改个人信息", businessType = BusinessType.UPDATE)
     @RequestMapping(value = "/updateUser", method = RequestMethod.PUT)
     public AjaxResult updateUser(@RequestBody SysUserUpdate user) {
         if (!StringUtils.isEmpty(user) && !StringUtils.isEmpty(user.getPassword())) {
@@ -318,7 +318,7 @@ public class SysUserController extends BaseController {
      * 删除用户
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除用户", businessType = BusinessType.DELETE)
     @RequestMapping("/remove/{Ids}")
     public AjaxResult remove(@PathVariable Long[] Ids) {
         if (ArrayUtils.contains(Ids, getId())) {
@@ -353,7 +353,7 @@ public class SysUserController extends BaseController {
      * 重置密码
      */
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "重置密码", businessType = BusinessType.UPDATE)
     @GetMapping("/resetPwd/{id}")
     public AjaxResult resetPwd(@PathVariable(value = "id") Long id) {
         boolean stop=false;
@@ -389,7 +389,7 @@ public class SysUserController extends BaseController {
     /**
      * 修改密码
      */
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改密码", businessType = BusinessType.UPDATE)
     @RequestMapping("/updatePassWord")
     public AjaxResult updatePassWord(@RequestBody SysUser user) {
         LoginUser loginUser = getLoginUser();
@@ -418,7 +418,7 @@ public class SysUserController extends BaseController {
      * 状态修改
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "状态修改", businessType = BusinessType.UPDATE)
     @RequestMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
 //        userService.checkUserAllowed(user);
@@ -432,7 +432,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    @Log(title = "用户管理", businessType = BusinessType.MESSAGE)
+    @Log(title = "根据用户编号获取授权角色", businessType = BusinessType.MESSAGE)
     public AjaxResult authRole(@PathVariable("userId") Long id) {
         AjaxResult ajax = AjaxResult.success();
         SysUser user = userService.selectUserById(id);
@@ -446,7 +446,7 @@ public class SysUserController extends BaseController {
      * 用户授权角色
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.GRANT)
+    @Log(title = "用户授权角色", businessType = BusinessType.GRANT)
     @RequestMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
 //        userService.checkUserDataScope(userId);
@@ -459,7 +459,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
-    @Log(title = "用户管理", businessType = BusinessType.OTHER)
+    @Log(title = "获取部门树列表", businessType = BusinessType.OTHER)
     public AjaxResult deptTree(SysDeptVo sysDeptVo) {
         sysDeptVo = (SysDeptVo) dataScoreUtil.setDataScore(getUserId(), sysDeptVo);
         return success(deptService.selectDeptTreeList(sysDeptVo));
@@ -469,7 +469,7 @@ public class SysUserController extends BaseController {
      * 数据权限分配
      */
     @GetMapping("/dataPermission/{id}/{dataPermission}")
-    @Log(title = "用户管理", businessType = BusinessType.GRANT)
+    @Log(title = "数据权限分配", businessType = BusinessType.GRANT)
     public AjaxResult dataPermission(@PathVariable("id") Long id, @PathVariable("dataPermission") Integer dataPermission) {
         BaseUser baseUser = baseUserService.getUserById(id);
         if (baseUser.getUserName().equals("admin")) {