Browse Source

修改资产管理日志注解

zhongwei
段飞宇 1 year ago
parent
commit
1ed72f20d0
  1. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java
  2. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceiveController.java
  3. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpReceivesController.java
  4. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java
  5. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java
  6. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java
  7. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java
  8. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java
  9. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java
  10. 4
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java
  11. 2
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java
  12. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java
  13. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java
  14. 85
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java

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

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

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

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

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

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

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

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

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

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

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

@ -102,7 +102,7 @@ public class WtSpBasicController extends BladeController {
@ApiOperation(value = "分页", notes = "传入SP_BASIC") @ApiOperation(value = "分页", notes = "传入SP_BASIC")
@OperationAnnotation(moduleName = "资产管理",title = "物资库存台账",operatorType = OperatorType.MOBILE,businessType = @OperationAnnotation(moduleName = "资产管理",title = "物资库存台账",operatorType = OperatorType.MOBILE,businessType =
BusinessType.GENCODE, BusinessType.GENCODE,
action = "分页条件") action = "分页查询物资库存台账列表")
public R<IPage<WtSpBasicVO>> pageList(WtSpBasicEntity SP_BASIC, Query query, Long warehouseId, String sign) { 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); IPage<WtSpBasicVO> pages = SP_BASICService.selectPage(SP_BASIC, query,warehouseId,sign);
return R.data(pages); return R.data(pages);

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

@ -83,7 +83,7 @@ public class WtSpManagementController extends BladeController {
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@ApiOperation(value = "懒加载列表", notes = "传入parentId") @ApiOperation(value = "懒加载列表", notes = "传入parentId")
@OperationAnnotation(moduleName = "资产管理",title = "物资类别",operatorType = OperatorType.MOBILE,businessType = @OperationAnnotation(moduleName = "资产管理",title = "物资类别",operatorType = OperatorType.MOBILE,businessType =
BusinessType.GENCODE, action = "分页条件") BusinessType.GENCODE, action = "分页条件物资类别列表")
public R<List<WtSpManagementVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> managent) { public R<List<WtSpManagementVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> managent) {
List<WtSpManagementVO> list = SP_MANAGEMENTService.lazyList(parentId, managent); List<WtSpManagementVO> list = SP_MANAGEMENTService.lazyList(parentId, managent);
return R.data(WtSpManagementWrapper.build().listNodeLazyVO(list)); return R.data(WtSpManagementWrapper.build().listNodeLazyVO(list));

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

@ -72,7 +72,7 @@ public class WtSpProviderController extends BladeController {
@ApiOperation(value = "分页", notes = "传入SP_PROVIDER") @ApiOperation(value = "分页", notes = "传入SP_PROVIDER")
@OperationAnnotation(moduleName = "资产管理",title = "供应商管理",operatorType = OperatorType.MOBILE @OperationAnnotation(moduleName = "资产管理",title = "供应商管理",operatorType = OperatorType.MOBILE
,businessType = BusinessType.GENCODE, ,businessType = BusinessType.GENCODE,
action = "分页查询") action = "分页查询供应商管理列表")
public R<IPage<WtSpProviderEntity>> list(WtSpProviderEntity providerEntity, Query query) { public R<IPage<WtSpProviderEntity>> list(WtSpProviderEntity providerEntity, Query query) {
QueryWrapper<WtSpProviderEntity> queryWrapper = Condition.getQueryWrapper(providerEntity); QueryWrapper<WtSpProviderEntity> queryWrapper = Condition.getQueryWrapper(providerEntity);
if(Func.isNotEmpty(providerEntity.getProviderName())){ if(Func.isNotEmpty(providerEntity.getProviderName())){

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

@ -69,7 +69,7 @@ public class WtSpToolBasicController extends BladeController {
@ApiOperation(value = "分页", notes = "传入toolBasicEntity") @ApiOperation(value = "分页", notes = "传入toolBasicEntity")
@OperationAnnotation(moduleName = "资产管理",title = "工具台账",operatorType = OperatorType.MOBILE, @OperationAnnotation(moduleName = "资产管理",title = "工具台账",operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE, businessType = BusinessType.GENCODE,
action = "分页条件") action = "分页查询工具台账列表")
public R<IPage<WtSpToolBasicVO>> pageList(WtSpToolBasicVO toolBasicVO, Query query) { public R<IPage<WtSpToolBasicVO>> pageList(WtSpToolBasicVO toolBasicVO, Query query) {
IPage<WtSpToolBasicVO> pages = SP_TOOL_BASICService.selectPageList(Condition.getPage(query), toolBasicVO); IPage<WtSpToolBasicVO> pages = SP_TOOL_BASICService.selectPageList(Condition.getPage(query), toolBasicVO);
return R.data(pages); return R.data(pages);

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

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

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

@ -59,7 +59,7 @@ public class WtSpWarehouseController extends BladeController {
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE") @ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE")
@OperationAnnotation(moduleName = "资产管理",title = "库存管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, @OperationAnnotation(moduleName = "资产管理",title = "库存管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,
action = "分页查询") action = "分页查询库存管理列表")
public R<IPage<WtSpWarehouseVO>> list(WtSpWarehouseEntity wtSpWarehouseEntity, Query query) { public R<IPage<WtSpWarehouseVO>> list(WtSpWarehouseEntity wtSpWarehouseEntity, Query query) {
IPage<WtSpWarehouseVO> pages = SP_WAREHOUSEService.selectPage(wtSpWarehouseEntity, query); IPage<WtSpWarehouseVO> pages = SP_WAREHOUSEService.selectPage(wtSpWarehouseEntity, query);
return R.data(pages); return R.data(pages);

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

@ -48,7 +48,7 @@ public class AbnormalAlarmController extends BladeController {
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@ApiOperation(value = "统计通讯中断时间", notes = "传入imsDutyMainEntity") @ApiOperation(value = "统计通讯中断时间", notes = "传入imsDutyMainEntity")
@OperationAnnotation(moduleName = "通讯告警统计",title = "通讯告警统计", operatorType = OperatorType.MOBILE, @OperationAnnotation(moduleName = "通讯告警统计",title = "通讯告警统计", operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,action = "统计通讯中断时间") businessType = BusinessType.GENCODE,action = "查询通讯告警统计数据")
public R<IPage<HistoryAbnormalAlarmVo>> statisticsTime(HistoryAlarmVo entity, Query query) { public R<IPage<HistoryAbnormalAlarmVo>> statisticsTime(HistoryAlarmVo entity, Query query) {
IPage<HistoryAbnormalAlarmVo> pages = service.getAlarmTime(query,entity); IPage<HistoryAbnormalAlarmVo> pages = service.getAlarmTime(query,entity);
return R.data(pages); return R.data(pages);

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java

@ -78,7 +78,7 @@ public class StAlamRecordController {
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入vo") @ApiOperation(value = "分页", notes = "传入vo")
@OperationAnnotation(moduleName = "数据查询",title = "系统预警处理", operatorType = OperatorType.MOBILE, @OperationAnnotation(moduleName = "数据查询",title = "系统预警处理", operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,action = "分页查询") businessType = BusinessType.GENCODE,action = "分页查询系统预警处理数据")
public R<IPage<StAlarmRecordVo>> list(StAlarmRecordVo vo, Query query) { public R<IPage<StAlarmRecordVo>> list(StAlarmRecordVo vo, Query query) {
return R.data(stAlamRecordService.doPageList(Condition.getPage(query), vo)); return R.data(stAlamRecordService.doPageList(Condition.getPage(query), vo));
} }

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

@ -1,5 +1,11 @@
package com.hnac.hzims.operational.report.controller; package com.hnac.hzims.operational.report.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
import com.hnac.hzims.common.logs.enums.BusinessType;
import com.hnac.hzims.common.logs.enums.OperatorType;
import com.hnac.hzims.operational.duty.entity.ImsDutyClassTypeEntity;
import com.hnac.hzims.operational.main.constant.HomePageConstant; import com.hnac.hzims.operational.main.constant.HomePageConstant;
import com.hnac.hzims.operational.report.service.IDeptService; import com.hnac.hzims.operational.report.service.IDeptService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -7,6 +13,8 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.system.entity.Dept; import org.springblade.system.entity.Dept;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -53,4 +61,81 @@ public class DeptController extends BladeController {
} }
return R.data(deptService.selectArea(serveType,Collections.singletonList(type))); return R.data(deptService.selectArea(serveType,Collections.singletonList(type)));
} }
@OperationAnnotation(moduleName = "集中监控",
title = "集中监控",
operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,
action = "查询集中监控数据")
@GetMapping("/internaldevice")
public R internaldevice() {
return R.success("查询集中监控数据成功");
}
@OperationAnnotation(moduleName = "综合调度",
title = "综合调度",
operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,
action = "查询集中监控数据")
@GetMapping("/comprehensive")
public R comprehensive() {
return R.success("查询综合调度成功");
}
@OperationAnnotation(moduleName = "实时监控",
title = "实时监控",
operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,
action = "查询实时监控数据")
@GetMapping("/monitoringBecause")
public R monitoringBecause() {
return R.success("查询实时监控成功");
}
@OperationAnnotation(moduleName = "视频监控",
title = "视频监控",
operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,
action = "查询视频监控数据")
@GetMapping("/surveillance")
public R surveillance() {
return R.success("查询视频监控成功");
}
@OperationAnnotation(moduleName = "演示大屏",
title = "演示大屏",
operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,
action = "查询演示大屏数据")
@GetMapping("/demonstrates")
public R demonstrates() {
return R.success("查询演示大屏成功");
}
@OperationAnnotation(moduleName = "生态监控",
title = "生态监控",
operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,
action = "查询生态监控数据")
@GetMapping("/ecological")
public R ecological() {
return R.success("查询生态监控成功");
}
@OperationAnnotation(moduleName = "气象监测",
title = "气象监测",
operatorType = OperatorType.MOBILE,
businessType = BusinessType.GENCODE,
action = "查询气象监测数据")
@GetMapping("/monitoring")
public R monitoring() {
return R.success("查询气象监测成功");
}
} }

Loading…
Cancel
Save