From 1ed72f20d029800a39d9e4ef70948a2ac84ac39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 26 Jul 2023 13:57:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=97=A5=E5=BF=97=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spare/controller/SpAllocationController.java | 2 +- .../spare/controller/SpReceiveController.java | 2 +- .../spare/controller/SpReceivesController.java | 2 +- .../spare/controller/SpWarehouseInController.java | 2 +- .../spare/controller/SpWarehouseOutController.java | 2 +- .../spare/controller/WtSpBasicController.java | 2 +- .../spare/controller/WtSpManagementController.java | 2 +- .../spare/controller/WtSpProviderController.java | 2 +- .../spare/controller/WtSpToolBasicController.java | 2 +- .../spare/controller/WtSpTotalController.java | 4 +- .../spare/controller/WtSpWarehouseController.java | 2 +- .../alert/controller/AbnormalAlarmController.java | 2 +- .../config/controller/StAlamRecordController.java | 2 +- .../report/controller/DeptController.java | 85 ++++++++++++++++++++++ 14 files changed, 99 insertions(+), 14 deletions(-) diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java index c69bbe2..65c7295 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpAllocationController.java +++ b/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") @OperationAnnotation(moduleName = "资产管理", title = "调泼单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页查询") + action = "分页查询调泼单列表") public R> pageList(SpAllocationVO allocationVO, Query query) { IPage pages = sp_allocationService.selectPageList(Condition.getPage(query),allocationVO); return R.data(pages); 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 91b20cc..6d71685 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 @@ -55,7 +55,7 @@ public class SpReceiveController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_receive") @OperationAnnotation(moduleName = "资产管理",title = "工具领用",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页查询") + action = "分页查询工具领用列表") public R> list(SpReceiveVO receiveVO, Query query) { IPage pages = sp_receiveService.selectPageList(Condition.getPage(query), receiveVO); return R.data(pages); 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 3b8a204..e10a65a 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 @@ -58,7 +58,7 @@ public class SpReceivesController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_receives") @OperationAnnotation(moduleName = "资产管理",title = "工具回退",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页查询") + action = "分页查询工具回退列表") public R> list(SpReceivesVO sp_receives, Query query) { IPage pages = sp_receivesService.selectPageList(Condition.getPage(query), sp_receives); return R.data(pages); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java index eb892ce..3ec5e48 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseInController.java +++ b/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") @OperationAnnotation(moduleName = "资产管理",title = "入库单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页条件") + action = "分页查询入库单列表") public R> pageList(SpWarehouseInVO warehouseInVO, Query query) { IPage pages = sp_warehouse_inService.selectPageList(Condition.getPage(query),warehouseInVO); return R.data(pages); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java index f73924d..8c61f78 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java +++ b/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") @OperationAnnotation(moduleName = "资产管理",title = "出库单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页查询") + action = "分页查询出库单列表") public R> list(SpWarehouseOutVO warehouseOutVO, Query query) { IPage pages = sp_warehouse_outService.selectPageList(Condition.getPage(query),warehouseOutVO); return R.data(pages); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java index bcb74c0..15f27d0 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpBasicController.java +++ b/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") @OperationAnnotation(moduleName = "资产管理",title = "物资库存台账",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页条件") + action = "分页查询物资库存台账列表") public R> pageList(WtSpBasicEntity SP_BASIC, Query query, Long warehouseId, String sign) { IPage pages = SP_BASICService.selectPage(SP_BASIC, query,warehouseId,sign); return R.data(pages); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java index c3f4e73..6e684fe 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpManagementController.java +++ b/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) @ApiOperation(value = "懒加载列表", notes = "传入parentId") @OperationAnnotation(moduleName = "资产管理",title = "物资类别",operatorType = OperatorType.MOBILE,businessType = - BusinessType.GENCODE, action = "分页条件") + BusinessType.GENCODE, action = "分页条件物资类别列表") public R> lazyList(Long parentId, @ApiIgnore @RequestParam Map managent) { List list = SP_MANAGEMENTService.lazyList(parentId, managent); return R.data(WtSpManagementWrapper.build().listNodeLazyVO(list)); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java index 6f6c6a3..54f1ab0 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpProviderController.java +++ b/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") @OperationAnnotation(moduleName = "资产管理",title = "供应商管理",operatorType = OperatorType.MOBILE ,businessType = BusinessType.GENCODE, - action = "分页查询") + action = "分页查询供应商管理列表") public R> list(WtSpProviderEntity providerEntity, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper(providerEntity); if(Func.isNotEmpty(providerEntity.getProviderName())){ diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java index e79da5a..2feb625 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpToolBasicController.java +++ b/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") @OperationAnnotation(moduleName = "资产管理",title = "工具台账",operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, - action = "分页条件") + action = "分页查询工具台账列表") public R> pageList(WtSpToolBasicVO toolBasicVO, Query query) { IPage pages = SP_TOOL_BASICService.selectPageList(Condition.getPage(query), toolBasicVO); return R.data(pages); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java index c9dfef9..98046fd 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpTotalController.java +++ b/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") @OperationAnnotation(moduleName = "资产管理",title = "库存清单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页条件") + action = "分页查询库存清单列表") public R> pageList(WtSpToolVO spToolVO, Query query) { IPage pages = SP_TOTALService.selectSpToolList(Condition.getPage(query),spToolVO); return R.data(pages); @@ -83,7 +83,7 @@ public class WtSpTotalController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "库存预警列表", notes = "传入spToolVO") @OperationAnnotation(moduleName = "资产管理",title = "库存预警",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页查询") + action = "分页查询库存预警列表") public R> warnPageList(WtSpToolVO spToolVO, Query query) { IPage pages = SP_TOTALService.warnPageList(Condition.getPage(query),spToolVO); return R.data(pages); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java index b47fb7c..a4fd186 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/WtSpWarehouseController.java +++ b/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) @ApiOperation(value = "分页", notes = "传入SP_WAREHOUSE") @OperationAnnotation(moduleName = "资产管理",title = "库存管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页查询") + action = "分页查询库存管理列表") public R> list(WtSpWarehouseEntity wtSpWarehouseEntity, Query query) { IPage pages = SP_WAREHOUSEService.selectPage(wtSpWarehouseEntity, query); return R.data(pages); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java index 4e8804c..34e318e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java +++ b/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) @ApiOperation(value = "统计通讯中断时间", notes = "传入imsDutyMainEntity") @OperationAnnotation(moduleName = "通讯告警统计",title = "通讯告警统计", operatorType = OperatorType.MOBILE, - businessType = BusinessType.GENCODE,action = "统计通讯中断时间") + businessType = BusinessType.GENCODE,action = "查询通讯告警统计数据") public R> statisticsTime(HistoryAlarmVo entity, Query query) { IPage pages = service.getAlarmTime(query,entity); return R.data(pages); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java index cbafd76..e0ba376 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java @@ -78,7 +78,7 @@ public class StAlamRecordController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入vo") @OperationAnnotation(moduleName = "数据查询",title = "系统预警处理", operatorType = OperatorType.MOBILE, - businessType = BusinessType.GENCODE,action = "分页查询") + businessType = BusinessType.GENCODE,action = "分页查询系统预警处理数据") public R> list(StAlarmRecordVo vo, Query query) { return R.data(stAlamRecordService.doPageList(Condition.getPage(query), vo)); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java index 293d49b..5226e14 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/controller/DeptController.java +++ b/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; +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.report.service.IDeptService; import io.swagger.annotations.ApiOperation; @@ -7,6 +13,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; 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.system.entity.Dept; 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))); } + + + @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("查询气象监测成功"); + } }