新增日志注解

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.spare.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.spare.entity.SpAllocationEntity;
 import com.hnac.hzims.spare.service.ISpAllocationService;
 import com.hnac.hzims.spare.vo.SpAllocationVO;
@@ -64,6 +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,
+			action = "分页查询")
 	public R<IPage<SpAllocationVO>> pageList(SpAllocationVO allocationVO, Query query) {
 		IPage<SpAllocationVO> pages = sp_allocationService.selectPageList(Condition.getPage(query),allocationVO);
 		return R.data(pages);

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.spare.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.spare.entity.SpReceiveEntity;
 import com.hnac.hzims.spare.service.ISpReceiveService;
 import com.hnac.hzims.spare.vo.SpReceiveVO;
@@ -51,6 +54,8 @@ public class SpReceiveController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_receive")
+	@OperationAnnotation(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);
 		return R.data(pages);

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

@@ -1,6 +1,9 @@
 package com.hnac.hzims.spare.controller;
 
 
+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.spare.entity.SpReceivesEntity;
 import com.hnac.hzims.spare.service.ISpReceivesService;
 import com.hnac.hzims.spare.vo.SpReceivesVO;
@@ -50,10 +53,12 @@ public class SpReceivesController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
-	@ApiLog
+	// @ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_receives")
+	@OperationAnnotation(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);
 		return R.data(pages);

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.spare.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.spare.entity.SpWarehouseInEntity;
 import com.hnac.hzims.spare.service.ISpWarehouseInService;
 import com.hnac.hzims.spare.vo.SpWarehouseInVO;
@@ -63,6 +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,
+			action = "分页条件")
 	public R<IPage<SpWarehouseInVO>> pageList(SpWarehouseInVO warehouseInVO, Query query) {
 		IPage<SpWarehouseInVO> pages = sp_warehouse_inService.selectPageList(Condition.getPage(query),warehouseInVO);
 		return R.data(pages);

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.spare.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.spare.entity.SpWarehouseOutEntity;
 import com.hnac.hzims.spare.service.ISpWarehouseOutService;
 import com.hnac.hzims.spare.vo.SpWarehouseOutVO;
@@ -51,6 +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,
+			action = "分页查询")
 	public R<IPage<SpWarehouseOutVO>> list(SpWarehouseOutVO warehouseOutVO, Query query) {
 		IPage<SpWarehouseOutVO> pages = sp_warehouse_outService.selectPageList(Condition.getPage(query),warehouseOutVO);
 		return R.data(pages);

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.spare.controller;
 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.hzims.spare.entity.SpTemporaryStockDetailEntity;
 import com.hnac.hzims.spare.entity.SpTemporaryStockEntity;
 import com.hnac.hzims.spare.entity.WtSpBasicEntity;
@@ -97,6 +100,8 @@ public class WtSpBasicController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入SP_BASIC")
+	@OperationAnnotation(title = "物资库存台账",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页条件")
 	public R<IPage<WtSpBasicVO>> pageList(WtSpBasicEntity SP_BASIC, Query query, Long warehouseId, String sign) {
 		IPage<WtSpBasicVO> pages = SP_BASICService.selectPage(SP_BASIC, query,warehouseId,sign);
 		return R.data(pages);

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.spare.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.spare.entity.WtSpManagementEntity;
 import com.hnac.hzims.spare.service.IWtSpManagementService;
 import com.hnac.hzims.spare.vo.WtSpManagementVO;
@@ -79,6 +82,8 @@ public class WtSpManagementController extends BladeController {
 	})
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "懒加载列表", notes = "传入parentId")
+	@OperationAnnotation(title = "物资类型",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页条件")
 	public R<List<WtSpManagementVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> managent) {
 		List<WtSpManagementVO> list = SP_MANAGEMENTService.lazyList(parentId, managent);
 		return R.data(WtSpManagementWrapper.build().listNodeLazyVO(list));

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.spare.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.spare.entity.WtSpProviderEntity;
 import com.hnac.hzims.spare.service.IWtSpProviderService;
 import io.swagger.annotations.Api;
@@ -67,6 +70,8 @@ public class WtSpProviderController extends BladeController {
     @GetMapping("/list")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "分页", notes = "传入SP_PROVIDER")
+    @OperationAnnotation(title = "供应商管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+            action = "分页查询")
     public R<IPage<WtSpProviderEntity>> list(WtSpProviderEntity providerEntity, Query query) {
         QueryWrapper<WtSpProviderEntity> queryWrapper = Condition.getQueryWrapper(providerEntity);
         if(Func.isNotEmpty(providerEntity.getProviderName())){

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.spare.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.spare.entity.WtSpToolBasicEntity;
 import com.hnac.hzims.spare.service.IWtSpToolBasicService;
 import com.hnac.hzims.spare.vo.WtSpToolBasicVO;
@@ -64,6 +67,8 @@ public class WtSpToolBasicController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入toolBasicEntity")
+	@OperationAnnotation(title = "工具台账",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页条件")
 	public R<IPage<WtSpToolBasicVO>> pageList(WtSpToolBasicVO toolBasicVO, Query query) {
 		IPage<WtSpToolBasicVO> pages = SP_TOOL_BASICService.selectPageList(Condition.getPage(query), toolBasicVO);
 		return R.data(pages);

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.spare.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.spare.entity.WtSpTotalEntity;
 import com.hnac.hzims.spare.service.IWtSpBasicService;
 import com.hnac.hzims.spare.service.IWtSpTotalService;
@@ -66,6 +69,8 @@ public class WtSpTotalController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入spToolVO")
+	@OperationAnnotation(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);
 		return R.data(pages);
@@ -76,6 +81,8 @@ public class WtSpTotalController extends BladeController {
 	@GetMapping("/warnPageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "库存预警列表", notes = "传入spToolVO")
+	@OperationAnnotation(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);
 		return R.data(pages);

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.spare.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.spare.entity.WtSpWarehouseEntity;
 import com.hnac.hzims.spare.service.IWtSpWarehouseService;
 import com.hnac.hzims.spare.vo.WtSpWarehouseVO;
@@ -55,6 +58,8 @@ public class WtSpWarehouseController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE")
+	@OperationAnnotation(title = "库存管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页查询")
 	public R<IPage<WtSpWarehouseVO>> list(WtSpWarehouseEntity wtSpWarehouseEntity, Query query) {
 		IPage<WtSpWarehouseVO> pages = SP_WAREHOUSEService.selectPage(wtSpWarehouseEntity, query);
 		return R.data(pages);

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.hzims.equipment.entity.EmInfoEntity;
 import com.hnac.hzims.equipment.service.IEmInfoService;
 import com.hnac.hzims.equipment.vo.EmInfoAddVo;
@@ -83,6 +86,8 @@ public class EmInfoController extends BladeController {
 	@ApiOperation(value = "设备分页", notes = "传入em_info")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(title = "设备信息",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页条件")
 	public R<IPage<EmInfoEntity>> list(@ApiIgnore @RequestParam Map<String, Object> em_info, Query query) {
 		QueryWrapper<EmInfoEntity> queryWrapper = Condition.getQueryWrapper(em_info, EmInfoEntity.class);
 		queryWrapper.lambda().eq(EmInfoEntity::getGpid, 0);

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.equipment.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.PlanGenerationEntity;
 import com.hnac.hzims.equipment.service.IPlanGenerationService;
 import com.hnac.hzims.equipment.vo.PlanGenerationVo;
@@ -49,6 +52,8 @@ public class PlanGenertionController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
+	@OperationAnnotation(title = "计划发电量填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页条件")
 	@ApiOperation(value = "分页", notes = "传入entity")
 	public R<IPage<PlanGenerationVo>> list(PlanGenerationVo vo, Query query) {
 		return R.data(service.doPage(Condition.getPage(query), vo));

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.equipment.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.dto.WorkshopInfoDTO;
 import com.hnac.hzims.equipment.service.IEmParamService;
 import com.hnac.hzims.equipment.service.IWorkshopInfoService;
@@ -60,6 +63,8 @@ public class WorkshopInfoController extends BladeController {
 	@RequestMapping(value = "/listPage",method = RequestMethod.GET)
 	@ApiOperation("列表分页查询")
 	@ApiOperationSupport(order = 3)
+	@OperationAnnotation(title = "产房管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "列表分页查询")
 	public R<IPage> listPage(WorkshopInfoDTO req, Query query) {
 		return R.data(service.page(Condition.getPage(query),service.getLambdaQuery(req)));
 	}

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.fdp.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.fdp.dto.FdpFaultDTO;
 import com.hnac.hzims.fdp.entity.FdpFaultEntity;
 import com.hnac.hzims.fdp.response.FaultStateResp;
@@ -99,6 +102,8 @@ public class FdpFaultController extends BladeController {
 	@ApiLog
 	@GetMapping("/queryFaultListOrd")
 	@ApiOperationSupport(order = 60)
+	@OperationAnnotation(title = "智能诊断",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
+			action = "分页查询")
 	@ApiOperation(value = "分页 查询参数:name,fdpId,emId,detectability,severity,fdpDeviceId,fdpDeviceName")
 	public R queryFaultListOrd(FdpFaultDTO req, Query query) {
 		return R.data(service.queryFaultListOrd(req, query));

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.fdp.controller;
 import com.alibaba.fastjson.JSONObject;
 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.fdp.dto.FdpMonitorDTO;
 import com.hnac.hzims.fdp.dto.FdpMonitorExtendDTO;
 import com.hnac.hzims.fdp.dto.FdpTaskDTO;
@@ -149,6 +152,8 @@ public class FdpMonitorController extends BladeController {
 	@GetMapping("/listPage")
 	@ApiOperationSupport(order = 110)
 	@ApiOperation(value = "查询监测点列表")
+	@OperationAnnotation(title = "监测点绑定",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页查询")
 	public R<IPage<FdpMonitorEntity>> listPage(FdpMonitorEntity entity, Query query) {
 		return service.listPage(Condition.getPage(query), entity);
 	}

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.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.fdp.dto.FdpTaskDTO;
 import com.hnac.hzims.fdp.entity.FdpTaskEntity;
 import com.hnac.hzims.fdp.service.IFdpTaskService;
@@ -89,11 +92,13 @@ public class FdpTaskController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:name,emId,faultId,reasonId,satisfaction")
+	@OperationAnnotation(title = "智能诊断任务",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页查询")
 	public R<IPage<FdpTaskVO>> list(FdpTaskDTO req, Query query) {
 		return service.list(req, query);
 	}
 
-	 @GetMapping("/updateTaskStatus")
+	 // @GetMapping("/updateTaskStatus")
 	 @ApiOperationSupport(order = 60)
 	 @ApiOperation("更新任务状态")
 	public R updateTaskStatus(@RequestParam Long id) {

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.access.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.access.dto.OperAccessLibraryDTO;
 import com.hnac.hzims.operational.access.dto.OperAccessLibraryListDTO;
 import com.hnac.hzims.operational.access.service.IOperAccessLibraryService;
@@ -82,6 +85,8 @@ public class OperAccessLibraryController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:emCode,gradeCode")
+	@OperationAnnotation(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/OperAccessPlanController.java

@@ -3,6 +3,9 @@ package com.hnac.hzims.operational.access.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.common.invalid.ObjectRequiredInvalid;
+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.OperationalConstants;
 import com.hnac.hzims.operational.access.dto.OperAccessPlanDTO;
 import com.hnac.hzims.operational.access.dto.OperAccessPlanFlowDTO;
@@ -121,6 +124,8 @@ public class OperAccessPlanController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
+	@OperationAnnotation(title = "检修计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页 查询参数:code,name,gradeCode,manager,techLead,handleStatus,status")
 	@ApiOperation(value = "分页 查询参数:code,name,gradeCode,manager,techLead,handleStatus,status")
 	public R<IPage<OperAccessPlanVO>> list(OperAccessPlanListDTO req, Query query) {
 		return service.list(req, query);

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.access.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.access.dto.OperAccessStatisticsDTO;
 import com.hnac.hzims.operational.access.service.IOperAccessStatisticsService;
 import com.hnac.hzims.operational.access.vo.OperAccessStatisticsVO;
@@ -81,6 +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,
+			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

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.access.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.access.dto.OperAccessTaskDTO;
 import com.hnac.hzims.operational.access.dto.OperAccessTaskFlowDTO;
 import com.hnac.hzims.operational.access.service.IOperAccessTaskService;
@@ -80,6 +83,8 @@ public class OperAccessTaskController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
+	@OperationAnnotation(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) {
 		return service.list(req, query);

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

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.common.invalid.DictInvalid;
 import com.hnac.hzims.common.invalid.ObjectRequiredInvalid;
+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.defect.entity.OperDefectEntity;
 import com.hnac.hzims.operational.defect.service.IOperDefectService;
 import com.hnac.hzims.operational.defect.vo.OperDefectVO;
@@ -62,6 +65,8 @@ public class OperDefectController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入defect")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(title = "缺陷库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			= "分页")
 	public R<IPage<OperDefectVO>> list(OperDefectEntity defect, Query query) {
 		LambdaQueryWrapper<OperDefectEntity> queryWrapper = Condition.getQueryWrapper(new OperDefectEntity(), defect);
 		if (defect.getActStartTime() != null) {
@@ -150,6 +155,8 @@ public class OperDefectController extends BladeController {
 	@GetMapping("/getDefectStatistics")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "获取缺陷的统计月报", notes = " month 格式：2021-01")
+	@OperationAnnotation(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);
 		return R.data(defectStatistics);

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.operational.defect.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.defect.dto.OperDefectStatisticsDTO;
 import com.hnac.hzims.operational.defect.entity.OperDefectStatisticsEntity;
 import com.hnac.hzims.operational.defect.entity.OperFaultEntity;
@@ -66,6 +69,8 @@ public class OperDefectStatisticsController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入statistics")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(title = "缺陷记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			= "分页")
 	public R<IPage<OperDefectStatisticsVO>> list(  OperDefectStatisticsEntity entity, Query query) {
 		LambdaQueryWrapper<OperDefectStatisticsEntity> queryWrapper = Condition.getQueryWrapper(new OperDefectStatisticsEntity(),entity);
 		if(entity.getActStartTime()!=null){

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.operational.defect.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.defect.entity.OperFaultEntity;
 import com.hnac.hzims.operational.defect.service.IOperFaultService;
 import com.hnac.hzims.operational.defect.vo.OperFaultBatchVO;
@@ -57,6 +60,8 @@ public class OperFaultController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入fault")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(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);
 		queryWrapper.orderByDesc(OperFaultEntity::getUpdateTime);

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

@@ -6,6 +6,9 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.google.common.collect.Lists;
 import com.hnac.hzims.common.invalid.DictInvalid;
 import com.hnac.hzims.common.invalid.ObjectRequiredInvalid;
+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.fdp.entity.FdpTaskEntity;
 import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity;
 import com.hnac.hzims.operational.defect.service.IOperPhenomenonService;
@@ -66,6 +69,8 @@ public class OperPhenomenonController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入phenomenon")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(title = "现象库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			= "分页")
 	public R<IPage<OperPhenomenonVO>> list(OperPhenomenonEntity entity,String taskIds, Query query, Date findTimeEnd) {
 		LambdaQueryWrapper<OperPhenomenonEntity> queryWrapper = Condition.getQueryWrapper(new OperPhenomenonEntity(), entity);
 		if (StringUtil.isNotBlank(taskIds)){

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.operational.duty.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.ImsDutyClassEntity;
 import com.hnac.hzims.operational.duty.service.IImsDutyClassService;
 import io.swagger.annotations.Api;
@@ -64,6 +67,8 @@ public class ImsDutyClassController extends BladeController {
 	 */
 	@GetMapping("/getlist")
 	@ApiOperationSupport(order = 2)
+	@OperationAnnotation(title = "班次设置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			= "列表(不分页)")
 	@ApiOperation(value = "列表(不分页)", notes = "传入imsDutyClass")
 	public R<List<ImsDutyClassEntity>> getlist(ImsDutyClassEntity imsDutyClass) {
 		List<ImsDutyClassEntity> list  = imsDutyClassService.getList(imsDutyClass);

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.operational.duty.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.ImsDutyClassTypeEntity;
 import com.hnac.hzims.operational.duty.service.IImsDutyClassTypeService;
 import io.swagger.annotations.Api;
@@ -101,6 +104,8 @@ public class ImsDutyClassTypeController extends BladeController {
 	 */
 	@GetMapping("/classTypeList")
 	@ApiOperationSupport(order = 9)
+	@OperationAnnotation(title = "班次类型设置",operatorType = OperatorType.MOBILE,businessType = 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) {
 		return R.data(imsDutyClassTypeService.getClassTypeList(createDept,classTypeId));

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.operational.duty.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.ImsDutyGroupEntity;
 import com.hnac.hzims.operational.duty.service.IImsDutyGroupService;
 import com.hnac.hzims.operational.duty.vo.ImsDutyGroupPersonVO;
@@ -51,6 +54,8 @@ public class ImsDutyGroupController extends BladeController {
 	/**
 	 * 分页 代码自定义代号
 	 */
+	@OperationAnnotation(title = "班组管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			= "分页")
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入imsDutyGroup")
@@ -141,6 +146,8 @@ public class ImsDutyGroupController extends BladeController {
 	 */
 	@PostMapping("/personGroupAll")
 	@ApiOperationSupport(order = 9)
+	@OperationAnnotation(title = "人员分组",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			= "人员分组查询")
 	@ApiOperation(value = "人员分组查询", notes = "传入imsDutyGroup")
 	public R<List<ImsDutyGroupPersonVO>> personGroupAll(@RequestParam(required = false) Long createDept) {
 		return imsDutyGroupService.getPersonGroupAll(createDept);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.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.ImsDutyEmergencyEntity;
 import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
 import com.hnac.hzims.operational.duty.entity.ImsDutyRecEntity;
@@ -70,6 +73,8 @@ public class ImsDutyRecController extends BladeController {
 	/**
 	 * 自定义分页 附件表
 	 */
+	@OperationAnnotation(title = "交接班记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页--交接班记录")
 	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页--交接班记录", notes = "传入entity")
@@ -125,6 +130,8 @@ public class ImsDutyRecController extends BladeController {
 	@GetMapping("/getTheCurrentDuty")
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "获取当前值班班组")
+	@OperationAnnotation(title = "交接班管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			= "获取当前值班班组")
 	public R<ImsDutyRecVO> getTheCurrentDuty(@ApiParam(value = "机构ID") Long deptId){
 		if(null == deptId){
 			deptId = Long.valueOf(AuthUtil.getDeptId());

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecQRRecordController.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.ImsDutyRecQRRecordEntity;
 import com.hnac.hzims.operational.duty.service.IImsDutyRecQRRecordService;
 import com.hnac.hzims.operational.duty.vo.ImsDutyRecQRRecordExtendVo;
@@ -54,6 +57,8 @@ public class ImsDutyRecQRRecordController extends BladeController {
 	 */
 	@PostMapping("/pageList")
 	@ApiOperationSupport(order = 3)
+	@OperationAnnotation(title = "签到记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			= "分页--交接班扫码记录")
 	@ApiOperation(value = "分页--交接班扫码记录", notes = "传入vo")
 	public R<IPage<ImsDutyRecQRRecordVo>> page(@Valid @RequestBody ImsDutyRecQRRecordVo vo, Query query) {
 		return R.data(recQRRecordService.doPageList(Condition.getPage(query), vo));

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.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.OtherEntity;
 import com.hnac.hzims.operational.fill.service.OtherService;
 import com.hnac.hzims.operational.fill.vo.OtherVo;
@@ -63,6 +66,8 @@ public class OtherController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
+	@OperationAnnotation(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

@@ -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.OverConfigEntity;
 import com.hnac.hzims.operational.fill.service.OverConfigService;
 import com.hnac.hzims.operational.fill.vo.OverConfigVo;
@@ -63,6 +66,8 @@ public class OverConfigController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
+	@OperationAnnotation(title = "检修卡配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "查询条件")
 	@ApiOperation(value = "分页", notes = "查询条件：over_name")
 	public R<IPage<OverConfigVo>> list(OverConfigVo vo, Query query) {
 		return service.pageCondition(vo, query);
@@ -70,7 +75,7 @@ public class OverConfigController extends BladeController {
 
 	/**
 	 * 获取排序号
-	 */
+	 // */
 	@ApiLog
 	@PostMapping("/getSort")
 	@ApiOperationSupport(order = 5)

hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.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.dto.OverReqDTO;
 import com.hnac.hzims.operational.fill.entity.OverEntity;
 import com.hnac.hzims.operational.fill.service.OverService;
@@ -64,6 +67,8 @@ public class OverController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
+	@OperationAnnotation(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

@@ -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.PowerEntity;
 import com.hnac.hzims.operational.fill.service.PowerService;
 import com.hnac.hzims.operational.fill.vo.PowerVo;
@@ -63,6 +66,8 @@ public class PowerController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
+	@OperationAnnotation(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/SolveController.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.SolveEntity;
 import com.hnac.hzims.operational.fill.service.SolveService;
 import com.hnac.hzims.operational.fill.vo.SolveVo;
@@ -63,6 +66,8 @@ public class SolveController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 4)
+	@OperationAnnotation(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/main/controller/AreaMonthReportController.java

@@ -1,6 +1,9 @@
 package com.hnac.hzims.operational.main.controller;
 
 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.main.service.IAreaMonthReportService;
 import com.hnac.hzims.operational.main.vo.AreaMonthReportVo;
 import io.swagger.annotations.Api;
@@ -44,6 +47,8 @@ public class AreaMonthReportController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation("获取区域月报")
 	@GetMapping("/getAreaMonthReport")
+	@OperationAnnotation(title = "水电生产运行月报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "获取区域月报")
 	public R<List<AreaMonthReportVo>> getAreaMonthReport(@ApiParam(value = "日期-年月", required = true) String date) {
 		return service.getReport(date);
 	}

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.main.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.access.constants.AccessConstants;
 import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity;
 import com.hnac.hzims.operational.access.service.IOperAccessTaskService;
@@ -58,6 +61,9 @@ public class MainReportController extends BladeController {
 	@ApiOperationSupport(order = 10)
 	@ApiOperation("缺陷报表")
 	@GetMapping("/defect")
+	@OperationAnnotation(title = "缺陷统计",
+			operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
+			action = "缺陷报表")
 	public R<Map<String, DefectReportVO>> defect(@RequestParam String startDate, @RequestParam String endDate) {
 		Date startTime = DateUtil.parse(startDate, DateUtil.PATTERN_DATE);
 		Date endTime = DateUtil.plusDays(DateUtil.parse(endDate, DateUtil.PATTERN_DATE), 1);
@@ -97,6 +103,8 @@ public class MainReportController extends BladeController {
 	@ApiOperationSupport(order = 20)
 	@ApiOperation("运维报表(日常维护、巡检、检修)")
 	@GetMapping("/operational")
+	@OperationAnnotation(title = "任务统计",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "运维报表(日常维护、巡检、检修) 分页查询")
 	public R<Map<String, OperationalReportVO>> operational(@RequestParam String startDate, @RequestParam String endDate) {
 		Date startTime = DateUtil.parse(startDate, DateUtil.PATTERN_DATE);
 		Date endTime = DateUtil.plusDays(DateUtil.parse(endDate, DateUtil.PATTERN_DATE), 1);

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

@@ -1,6 +1,9 @@
 package com.hnac.hzims.operational.main.controller;
 
 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.main.service.IMainSystemMonitoringService;
 import com.hnac.hzims.operational.main.vo.*;
 import com.hnac.hzims.operational.station.entity.StationEntity;
@@ -123,6 +126,8 @@ public class MainSystemMonitoringController {
 
 	@ApiLog
 	@GetMapping("/listByAuthDept")
+	@OperationAnnotation(title = "排班计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+			= "根据用户权限查询站点及部门")
 	@ApiOperationSupport(order = 100)
 	@ApiOperation(value = "根据用户权限查询站点及部门", notes = "")
 	public R<List<StationDeptVo>> listByAuthDept() {

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.operational.main.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.main.entity.MainWorkBenchEntity;
 import com.hnac.hzims.operational.main.service.IMainWorkBenchService;
 import com.hnac.hzims.operational.main.vo.InDustryVo;
@@ -85,6 +88,8 @@ public class MainWorkBenchController extends BladeController {
 	@ApiOperationSupport(order = 50)
 	@ApiOperation("获取路由")
 	@PostMapping("/getHomePageWorkBench")
+	@OperationAnnotation(title = "首页工作台",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "获取路由")
 	public R<InDustryVo> getHomePageWorkBench(@Valid @RequestBody RoutingParamVo vo) {
 		return R.data(workBenchService.getHomePageWorkBench(vo));
 	}

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

@@ -6,6 +6,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.main.entity.RunMonthReportEntity;
 import com.hnac.hzims.operational.main.service.IRunMonthReportService;
 import com.hnac.hzims.operational.main.vo.RunMonthReportUnitVo;
@@ -236,6 +239,8 @@ public class RunMonthReportController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation("根据站点获取运行月报-新版")
 	@GetMapping("/new/getByStation")
+	@OperationAnnotation(title = "运行月报告",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "根据站点获取运行月报-新版")
 	public R getNewByStation(@ApiParam(value = "日期-年月", required = true) String date,
 							 @ApiParam(value = "站点ID", required = true) String stationId) {
 		RunMonthReportEntity runMonthReport = runMonthReportService.getOne(new LambdaQueryWrapper<RunMonthReportEntity>() {{

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.maintenance.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.maintenance.dto.OperMaintenanceLibraryDTO;
 import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceLibraryService;
 import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceLibraryVO;
@@ -84,6 +87,8 @@ public class OperMaintenanceLibraryController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
+	@OperationAnnotation(title = "设备维护库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页 查询参数:libraryCode,emCode,typeCode,procDefId,disposers(仅支持一人)")
 	@ApiOperation(value = "分页 查询参数:libraryCode,emCode,typeCode,procDefId,disposers(仅支持一人)")
 	public R<IPage<OperMaintenanceLibraryVO>> list(OperMaintenanceLibraryDTO req, Query query) {
 		return libraryService.list(req, query);

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

@@ -1,6 +1,9 @@
 package com.hnac.hzims.operational.maintenance.controller;
 
 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.maintenance.dto.OperMaintenanceMonitorReportMonthDTO;
 import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceMonitorService;
 import com.hnac.hzims.operational.maintenance.vo.OperMaintenancePlanVO;
@@ -38,6 +41,8 @@ public class OperMaintenanceMonitorController extends BladeController {
 	@GetMapping("/report/month")
 	@ApiOperationSupport(order = 40)
 	@ApiOperation(value = "监控月报表")
+	@OperationAnnotation(title = "日常维护计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "监控月报表")
 	public R<Map<String, List<OperMaintenancePlanVO>>> reportMonth(OperMaintenanceMonitorReportMonthDTO req) {
 		return monitorService.reportMonth(req);
 	}

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.operational.maintenance.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.maintenance.dto.OperMaintenancePlanDTO;
 import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity;
 import com.hnac.hzims.operational.maintenance.scheduled.MaintenancePlanCreateTask;
@@ -91,6 +94,8 @@ public class OperMaintenancePlanController extends BladeController {
 	@ApiOperation(value = "分页 查询参数:refLibraryId,disposer")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(title = "日常维护计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页查询")
 	public R<IPage<OperMaintenancePlanVO>> list(OperMaintenancePlanDTO req, Query query) {
 		return planService.list(req, query);
 	}

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

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.common.invalid.DictInvalid;
 import com.hnac.hzims.common.invalid.ObjectRequiredInvalid;
+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.maintenance.constants.MaintenanceConstant;
 import com.hnac.hzims.operational.maintenance.dto.OperMaintenanceTaskDTO;
 import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity;
@@ -101,6 +104,8 @@ public class OperMaintenanceTaskController extends BladeController {
 	@ApiOperation(value = "分页 查询参数:refLibraryId,processInstanceId,disposer,content,status")
 	@ApiImplicitParams({
 	})
+	@OperationAnnotation(title = "日常维护记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页 查询参数:refLibraryId,processInstanceId,disposer,content,status")
 	public R<IPage<OperMaintenanceTaskVO>> list(OperMaintenanceTaskDTO req, Query query) {
 		return taskService.list(req, query);
 	}

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

@@ -1,6 +1,9 @@
 package com.hnac.hzims.operational.report.controller;
 
 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.common.utils.DateUtil;
 import com.hnac.hzims.operational.report.service.ITaskMonthService;
 import com.hnac.hzims.operational.report.vo.PersonalMonthReportVO;
@@ -60,6 +63,8 @@ public class MonthReportController {
 	@GetMapping("/getStationMonthReportByStationCode")
 	@ApiOperation(value = "根据站点编码获取站点月报",notes = "根据站点编码获取站点月报")
 	@ApiOperationSupport(order = 1)
+	@OperationAnnotation(title = "统计月报(对内 对外)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "根据站点编码获取站点月报")
 	public R<StationReportAllVO> getStationMonthReportByStationCode(@RequestParam("deptId") Long deptId,@RequestParam("month") String month) throws Exception {
 //		LocalDate startDate = DateUtil.getFirstDayByYearMonth(month);
 //		LocalDate endDate = DateUtil.getLastDayByYearMonth(month);
@@ -72,6 +77,8 @@ public class MonthReportController {
 	@GetMapping("/getPersonalMonthReport")
 	@ApiOperation(value = "获取当前登录人个人月报",notes = "获取当前登录人个人月报")
 	@ApiOperationSupport(order = 2)
+	@OperationAnnotation(title = "统计月报-个人",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "获取当前登录人个人月报")
 	public R<PersonalMonthReportVO> getPersonalMonthReport(@RequestParam("month") String month) throws Exception {
 		PersonalMonthReportVO personalMonthReportVO = monthReportService.getPersonalMonthReport(month);
 		return R.data(personalMonthReportVO);

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

@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.data.service.HzimsDataService;
 import com.hnac.hzims.operational.main.service.IMainSystemMonitoringService;
 import com.hnac.hzims.operational.station.entity.StationEntity;
@@ -57,13 +60,15 @@ public class StationController extends BladeController {
 	@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "分页", notes = "传入StationEntity")
+	@OperationAnnotation(title = "智能诊断",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页查询")
 	public R<IPage<StationVO>> list(StationEntity entity, Query query) {
 		IPage<StationVO> vos = stationService.list(entity,query);
 		return R.data(vos);
 	}
 
 	@GetMapping("/detail/{id}")
-	@ApiOperationSupport(order = 60)
+	// @ApiOperationSupport(order = 60)
 	@ApiOperation(value = "查看详情", notes = "查看详情")
 	public R<StationEntity> detail(@PathVariable @ApiParam("主键ID") Long id) {
 		return R.data(stationService.getById(id));

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

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.operational.station.dto.StationVideoTypeDTO;
 import com.hnac.hzims.operational.station.entity.StationEntity;
 import com.hnac.hzims.operational.station.entity.StationVideoTypeEntity;
@@ -138,6 +141,8 @@ public class StationVideoTypeController extends BladeController {
 	@RequestMapping(value = "/getVideoMonitor", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "获取视频监测列表", notes = "获取视频监测列表")
+	@OperationAnnotation(title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
+			action = "获取视频监测列表")
 	public R<List<VideoMonitorVO>> getVideoMonitor(){
 		List<VideoMonitorVO> result = stationVideoTypeService.getVideoMonitor();
 		return R.data(result);
@@ -146,6 +151,8 @@ public class StationVideoTypeController extends BladeController {
 	@ApiLog
 	@RequestMapping(value = "/getById", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperationSupport(order = 60)
+	@OperationAnnotation(title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE,
+			action = "获取视频监测对象")
 	@ApiOperation(value = "获取视频监测对象", notes = "获取视频监测对象")
 	public R<StationVideoTypeEntity> getById(@RequestParam Long id,@RequestParam int streamType){
 		return R.data(stationVideoTypeService.getById(id,streamType));

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

@@ -3,6 +3,9 @@ package com.hnac.hzims.safeproduct.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.AccidentDTO;
 import com.hnac.hzims.safeproduct.entity.AccidentEntity;
 import com.hnac.hzims.safeproduct.service.IAccidentService;
@@ -112,6 +115,8 @@ public class AccidentController extends BladeController {
 	@GetMapping("/pageList")
 	@ApiOperation("分页查询")
 	@ApiOperationSupport(order = 5)
+	@OperationAnnotation(title = "事故管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页条件")
 	public R<IPage> pageList(AccidentDTO req, Query query){
 		AccidentEntity accidentEntity = BeanUtil.copy(req,AccidentEntity.class);
 		LambdaQueryWrapper<AccidentEntity> queryWrapper = Condition.getQueryWrapper(new AccidentEntity(),accidentEntity);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.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.EmergencyPlanDTO;
 import com.hnac.hzims.safeproduct.dto.EmergencyPlanListDTO;
 import com.hnac.hzims.safeproduct.service.IEmergencyPlanService;
@@ -76,6 +79,8 @@ public class EmergencyPlanController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
+	@OperationAnnotation(title = "应急预案文件",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页条件")
 	@ApiOperation(value = "分页", notes = "查询条件：typeId,fileStatus,fileName")
 	public R<IPage<EmergencyPlanVO>> list(EmergencyPlanListDTO req, Query query) {
 		return emergencyPlanService.pageCondition(req, query);

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.hzims.safeproduct.Constants;
 import com.hnac.hzims.safeproduct.constants.RoleConstant;
 import com.hnac.hzims.safeproduct.dto.ReviewDto;
@@ -133,6 +136,8 @@ public class ReviewController extends BladeController {
 	@GetMapping("/listPage")
 	@ApiOperation("分页查询")
 	@ApiOperationSupport(order = 4)
+	@OperationAnnotation(title = "电站安全标准",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页查询")
 	public R<IPage> listPage(ReviewDto req, Query query) {
 		LambdaQueryWrapper<ReviewEntity> queryWrapper = Condition.getQueryWrapper(new ReviewEntity(),BeanUtil.copy(req,ReviewEntity.class));
 		if(Func.isNotEmpty(req.getStatus())){

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.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.SafeEquipmentTrialDTO;
 import com.hnac.hzims.safeproduct.entity.SafeEquipmentTrialEntity;
 import com.hnac.hzims.safeproduct.service.SafeEquipmentTrialService;
@@ -53,6 +56,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,
+			action = "分页条件")
 	public R<IPage<SafeEquipmentTrialVO>> list(SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) {
 		return service.pageCondition(safeEquipmentTrialDTO, query);
 	}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.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.SafetyToolBatchRecheckDTO;
 import com.hnac.hzims.safeproduct.dto.SafetyToolDTO;
 import com.hnac.hzims.safeproduct.entity.SafetyToolEntity;
@@ -94,6 +97,8 @@ public class SafetyToolController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
+	@OperationAnnotation(title = "安全工具器",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页条件")
 	@ApiOperation(value = "分页", notes = "查询条件：typeId,toolName,toolCode")
 	public R<IPage<SafetyToolVO>> list(SafetyToolDTO req, Query query) {
 		return safetyToolService.pageCondition(req, query);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolTypeController.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.SafetyToolTypeBatchConfigDTO;
 import com.hnac.hzims.safeproduct.dto.SafetyToolTypeDTO;
 import com.hnac.hzims.safeproduct.dto.SafetyToolTypeListDTO;
@@ -94,6 +97,8 @@ public class SafetyToolTypeController extends BladeController {
 	@ApiLog
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 60)
+	@OperationAnnotation(title = "安全工器具类型",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页条件")
 	@ApiOperation(value = "分页", notes = "查询条件：sendType,name,startSendTime,endSendTime")
 	public R<IPage<SafetyToolTypeVO>> list(SafetyToolTypeListDTO req, Query query) {
 		return R.data(safetyToolTypeService.pageCondition(req, query));

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.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.SystemFileDTO;
 import com.hnac.hzims.safeproduct.dto.SystemFileListDTO;
 import com.hnac.hzims.safeproduct.entity.SystemFileEntity;
@@ -82,6 +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,
+			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/library/controller/TicketMatterGroupController.java

@@ -3,6 +3,9 @@ package com.hnac.hzims.ticket.library.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.ticket.library.dto.TicketMatterGroupDTO;
 import com.hnac.hzims.ticket.library.entity.TicketMatterGroupEntity;
 import com.hnac.hzims.ticket.library.service.ITicketMatterGroupService;
@@ -82,6 +85,8 @@ public class TicketMatterGroupController extends BladeController {
 	@GetMapping("/queryList")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页")
+	@OperationAnnotation(title = "两票管理(票据管理)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<TicketMatterGroupVO>> queryList(TicketMatterGroupDTO req, Query query) {
 		return service.queryList(req,query);
 	}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java

@@ -29,37 +29,39 @@ import java.util.List;
 @Slf4j
 public class StandardWorkTicketConsumer implements IQueueConsume {
 
-	@Autowired
+    @Autowired
-	private List<TicketService> ticketServiceList;
+    private List<TicketService> ticketServiceList;
 
-	@Autowired
+    @Autowired
-	private WorkflowOperationLogService workflowOperationLogService;
+    private WorkflowOperationLogService workflowOperationLogService;
 
-	@Override
+    @Override
-	public void handlerMessage(String message) {
+    public void handlerMessage(String message) {
-		log.info("监听到数据:{}", message);
+        log.info("监听到数据:{}", message);
-		WorkTicketMessageResponse response = JSONObject.parseObject(message, WorkTicketMessageResponse.class);
+        WorkTicketMessageResponse response = JSONObject.parseObject(message, WorkTicketMessageResponse.class);
-		String taskDefinitionKey = response.getTaskDefinitionKey();
+        String taskDefinitionKey = response.getTaskDefinitionKey();
-		WorkflowQueue ticker = new WorkflowQueue();
+        WorkflowQueue ticker = new WorkflowQueue();
-		ticker.setDeploymentId(taskDefinitionKey);
+        ticker.setDeploymentId(taskDefinitionKey);
-		//判断执行具体的实现类
+        //判断执行具体的实现类
-		TicketService ticketService = ticketServiceList.stream().filter(item -> item.isWorkflowTicket(ticker))
+        TicketService ticketService = ticketServiceList.stream().filter(item -> item.isWorkflowTicket(ticker))
-			.findFirst().orElse(null);
+                .findFirst().orElse(null);
-		if (ObjectUtils.isNotEmpty(ticketService)){
+        if (ObjectUtils.isNotEmpty(ticketService)) {
-			//执行业务方法
+            //执行业务方法
-			try {
+            try {
-				ticketService.calculate(response);
+                ticketService.calculate(response);
-			} catch (Exception e) {
+            } catch (Exception e) {
-				//todo 业务出错误 做补偿
+                //todo 业务出错误 做补偿
-				log.error("业务出错,StandardWorkTicketConsumer: ", e);
+                log.error("业务出错,StandardWorkTicketConsumer: ", e);
-				log.info("正在保存到hzims_workflow_operation_log....");
+                log.info("正在保存到hzims_workflow_operation_log....");
-				WorkflowOperationLog workflowOperationLog = new WorkflowOperationLog();
+                WorkflowOperationLog workflowOperationLog = new WorkflowOperationLog();
-				BeanUtils.copyProperties(response,workflowOperationLog);
+                BeanUtils.copyProperties(response, workflowOperationLog);
-				workflowOperationLogService.save(workflowOperationLog);
+                workflowOperationLogService.save(workflowOperationLog);
 
-			}
+            }
-		}
+        }
 
 
-	}
+    }
 }
+
+

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessTypeController.java

@@ -11,7 +11,11 @@ import com.hnac.hzims.ticket.processflow.properties.WorkTicketProperties;
 import com.hnac.hzims.ticket.processflow.service.ProcessTypeService;
 import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue;
 import com.hnac.hzims.ticket.processflow.strategy.service.TicketService;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.core.feign.IFlowClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,7 +23,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -30,23 +36,27 @@ import java.util.stream.Collectors;
  * @author dfy
  * @since 2023-03-29
  */
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/processflow/process-type")
 public class ProcessTypeController {
 
-    @Autowired
-    private TicketProperties ticketProperties;
 
+    private final TicketProperties ticketProperties;
 
-    @Autowired
-    private ProcessTypeService processTypeService;
 
 
-    @Autowired
+    private final ProcessTypeService processTypeService;
-    private List<TicketService> ticketServiceList;
 
-    @Autowired
+
-    private RedisTemplate redisTemplate;
+
+    private final List<TicketService> ticketServiceList;
+
+
+    private final  RedisTemplate redisTemplate;
+
+
+    private final IFlowClient flowClient;
 
 
     @GetMapping("/add")
@@ -93,5 +103,24 @@ public class ProcessTypeController {
         System.out.println(1/0);
         return R.data(list);
     }
+
+
+    @OperationAnnotation(title = "工作流审批类型", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE,
+            action ="审批流处理")
+    @GetMapping("/build")
+    public void addList() {
+        Map<String,Object> params = new HashMap<String, Object>(2) {{
+            put("taskId", "1");
+            put("signUserIds", "admin");
+        }};
+        R<BladeFlow> result = flowClient
+                .startProcessInstanceContainNameByKey(
+                        "newFirstWorkTicket","workTicket:task:" + "11",
+                        "工作流处理业务",
+                        params);
+
+
+        System.out.println(result.getData());
+    }
 }
 

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

@@ -2,6 +2,9 @@ package com.hnac.hzims.ticket.repair.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.ticket.repair.entity.RepairEntity;
 import com.hnac.hzims.ticket.repair.service.IOperRepairService;
 import com.hnac.hzims.ticket.repair.vo.RepairVO;
@@ -53,6 +56,8 @@ public class OperRepairController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "确认抢修单", notes = "流程对象")
+	@OperationAnnotation(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/standardTicket/controller/StandardTicketInfoController.java

@@ -3,6 +3,9 @@ package com.hnac.hzims.ticket.standardTicket.controller;
 import com.alibaba.fastjson.JSONObject;
 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.ticket.standardTicket.dto.StandardTicketInfoDto;
 import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService;
 import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketInfoVO;
@@ -67,6 +70,8 @@ public class StandardTicketInfoController extends BladeController {
 	@PostMapping("/queryList")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页")
+	@OperationAnnotation(title = "两票管理(操作票)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<StandardTicketInfoVO>> queryList(StandardTicketInfoDto req, Query query) {
 		return standardTicketInfoService.queryList(req, query);
 	}

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

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.common.invalid.DictInvalid;
 import com.hnac.hzims.common.invalid.ObjectRequiredInvalid;
+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.ticket.constants.DictConstants;
 import com.hnac.hzims.ticket.workTicket.dto.TicketAccessTaskDto;
 import com.hnac.hzims.ticket.workTicket.dto.WorkInfoFlowDto;
@@ -89,6 +92,8 @@ public class WorkTicketInfoController {
 	@PostMapping("/queryList")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页")
+	@OperationAnnotation(title = "两票管理(工作票)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页")
 	public R<IPage<WorkTicketInfoVO>> queryList(WorkTicketInfoDto req, Query query) {
 		return workTicketInfoService.queryList(req, query);
 	}
@@ -141,6 +146,8 @@ public class WorkTicketInfoController {
 	@ApiLog
 	@GetMapping("/userListByRoleAlias")
 	@ApiOperationSupport(order = 100)
+	@OperationAnnotation(title = "两票管理(工作票)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "获取某机构下角色的人员列表")
 	@ApiOperation(value = "获取某机构下角色的人员列表")
 	public R userListByRoleAlias(@RequestParam("roleAlias")  @ApiParam("角色别称") String roleAlias) {
 		IUserClient userClient = SpringUtil.getBean(IUserClient.class);

hzims-service/topvision/src/main/java/com/hnac/hzims/topvision/controller/ImsTopvisionUserController.java

@@ -1,6 +1,9 @@
 package com.hnac.hzims.topvision.controller;
 
 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.hzims.topvision.dto.TopvisionUserInfo;
 import io.swagger.annotations.Api;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -54,6 +57,8 @@ public class ImsTopvisionUserController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入topvisionUser")
+	@OperationAnnotation(title = "远程协作",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
+			action = "分页查询")
 	public R<IPage<ImsTopvisionUserEntity>> list(ImsTopvisionUserEntity topvisionUser, Query query) {
 		IPage<ImsTopvisionUserEntity> pages = topvisionUserService.page(Condition.getPage(query), Condition.getQueryWrapper(topvisionUser));
 		return R.data(pages);