Merge remote-tracking branch 'origin/master'

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java

@@ -67,7 +67,8 @@ public class SpAllocationController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_allocation")
-	@OperationAnnotation(title = "调泼单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",
+			title = "调泼单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<SpAllocationVO>> pageList(SpAllocationVO allocationVO, Query query) {
 		IPage<SpAllocationVO> pages = sp_allocationService.selectPageList(Condition.getPage(query),allocationVO);

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java

@@ -54,7 +54,7 @@ public class SpReceiveController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_receive")
-	@OperationAnnotation(title = "工具领用",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "工具领用",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<SpReceiveVO>> list(SpReceiveVO receiveVO, Query query) {
 		IPage<SpReceiveVO> pages = sp_receiveService.selectPageList(Condition.getPage(query), receiveVO);

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java

@@ -57,7 +57,7 @@ public class SpReceivesController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_receives")
-	@OperationAnnotation(title = "工具回退",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "工具回退",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<SpReceivesVO>> list(SpReceivesVO sp_receives, Query query) {
 		IPage<SpReceivesVO> pages = sp_receivesService.selectPageList(Condition.getPage(query), sp_receives);

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java

@@ -66,7 +66,8 @@ public class SpWarehouseInController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_warehouse_in")
-	@OperationAnnotation(title = "入库单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "入库单",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页条件")
 	public R<IPage<SpWarehouseInVO>> pageList(SpWarehouseInVO warehouseInVO, Query query) {
 		IPage<SpWarehouseInVO> pages = sp_warehouse_inService.selectPageList(Condition.getPage(query),warehouseInVO);

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java

@@ -54,7 +54,8 @@ public class SpWarehouseOutController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_warehouse_out")
-	@OperationAnnotation(title = "出库单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "出库单",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<SpWarehouseOutVO>> list(SpWarehouseOutVO warehouseOutVO, Query query) {
 		IPage<SpWarehouseOutVO> pages = sp_warehouse_outService.selectPageList(Condition.getPage(query),warehouseOutVO);

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java

@@ -69,7 +69,8 @@ public class WtSpTotalController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入spToolVO")
-	@OperationAnnotation(title = "库存清单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "库存清单",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页条件")
 	public R<IPage<WtSpToolVO>> pageList(WtSpToolVO spToolVO, Query query) {
 		IPage<WtSpToolVO> pages = SP_TOTALService.selectSpToolList(Condition.getPage(query),spToolVO);
@@ -81,7 +82,7 @@ public class WtSpTotalController extends BladeController {
 	@GetMapping("/warnPageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "库存预警列表", notes = "传入spToolVO")
-	@OperationAnnotation(title = "库存预警",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "资产管理",title = "库存预警",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<WtSpToolVO>> warnPageList(WtSpToolVO spToolVO, Query query) {
 		IPage<WtSpToolVO> pages = SP_TOTALService.warnPageList(Condition.getPage(query),spToolVO);

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDeviceController.java

@@ -2,6 +2,9 @@ package com.hnac.hzims.fdp.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.equipment.entity.EmTreeNode;
 import com.hnac.hzims.fdp.dto.FdpDeviceDTO;
 import com.hnac.hzims.fdp.entity.FdpDeviceEntity;
@@ -79,6 +82,9 @@ public class FdpDeviceController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 100)
 	@ApiOperation(value = "自定义分页   FDP设备列表")
+	@OperationAnnotation(moduleName = "智能诊断",title = "智能诊断配置",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "分页条件")
 	public R<IPage<FdpDeviceVO>> list(FdpDeviceDTO entity, Query query) {
 		return service.doList(Condition.getPage(query), entity);
 	}

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java

@@ -151,7 +151,7 @@ public class FdpMonitorController extends BladeController {
 	@GetMapping("/listPage")
 	@ApiOperationSupport(order = 110)
 	@ApiOperation(value = "查询监测点列表")
-	@OperationAnnotation(moduleName = "智能诊断",title = "监测点绑定",operatorType = OperatorType.MOBILE,businessType =
+	@OperationAnnotation(moduleName = "智能诊断",title = "智能诊断配置",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<FdpMonitorEntity>> listPage(FdpMonitorEntity entity, Query query) {

hzims-service/inspect/pom.xml

@@ -216,6 +216,13 @@
 
 		<!-- 用于创建multipartfile对象 end-->
 
+
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>hzims-biz-common</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
     <build>

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java

@@ -2,6 +2,9 @@ package com.hnac.hzinfo.inspect.ai.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.ai.vo.ClockVO;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
@@ -53,6 +56,10 @@ public class ClockController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入st_clock")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(moduleName = "巡检管理", title = "智能巡检配置",
+			operatorType = OperatorType.MOBILE,
+			businessType = BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<ClockEntity>> list(@ApiIgnore @RequestParam Map<String,Object> st_clock, Query query) {
 		QueryWrapper<ClockEntity> queryWrapper = Condition.getQueryWrapper( st_clock, ClockEntity.class);
 		IPage<ClockEntity> pages = st_clockService.page(Condition.getPage(query), queryWrapper);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java

@@ -2,6 +2,9 @@ package com.hnac.hzinfo.inspect.ai.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
@@ -51,6 +54,10 @@ public class ClockTypeController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入st_clock_type")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(moduleName = "巡检管理", title = "智能巡检配置",
+			operatorType = OperatorType.MOBILE,
+			businessType = BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<ClockTypeEntity>> list(@ApiIgnore @RequestParam Map<String,Object> st_clock_type, Query query) {
 		QueryWrapper<ClockTypeEntity> queryWrapper = Condition.getQueryWrapper( st_clock_type, ClockTypeEntity.class);
 		IPage<ClockTypeEntity> pages = st_clock_typeService.page(Condition.getPage(query), queryWrapper);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java

@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.ai.vo.robot.RobotAiReturnData;
 import com.hnac.hzinfo.inspect.ai.vo.robot.RobotServerTaskParam;
 import io.swagger.annotations.*;
@@ -60,6 +63,10 @@ public class RobotController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入st_robot")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(moduleName = "巡检管理", title = "机器人管理",
+			operatorType = OperatorType.MOBILE,
+			businessType = BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<RobotEntity>> list(@ApiIgnore @RequestParam Map<String,Object> st_robot, Query query) {
 		QueryWrapper<RobotEntity> queryWrapper = Condition.getQueryWrapper( st_robot, RobotEntity.class);
 		IPage<RobotEntity> pages = st_robotService.page(Condition.getPage(query), queryWrapper);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.obj.entity.ContentEntity;
 import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity;
 import com.hnac.hzinfo.inspect.obj.services.ProjectContentService;
@@ -47,6 +50,9 @@ public class ContentController {
 	 */
 	@GetMapping("/list")
 	@ApiOperation(value = "巡检内容列表", notes = "巡检内容列表")
+	@OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "巡检对象列表")
 	public R<IPage<ContentEntity>> list(ContentListQueryVO content, Query query, BladeUser bladeUser) {
 		LambdaQueryWrapper<ContentEntity> queryWrapper = Condition.getQueryWrapper(new ContentEntity(),content);
 		queryWrapper.orderByDesc(ContentEntity::getUpdateTime);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.obj.entity.ObjectDangerEntity;
 import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity;
 import com.hnac.hzinfo.inspect.obj.entity.ObjectTemplateEntity;
@@ -86,6 +89,9 @@ public class ObjectController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "巡检对象列表", notes = "巡检对象列表")
+	@OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "巡检对象列表")
 	public R<IPage<ObjectEntity>> list(ObjectListQueryVO object, Query query, BladeUser bladeUser) {
 		IPage<ObjectEntity> pages = Condition.getPage(query);
 		ObjectEntity entity = new ObjectEntity();

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java

@@ -5,6 +5,9 @@ package com.hnac.hzinfo.inspect.obj.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.collect.Lists;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity;
 import com.hnac.hzinfo.inspect.obj.services.ObjectUserService;
 import com.hnac.hzinfo.inspect.obj.vo.ObjectUserAddVO;
@@ -55,6 +58,10 @@ public class ObjectUserController {
 	 * 巡检对象用户列表
 	 */
 	@GetMapping("/list")
+	@OperationAnnotation(moduleName = "巡检管理", title = "巡检配置",
+			operatorType = OperatorType.MOBILE,
+			businessType = BusinessType.GENCODE,
+			action = "巡检对象用户列表")
 	@ApiOperation(value = "巡检对象用户列表", notes = "巡检对象用户列表(跨服务查询)")
 	public R<IPage<ObjectUserListVO>> list(ObjectUserListQuery content, Query query, BladeUser bladeUser) {
 		if(!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)){

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity;
 import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity;
 import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity;
@@ -52,6 +55,9 @@ public class ProjectController {
 	 */
 	@GetMapping("/list")
 	@ApiOperation(value = "巡检项目列表", notes = "巡检项目列表")
+	@OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "巡检对象列表")
 	public R<IPage<ProjectEntity>> list(ProjectListQueryVO project, Query query, BladeUser bladeUser) {
 		LambdaQueryWrapper<ProjectEntity> queryWrapper = Condition.getQueryWrapper(new ProjectEntity(),project);
 		queryWrapper.orderByDesc(ProjectEntity::getUpdateTime);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.obj.entity.ObjectTemplateEntity;
 import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity;
 import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity;
@@ -66,6 +69,9 @@ public class TemplateController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "巡检模板列表分页", notes = "传入巡检模板")
+	@OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "巡检对象列表")
 	public R<IPage<TemplateEntity>> list(TemplateListQueryVO inspectionTemplate, Query query, BladeUser bladeUser) {
 		LambdaQueryWrapper<TemplateEntity> queryWrapper = Condition.getQueryWrapper(new TemplateEntity(),inspectionTemplate);
 		queryWrapper.orderByDesc(TemplateEntity::getUpdateTime);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.Constants;
 import com.hnac.hzinfo.inspect.invalid.DictInvalid;
 import com.hnac.hzinfo.inspect.obj.utils.CodeUtils;
@@ -69,6 +72,9 @@ public class PlanController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页显示计划列表", notes = "传入plan")
+	@OperationAnnotation(moduleName = "巡检管理",title = "巡检计划",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "分页显示计划列表")
 	public R<IPage<PlanEntity>> list(PlanListQueryVO plan, Query query, BladeUser bladeUser) {
 		LambdaQueryWrapper<PlanEntity> queryWrapper = Condition.getQueryWrapper(new PlanEntity(),plan);
 		if(plan.getStartTime()!=null){

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java

@@ -2,9 +2,14 @@ package com.hnac.hzinfo.inspect.plan.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
+
 import javax.validation.Valid;
+
 import org.springblade.core.boot.ctrl.BladeController;
 
 import org.springblade.core.mp.support.Condition;
@@ -53,9 +58,13 @@ public class RouteController extends BladeController {
     @ApiOperation(value = "分页", notes = "传入st_re_route")
     @ApiImplicitParams({
     })
-	public R<IPage<RouteEntity>> list(@ApiIgnore @RequestParam Map<String,Object> st_re_route, Query query) {
+    @OperationAnnotation(moduleName = "巡检管理", title = "巡检配置",
-		QueryWrapper<RouteEntity> queryWrapper = Condition.getQueryWrapper( st_re_route, RouteEntity.class);
+            operatorType = OperatorType.MOBILE,
-		queryWrapper.orderByDesc("create_time","update_time");
+            businessType = BusinessType.GENCODE,
+            action = "列表(不分页)")
+    public R<IPage<RouteEntity>> list(@ApiIgnore @RequestParam Map<String, Object> st_re_route, Query query) {
+        QueryWrapper<RouteEntity> queryWrapper = Condition.getQueryWrapper(st_re_route, RouteEntity.class);
+        queryWrapper.orderByDesc("create_time", "update_time");
         IPage<RouteEntity> pages = st_re_routeService.page(Condition.getPage(query), queryWrapper);
         return R.data(pages);
     }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java

@@ -2,6 +2,9 @@ package com.hnac.hzinfo.inspect.report.controller;
 
 import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.excel.EasyExcel;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.gather.vo.TaskGatherQueryVO;
 import com.hnac.hzinfo.inspect.report.entity.InspectMonthReportExcel;
 import com.hnac.hzinfo.inspect.report.entity.MonthRoutReport;
@@ -37,6 +40,9 @@ public class InspectReportController {
 
 	@RequestMapping(value = "/getInspectMonthReport", method = { RequestMethod.POST,RequestMethod.GET })
 	@ApiOperation(notes = "子站-巡检月报表接口-按路径", value = "针对巡检月报表页")
+	@OperationAnnotation(moduleName = "生产月报", title = "巡检报表", operatorType = OperatorType.MOBILE, businessType =
+			BusinessType.GENCODE,
+			action = "子站-巡检月报表接口-按路径")
 	public  R<Map<String,MonthRoutReport>> getInspectMonthReport(
 		@ApiParam(value = "年月 2019-02") @RequestParam(required = true) String month,
 		@ApiParam(value = "巡检路径id") @RequestParam(required = true) Long routId,

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.annotation.JsonRawValue;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.google.common.collect.Lists;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.core.push.enums.PushAudienceType;
 import com.hnac.hzinfo.core.push.model.PushAudience;
 import com.hnac.hzinfo.core.push.model.PushInfo;
@@ -103,6 +106,9 @@ public class TaskController extends BladeController {
 	 */
 	@GetMapping("/list")
 	@ApiOperation(value = "分页显示任务列表", notes = "传入task")
+	@OperationAnnotation(moduleName = "巡检管理",title = "我的巡检任务",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "分页显示任务列表")
 	public R<BladePage<TaskVo>> list(TaskListQuery task, Query query) {
 		//CacheUtil.put("test#2","inspect","test","12");
 //		LambdaQueryWrapper<TaskEntity> queryWrapper = Condition.getQueryWrapper(new TaskEntity(),task);
@@ -154,6 +160,9 @@ public class TaskController extends BladeController {
 	 */
 	@GetMapping("/robotList")
 	@ApiOperation(value = "机器人任务列表", notes = "传入task")
+	@OperationAnnotation(moduleName = "巡检管理",title = "机器人巡检",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "机器人任务列表")
 	public R<IPage<TaskVo>> robotList(TaskListQuery task, Query query) {
 		IPage<TaskVo> pages = Condition.getPage(query);
 		task.setAutoVideo(PlanContants.InspectTypeEnum.ROBOT.getVal());
@@ -167,6 +176,10 @@ public class TaskController extends BladeController {
 	 * 视频任务列表
 	 */
 	@GetMapping("/videoList")
+	@OperationAnnotation(moduleName = "巡检管理", title = "视频巡检任务",
+			operatorType = OperatorType.MOBILE,
+			businessType = BusinessType.GENCODE,
+			action = "视频任务列表")
 	@ApiOperation(value = "视频任务列表", notes = "传入task")
 	public R<IPage<TaskVo>> videoList(TaskListQuery task, Query query) {
 		IPage<TaskVo> pages = Condition.getPage(query);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskRecordController.java

@@ -5,6 +5,9 @@ package com.hnac.hzinfo.inspect.task.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.task.entity.TaskRecordEntity;
 import com.hnac.hzinfo.inspect.task.service.ITaskRecordService;
 import com.hnac.hzinfo.inspect.task.service.ITaskService;
@@ -41,6 +44,9 @@ public class TaskRecordController {
 
 	@GetMapping("/list")
 	@ApiOperation(value = "巡检报备列表", notes = "巡检报备列表(只显示未开始)")
+	@OperationAnnotation(moduleName = "巡检管理",title = "巡检设备",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "巡检报备列表")
 	public R<IPage<TaskVo>> getListTaskRecord(TaskListQuery task, Query query) {
 		IPage<TaskVo> pages = Condition.getPage(query);
 		if(!AuthUtil.isAdministrator()){

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java

@@ -85,7 +85,8 @@ public class OperAccessLibraryController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:emCode,gradeCode")
-	@OperationAnnotation(title = "检修库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "检修管理",title = "检修库",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页 查询参数:emCode,gradeCode")
 	public R<IPage<OperAccessLibraryVO>> list(OperAccessLibraryListDTO req, Query query) {
 		return service.list(req, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java

@@ -84,7 +84,8 @@ public class OperAccessStatisticsController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:pid,taskId,manager")
-	@OperationAnnotation(title = "检修记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "检修管理",title = "检修记录",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页 查询参数:pid,taskId,manager")
 	public R<IPage<OperAccessStatisticsVO>> list(OperAccessStatisticsDTO req, Query query) {
 		return service.list(req, Condition.getPage(query));

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java

@@ -83,7 +83,8 @@ public class OperAccessTaskController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
-	@OperationAnnotation(title = "我的检修任务",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "检修管理",title = "我的检修任务",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页 查询参数:name,code,handler,status,planId,planCode")
 	@ApiOperation(value = "分页 查询参数:name,code,handler,status,planId,planCode")
 	public R<IPage<OperAccessTaskVO>> list(OperAccessTaskDTO req, Query query) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AlarmHandleController.java

@@ -3,6 +3,9 @@ package com.hnac.hzims.operational.alert.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.operational.alert.service.AlarmHandleService;
 import com.hnac.hzims.operational.alert.vo.AlarmHandleVo;
 import com.hnac.hzims.operational.alert.vo.HandleQueryVo;
@@ -49,6 +52,9 @@ public class AlarmHandleController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入AlarmHandleEntity")
+	@OperationAnnotation(moduleName = "告警配置", title = "告警配置记录", operatorType = OperatorType.MOBILE, businessType =
+			BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<AlarmHandleVo>> list(HandleQueryVo param, Query query) {
 		IPage<AlarmHandleVo> pages = service.pageCondition(query, param);
 		return R.data(pages);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java

@@ -162,7 +162,8 @@ public class OperDefectController extends BladeController {
     @GetMapping("/getDefectStatistics")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "获取缺陷的统计月报", notes = " month 格式：2021-01")
-    @OperationAnnotation(moduleName = "缺陷管理", title = "缺陷月报表", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE,
+    @OperationAnnotation(moduleName = "生产月报", title = "缺陷月报表", operatorType = OperatorType.MOBILE, businessType =
+            BusinessType.GENCODE,
             action = "获取缺陷的统计月报")
     public R<Map<String, Object>> getDefectStatistics(@ApiParam(value = "month 格式：2021-01", required = true) @RequestParam String month) {
         Map<String, Object> defectStatistics = defectService.getDefectStatistics(month);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperFaultController.java

@@ -60,7 +60,8 @@ public class OperFaultController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入fault")
 	@ApiImplicitParams({
 	})
-	@OperationAnnotation(title = "故障库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "智能诊断",title = "故障库",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页查询")
 	public R<IPage<OperFaultVO>> list(OperFaultEntity entity, Query query) {
 		LambdaQueryWrapper<OperFaultEntity> queryWrapper = Condition.getQueryWrapper(new OperFaultEntity(),entity);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java

@@ -54,6 +54,9 @@ public class ImsDutyClassController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入imsDutyClass")
+	@OperationAnnotation(moduleName = "值班管理",title = "值班配置",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,action
+			= "列表(不分页)")
 	public R<IPage<ImsDutyClassEntity>> list(ImsDutyClassEntity imsDutyClass, Query query) {
 		LambdaQueryWrapper<ImsDutyClassEntity> queryWrapper = Condition.getQueryWrapper(new ImsDutyClassEntity(),imsDutyClass);
 		if(null != imsDutyClass.getCreateDept()){
@@ -68,7 +71,7 @@ public class ImsDutyClassController extends BladeController {
 	 */
 	@GetMapping("/getlist")
 	@ApiOperationSupport(order = 2)
-	@OperationAnnotation(moduleName = "值班管理",title = "班次设置",operatorType = OperatorType.MOBILE,businessType =
+	@OperationAnnotation(moduleName = "值班管理",title = "值班配置",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,action
 			= "列表(不分页)")
 	@ApiOperation(value = "列表(不分页)", notes = "传入imsDutyClass")

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassTypeController.java

@@ -52,6 +52,11 @@ public class ImsDutyClassTypeController extends BladeController {
      */
     @GetMapping("/list")
     @ApiOperationSupport(order = 2)
+    @OperationAnnotation(moduleName = "值班管理",
+            title = "值班配置",
+            operatorType = OperatorType.MOBILE,
+            businessType = BusinessType.GENCODE,
+            action = "分页")
     @ApiOperation(value = "分页", notes = "传入imsDutyClassType")
     public R<IPage<ImsDutyClassTypeEntity>> list(ImsDutyClassTypeEntity imsDutyClassType, Query query) {
         LambdaQueryWrapper<ImsDutyClassTypeEntity> queryWrapper = Condition.getQueryWrapper(new ImsDutyClassTypeEntity(), imsDutyClassType);
@@ -104,12 +109,12 @@ public class ImsDutyClassTypeController extends BladeController {
      */
     @GetMapping("/classTypeList")
     @ApiOperationSupport(order = 9)
-	@OperationAnnotation(moduleName = "值班管理",title = "班次类型设置",operatorType = OperatorType.MOBILE,businessType =
+    @OperationAnnotation(moduleName = "值班管理", title = "班次类型设置", operatorType = OperatorType.MOBILE, businessType =
-			BusinessType.GENCODE,action
+            BusinessType.GENCODE, action
             = "获取不存在班次中的班次类型")
     @ApiOperation(value = "获取不存在班次中的班次类型", notes = "传入ids")
-	public R<List<ImsDutyClassTypeEntity>> classTypeList(@ApiParam(value = "机构ID", required = true) @RequestParam Long createDept,@ApiParam(value = "班次类型ID", required = true) @RequestParam(required = false) Long classTypeId) {
+    public R<List<ImsDutyClassTypeEntity>> classTypeList(@ApiParam(value = "机构ID", required = true) @RequestParam Long createDept, @ApiParam(value = "班次类型ID", required = true) @RequestParam(required = false) Long classTypeId) {
-		return R.data(imsDutyClassTypeService.getClassTypeList(createDept,classTypeId));
+        return R.data(imsDutyClassTypeService.getClassTypeList(createDept, classTypeId));
     }
 
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyGroupController.java

@@ -54,8 +54,10 @@ public class ImsDutyGroupController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
-	@OperationAnnotation(moduleName = "值班管理",title = "班组管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "值班管理",title = "签到记录",
-			= "分页")
+			operatorType = OperatorType.MOBILE,
+			businessType = BusinessType.GENCODE,
+			action = "分页")
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入imsDutyGroup")

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainController.java

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.duty.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
 import com.hnac.hzims.operational.duty.service.IImsDutyMainService;
 import com.hnac.hzims.operational.duty.vo.ChangeDutyMainVo;
@@ -116,11 +119,15 @@ public class ImsDutyMainController extends BladeController {
 //		}
 //		return imsDutyMainService.getScheduling(imsSchedulingVo);
 //	}
+
     /**
      * 查询排班
      */
     @PostMapping("/scheduling/list")
     @ApiOperationSupport(order = 8)
+    @OperationAnnotation(moduleName = "值班管理", title = "排班计划",
+            operatorType = OperatorType.MOBILE,
+            businessType = BusinessType.GENCODE, action = "查询排班")
     @ApiOperation(value = "查询排班", notes = "传年份和月份  year   month")
     public R schedulingList(@Valid @ApiParam(value = "年份", required = true) @RequestParam int year,
                             @ApiParam(value = "月份", required = true) @RequestParam int month,
@@ -170,6 +177,10 @@ public class ImsDutyMainController extends BladeController {
     @GetMapping("/getAllPersonInfo")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "返回对应部门所有人员", notes = "")
+    @OperationAnnotation(moduleName = "值班管理", title = "调班管理",
+            operatorType = OperatorType.MOBILE,
+            businessType = BusinessType.GENCODE,
+            action = "返回对应部门所有人员")
     public R getAllPersonInfo(Long deptId) {
         return R.data(imsDutyMainService.getAllPersonInfo(deptId));
     }
@@ -180,12 +191,12 @@ public class ImsDutyMainController extends BladeController {
     @GetMapping("/getDutyMainInfoVoById")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "值班人员ID对应班次信息", notes = "")
-	public R getDutyMainInfoVoById(@ApiParam(value = "机构ID") Long deptId,@ApiParam(value = "申请人ID") Long personId) {
+    public R getDutyMainInfoVoById(@ApiParam(value = "机构ID") Long deptId, @ApiParam(value = "申请人ID") Long personId) {
-		return imsDutyMainService.getDutyEmergencyEntityById(deptId,personId);
+        return imsDutyMainService.getDutyEmergencyEntityById(deptId, personId);
     }
 
     /**
-	 *灵活调入，调出
+     * 灵活调入，调出
      */
     @PostMapping("/updateDutyMainInfoVoById")
     @ApiOperationSupport(order = 9)

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java

@@ -79,7 +79,8 @@ public class ImsDutyRecController extends BladeController {
 	/**
 	 * 自定义分页 附件表
 	 */
-	@OperationAnnotation(title = "交接班记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "值班管理",title = "交接班记录",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页--交接班记录")
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 3)
@@ -254,6 +255,9 @@ public class ImsDutyRecController extends BladeController {
 	 */
 	@PostMapping("/queryEmergency")
 	@ApiOperationSupport(order = 6)
+	@OperationAnnotation(moduleName = "值班管理",title = "值班突发事件登记",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,action
+			= "列表(不分页)")
 	@ApiOperation(value = "查询突发事件记录", notes = "传入imsDutyEmergencyEntity")
 	public R queryEmergency( @Valid @RequestBody ImsDutyEmergencyVo imsDutyEmergencyVo,Query query) {
 		return iImsDutyEmergencyService.queryEntity(imsDutyEmergencyVo,query);
@@ -286,6 +290,10 @@ public class ImsDutyRecController extends BladeController {
 	@PostMapping("/queryAnalyseExample")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "查询分析实例模板", notes = "传入analyseExample")
+	@OperationAnnotation(moduleName = "值班管理", title = "值班日志配置",
+			operatorType = OperatorType.MOBILE,
+			businessType = BusinessType.GENCODE,
+			action = "查询分析实例模板")
 	public R queryAnalyseExample( AnalyseExample analyseExample,Query query) {
 		return iImsAnalyseExampleService.queryAnalyseExample(analyseExample,query);
 	}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.fill.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.operational.fill.entity.GenerateEntity;
 import com.hnac.hzims.operational.fill.service.GenerateService;
 import com.hnac.hzims.operational.fill.vo.GenerateVo;
@@ -57,6 +60,9 @@ public class GenerateController extends BladeController {
     @ApiLog
     @GetMapping("/list")
     @ApiOperationSupport(order = 4)
+    @OperationAnnotation(moduleName = "数据填报",
+            title = "水电站发电量填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+            action = "分页")
     @ApiOperation(value = "分页", notes = "查询条件：：startTime,endTime,stationCode")
     public R<IPage<GenerateVo>> list(QueryVo filter, Query query) {
         return service.pageCondition(filter, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java

@@ -66,8 +66,9 @@ public class OtherController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
-	@OperationAnnotation(title = "其他填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "数据填报",
-			action = "分页条件")
+			title = "配置数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	@ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime")
 	public R<IPage<OtherVo>> list(OtherVo vo, Query query) {
 		return service.pageCondition(vo, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java

@@ -66,7 +66,8 @@ public class OverConfigController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
-	@OperationAnnotation(title = "检修卡配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "数据填报",
+			title = "配置数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "查询条件")
 	@ApiOperation(value = "分页", notes = "查询条件：over_name")
 	public R<IPage<OverConfigVo>> list(OverConfigVo vo, Query query) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java

@@ -67,8 +67,9 @@ public class OverController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
-	@OperationAnnotation(title = "检修卡填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "数据填报",
-			action = "分页条件")
+			title = "配置数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	@ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime")
 	public R<IPage<OverVo>> list(OverVo vo, Query query) {
 		return service.pageCondition(vo, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java

@@ -66,8 +66,9 @@ public class PowerController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
-	@OperationAnnotation(title = "(风电 光扶)数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "数据填报",
-			action = "分页条件")
+			title = "风电数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	@ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime")
 	public R<IPage<PowerVo>> list(PowerVo vo, Query query) {
 		return service.pageCondition(vo, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java

@@ -1,6 +1,9 @@
 package com.hnac.hzims.operational.fill.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.operational.fill.vo.RainfallVo;
 import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Query;
@@ -58,6 +61,9 @@ public class RainfallController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
+	@OperationAnnotation(moduleName = "数据填报",
+			title = "降雨量填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	@ApiOperation(value = "分页", notes = "查询条件：：startTime,endTime,stationCode")
 	public R<IPage<RainfallVo>> list(QueryVo filter, Query query) {
 		return service.pageCondition(filter, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java

@@ -66,8 +66,9 @@ public class SolveController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
-	@OperationAnnotation(title = "消缺填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "数据填报",
-			action = "分页条件")
+			title = "配置数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	@ApiOperation(value = "分页", notes = "查询条件：startDate,endDate,createDept")
 	public R<IPage<SolveVo>> list(SolveVo vo, Query query) {
 		return service.pageCondition(vo, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.fill.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.operational.fill.entity.StorageEntity;
 import com.hnac.hzims.operational.fill.service.StorageService;
 import com.hnac.hzims.operational.fill.vo.QueryVo;
@@ -55,6 +58,9 @@ public class StorageController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
+	@OperationAnnotation(moduleName = "数据填报",
+			title = "储能站发电量填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	@ApiOperation(value = "分页", notes = "查询条件：startTime,endTime,stationCode")
 	public R<IPage<StorageEntity>> list(QueryVo vo, Query query) {
 		return service.pageCondition(vo, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.fill.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.operational.fill.entity.UseEntity;
 import com.hnac.hzims.operational.fill.service.UseService;
 import com.hnac.hzims.operational.fill.vo.QueryVo;
@@ -56,6 +59,9 @@ public class UseController extends BladeController {
     @ApiLog
     @GetMapping("/list")
     @ApiOperationSupport(order = 4)
+    @OperationAnnotation(moduleName = "数据填报",
+            title = "磊站用电填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+            action = "分页")
     @ApiOperation(value = "分页", notes = "查询条件：：startTime,endTime,stationCode")
     public R<IPage<UseVo>> list(QueryVo filter, Query query) {
         return service.pageCondition(filter, query);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomePageController.java

@@ -82,8 +82,8 @@ public class HomePageController extends BladeController {
 	@ApiLog
 	@ApiOperation("年计划发电完成趋势")
 	@GetMapping("/planAactualTrend")
-	@OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE,
+	// @OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE,
-			businessType = BusinessType.GENCODE,action = "年计划发电完成趋势")
+	// 		businessType = BusinessType.GENCODE,action = "年计划发电完成趋势")
 	@ApiOperationSupport(order = 6)
 	public R<List<PowerMonthVo>> planActualTrend(@ApiParam(value = "区域机构ID") Long deptId) {
 		return R.data(homePageService.planActualTrend(deptId));

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java

@@ -128,7 +128,7 @@ public class MainSystemMonitoringController {
 
 	@GetMapping("/listByAuthDept")
 	@OperationAnnotation(moduleName = "值班管理",
-			title = "排班计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			title = "值班配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
 			= "根据用户权限查询站点及部门")
 	@ApiOperationSupport(order = 100)
 	@ApiOperation(value = "根据用户权限查询站点及部门", notes = "")

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java

@@ -87,7 +87,7 @@ public class OperMaintenanceLibraryController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
-	@OperationAnnotation(moduleName = "设备管理",title = "设备维护库",operatorType = OperatorType.MOBILE,businessType =
+	@OperationAnnotation(moduleName = "日常维护",title = "设备维护库",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "分页 查询参数:libraryCode,emCode,typeCode,procDefId,disposers(仅支持一人)")
 	@ApiOperation(value = "分页 查询参数:libraryCode,emCode,typeCode,procDefId,disposers(仅支持一人)")

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckMonthController.java

@@ -3,6 +3,9 @@ package com.hnac.hzims.safeproduct.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.safeproduct.dto.CheckMonthDTO;
 import com.hnac.hzims.safeproduct.entity.CheckMonthEntity;
 import com.hnac.hzims.safeproduct.service.ICheckMonthService;
@@ -98,6 +101,9 @@ public class CheckMonthController extends BladeController {
 	@GetMapping("/listNotDataScope")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页", notes = "查询条件：month,status,createDept")
+	@OperationAnnotation(moduleName = "安全管理",
+			title = "月度自查核查",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<CheckMonthVo>> listNotDataScope(CheckMonthEntity req, Query query) {
 		R<IPage<CheckMonthVo>> pageR = checkMonthlyService.pageNotDataScope(req, query);
 		IPage<CheckMonthVo> page = pageR.getData();

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java

@@ -2,6 +2,9 @@ package com.hnac.hzims.safeproduct.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.safeproduct.dto.DangerSourceDTO;
 import com.hnac.hzims.safeproduct.entity.DangerSourceEntity;
 import com.hnac.hzims.safeproduct.service.IDangerSourceService;
@@ -78,6 +81,9 @@ public class DangerSourceController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页", notes = "查询条件：eqId,level,`dangerEle,applyType,type")
+	@OperationAnnotation(moduleName = "安全管理",title = "危险点列表",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<DangerSourceVO>> list(DangerSourceEntity req, Query query) {
 		return dangerSourceService.pageCondition(req, query);
 	}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java

@@ -79,7 +79,8 @@ public class EmergencyPlanController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
-	@OperationAnnotation(title = "应急预案文件",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "安全管理",title = "应急预案文件",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页条件")
 	@ApiOperation(value = "分页", notes = "查询条件：typeId,fileStatus,fileName")
 	public R<IPage<EmergencyPlanVO>> list(EmergencyPlanListDTO req, Query query) {

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonCameraInfoController.java

@@ -3,6 +3,9 @@ package com.hnac.hzims.safeproduct.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
+import com.hnac.hzims.common.logs.enums.BusinessType;
+import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.safeproduct.entity.ImsMonCameraInfoEntity;
 import com.hnac.hzims.safeproduct.service.IImsMonCameraInfoService;
 import io.swagger.annotations.*;
@@ -76,6 +79,10 @@ public class ImsMonCameraInfoController extends BladeController {
 		@ApiImplicitParam(name = "isControl", value = "是否云台控制", paramType = "query", dataType = "Integer"),
 		@ApiImplicitParam(name = "isHikvideo", value = "是否平台接入", paramType = "query", dataType = "Integer"),
 	})
+	@OperationAnnotation(moduleName = "巡检管理", title = "智能巡检配置",
+			operatorType = OperatorType.MOBILE,
+			businessType = BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<ImsMonCameraInfoEntity>> list(@ApiIgnore @RequestParam Map<String,Object> cameraInfo, Query query) {
 		QueryWrapper<ImsMonCameraInfoEntity> queryWrapper = new QueryWrapper<>();
 		if (!Func.isEmpty(cameraInfo.get("tenantId"))) {

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.java

@@ -57,7 +57,8 @@ public class SafeEquipmentTrialController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime")
-	@OperationAnnotation(title = "设备试验",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "设备管理",title = "设备试验",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页条件")
 	public R<BladePage<SafeEquipmentTrialVO>> list(SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) {
 		return service.pageCondition(safeEquipmentTrialDTO, query);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java

@@ -85,7 +85,8 @@ public class SystemFileController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页", notes = "查询条件：fTypeId,fileStatus,fileName")
-	@OperationAnnotation(title = "体系文件",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "安全管理",title = "体系文件",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "分页条件")
 	public R<IPage<SystemFileVO>> list(SystemFileListDTO req, Query query) {
 		return systemFileService.pageCondition(req, query);

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/controller/OperRepairController.java

@@ -56,7 +56,8 @@ public class OperRepairController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "确认抢修单", notes = "流程对象")
-	@OperationAnnotation(title = "两票管理(应急单)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+	@OperationAnnotation(moduleName = "两票管理",title = "应急单",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
 			action = "确认抢修单")
 	public R<IPage<RepairVO>> list(RepairEntity entity, Query query) {
 		return R.data(service.pages(entity,query));

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@@ -415,11 +415,12 @@ public class TicketProcessServiceImpl implements TicketProcessService {
                 message.setPushType(MessageConstants.IMMEDIATELY);
                 //您有一张工作票待审批，工作内容：*****，审批环节：*****；
                 String countent =
-                        "您有一张工作票待审批,工作内容：".concat(workTicketInfo.getWorkContent())
+                        "您有一张工作票待审批,工作内容: ".concat(workTicketInfo.getWorkContent())
-                                .concat("，审批环节：")
+                                .concat(",审批环节: ")
                                 .concat(response.getTaskName());
                 message.setContent(countent);
                 message.setDeptId(workTicketInfo.getCreateDept());
+                message.setCreateDept(workTicketInfo.getCreateDept());
                 R<String> deptName = sysClient.getDeptName(workTicketInfo.getCreateDept());
                 if (deptName.isSuccess()) {
                     message.setDeptName(deptName.getData());

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java

@@ -156,7 +156,7 @@ public class WorkTicketInfoController {
     @GetMapping("/userListByRoleAlias")
     @ApiOperationSupport(order = 100)
     @OperationAnnotation(moduleName = "两票管理",
-            title = "两票管理(工作票)", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE,
+            title = "工作票", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE,
             action = "获取某机构下角色的人员列表")
     @ApiOperation(value = "获取某机构下角色的人员列表")
     public R userListByRoleAlias(@RequestParam("roleAlias") @ApiParam("角色别称") String roleAlias) {