diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java index 6d71685..23fdefd 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java +++ b/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 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> 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)); } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java index e10a65a..879873c 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java +++ b/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 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> list(SpReceivesVO sp_receives, Query query) { IPage 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))); } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpRevertController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpRevertController.java index bbdd0f6..750610a 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpRevertController.java +++ b/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 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> list(SpRevertEntity sp_revert, Query query) { IPage 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))); }