Merge remote-tracking branch 'origin/master'

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

@@ -2,12 +2,15 @@ package com.hnac.hzims.spare.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.AssetsConstants;
 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;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -32,6 +35,7 @@ import javax.validation.Valid;
 @AllArgsConstructor
 @RequestMapping("/sp_receive")
 @Api(value = "领用单管理", tags = "领用单管理")
+@Business(module = AssetsConstants.APP_NAME,value = "消息推送统计管理",ignore = false)
 public class SpReceiveController extends BladeController {
 
 	private final ISpReceiveService sp_receiveService;
@@ -42,6 +46,7 @@ public class SpReceiveController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入sp_receive")
+	@Operate(label = "领用单详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<SpReceiveVO> detail(SpReceiveEntity sp_receive) {
 		SpReceiveVO detail = sp_receiveService.getDetail(sp_receive);
 		return R.data(detail);
@@ -54,6 +59,7 @@ public class SpReceiveController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_receive")
+	@Operate(label = "领用单分页",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	@OperationAnnotation(moduleName = "资产管理",title = "工具领用",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询工具领用列表")
 	public R<IPage<SpReceiveVO>> list(SpReceiveVO receiveVO, Query query) {
@@ -67,6 +73,7 @@ public class SpReceiveController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入sp_receive")
+	@Operate(label = "领用单新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody SpReceiveEntity sp_receive) {
 		return R.status(sp_receiveService.save(sp_receive));
 	}
@@ -77,6 +84,7 @@ public class SpReceiveController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入sp_receive")
+	@Operate(label = "领用单修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody SpReceiveEntity sp_receive) {
 		return R.status(sp_receiveService.updateById(sp_receive));
 	}
@@ -87,6 +95,7 @@ public class SpReceiveController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入sp_receive")
+	@Operate(label = "领用单新增或修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R submit(@Valid @RequestBody SpReceiveEntity sp_receive) {
 		return R.status(sp_receiveService.saveOrUpdate(sp_receive));
 	}
@@ -98,6 +107,7 @@ public class SpReceiveController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "领用单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(sp_receiveService.deleteLogic(Func.toLongList(ids)));
 	}
@@ -115,6 +125,7 @@ public class SpReceiveController extends BladeController {
 	@PostMapping("/returns")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "退回", notes = "传入sp_receive")
+	@Operate(label = "领用单退回",type = com.hnac.hzinfo.log.contants.BusinessType.OTHER,ignore = false)
 	public R returns(@Valid @RequestBody SpReceiveVO sp_receive) {
 		return R.status(sp_receiveService.returns(sp_receive));
 	}

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

@@ -1,12 +1,15 @@
 package com.hnac.hzims.spare.controller;
 
 
+import com.hnac.hzims.AssetsConstants;
 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;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.Api;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.ApiOperation;
@@ -35,6 +38,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 @AllArgsConstructor
 @RequestMapping("/sp_receives")
 @Api(value = "", tags = "")
+@Business(module = AssetsConstants.APP_NAME,value = "资产管理",ignore = false)
 public class SpReceivesController extends BladeController {
 
 	private final ISpReceivesService sp_receivesService;
@@ -45,6 +49,7 @@ public class SpReceivesController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入sp_receives")
+	@Operate(label = "资产管理详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<SpReceivesVO> detail(SpReceivesEntity sp_receives) {
 		SpReceivesVO detail = sp_receivesService.getDetail(sp_receives);
 		return R.data(detail);
@@ -59,6 +64,7 @@ public class SpReceivesController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入sp_receives")
 	@OperationAnnotation(moduleName = "资产管理",title = "工具回退",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询工具回退列表")
+	@Operate(label = "资产管理详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	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);
@@ -70,6 +76,7 @@ public class SpReceivesController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入sp_receives")
+	@Operate(label = "资产管理详情",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody SpReceivesEntity sp_receives) {
 		return R.status(sp_receivesService.save(sp_receives));
 	}
@@ -80,6 +87,7 @@ public class SpReceivesController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入sp_receives")
+	@Operate(label = "资产管理修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody SpReceivesEntity sp_receives) {
 		return R.status(sp_receivesService.updateById(sp_receives));
 	}
@@ -90,6 +98,7 @@ public class SpReceivesController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入sp_receives")
+	@Operate(label = "资产管理新增或修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R submit(@Valid @RequestBody SpReceivesEntity sp_receives) {
 		return R.status(sp_receivesService.saveOrUpdate(sp_receives));
 	}
@@ -101,6 +110,7 @@ public class SpReceivesController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "资产管理删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(sp_receivesService.deleteLogic(Func.toLongList(ids)));
 	}

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

@@ -2,8 +2,12 @@ package com.hnac.hzims.spare.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.AssetsConstants;
 import com.hnac.hzims.spare.entity.SpRevertEntity;
 import com.hnac.hzims.spare.service.ISpRevertService;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
+import com.hnac.hzinfo.log.contants.BusinessType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -29,6 +33,7 @@ import javax.validation.Valid;
 @RequestMapping("/sp_revert")
 @Api(value = "", tags = "")
 @ApiIgnore
+@Business(module = AssetsConstants.APP_NAME,value = "归还管理",ignore = false)
 public class SpRevertController extends BladeController {
 
 	private final ISpRevertService sp_revertService;
@@ -39,6 +44,7 @@ public class SpRevertController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入sp_revert")
+	@Operate(label = "归还详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<SpRevertEntity> detail(SpRevertEntity sp_revert) {
 		SpRevertEntity detail = sp_revertService.getOne(Condition.getQueryWrapper(sp_revert));
 		return R.data(detail);
@@ -50,6 +56,7 @@ public class SpRevertController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_revert")
+	@Operate(label = "归还分页",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<SpRevertEntity>> list(SpRevertEntity sp_revert, Query query) {
 		IPage<SpRevertEntity> pages = sp_revertService.page(Condition.getPage(query), Condition.getQueryWrapper(sp_revert));
 		return R.data(pages);
@@ -61,6 +68,7 @@ public class SpRevertController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入sp_revert")
+	@Operate(label = "归还新增",type = BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody SpRevertEntity sp_revert) {
 		return R.status(sp_revertService.save(sp_revert));
 	}
@@ -71,6 +79,7 @@ public class SpRevertController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入sp_revert")
+	@Operate(label = "归还修改",type = BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody SpRevertEntity sp_revert) {
 		return R.status(sp_revertService.updateById(sp_revert));
 	}
@@ -81,6 +90,7 @@ public class SpRevertController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入sp_revert")
+	@Operate(label = "归还新增或修改",type = BusinessType.UPDATE,ignore = false)
 	public R submit(@Valid @RequestBody SpRevertEntity sp_revert) {
 		return R.status(sp_revertService.saveOrUpdate(sp_revert));
 	}
@@ -92,6 +102,7 @@ public class SpRevertController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "归还删除",type = BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(sp_revertService.deleteLogic(Func.toLongList(ids)));
 	}

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

@@ -2,12 +2,15 @@ package com.hnac.hzims.spare.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.AssetsConstants;
 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;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -33,6 +36,7 @@ import javax.validation.Valid;
 @AllArgsConstructor
 @RequestMapping("/sp_warehouse_in")
 @Api(value = "入库单管理", tags = "入库单管理")
+@Business(module = AssetsConstants.APP_NAME,value = "入库单管理",ignore = false)
 public class SpWarehouseInController extends BladeController {
 
 	private final ISpWarehouseInService sp_warehouse_inService;
@@ -43,6 +47,7 @@ public class SpWarehouseInController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入sp_warehouse_in")
+	@Operate(label = "入库单详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<SpWarehouseInVO> detail(SpWarehouseInEntity sp_warehouse_in) {
 		SpWarehouseInVO detail = sp_warehouse_inService.getDetail(sp_warehouse_in);
 		return R.data(detail);
@@ -55,6 +60,7 @@ public class SpWarehouseInController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入sp_warehouse_in")
 	@ApiIgnore
+	@Operate(label = "入库单查询",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<SpWarehouseInEntity>> list(SpWarehouseInEntity sp_warehouse_in, Query query) {
 		IPage<SpWarehouseInEntity> pages = sp_warehouse_inService.page(Condition.getPage(query), Condition.getQueryWrapper(sp_warehouse_in));
 		return R.data(pages);
@@ -69,6 +75,7 @@ public class SpWarehouseInController extends BladeController {
 	@OperationAnnotation(moduleName = "资产管理",title = "入库单",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "分页查询入库单列表")
+	@Operate(label = "入库单分页",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<SpWarehouseInVO>> pageList(SpWarehouseInVO warehouseInVO, Query query) {
 		IPage<SpWarehouseInVO> pages = sp_warehouse_inService.selectPageList(Condition.getPage(query),warehouseInVO);
 		return R.data(pages);
@@ -80,6 +87,7 @@ public class SpWarehouseInController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入sp_warehouse_in")
+	@Operate(label = "入库单新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody SpWarehouseInEntity sp_warehouse_in) {
 		return R.status(sp_warehouse_inService.save(sp_warehouse_in));
 	}
@@ -90,6 +98,7 @@ public class SpWarehouseInController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入sp_warehouse_in")
+	@Operate(label = "入库单修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody SpWarehouseInEntity sp_warehouse_in) {
 		return R.status(sp_warehouse_inService.updateById(sp_warehouse_in));
 	}
@@ -100,6 +109,7 @@ public class SpWarehouseInController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入sp_warehouse_in")
+	@Operate(label = "入库单新增或修改",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R submit(@Valid @RequestBody SpWarehouseInEntity sp_warehouse_in) {
 		return R.status(sp_warehouse_inService.saveOrUpdate(sp_warehouse_in));
 	}
@@ -111,6 +121,7 @@ public class SpWarehouseInController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "入库单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(sp_warehouse_inService.deleteLogic(Func.toLongList(ids)));
 	}

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

@@ -3,6 +3,7 @@ package com.hnac.hzims.spare.controller;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.AssetsConstants;
 import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
 import com.hnac.hzims.common.logs.enums.BusinessType;
 import com.hnac.hzims.common.logs.enums.OperatorType;
@@ -11,6 +12,8 @@ import com.hnac.hzims.spare.service.ISpWarehouseOutService;
 import com.hnac.hzims.spare.vo.SpWarehouseExportVO;
 import com.hnac.hzims.spare.vo.SpWarehouseOutVO;
 import com.hnac.hzims.vo.VoteChartVo;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,6 +49,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 @RequestMapping("/sp_warehouse_out")
 @Api(value = "出库单管理", tags = "出库单管理")
+@Business(module = AssetsConstants.APP_NAME,value = "出库单管理",ignore = false)
 public class SpWarehouseOutController extends BladeController {
 
 	private final ISpWarehouseOutService sp_warehouse_outService;
@@ -56,6 +60,7 @@ public class SpWarehouseOutController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入sp_warehouse_out")
+	@Operate(label = "出库单详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<SpWarehouseOutVO> detail(SpWarehouseOutEntity sp_warehouse_out) {
 		SpWarehouseOutVO detail = sp_warehouse_outService.getDetail(sp_warehouse_out);
 		return R.data(detail);
@@ -71,6 +76,7 @@ public class SpWarehouseOutController extends BladeController {
 	@OperationAnnotation(moduleName = "资产管理",title = "出库单",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "分页查询出库单列表")
+	@Operate(label = "出库单详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<SpWarehouseOutVO>> list(SpWarehouseOutVO warehouseOutVO, Query query) {
 		IPage<SpWarehouseOutVO> pages = sp_warehouse_outService.selectPageList(Condition.getPage(query),warehouseOutVO);
 		return R.data(pages);
@@ -85,6 +91,7 @@ public class SpWarehouseOutController extends BladeController {
 	@OperationAnnotation(moduleName = "资产管理",title = "出库单",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "导出出库单列表")
+	@Operate(label = "出库单详情",type = com.hnac.hzinfo.log.contants.BusinessType.IMPORT,ignore = false)
 	public void exportList(HttpServletResponse response, SpWarehouseOutVO warehouseOutVO) {
 		if(ObjectUtil.isEmpty(AuthUtil.getUser())||ObjectUtil.isEmpty(AuthUtil.getUser().getUserId())){
 			throw new ServiceException("暂无权限查看，请稍后重试");
@@ -119,6 +126,7 @@ public class SpWarehouseOutController extends BladeController {
 	@GetMapping("/warnList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "工单预警", notes = "传入sp_warehouse_out")
+	@Operate(label = "工单预警",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<SpWarehouseOutVO>> warnList(SpWarehouseOutVO warehouseOutVO, Query query) {
 		IPage<SpWarehouseOutVO> pages = sp_warehouse_outService.selectWarnPage(Condition.getPage(query),warehouseOutVO);
 		return R.data(pages);
@@ -130,6 +138,7 @@ public class SpWarehouseOutController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入sp_warehouse_out")
+	@Operate(label = "出库单新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody SpWarehouseOutEntity sp_warehouse_out) {
 		return R.status(sp_warehouse_outService.save(sp_warehouse_out));
 	}
@@ -140,6 +149,7 @@ public class SpWarehouseOutController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入sp_warehouse_out")
+	@Operate(label = "出库单详情",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody SpWarehouseOutEntity sp_warehouse_out) {
 		return R.status(sp_warehouse_outService.updateById(sp_warehouse_out));
 	}
@@ -150,6 +160,7 @@ public class SpWarehouseOutController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入sp_warehouse_out")
+	@Operate(label = "出库单详情",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R submit(@Valid @RequestBody SpWarehouseOutEntity sp_warehouse_out) {
 		return R.status(sp_warehouse_outService.saveOrUpdate(sp_warehouse_out));
 	}
@@ -161,6 +172,7 @@ public class SpWarehouseOutController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "出库单删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(sp_warehouse_outService.deleteLogic(Func.toLongList(ids)));
 	}

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

@@ -3,6 +3,7 @@ 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.AssetsConstants;
 import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
 import com.hnac.hzims.common.logs.enums.BusinessType;
 import com.hnac.hzims.common.logs.enums.OperatorType;
@@ -12,6 +13,8 @@ import com.hnac.hzims.spare.entity.WtSpBasicEntity;
 import com.hnac.hzims.spare.service.IWtSpBasicService;
 import com.hnac.hzims.spare.service.IWtSpManagementService;
 import com.hnac.hzims.spare.vo.WtSpBasicVO;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -44,6 +47,7 @@ import java.util.Map;
 @AllArgsConstructor
 @RequestMapping("/SP_BASIC")
 @Api(value = "备品备件基础信息", tags = "备品备件基础信息")
+@Business(module = AssetsConstants.APP_NAME,value = "备品备件基础信息",ignore = false)
 public class WtSpBasicController extends BladeController {
 
 	private final IWtSpBasicService SP_BASICService;
@@ -57,6 +61,7 @@ public class WtSpBasicController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入SP_BASIC")
+	@Operate(label = "备品备件基础信息详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<WtSpBasicEntity> detail(WtSpBasicEntity SP_BASIC) {
 		WtSpBasicEntity detail = SP_BASICService.getOne(Condition.getQueryWrapper(SP_BASIC));
 		return R.data(detail);
@@ -69,6 +74,7 @@ public class WtSpBasicController extends BladeController {
 	@ApiIgnore
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入SP_BASIC")
+	@Operate(label = "备品备件基础信息分页",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<WtSpBasicEntity>> list(WtSpBasicEntity SP_BASIC, Query query) {
 		BladeUser bladeUser = AuthUtil.getUser();
 		IPage<WtSpBasicEntity> pages = SP_BASICService.page(Condition.getPage(query), Condition.getQueryWrapper(SP_BASIC));
@@ -80,6 +86,7 @@ public class WtSpBasicController extends BladeController {
 	@GetMapping("/stockList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "临时库存台账", notes = "传入SP_BASIC")
+	@Operate(label = "临时库存台账",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<SpTemporaryStockEntity>> stockList(WtSpBasicEntity SP_BASIC, Query query) {
 		IPage<SpTemporaryStockEntity> pages = SP_BASICService.stockList(SP_BASIC, query);
 		return R.data(pages);
@@ -88,6 +95,7 @@ public class WtSpBasicController extends BladeController {
 	@GetMapping("/stockDetail")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "临时库存台账明细", notes = "传入SP_BASIC")
+	@Operate(label = "临时库存台账明细",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<List<SpTemporaryStockDetailEntity>> stockDetail(Long id) {
 		List<SpTemporaryStockDetailEntity> list = SP_BASICService.stockDetail(id);
 		return R.data(list);
@@ -103,6 +111,7 @@ public class WtSpBasicController extends BladeController {
 	@OperationAnnotation(moduleName = "资产管理",title = "物资库存台账",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "分页查询物资库存台账列表")
+	@Operate(label = "分页查询物资库存台账列表",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	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);
@@ -115,6 +124,7 @@ public class WtSpBasicController extends BladeController {
 	})
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "备件列表", notes = "传入basic")
+	@Operate(label = "备件列表",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<List<WtSpBasicEntity>> getlist(@ApiIgnore @RequestParam Map<String, Object> basic) {
 		List<WtSpBasicEntity> list = SP_BASICService.getList(basic);
 		return R.data(list);
@@ -126,6 +136,7 @@ public class WtSpBasicController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入SP_BASIC")
+	@Operate(label = "备品备件基础信息新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody WtSpBasicEntity SP_BASIC) {
 		List<WtSpBasicEntity> wtSpBasicEntityList = SP_BASICService.list(Wrappers.<WtSpBasicEntity>lambdaQuery()
 				.eq(WtSpBasicEntity::getCode, SP_BASIC.getCode()));
@@ -140,6 +151,7 @@ public class WtSpBasicController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入SP_BASIC")
+	@Operate(label = "备品备件基础信息修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody WtSpBasicEntity SP_BASIC) {
 		List<WtSpBasicEntity> wtSpBasicEntityList = SP_BASICService.list(Wrappers.<WtSpBasicEntity>lambdaQuery()
 			.eq(WtSpBasicEntity::getCode, SP_BASIC.getCode())
@@ -158,6 +170,7 @@ public class WtSpBasicController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入SP_BASIC")
 	@ApiIgnore
+	@Operate(label = "备品备件新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R submit(@Valid @RequestBody WtSpBasicEntity SP_BASIC) {
 		return R.status(SP_BASICService.saveOrUpdate(SP_BASIC));
 	}
@@ -169,6 +182,7 @@ public class WtSpBasicController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "备品备件基础信息逻辑删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(SP_BASICService.deleteLogic(Func.toLongList(ids)));
 	}
@@ -179,6 +193,7 @@ public class WtSpBasicController extends BladeController {
 	 */
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "库存填写模板导出", notes = "库存填写模板导出")
+	@Operate(label = "库存填写模板导出",type = com.hnac.hzinfo.log.contants.BusinessType.IMPORT,ignore = false)
 	@RequestMapping(value = "/writeTemplateDownload", method = {RequestMethod.GET, RequestMethod.POST})
 	public void writeTemplateDownload(HttpServletResponse response) {
 		SP_BASICService.writeTemplateDownload(response);
@@ -190,6 +205,7 @@ public class WtSpBasicController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导入台账填写Excel")
 	@RequestMapping(value = "/importExcel", method = {RequestMethod.POST})
+	@Operate(label = "导入台账填写Excel",type = com.hnac.hzinfo.log.contants.BusinessType.IMPORT,ignore = false)
 	public R importExcel( @RequestParam MultipartFile file) throws Exception {
 //		System.out.println(11);
 		return SP_BASICService.importExcel(file);

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

@@ -3,6 +3,7 @@ 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.AssetsConstants;
 import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
 import com.hnac.hzims.common.logs.enums.BusinessType;
 import com.hnac.hzims.common.logs.enums.OperatorType;
@@ -10,6 +11,8 @@ import com.hnac.hzims.spare.entity.WtSpManagementEntity;
 import com.hnac.hzims.spare.service.IWtSpManagementService;
 import com.hnac.hzims.spare.vo.WtSpManagementVO;
 import com.hnac.hzims.spare.wrapper.WtSpManagementWrapper;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -38,6 +41,7 @@ import java.util.Map;
 @AllArgsConstructor
 @RequestMapping("/SP_MANAGEMENT")
 @Api(value = "备品备件分类管理", tags = "备品备件分类管理")
+@Business(module = AssetsConstants.APP_NAME,value = "备品备件分类管理",ignore = false)
 public class WtSpManagementController extends BladeController {
 
 	private final IWtSpManagementService SP_MANAGEMENTService;
@@ -50,6 +54,7 @@ public class WtSpManagementController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入SP_MANAGEMENT")
+	@Operate(label = "备品备件分类详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<WtSpManagementEntity> detail(WtSpManagementEntity SP_MANAGEMENT) {
 		WtSpManagementEntity detail = SP_MANAGEMENTService.getOne(Condition.getQueryWrapper(SP_MANAGEMENT));
 		return R.data(detail);
@@ -61,6 +66,7 @@ public class WtSpManagementController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入SP_MANAGEMENT")
+	@Operate(label = "备品备件分类管理分页",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<WtSpManagementEntity>> list(WtSpManagementEntity SP_MANAGEMENT, Query query) {
 		QueryWrapper<WtSpManagementEntity> queryWrapper = Condition.getQueryWrapper(SP_MANAGEMENT);
 		//queryWrapper.lambda().like(WtSpManagementEntity::getCode, SP_MANAGEMENT.getCode());
@@ -84,6 +90,7 @@ public class WtSpManagementController extends BladeController {
 	@ApiOperation(value = "懒加载列表", notes = "传入parentId")
 	@OperationAnnotation(moduleName = "资产管理",title = "物资类别",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE, action = "分页条件物资类别列表")
+	@Operate(label = "懒加载列表",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	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));
@@ -96,6 +103,7 @@ public class WtSpManagementController extends BladeController {
 	@GetMapping("/selectOptionList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "备品备件分类列表(下拉框)", notes = "传入parentId")
+	@Operate(label = "备品备件分类列表",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<List<WtSpManagementEntity>> selectOptionList(Long parentId,String name) {
 		List<WtSpManagementEntity> list = SP_MANAGEMENTService.selectOptionList(parentId,name);
 		return R.data(list);
@@ -107,6 +115,7 @@ public class WtSpManagementController extends BladeController {
 	@GetMapping("/getSpareDictList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "备品备件类型列表(下拉框)")
+	@Operate(label = "备品备件类型列表",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public List<DictBiz> getSpareDictList() {
 		R<List<DictBiz>> list = dictBizClient.getList("spare_type");
 		return list.getData();
@@ -118,6 +127,7 @@ public class WtSpManagementController extends BladeController {
 	@GetMapping("/getSpareUnitList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "备品备件计量单位列表(下拉框)")
+	@Operate(label = "备品备件计量单位列表",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public List<DictBiz> getSpareUnitList() {
 		R<List<DictBiz>> list = dictBizClient.getList("spare_unit");
 		return list.getData();
@@ -129,6 +139,7 @@ public class WtSpManagementController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入SP_MANAGEMENT")
+	@Operate(label = "备品备件分类新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody WtSpManagementEntity SP_MANAGEMENT) {
 		return R.status(SP_MANAGEMENTService.save(SP_MANAGEMENT));
 	}
@@ -139,6 +150,7 @@ public class WtSpManagementController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入SP_MANAGEMENT")
+	@Operate(label = "备品备件分类修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody WtSpManagementEntity SP_MANAGEMENT) {
 		return R.status(SP_MANAGEMENTService.updateById(SP_MANAGEMENT));
 	}
@@ -150,6 +162,7 @@ public class WtSpManagementController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入SP_MANAGEMENT")
 	@ApiIgnore
+	@Operate(label = "备品备件分类新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R submit(@Valid @RequestBody WtSpManagementEntity SP_MANAGEMENT) {
 		return R.status(SP_MANAGEMENTService.saveOrUpdate(SP_MANAGEMENT));
 	}
@@ -161,6 +174,7 @@ public class WtSpManagementController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "备品备件分类删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(SP_MANAGEMENTService.deleteLogic(Func.toLongList(ids)));
 	}
@@ -171,6 +185,7 @@ public class WtSpManagementController extends BladeController {
 	@PostMapping("/createCode")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "生成编码", notes = "传入parentId")
+	@Operate(label = "生成编码",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public String createCode(@ApiParam(value = "父ID", required = true) @RequestParam Long parentId,Integer type) {
 		return SP_MANAGEMENTService.createCode(parentId,type);
 	}
@@ -181,6 +196,7 @@ public class WtSpManagementController extends BladeController {
 	@GetMapping("/derive-device")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "导出", notes = "")
+	@Operate(label = "导出",type = com.hnac.hzinfo.log.contants.BusinessType.IMPORT,ignore = false)
 	public void derive(HttpServletResponse response){
 		SP_MANAGEMENTService.derive(response);
 	}

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

@@ -3,11 +3,14 @@ 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.AssetsConstants;
 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 com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,6 +39,7 @@ import java.util.List;
 @AllArgsConstructor
 @RequestMapping("/SP_PROVIDER")
 @Api(value = "供应商管理", tags = "供应商管理")
+@Business(module = AssetsConstants.APP_NAME,value = "供应商管理",ignore = false)
 public class WtSpProviderController extends BladeController {
 
     private final IWtSpProviderService SP_PROVIDERService;
@@ -47,6 +51,7 @@ public class WtSpProviderController extends BladeController {
     @GetMapping("/detail")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "详情", notes = "传入SP_PROVIDER")
+    @Operate(label = "供应商详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
     public R<WtSpProviderEntity> detail(WtSpProviderEntity SP_PROVIDER) {
         WtSpProviderEntity detail = SP_PROVIDERService.getOne(Condition.getQueryWrapper(SP_PROVIDER));
         return R.data(detail);
@@ -60,6 +65,7 @@ public class WtSpProviderController extends BladeController {
     @GetMapping("/getProviderList")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取供应商列表")
+    @Operate(label = "获取供应商列表",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
     public List<WtSpProviderEntity> getProviderList() {
         List<WtSpProviderEntity> list = SP_PROVIDERService.list();
         return list;
@@ -73,6 +79,7 @@ public class WtSpProviderController extends BladeController {
     @OperationAnnotation(moduleName = "资产管理",title = "供应商管理",operatorType = OperatorType.MOBILE
             ,businessType = BusinessType.GENCODE,
             action = "分页查询供应商管理列表")
+    @Operate(label = "供应商管理分页",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
     public R<IPage<WtSpProviderEntity>> list(WtSpProviderEntity providerEntity, Query query) {
         QueryWrapper<WtSpProviderEntity> queryWrapper = Condition.getQueryWrapper(providerEntity);
         if(Func.isNotEmpty(providerEntity.getProviderName())){
@@ -88,6 +95,7 @@ public class WtSpProviderController extends BladeController {
     @PostMapping("/save")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增", notes = "传入SP_PROVIDER")
+    @Operate(label = "供应商新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
     public R save(@Valid @RequestBody WtSpProviderEntity SP_PROVIDER) {
 //        R<Dept> result = sysClient.getDept(Long.parseLong(SP_PROVIDER.getOrganizationId()));
 //        if (null != result.getData()) {
@@ -102,6 +110,7 @@ public class WtSpProviderController extends BladeController {
     @PostMapping("/update")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "修改", notes = "传入SP_PROVIDER")
+    @Operate(label = "供应商修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
     public R update(@Valid @RequestBody WtSpProviderEntity SP_PROVIDER) {
         return R.status(SP_PROVIDERService.updateById(SP_PROVIDER));
     }
@@ -113,6 +122,7 @@ public class WtSpProviderController extends BladeController {
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "新增或修改", notes = "传入SP_PROVIDER")
     @ApiIgnore
+    @Operate(label = "供应商新增或修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
     public R submit(@Valid @RequestBody WtSpProviderEntity SP_PROVIDER) {
         return R.status(SP_PROVIDERService.saveOrUpdate(SP_PROVIDER));
     }
@@ -124,6 +134,7 @@ public class WtSpProviderController extends BladeController {
     @PostMapping("/remove")
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    @Operate(label = "供应商删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
     public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         return R.status(SP_PROVIDERService.deleteLogic(Func.toLongList(ids)));
     }

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

@@ -2,12 +2,15 @@ package com.hnac.hzims.spare.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.AssetsConstants;
 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;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -34,6 +37,7 @@ import java.util.List;
 @AllArgsConstructor
 @RequestMapping("/SP_TOOL_BASIC")
 @Api(value = "工具台账管理", tags = "工具台账管理")
+@Business(module = AssetsConstants.APP_NAME,value = "工具台账管理",ignore = false)
 public class WtSpToolBasicController extends BladeController {
 
 	private final IWtSpToolBasicService SP_TOOL_BASICService;
@@ -44,6 +48,7 @@ public class WtSpToolBasicController extends BladeController {
 	@GetMapping("/detailReceice")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "台账详情", notes = "传入SP_TOOL_BASIC")
+	@Operate(label = "工具台账详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<List<WtSpToolBasicVO>> getDetailReceive(WtSpToolBasicEntity spToolBasicEntity) {
 		List<WtSpToolBasicVO> list= SP_TOOL_BASICService.getDetailReceive(spToolBasicEntity);
 		return R.data(list);
@@ -56,6 +61,7 @@ public class WtSpToolBasicController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "旧分页", notes = "传入toolBasicEntity")
 	@ApiIgnore
+	@Operate(label = "工具台账详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<WtSpToolBasicVO>> list(WtSpToolBasicEntity toolBasicEntity, Query query) {
 		IPage<WtSpToolBasicVO> pages = SP_TOOL_BASICService.selectPage(toolBasicEntity, query);
 		return R.data(pages);
@@ -70,6 +76,7 @@ public class WtSpToolBasicController extends BladeController {
 	@OperationAnnotation(moduleName = "资产管理",title = "工具台账",operatorType = OperatorType.MOBILE,
 			businessType = BusinessType.GENCODE,
 			action = "分页查询工具台账列表")
+	@Operate(label = "台账分页",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<WtSpToolBasicVO>> pageList(WtSpToolBasicVO toolBasicVO, Query query) {
 		IPage<WtSpToolBasicVO> pages = SP_TOOL_BASICService.selectPageList(Condition.getPage(query), toolBasicVO);
 		return R.data(pages);
@@ -81,6 +88,7 @@ public class WtSpToolBasicController extends BladeController {
 	@PostMapping("/save")
 	// @ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入SP_TOOL_BASIC")
+	@Operate(label = "台账新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody WtSpToolBasicEntity SP_TOOL_BASIC) {
 		return R.status(SP_TOOL_BASICService.save(SP_TOOL_BASIC));
 	}
@@ -91,6 +99,7 @@ public class WtSpToolBasicController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入SP_TOOL_BASIC")
+	@Operate(label = "台账修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody WtSpToolBasicEntity SP_TOOL_BASIC) {
 		return R.status(SP_TOOL_BASICService.updateById(SP_TOOL_BASIC));
 	}
@@ -101,6 +110,7 @@ public class WtSpToolBasicController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入SP_TOOL_BASIC")
+	@Operate(label = "台账新增或修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R submit(@Valid @RequestBody WtSpToolBasicEntity SP_TOOL_BASIC) {
 		return R.status(SP_TOOL_BASICService.saveOrUpdate(SP_TOOL_BASIC));
 	}
@@ -112,6 +122,7 @@ public class WtSpToolBasicController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "台账删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(SP_TOOL_BASICService.deleteLogic(Func.toLongList(ids)));
 	}

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

@@ -2,6 +2,7 @@ package com.hnac.hzims.spare.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.AssetsConstants;
 import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
 import com.hnac.hzims.common.logs.enums.BusinessType;
 import com.hnac.hzims.common.logs.enums.OperatorType;
@@ -9,6 +10,8 @@ import com.hnac.hzims.spare.entity.WtSpTotalEntity;
 import com.hnac.hzims.spare.service.IWtSpBasicService;
 import com.hnac.hzims.spare.service.IWtSpTotalService;
 import com.hnac.hzims.spare.vo.WtSpToolVO;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -34,6 +37,7 @@ import javax.validation.Valid;
 @AllArgsConstructor
 @RequestMapping("/SP_TOTAL")
 @Api(value = "备品备件库存", tags = "备品备件库存")
+@Business(module = AssetsConstants.APP_NAME,value = "备品备件库存",ignore = false)
 public class WtSpTotalController extends BladeController {
 
 	private final IWtSpTotalService SP_TOTALService;
@@ -46,6 +50,7 @@ public class WtSpTotalController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入SP_TOTAL")
+	@Operate(label = "备品备件库存详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<WtSpTotalEntity> detail(WtSpTotalEntity SP_TOTAL) {
 		WtSpTotalEntity detail = SP_TOTALService.getOne(Condition.getQueryWrapper(SP_TOTAL));
 		return R.data(detail);
@@ -58,6 +63,7 @@ public class WtSpTotalController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiIgnore
 	@ApiOperation(value = "分页", notes = "传入SP_TOTAL")
+	@Operate(label = "备品备件库存详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<WtSpTotalEntity>> list(WtSpTotalEntity SP_TOTAL, Query query) {
 		IPage<WtSpTotalEntity> pages = SP_TOTALService.page(Condition.getPage(query), Condition.getQueryWrapper(SP_TOTAL));
 		return R.data(pages);
@@ -72,6 +78,7 @@ public class WtSpTotalController extends BladeController {
 	@OperationAnnotation(moduleName = "资产管理",title = "库存清单",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "分页查询库存清单列表")
+	@Operate(label = "备品备件库存分页",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<WtSpToolVO>> pageList(WtSpToolVO spToolVO, Query query) {
 		IPage<WtSpToolVO> pages = SP_TOTALService.selectSpToolList(Condition.getPage(query),spToolVO);
 		return R.data(pages);
@@ -84,6 +91,7 @@ public class WtSpTotalController extends BladeController {
 	@ApiOperation(value = "库存预警列表", notes = "传入spToolVO")
 	@OperationAnnotation(moduleName = "资产管理",title = "库存预警",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询库存预警列表")
+	@Operate(label = "库存预警列表",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<WtSpToolVO>> warnPageList(WtSpToolVO spToolVO, Query query) {
 		IPage<WtSpToolVO> pages = SP_TOTALService.warnPageList(Condition.getPage(query),spToolVO);
 		return R.data(pages);
@@ -95,6 +103,7 @@ public class WtSpTotalController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入SP_TOTAL")
+	@Operate(label = "备品备件库存新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody WtSpTotalEntity SP_TOTAL) {
 		return R.status(SP_TOTALService.save(SP_TOTAL));
 	}
@@ -105,6 +114,7 @@ public class WtSpTotalController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入SP_TOTAL")
+	@Operate(label = "备品备件库存修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody WtSpTotalEntity SP_TOTAL) {
 		return R.status(SP_TOTALService.updateById(SP_TOTAL));
 	}
@@ -116,6 +126,7 @@ public class WtSpTotalController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入SP_TOTAL")
 	@ApiIgnore
+	@Operate(label = "备品备件库存新增或修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R submit(@Valid @RequestBody WtSpTotalEntity SP_TOTAL) {
 		return R.status(SP_TOTALService.saveOrUpdate(SP_TOTAL));
 	}
@@ -127,6 +138,7 @@ public class WtSpTotalController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "备品备件库存删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(SP_TOTALService.deleteLogic(Func.toLongList(ids)));
 	}

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

@@ -2,12 +2,15 @@ package com.hnac.hzims.spare.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.AssetsConstants;
 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;
+import com.hnac.hzinfo.log.annotation.Business;
+import com.hnac.hzinfo.log.annotation.Operate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,6 +39,7 @@ import java.util.List;
 @AllArgsConstructor
 @RequestMapping("/SP_WAREHOUSE")
 @Api(value = "仓库管理", tags = "仓库管理")
+@Business(module = AssetsConstants.APP_NAME,value = "仓库管理",ignore = false)
 public class WtSpWarehouseController extends BladeController {
 
 	private final IWtSpWarehouseService SP_WAREHOUSEService;
@@ -46,6 +50,7 @@ public class WtSpWarehouseController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入SP_WAREHOUSE")
+	@Operate(label = "仓库管理详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<WtSpWarehouseEntity> detail(WtSpWarehouseEntity SP_WAREHOUSE) {
 		WtSpWarehouseEntity detail = SP_WAREHOUSEService.getOne(Condition.getQueryWrapper(SP_WAREHOUSE));
 		return R.data(detail);
@@ -60,6 +65,7 @@ public class WtSpWarehouseController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE")
 	@OperationAnnotation(moduleName = "资产管理",title = "库存管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
 			action = "分页查询库存管理列表")
+	@Operate(label = "库存管理",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<IPage<WtSpWarehouseVO>> list(WtSpWarehouseEntity wtSpWarehouseEntity, Query query) {
 		IPage<WtSpWarehouseVO> pages = SP_WAREHOUSEService.selectPage(wtSpWarehouseEntity, query);
 		return R.data(pages);
@@ -73,6 +79,7 @@ public class WtSpWarehouseController extends BladeController {
 	@GetMapping("/selectOptionList")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "仓库列表(下拉框)")
+	@Operate(label = "仓库列表",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<List<WtSpWarehouseEntity>>
 	selectOptionList(Long deptId) {
 		BladeUser user = AuthUtil.getUser();
@@ -86,6 +93,7 @@ public class WtSpWarehouseController extends BladeController {
 	@GetMapping("/getById")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "传入Id")
+	@Operate(label = "仓库管理详情",type = com.hnac.hzinfo.log.contants.BusinessType.QUERY,ignore = false)
 	public R<WtSpWarehouseEntity> getById(Long spareId) {
 		WtSpWarehouseEntity detail = SP_WAREHOUSEService.selectById(spareId);
 		return R.data(detail);
@@ -98,6 +106,7 @@ public class WtSpWarehouseController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入SP_WAREHOUSE")
+	@Operate(label = "仓库管理新增",type = com.hnac.hzinfo.log.contants.BusinessType.INSERT,ignore = false)
 	public R save(@Valid @RequestBody WtSpWarehouseEntity SP_WAREHOUSE) {
 		return R.status(SP_WAREHOUSEService.save(SP_WAREHOUSE));
 	}
@@ -108,6 +117,7 @@ public class WtSpWarehouseController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入SP_WAREHOUSE")
+	@Operate(label = "仓库管理修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R update(@Valid @RequestBody WtSpWarehouseEntity SP_WAREHOUSE) {
 		return R.status(SP_WAREHOUSEService.updateById(SP_WAREHOUSE));
 	}
@@ -119,6 +129,7 @@ public class WtSpWarehouseController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入SP_WAREHOUSE")
 	@ApiIgnore
+	@Operate(label = "仓库管理新增或修改",type = com.hnac.hzinfo.log.contants.BusinessType.UPDATE,ignore = false)
 	public R submit(@Valid @RequestBody WtSpWarehouseEntity SP_WAREHOUSE) {
 		return R.status(SP_WAREHOUSEService.saveOrUpdate(SP_WAREHOUSE));
 	}
@@ -130,6 +141,7 @@ public class WtSpWarehouseController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@Operate(label = "仓库管理删除",type = com.hnac.hzinfo.log.contants.BusinessType.DELETE,ignore = false)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(SP_WAREHOUSEService.deleteLogic(Func.toLongList(ids)));
 	}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java

@@ -171,12 +171,15 @@ public class ImsDutyGroupServiceImpl extends BaseServiceImpl<ImsDutyGroupMapper,
 			}
 			List<ImsDutyGroupPVO> imsDutyGroupPVOS = imsDutyGroupPService.listByGroupId(entity.getId());
 			if (CollectionUtil.isNotEmpty(imsDutyGroupPVOS)){
-				List<Long> userIds = imsDutyGroupPVOS.stream().map(ImsDutyGroupPVO::getPersonId).collect(Collectors.toList());
+				List<Long> userIds = imsDutyGroupPVOS.stream()
+						.map(ImsDutyGroupPVO::getPersonId).collect(Collectors.toList());
 				String name="";
 				for (int i1 = 0; i1 < userIds.size(); i1++) {
-					name=name+UserCache.getUser(userIds.get(i1)).getName();
+					if(ObjectUtil.isNotEmpty(entity.getManagerId())&&!entity.getManagerId().equals(userIds.get(i1))){
-					if (i1!= userIds.size()-1){
+						name = name + UserCache.getUser(userIds.get(i1)).getName();
-						name=name+",";
+						if (i1 != userIds.size() - 1) {
+							name = name + ",";
+						}
 					}
 				}
 				if (StringUtils.isNotBlank(name)) {