From 5085b922a73b86fbd5a718446ed97c4755514bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Thu, 8 Jun 2023 17:24:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spare/controller/SpAllocationController.java | 3 +- .../spare/controller/SpReceiveController.java | 2 +- .../spare/controller/SpReceivesController.java | 2 +- .../spare/controller/SpWarehouseInController.java | 3 +- .../spare/controller/SpWarehouseOutController.java | 3 +- .../spare/controller/WtSpTotalController.java | 5 +- .../hzims/fdp/controller/FdpDeviceController.java | 6 + .../hzims/fdp/controller/FdpMonitorController.java | 2 +- hzims-service/inspect/pom.xml | 7 + .../inspect/ai/controller/ClockController.java | 7 + .../inspect/ai/controller/ClockTypeController.java | 7 + .../inspect/ai/controller/RobotController.java | 7 + .../hzinfo/inspect/obj/web/ContentController.java | 6 + .../hzinfo/inspect/obj/web/ObjectController.java | 6 + .../inspect/obj/web/ObjectUserController.java | 7 + .../hzinfo/inspect/obj/web/ProjectController.java | 6 + .../hzinfo/inspect/obj/web/TemplateController.java | 6 + .../inspect/plan/controller/PlanController.java | 6 + .../inspect/plan/controller/RouteController.java | 175 ++++++------ .../report/controller/InspectReportController.java | 6 + .../inspect/task/controller/TaskController.java | 13 + .../task/controller/TaskRecordController.java | 6 + .../controller/OperAccessLibraryController.java | 3 +- .../controller/OperAccessStatisticsController.java | 3 +- .../controller/OperAccessTaskController.java | 3 +- .../alert/controller/AlarmHandleController.java | 6 + .../defect/controller/OperDefectController.java | 3 +- .../defect/controller/OperFaultController.java | 3 +- .../duty/controller/ImsDutyClassController.java | 5 +- .../controller/ImsDutyClassTypeController.java | 145 +++++----- .../duty/controller/ImsDutyGroupController.java | 6 +- .../duty/controller/ImsDutyMainController.java | 303 +++++++++++---------- .../duty/controller/ImsDutyRecController.java | 10 +- .../fill/controller/GenerateController.java | 6 + .../fill/controller/OtherController.java | 5 +- .../fill/controller/OverConfigController.java | 3 +- .../fill/controller/OverController.java | 5 +- .../fill/controller/PowerController.java | 5 +- .../fill/controller/RainfallController.java | 6 + .../fill/controller/SolveController.java | 5 +- .../fill/controller/StorageController.java | 6 + .../operational/fill/controller/UseController.java | 6 + .../main/controller/HomePageController.java | 4 +- .../controller/MainSystemMonitoringController.java | 2 +- .../OperMaintenanceLibraryController.java | 2 +- .../controller/CheckMonthController.java | 6 + .../controller/DangerSourceController.java | 6 + .../controller/EmergencyPlanController.java | 3 +- .../controller/ImsMonCameraInfoController.java | 7 + .../controller/SafeEquipmentTrialController.java | 3 +- .../controller/SystemFileController.java | 3 +- .../repair/controller/OperRepairController.java | 3 +- .../service/impl/TicketProcessServiceImpl.java | 5 +- .../controller/WorkTicketInfoController.java | 2 +- 54 files changed, 538 insertions(+), 336 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 1ed8d0b..c69bbe2 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 @@ -67,7 +67,8 @@ public class SpAllocationController extends BladeController { @GetMapping("/pageList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_allocation") - @OperationAnnotation(title = "调泼单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "资产管理", + title = "调泼单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, action = "分页查询") public R> pageList(SpAllocationVO allocationVO, Query query) { IPage pages = sp_allocationService.selectPageList(Condition.getPage(query),allocationVO); 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 963dbc7..91b20cc 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 @@ -54,7 +54,7 @@ public class SpReceiveController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_receive") - @OperationAnnotation(title = "工具领用",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "资产管理",title = "工具领用",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, action = "分页查询") public R> list(SpReceiveVO receiveVO, Query query) { IPage pages = sp_receiveService.selectPageList(Condition.getPage(query), receiveVO); 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 c7506ce..3b8a204 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 @@ -57,7 +57,7 @@ public class SpReceivesController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_receives") - @OperationAnnotation(title = "工具回退",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "资产管理",title = "工具回退",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, action = "分页查询") public R> list(SpReceivesVO sp_receives, Query query) { IPage pages = sp_receivesService.selectPageList(Condition.getPage(query), sp_receives); 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 2dcdacf..eb892ce 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 @@ -66,7 +66,8 @@ public class SpWarehouseInController extends BladeController { @GetMapping("/pageList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_warehouse_in") - @OperationAnnotation(title = "入库单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "资产管理",title = "入库单",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页条件") public R> pageList(SpWarehouseInVO warehouseInVO, Query query) { IPage pages = sp_warehouse_inService.selectPageList(Condition.getPage(query),warehouseInVO); 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 7612743..f73924d 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 @@ -54,7 +54,8 @@ public class SpWarehouseOutController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入sp_warehouse_out") - @OperationAnnotation(title = "出库单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "资产管理",title = "出库单",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页查询") public R> list(SpWarehouseOutVO warehouseOutVO, Query query) { IPage pages = sp_warehouse_outService.selectPageList(Condition.getPage(query),warehouseOutVO); 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 adb1ce6..c9dfef9 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 @@ -69,7 +69,8 @@ public class WtSpTotalController extends BladeController { @GetMapping("/pageList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入spToolVO") - @OperationAnnotation(title = "库存清单",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "资产管理",title = "库存清单",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页条件") public R> pageList(WtSpToolVO spToolVO, Query query) { IPage pages = SP_TOTALService.selectSpToolList(Condition.getPage(query),spToolVO); @@ -81,7 +82,7 @@ public class WtSpTotalController extends BladeController { @GetMapping("/warnPageList") @ApiOperationSupport(order = 2) @ApiOperation(value = "库存预警列表", notes = "传入spToolVO") - @OperationAnnotation(title = "库存预警",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "资产管理",title = "库存预警",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, action = "分页查询") public R> warnPageList(WtSpToolVO spToolVO, Query query) { IPage pages = SP_TOTALService.warnPageList(Condition.getPage(query),spToolVO); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDeviceController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDeviceController.java index 6480bd0..39923b7 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDeviceController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDeviceController.java @@ -2,6 +2,9 @@ package com.hnac.hzims.fdp.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.equipment.entity.EmTreeNode; import com.hnac.hzims.fdp.dto.FdpDeviceDTO; import com.hnac.hzims.fdp.entity.FdpDeviceEntity; @@ -79,6 +82,9 @@ public class FdpDeviceController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 100) @ApiOperation(value = "自定义分页 FDP设备列表") + @OperationAnnotation(moduleName = "智能诊断",title = "智能诊断配置",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "分页条件") public R> list(FdpDeviceDTO entity, Query query) { return service.doList(Condition.getPage(query), entity); } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java index 2cf138e..18fe5f4 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpMonitorController.java @@ -151,7 +151,7 @@ public class FdpMonitorController extends BladeController { @GetMapping("/listPage") @ApiOperationSupport(order = 110) @ApiOperation(value = "查询监测点列表") - @OperationAnnotation(moduleName = "智能诊断",title = "监测点绑定",operatorType = OperatorType.MOBILE,businessType = + @OperationAnnotation(moduleName = "智能诊断",title = "智能诊断配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, action = "分页查询") public R> listPage(FdpMonitorEntity entity, Query query) { diff --git a/hzims-service/inspect/pom.xml b/hzims-service/inspect/pom.xml index 0483db8..f3610b8 100644 --- a/hzims-service/inspect/pom.xml +++ b/hzims-service/inspect/pom.xml @@ -216,6 +216,13 @@ + + + com.hnac.hzims + hzims-biz-common + 4.0.0-SNAPSHOT + + diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java index 85f957d..f1d4513 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockController.java @@ -2,6 +2,9 @@ package com.hnac.hzinfo.inspect.ai.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzinfo.inspect.ai.vo.ClockVO; import io.swagger.annotations.*; import lombok.AllArgsConstructor; @@ -53,6 +56,10 @@ public class ClockController extends BladeController { @ApiOperation(value = "分页", notes = "传入st_clock") @ApiImplicitParams({ }) + @OperationAnnotation(moduleName = "巡检管理", title = "智能巡检配置", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "分页") public R> list(@ApiIgnore @RequestParam Map st_clock, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper( st_clock, ClockEntity.class); IPage pages = st_clockService.page(Condition.getPage(query), queryWrapper); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java index 84ee06e..8d364e5 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/ClockTypeController.java @@ -2,6 +2,9 @@ package com.hnac.hzinfo.inspect.ai.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import javax.validation.Valid; @@ -51,6 +54,10 @@ public class ClockTypeController extends BladeController { @ApiOperation(value = "分页", notes = "传入st_clock_type") @ApiImplicitParams({ }) + @OperationAnnotation(moduleName = "巡检管理", title = "智能巡检配置", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "分页") public R> list(@ApiIgnore @RequestParam Map st_clock_type, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper( st_clock_type, ClockTypeEntity.class); IPage pages = st_clock_typeService.page(Condition.getPage(query), queryWrapper); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java index eee50ac..a7185fb 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/controller/RobotController.java @@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzinfo.inspect.ai.vo.robot.RobotAiReturnData; import com.hnac.hzinfo.inspect.ai.vo.robot.RobotServerTaskParam; import io.swagger.annotations.*; @@ -60,6 +63,10 @@ public class RobotController extends BladeController { @ApiOperation(value = "分页", notes = "传入st_robot") @ApiImplicitParams({ }) + @OperationAnnotation(moduleName = "巡检管理", title = "机器人管理", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "分页") public R> list(@ApiIgnore @RequestParam Map st_robot, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper( st_robot, RobotEntity.class); IPage pages = st_robotService.page(Condition.getPage(query), queryWrapper); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java index 549c8e3..fbd0691 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; import com.hnac.hzinfo.inspect.obj.services.ProjectContentService; @@ -47,6 +50,9 @@ public class ContentController { */ @GetMapping("/list") @ApiOperation(value = "巡检内容列表", notes = "巡检内容列表") + @OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "巡检对象列表") public R> list(ContentListQueryVO content, Query query, BladeUser bladeUser) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new ContentEntity(),content); queryWrapper.orderByDesc(ContentEntity::getUpdateTime); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java index b9b0c9b..32bdf09 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java @@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzinfo.inspect.obj.entity.ObjectDangerEntity; import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity; import com.hnac.hzinfo.inspect.obj.entity.ObjectTemplateEntity; @@ -86,6 +89,9 @@ public class ObjectController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "巡检对象列表", notes = "巡检对象列表") + @OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "巡检对象列表") public R> list(ObjectListQueryVO object, Query query, BladeUser bladeUser) { IPage pages = Condition.getPage(query); ObjectEntity entity = new ObjectEntity(); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java index af1e46b..cfc380c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java @@ -5,6 +5,9 @@ package com.hnac.hzinfo.inspect.obj.web; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.Lists; +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.hzinfo.inspect.obj.entity.ObjectUserEntity; import com.hnac.hzinfo.inspect.obj.services.ObjectUserService; import com.hnac.hzinfo.inspect.obj.vo.ObjectUserAddVO; @@ -55,6 +58,10 @@ public class ObjectUserController { * 巡检对象用户列表 */ @GetMapping("/list") + @OperationAnnotation(moduleName = "巡检管理", title = "巡检配置", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "巡检对象用户列表") @ApiOperation(value = "巡检对象用户列表", notes = "巡检对象用户列表(跨服务查询)") public R> list(ObjectUserListQuery content, Query query, BladeUser bladeUser) { if(!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)){ diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java index 61aafd1..4dbb078 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java @@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; @@ -52,6 +55,9 @@ public class ProjectController { */ @GetMapping("/list") @ApiOperation(value = "巡检项目列表", notes = "巡检项目列表") + @OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "巡检对象列表") public R> list(ProjectListQueryVO project, Query query, BladeUser bladeUser) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new ProjectEntity(),project); queryWrapper.orderByDesc(ProjectEntity::getUpdateTime); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java index 2b564a5..52c5f70 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java @@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzinfo.inspect.obj.entity.ObjectTemplateEntity; import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity; import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; @@ -66,6 +69,9 @@ public class TemplateController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "巡检模板列表分页", notes = "传入巡检模板") + @OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "巡检对象列表") public R> list(TemplateListQueryVO inspectionTemplate, Query query, BladeUser bladeUser) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new TemplateEntity(),inspectionTemplate); queryWrapper.orderByDesc(TemplateEntity::getUpdateTime); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java index d2c07ac..ab6c773 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java @@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzinfo.inspect.Constants; import com.hnac.hzinfo.inspect.invalid.DictInvalid; import com.hnac.hzinfo.inspect.obj.utils.CodeUtils; @@ -69,6 +72,9 @@ public class PlanController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页显示计划列表", notes = "传入plan") + @OperationAnnotation(moduleName = "巡检管理",title = "巡检计划",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "分页显示计划列表") public R> list(PlanListQueryVO plan, Query query, BladeUser bladeUser) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new PlanEntity(),plan); if(plan.getStartTime()!=null){ diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java index 60f5591..57488ad 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java @@ -2,9 +2,14 @@ package com.hnac.hzinfo.inspect.plan.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import io.swagger.annotations.*; import lombok.AllArgsConstructor; + import javax.validation.Valid; + import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; @@ -22,7 +27,7 @@ import java.util.List; import java.util.Map; /** - * 控制器 + * 控制器 * * @author py */ @@ -32,86 +37,90 @@ import java.util.Map; @Api(value = "hld-巡检路径", tags = "hld-巡检路径") public class RouteController extends BladeController { - private final IRouteService st_re_routeService; - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @ApiOperation(value = "详情", notes = "传入st_re_route") - public R detail(RouteEntity st_re_route) { - RouteEntity detail = st_re_routeService.getOne(Condition.getQueryWrapper(st_re_route)); - return R.data(detail); - } - - /** - * 分页 代码自定义代号 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "分页", notes = "传入st_re_route") - @ApiImplicitParams({ - }) - public R> list(@ApiIgnore @RequestParam Map st_re_route, Query query) { - QueryWrapper queryWrapper = Condition.getQueryWrapper( st_re_route, RouteEntity.class); - queryWrapper.orderByDesc("create_time","update_time"); - IPage pages = st_re_routeService.page(Condition.getPage(query), queryWrapper); - return R.data(pages); - } - - /** - * 新增 代码自定义代号 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入st_re_route") - public R save(@Valid @RequestBody RouteEntity st_re_route) { - return R.status(st_re_routeService.save(st_re_route)); - } - - /** - * 修改 代码自定义代号 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入st_re_route") - public R update(@Valid @RequestBody RouteEntity st_re_route) { - return R.status(st_re_routeService.updateById(st_re_route)); - } - - /** - * 新增或修改 代码自定义代号 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "新增或修改", notes = "传入st_re_route") - public R submit(@Valid @RequestBody RouteEntity st_re_route) { - return R.status(st_re_routeService.saveOrUpdate(st_re_route)); - } - - - /** - * 删除 代码自定义代号 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(st_re_routeService.deleteLogic(Func.toLongList(ids))); - } - - @GetMapping("/getRouteByObjectId") - @ApiOperationSupport(order = 8) - @ApiOperation(value = "获取使用到相关对象ID的所有路径", notes = "传入对象id") - public R> getRouteByObjectId(@RequestParam Long objectId) { - return R.data(st_re_routeService.getRouteByObjectId(objectId)); - } - - @GetMapping("/getRouteByTemplateId") - @ApiOperationSupport(order = 8) - @ApiOperation(value = "获取使用到相关模板ID的所有路径", notes = "传入模板id") - public R> getRouteByTemplateId(@RequestParam Long templateId) { - return R.data(st_re_routeService.getRouteByTemplateId(templateId)); - } + private final IRouteService st_re_routeService; + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入st_re_route") + public R detail(RouteEntity st_re_route) { + RouteEntity detail = st_re_routeService.getOne(Condition.getQueryWrapper(st_re_route)); + return R.data(detail); + } + + /** + * 分页 代码自定义代号 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入st_re_route") + @ApiImplicitParams({ + }) + @OperationAnnotation(moduleName = "巡检管理", title = "巡检配置", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "列表(不分页)") + public R> list(@ApiIgnore @RequestParam Map st_re_route, Query query) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(st_re_route, RouteEntity.class); + queryWrapper.orderByDesc("create_time", "update_time"); + IPage pages = st_re_routeService.page(Condition.getPage(query), queryWrapper); + return R.data(pages); + } + + /** + * 新增 代码自定义代号 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入st_re_route") + public R save(@Valid @RequestBody RouteEntity st_re_route) { + return R.status(st_re_routeService.save(st_re_route)); + } + + /** + * 修改 代码自定义代号 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入st_re_route") + public R update(@Valid @RequestBody RouteEntity st_re_route) { + return R.status(st_re_routeService.updateById(st_re_route)); + } + + /** + * 新增或修改 代码自定义代号 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入st_re_route") + public R submit(@Valid @RequestBody RouteEntity st_re_route) { + return R.status(st_re_routeService.saveOrUpdate(st_re_route)); + } + + + /** + * 删除 代码自定义代号 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(st_re_routeService.deleteLogic(Func.toLongList(ids))); + } + + @GetMapping("/getRouteByObjectId") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "获取使用到相关对象ID的所有路径", notes = "传入对象id") + public R> getRouteByObjectId(@RequestParam Long objectId) { + return R.data(st_re_routeService.getRouteByObjectId(objectId)); + } + + @GetMapping("/getRouteByTemplateId") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "获取使用到相关模板ID的所有路径", notes = "传入模板id") + public R> getRouteByTemplateId(@RequestParam Long templateId) { + return R.data(st_re_routeService.getRouteByTemplateId(templateId)); + } } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java index 777bfaa..9ad2d66 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java @@ -2,6 +2,9 @@ package com.hnac.hzinfo.inspect.report.controller; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.excel.EasyExcel; +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.hzinfo.inspect.gather.vo.TaskGatherQueryVO; import com.hnac.hzinfo.inspect.report.entity.InspectMonthReportExcel; import com.hnac.hzinfo.inspect.report.entity.MonthRoutReport; @@ -37,6 +40,9 @@ public class InspectReportController { @RequestMapping(value = "/getInspectMonthReport", method = { RequestMethod.POST,RequestMethod.GET }) @ApiOperation(notes = "子站-巡检月报表接口-按路径", value = "针对巡检月报表页") + @OperationAnnotation(moduleName = "生产月报", title = "巡检报表", operatorType = OperatorType.MOBILE, businessType = + BusinessType.GENCODE, + action = "子站-巡检月报表接口-按路径") public R> getInspectMonthReport( @ApiParam(value = "年月 2019-02") @RequestParam(required = true) String month, @ApiParam(value = "巡检路径id") @RequestParam(required = true) Long routId, diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java index 99cda99..dbbe93c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java @@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.annotation.JsonRawValue; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.google.common.collect.Lists; +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.hzinfo.core.push.enums.PushAudienceType; import com.hnac.hzinfo.core.push.model.PushAudience; import com.hnac.hzinfo.core.push.model.PushInfo; @@ -103,6 +106,9 @@ public class TaskController extends BladeController { */ @GetMapping("/list") @ApiOperation(value = "分页显示任务列表", notes = "传入task") + @OperationAnnotation(moduleName = "巡检管理",title = "我的巡检任务",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "分页显示任务列表") public R> list(TaskListQuery task, Query query) { //CacheUtil.put("test#2","inspect","test","12"); // LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new TaskEntity(),task); @@ -154,6 +160,9 @@ public class TaskController extends BladeController { */ @GetMapping("/robotList") @ApiOperation(value = "机器人任务列表", notes = "传入task") + @OperationAnnotation(moduleName = "巡检管理",title = "机器人巡检",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "机器人任务列表") public R> robotList(TaskListQuery task, Query query) { IPage pages = Condition.getPage(query); task.setAutoVideo(PlanContants.InspectTypeEnum.ROBOT.getVal()); @@ -167,6 +176,10 @@ public class TaskController extends BladeController { * 视频任务列表 */ @GetMapping("/videoList") + @OperationAnnotation(moduleName = "巡检管理", title = "视频巡检任务", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "视频任务列表") @ApiOperation(value = "视频任务列表", notes = "传入task") public R> videoList(TaskListQuery task, Query query) { IPage pages = Condition.getPage(query); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskRecordController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskRecordController.java index c9c7bc2..8b31e0d 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskRecordController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskRecordController.java @@ -5,6 +5,9 @@ package com.hnac.hzinfo.inspect.task.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzinfo.inspect.task.entity.TaskRecordEntity; import com.hnac.hzinfo.inspect.task.service.ITaskRecordService; import com.hnac.hzinfo.inspect.task.service.ITaskService; @@ -41,6 +44,9 @@ public class TaskRecordController { @GetMapping("/list") @ApiOperation(value = "巡检报备列表", notes = "巡检报备列表(只显示未开始)") + @OperationAnnotation(moduleName = "巡检管理",title = "巡检设备",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "巡检报备列表") public R> getListTaskRecord(TaskListQuery task, Query query) { IPage pages = Condition.getPage(query); if(!AuthUtil.isAdministrator()){ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java index 31b720e..472a6c9 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java @@ -85,7 +85,8 @@ public class OperAccessLibraryController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:emCode,gradeCode") - @OperationAnnotation(title = "检修库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "检修管理",title = "检修库",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页 查询参数:emCode,gradeCode") public R> list(OperAccessLibraryListDTO req, Query query) { return service.list(req, query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java index 930002b..d70ac1b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java @@ -84,7 +84,8 @@ public class OperAccessStatisticsController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页 查询参数:pid,taskId,manager") - @OperationAnnotation(title = "检修记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "检修管理",title = "检修记录",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页 查询参数:pid,taskId,manager") public R> list(OperAccessStatisticsDTO req, Query query) { return service.list(req, Condition.getPage(query)); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java index f3ae298..7fad159 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java @@ -83,7 +83,8 @@ public class OperAccessTaskController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 50) - @OperationAnnotation(title = "我的检修任务",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "检修管理",title = "我的检修任务",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页 查询参数:name,code,handler,status,planId,planCode") @ApiOperation(value = "分页 查询参数:name,code,handler,status,planId,planCode") public R> list(OperAccessTaskDTO req, Query query) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AlarmHandleController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AlarmHandleController.java index b26c8b5..0a9cd85 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AlarmHandleController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AlarmHandleController.java @@ -3,6 +3,9 @@ package com.hnac.hzims.operational.alert.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.operational.alert.service.AlarmHandleService; import com.hnac.hzims.operational.alert.vo.AlarmHandleVo; import com.hnac.hzims.operational.alert.vo.HandleQueryVo; @@ -49,6 +52,9 @@ public class AlarmHandleController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入AlarmHandleEntity") + @OperationAnnotation(moduleName = "告警配置", title = "告警配置记录", operatorType = OperatorType.MOBILE, businessType = + BusinessType.GENCODE, + action = "分页") public R> list(HandleQueryVo param, Query query) { IPage pages = service.pageCondition(query, param); return R.data(pages); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java index dbe05cf..d23124c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java @@ -162,7 +162,8 @@ public class OperDefectController extends BladeController { @GetMapping("/getDefectStatistics") @ApiOperationSupport(order = 5) @ApiOperation(value = "获取缺陷的统计月报", notes = " month 格式：2021-01") - @OperationAnnotation(moduleName = "缺陷管理", title = "缺陷月报表", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "生产月报", title = "缺陷月报表", operatorType = OperatorType.MOBILE, businessType = + BusinessType.GENCODE, action = "获取缺陷的统计月报") public R> getDefectStatistics(@ApiParam(value = "month 格式：2021-01", required = true) @RequestParam String month) { Map defectStatistics = defectService.getDefectStatistics(month); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperFaultController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperFaultController.java index a4b0649..664d437 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperFaultController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperFaultController.java @@ -60,7 +60,8 @@ public class OperFaultController extends BladeController { @ApiOperation(value = "分页", notes = "传入fault") @ApiImplicitParams({ }) - @OperationAnnotation(title = "故障库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "智能诊断",title = "故障库",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页查询") public R> list(OperFaultEntity entity, Query query) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new OperFaultEntity(),entity); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java index b464ca2..4827769 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java @@ -54,6 +54,9 @@ public class ImsDutyClassController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入imsDutyClass") + @OperationAnnotation(moduleName = "值班管理",title = "值班配置",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE,action + = "列表(不分页)") public R> list(ImsDutyClassEntity imsDutyClass, Query query) { LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new ImsDutyClassEntity(),imsDutyClass); if(null != imsDutyClass.getCreateDept()){ @@ -68,7 +71,7 @@ public class ImsDutyClassController extends BladeController { */ @GetMapping("/getlist") @ApiOperationSupport(order = 2) - @OperationAnnotation(moduleName = "值班管理",title = "班次设置",operatorType = OperatorType.MOBILE,businessType = + @OperationAnnotation(moduleName = "值班管理",title = "值班配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action = "列表(不分页)") @ApiOperation(value = "列表(不分页)", notes = "传入imsDutyClass") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassTypeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassTypeController.java index f7036c9..39ef53a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassTypeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassTypeController.java @@ -34,82 +34,87 @@ import java.util.List; @Api(value = "班次类型controller", tags = "班次类型相关操作") public class ImsDutyClassTypeController extends BladeController { - private final IImsDutyClassTypeService imsDutyClassTypeService; + private final IImsDutyClassTypeService imsDutyClassTypeService; - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @ApiOperation(value = "详情", notes = "传入imsDutyClassType") - public R detail(ImsDutyClassTypeEntity imsDutyClassType) { - ImsDutyClassTypeEntity detail = imsDutyClassTypeService.getOne(Condition.getQueryWrapper(imsDutyClassType)); - return R.data(detail); - } + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入imsDutyClassType") + public R detail(ImsDutyClassTypeEntity imsDutyClassType) { + ImsDutyClassTypeEntity detail = imsDutyClassTypeService.getOne(Condition.getQueryWrapper(imsDutyClassType)); + return R.data(detail); + } - /** - * 分页 代码自定义代号 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "分页", notes = "传入imsDutyClassType") - public R> list(ImsDutyClassTypeEntity imsDutyClassType, Query query) { - LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new ImsDutyClassTypeEntity(), imsDutyClassType); - if (null != imsDutyClassType.getCreateDept()) { - queryWrapper.eq(ImsDutyClassTypeEntity::getCreateDept, imsDutyClassType.getCreateDept()); - } - queryWrapper.orderByDesc(ImsDutyClassTypeEntity::getCreateTime); - IPage pages = imsDutyClassTypeService.page(Condition.getPage(query), queryWrapper); - return R.data(pages); - } + /** + * 分页 代码自定义代号 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @OperationAnnotation(moduleName = "值班管理", + title = "值班配置", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "分页") + @ApiOperation(value = "分页", notes = "传入imsDutyClassType") + public R> list(ImsDutyClassTypeEntity imsDutyClassType, Query query) { + LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new ImsDutyClassTypeEntity(), imsDutyClassType); + if (null != imsDutyClassType.getCreateDept()) { + queryWrapper.eq(ImsDutyClassTypeEntity::getCreateDept, imsDutyClassType.getCreateDept()); + } + queryWrapper.orderByDesc(ImsDutyClassTypeEntity::getCreateTime); + IPage pages = imsDutyClassTypeService.page(Condition.getPage(query), queryWrapper); + return R.data(pages); + } - /** - * 获取所有班次类型 代码自定义代号 - */ - @GetMapping("/listClassType") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "获取所有班次类型") - public R> listClassType(@RequestParam(required = false) Long createDept) { - List list = imsDutyClassTypeService.list(new LambdaQueryWrapper() {{ - if (null != createDept) { - eq(ImsDutyClassTypeEntity::getCreateDept, createDept); - } - }}); - return R.data(list); - } + /** + * 获取所有班次类型 代码自定义代号 + */ + @GetMapping("/listClassType") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "获取所有班次类型") + public R> listClassType(@RequestParam(required = false) Long createDept) { + List list = imsDutyClassTypeService.list(new LambdaQueryWrapper() {{ + if (null != createDept) { + eq(ImsDutyClassTypeEntity::getCreateDept, createDept); + } + }}); + return R.data(list); + } - /** - * 新增或修改 代码自定义代号 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "新增或修改", notes = "传入imsDutyClassType") - public R submit(@Valid @RequestBody ImsDutyClassTypeEntity imsDutyClassType) { - return imsDutyClassTypeService.saveOrUpdateImsDutyClassType(imsDutyClassType); - } + /** + * 新增或修改 代码自定义代号 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入imsDutyClassType") + public R submit(@Valid @RequestBody ImsDutyClassTypeEntity imsDutyClassType) { + return imsDutyClassTypeService.saveOrUpdateImsDutyClassType(imsDutyClassType); + } - /** - * 删除 代码自定义代号 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return imsDutyClassTypeService.doDeleteLogic(Func.toLongList(ids)); - } + /** + * 删除 代码自定义代号 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return imsDutyClassTypeService.doDeleteLogic(Func.toLongList(ids)); + } - /** - * 获取不存在班次中的班次类型 - */ - @GetMapping("/classTypeList") - @ApiOperationSupport(order = 9) - @OperationAnnotation(moduleName = "值班管理",title = "班次类型设置",operatorType = OperatorType.MOBILE,businessType = - BusinessType.GENCODE,action - = "获取不存在班次中的班次类型") - @ApiOperation(value = "获取不存在班次中的班次类型", notes = "传入ids") - public R> classTypeList(@ApiParam(value = "机构ID", required = true) @RequestParam Long createDept,@ApiParam(value = "班次类型ID", required = true) @RequestParam(required = false) Long classTypeId) { - return R.data(imsDutyClassTypeService.getClassTypeList(createDept,classTypeId)); - } + /** + * 获取不存在班次中的班次类型 + */ + @GetMapping("/classTypeList") + @ApiOperationSupport(order = 9) + @OperationAnnotation(moduleName = "值班管理", title = "班次类型设置", operatorType = OperatorType.MOBILE, businessType = + BusinessType.GENCODE, action + = "获取不存在班次中的班次类型") + @ApiOperation(value = "获取不存在班次中的班次类型", notes = "传入ids") + public R> classTypeList(@ApiParam(value = "机构ID", required = true) @RequestParam Long createDept, @ApiParam(value = "班次类型ID", required = true) @RequestParam(required = false) Long classTypeId) { + return R.data(imsDutyClassTypeService.getClassTypeList(createDept, classTypeId)); + } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyGroupController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyGroupController.java index 19bf181..c3ded48 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyGroupController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyGroupController.java @@ -54,8 +54,10 @@ public class ImsDutyGroupController extends BladeController { /** * 分页 代码自定义代号 */ - @OperationAnnotation(moduleName = "值班管理",title = "班组管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action - = "分页") + @OperationAnnotation(moduleName = "值班管理",title = "签到记录", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "分页") @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入imsDutyGroup") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainController.java index 7f248e5..1c7727b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainController.java @@ -2,6 +2,9 @@ package com.hnac.hzims.operational.duty.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.service.IImsDutyMainService; import com.hnac.hzims.operational.duty.vo.ChangeDutyMainVo; @@ -34,75 +37,75 @@ import java.util.List; @Api(value = "值班信息主表controller", tags = "值班信息主表相关操作") public class ImsDutyMainController extends BladeController { - private final IImsDutyMainService imsDutyMainService; - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @ApiOperation(value = "详情", notes = "传入imsDutyMainEntity") - public R detail(ImsDutyMainEntity imsDutyMain) { - ImsDutyMainEntity detail = imsDutyMainService.getOne(Condition.getQueryWrapper(imsDutyMain)); - return R.data(detail); - } - - /** - * 分页 代码自定义代号 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "分页", notes = "传入imsDutyMain") - public R> list(ImsDutyMainEntity imsDutyMain, Query query) { - IPage pages = imsDutyMainService.page(Condition.getPage(query), Condition.getQueryWrapper(imsDutyMain)); - return R.data(pages); - } - - - /** - * 根据时间查询所有值班信息列表(不分页) - */ - @GetMapping("/getList") - @ApiOperationSupport(order = 3) - @ApiOperation(value = "列表(不分页)", notes = "传入imsDutyMain") - public R getlists(@ApiParam(value = "值班时间") @Valid @RequestParam("dutyDate") String dutyDate, @ApiParam(value = "申请人ID") Long personId) { - return imsDutyMainService.getByDateListAll(dutyDate, personId); - } - - - /** - * 新增或修改 代码自定义代号 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "新增或修改", notes = "传入imsDutyMain") - public R submit(@Valid @RequestBody ImsDutyMainEntity imsDutyMain) { - return imsDutyMainService.saveOrUpdateImsDutyMain(imsDutyMain); - } - - - /** - * 删除 代码自定义代号 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return imsDutyMainService.deleteV2(Func.toLongList(ids)); - } - - /** - * 排班管理 - */ - @PostMapping("/scheduling") - @ApiOperationSupport(order = 8) - @ApiOperation(value = "排班管理", notes = "") - public R scheduling(@Valid @RequestBody ImsSchedulingVo imsSchedulingVo) { - if (null == imsSchedulingVo.getCreateDept()) { - imsSchedulingVo.setCreateDept(Long.valueOf(AuthUtil.getDeptId())); - } - return imsDutyMainService.getSchedulingV2(imsSchedulingVo); - } + private final IImsDutyMainService imsDutyMainService; + + /** + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入imsDutyMainEntity") + public R detail(ImsDutyMainEntity imsDutyMain) { + ImsDutyMainEntity detail = imsDutyMainService.getOne(Condition.getQueryWrapper(imsDutyMain)); + return R.data(detail); + } + + /** + * 分页 代码自定义代号 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入imsDutyMain") + public R> list(ImsDutyMainEntity imsDutyMain, Query query) { + IPage pages = imsDutyMainService.page(Condition.getPage(query), Condition.getQueryWrapper(imsDutyMain)); + return R.data(pages); + } + + + /** + * 根据时间查询所有值班信息列表(不分页) + */ + @GetMapping("/getList") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "列表(不分页)", notes = "传入imsDutyMain") + public R getlists(@ApiParam(value = "值班时间") @Valid @RequestParam("dutyDate") String dutyDate, @ApiParam(value = "申请人ID") Long personId) { + return imsDutyMainService.getByDateListAll(dutyDate, personId); + } + + + /** + * 新增或修改 代码自定义代号 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入imsDutyMain") + public R submit(@Valid @RequestBody ImsDutyMainEntity imsDutyMain) { + return imsDutyMainService.saveOrUpdateImsDutyMain(imsDutyMain); + } + + + /** + * 删除 代码自定义代号 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return imsDutyMainService.deleteV2(Func.toLongList(ids)); + } + + /** + * 排班管理 + */ + @PostMapping("/scheduling") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "排班管理", notes = "") + public R scheduling(@Valid @RequestBody ImsSchedulingVo imsSchedulingVo) { + if (null == imsSchedulingVo.getCreateDept()) { + imsSchedulingVo.setCreateDept(Long.valueOf(AuthUtil.getDeptId())); + } + return imsDutyMainService.getSchedulingV2(imsSchedulingVo); + } // /** // * 排班管理 @@ -116,81 +119,89 @@ public class ImsDutyMainController extends BladeController { // } // return imsDutyMainService.getScheduling(imsSchedulingVo); // } - /** - * 查询排班 - */ - @PostMapping("/scheduling/list") - @ApiOperationSupport(order = 8) - @ApiOperation(value = "查询排班", notes = "传年份和月份 year month") - public R schedulingList(@Valid @ApiParam(value = "年份", required = true) @RequestParam int year, - @ApiParam(value = "月份", required = true) @RequestParam int month, - @ApiParam(value = "机构Id", required = true) Long deptId) { - if (null == deptId) { - deptId = Long.valueOf(AuthUtil.getDeptId()); - } - return imsDutyMainService.getSchedulingListV2(year, month, deptId); - } - - /** - * 根据值班id查询值班人员 - */ - @PostMapping("/person") - @ApiOperationSupport(order = 9) - @ApiOperation(value = "根据值班id查询人员", notes = "传id") - public R person(@ApiParam(value = "值班Id", required = true) @RequestParam Long id) { - return imsDutyMainService.getMainIdByPersonV2(id); - } - - /** - * 数据清理 - */ - @PostMapping("/dataDelete") - @ApiOperationSupport(order = 9) - @ApiOperation(value = "数据清理", notes = "传id") - public R dataDelete(@ApiParam(value = "机构ID", required = true) @RequestParam Long deptId, - @ApiParam(value = "开始时间", required = true) @RequestParam String startDate, - @ApiParam(value = "结束时间", required = true) @RequestParam String endDate) { - return imsDutyMainService.dataDelete(deptId, startDate, endDate); - } - - - /** - * 根据值班id查询值班人员 - */ - @GetMapping("/getHomePageDutyInfo") - @ApiOperationSupport(order = 9) - @ApiOperation(value = "获取首页值班数据", notes = "传id") - public R> getHomePageDutyInfo(Long deptId) { - return R.data(imsDutyMainService.getHomePageDutyInfo(deptId)); - } - - /** - * 返回对应部门所有人员 - */ - @GetMapping("/getAllPersonInfo") - @ApiOperationSupport(order = 9) - @ApiOperation(value = "返回对应部门所有人员", notes = "") - public R getAllPersonInfo(Long deptId) { - return R.data(imsDutyMainService.getAllPersonInfo(deptId)); - } - - /** - * 值班人员ID对应班次信息 - */ - @GetMapping("/getDutyMainInfoVoById") - @ApiOperationSupport(order = 9) - @ApiOperation(value = "值班人员ID对应班次信息", notes = "") - public R getDutyMainInfoVoById(@ApiParam(value = "机构ID") Long deptId,@ApiParam(value = "申请人ID") Long personId) { - return imsDutyMainService.getDutyEmergencyEntityById(deptId,personId); - } - - /** - *灵活调入，调出 - */ - @PostMapping("/updateDutyMainInfoVoById") - @ApiOperationSupport(order = 9) - @ApiOperation(value = "灵活调入，调出", notes = "") - public R updateDutyMainInfoVoById(@RequestBody ChangeDutyMainVo changeDutyMainVo) { - return imsDutyMainService.updateDutyMainInfoVoById(changeDutyMainVo); - } + + /** + * 查询排班 + */ + @PostMapping("/scheduling/list") + @ApiOperationSupport(order = 8) + @OperationAnnotation(moduleName = "值班管理", title = "排班计划", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, action = "查询排班") + @ApiOperation(value = "查询排班", notes = "传年份和月份 year month") + public R schedulingList(@Valid @ApiParam(value = "年份", required = true) @RequestParam int year, + @ApiParam(value = "月份", required = true) @RequestParam int month, + @ApiParam(value = "机构Id", required = true) Long deptId) { + if (null == deptId) { + deptId = Long.valueOf(AuthUtil.getDeptId()); + } + return imsDutyMainService.getSchedulingListV2(year, month, deptId); + } + + /** + * 根据值班id查询值班人员 + */ + @PostMapping("/person") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "根据值班id查询人员", notes = "传id") + public R person(@ApiParam(value = "值班Id", required = true) @RequestParam Long id) { + return imsDutyMainService.getMainIdByPersonV2(id); + } + + /** + * 数据清理 + */ + @PostMapping("/dataDelete") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "数据清理", notes = "传id") + public R dataDelete(@ApiParam(value = "机构ID", required = true) @RequestParam Long deptId, + @ApiParam(value = "开始时间", required = true) @RequestParam String startDate, + @ApiParam(value = "结束时间", required = true) @RequestParam String endDate) { + return imsDutyMainService.dataDelete(deptId, startDate, endDate); + } + + + /** + * 根据值班id查询值班人员 + */ + @GetMapping("/getHomePageDutyInfo") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "获取首页值班数据", notes = "传id") + public R> getHomePageDutyInfo(Long deptId) { + return R.data(imsDutyMainService.getHomePageDutyInfo(deptId)); + } + + /** + * 返回对应部门所有人员 + */ + @GetMapping("/getAllPersonInfo") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "返回对应部门所有人员", notes = "") + @OperationAnnotation(moduleName = "值班管理", title = "调班管理", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "返回对应部门所有人员") + public R getAllPersonInfo(Long deptId) { + return R.data(imsDutyMainService.getAllPersonInfo(deptId)); + } + + /** + * 值班人员ID对应班次信息 + */ + @GetMapping("/getDutyMainInfoVoById") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "值班人员ID对应班次信息", notes = "") + public R getDutyMainInfoVoById(@ApiParam(value = "机构ID") Long deptId, @ApiParam(value = "申请人ID") Long personId) { + return imsDutyMainService.getDutyEmergencyEntityById(deptId, personId); + } + + /** + * 灵活调入，调出 + */ + @PostMapping("/updateDutyMainInfoVoById") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "灵活调入，调出", notes = "") + public R updateDutyMainInfoVoById(@RequestBody ChangeDutyMainVo changeDutyMainVo) { + return imsDutyMainService.updateDutyMainInfoVoById(changeDutyMainVo); + } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java index ce66e89..51eb8f6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java @@ -79,7 +79,8 @@ public class ImsDutyRecController extends BladeController { /** * 自定义分页 附件表 */ - @OperationAnnotation(title = "交接班记录",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "值班管理",title = "交接班记录",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页--交接班记录") @GetMapping("/pageList") @ApiOperationSupport(order = 3) @@ -254,6 +255,9 @@ public class ImsDutyRecController extends BladeController { */ @PostMapping("/queryEmergency") @ApiOperationSupport(order = 6) + @OperationAnnotation(moduleName = "值班管理",title = "值班突发事件登记",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE,action + = "列表(不分页)") @ApiOperation(value = "查询突发事件记录", notes = "传入imsDutyEmergencyEntity") public R queryEmergency( @Valid @RequestBody ImsDutyEmergencyVo imsDutyEmergencyVo,Query query) { return iImsDutyEmergencyService.queryEntity(imsDutyEmergencyVo,query); @@ -286,6 +290,10 @@ public class ImsDutyRecController extends BladeController { @PostMapping("/queryAnalyseExample") @ApiOperationSupport(order = 6) @ApiOperation(value = "查询分析实例模板", notes = "传入analyseExample") + @OperationAnnotation(moduleName = "值班管理", title = "值班日志配置", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "查询分析实例模板") public R queryAnalyseExample( AnalyseExample analyseExample,Query query) { return iImsAnalyseExampleService.queryAnalyseExample(analyseExample,query); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java index ea2e873..7211b51 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java @@ -2,6 +2,9 @@ package com.hnac.hzims.operational.fill.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.operational.fill.entity.GenerateEntity; import com.hnac.hzims.operational.fill.service.GenerateService; import com.hnac.hzims.operational.fill.vo.GenerateVo; @@ -57,6 +60,9 @@ public class GenerateController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 4) + @OperationAnnotation(moduleName = "数据填报", + title = "水电站发电量填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + action = "分页") @ApiOperation(value = "分页", notes = "查询条件：：startTime,endTime,stationCode") public R> list(QueryVo filter, Query query) { return service.pageCondition(filter, query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java index 8368608..e50b207 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OtherController.java @@ -66,8 +66,9 @@ public class OtherController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 4) - @OperationAnnotation(title = "其他填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页条件") + @OperationAnnotation(moduleName = "数据填报", + title = "配置数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + action = "分页") @ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime") public R> list(OtherVo vo, Query query) { return service.pageCondition(vo, query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java index 9397166..67bcc41 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverConfigController.java @@ -66,7 +66,8 @@ public class OverConfigController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 4) - @OperationAnnotation(title = "检修卡配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "数据填报", + title = "配置数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, action = "查询条件") @ApiOperation(value = "分页", notes = "查询条件：over_name") public R> list(OverConfigVo vo, Query query) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java index 55c01ec..41f6693 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/OverController.java @@ -67,8 +67,9 @@ public class OverController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 4) - @OperationAnnotation(title = "检修卡填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页条件") + @OperationAnnotation(moduleName = "数据填报", + title = "配置数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + action = "分页") @ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime") public R> list(OverVo vo, Query query) { return service.pageCondition(vo, query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java index c17258b..9167c5c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/PowerController.java @@ -66,8 +66,9 @@ public class PowerController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 4) - @OperationAnnotation(title = "(风电 光扶)数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页条件") + @OperationAnnotation(moduleName = "数据填报", + title = "风电数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + action = "分页") @ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime") public R> list(PowerVo vo, Query query) { return service.pageCondition(vo, query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java index 5bc4b7e..611a5f2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java @@ -1,6 +1,9 @@ package com.hnac.hzims.operational.fill.controller; 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.fill.vo.RainfallVo; import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.mp.support.Query; @@ -58,6 +61,9 @@ public class RainfallController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 4) + @OperationAnnotation(moduleName = "数据填报", + title = "降雨量填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + action = "分页") @ApiOperation(value = "分页", notes = "查询条件：：startTime,endTime,stationCode") public R> list(QueryVo filter, Query query) { return service.pageCondition(filter, query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java index 040c9da..d3367a8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/SolveController.java @@ -66,8 +66,9 @@ public class SolveController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 4) - @OperationAnnotation(title = "消缺填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页条件") + @OperationAnnotation(moduleName = "数据填报", + title = "配置数据填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + action = "分页") @ApiOperation(value = "分页", notes = "查询条件：startDate,endDate,createDept") public R> list(SolveVo vo, Query query) { return service.pageCondition(vo, query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java index 1351748..1b90b78 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/StorageController.java @@ -2,6 +2,9 @@ package com.hnac.hzims.operational.fill.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.operational.fill.entity.StorageEntity; import com.hnac.hzims.operational.fill.service.StorageService; import com.hnac.hzims.operational.fill.vo.QueryVo; @@ -55,6 +58,9 @@ public class StorageController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 4) + @OperationAnnotation(moduleName = "数据填报", + title = "储能站发电量填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + action = "分页") @ApiOperation(value = "分页", notes = "查询条件：startTime,endTime,stationCode") public R> list(QueryVo vo, Query query) { return service.pageCondition(vo, query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java index d8ab1c0..a7ce9bf 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java @@ -2,6 +2,9 @@ package com.hnac.hzims.operational.fill.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.operational.fill.entity.UseEntity; import com.hnac.hzims.operational.fill.service.UseService; import com.hnac.hzims.operational.fill.vo.QueryVo; @@ -56,6 +59,9 @@ public class UseController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 4) + @OperationAnnotation(moduleName = "数据填报", + title = "磊站用电填报",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + action = "分页") @ApiOperation(value = "分页", notes = "查询条件：：startTime,endTime,stationCode") public R> list(QueryVo filter, Query query) { return service.pageCondition(filter, query); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomePageController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomePageController.java index 1f3d183..97f87376 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomePageController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomePageController.java @@ -82,8 +82,8 @@ public class HomePageController extends BladeController { @ApiLog @ApiOperation("年计划发电完成趋势") @GetMapping("/planAactualTrend") - @OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE, - businessType = BusinessType.GENCODE,action = "年计划发电完成趋势") + // @OperationAnnotation(moduleName = "演示大屏",title = "演示大屏", operatorType = OperatorType.MOBILE, + // businessType = BusinessType.GENCODE,action = "年计划发电完成趋势") @ApiOperationSupport(order = 6) public R> planActualTrend(@ApiParam(value = "区域机构ID") Long deptId) { return R.data(homePageService.planActualTrend(deptId)); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java index 503e110..514f1c1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainSystemMonitoringController.java @@ -128,7 +128,7 @@ public class MainSystemMonitoringController { @GetMapping("/listByAuthDept") @OperationAnnotation(moduleName = "值班管理", - title = "排班计划",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action + title = "值班配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action = "根据用户权限查询站点及部门") @ApiOperationSupport(order = 100) @ApiOperation(value = "根据用户权限查询站点及部门", notes = "") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java index 1bf6b50..08ba99f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceLibraryController.java @@ -87,7 +87,7 @@ public class OperMaintenanceLibraryController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 50) - @OperationAnnotation(moduleName = "设备管理",title = "设备维护库",operatorType = OperatorType.MOBILE,businessType = + @OperationAnnotation(moduleName = "日常维护",title = "设备维护库",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, action = "分页 查询参数:libraryCode,emCode,typeCode,procDefId,disposers(仅支持一人)") @ApiOperation(value = "分页 查询参数:libraryCode,emCode,typeCode,procDefId,disposers(仅支持一人)") diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckMonthController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckMonthController.java index 2359474..71dcd62 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckMonthController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CheckMonthController.java @@ -3,6 +3,9 @@ package com.hnac.hzims.safeproduct.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.safeproduct.dto.CheckMonthDTO; import com.hnac.hzims.safeproduct.entity.CheckMonthEntity; import com.hnac.hzims.safeproduct.service.ICheckMonthService; @@ -98,6 +101,9 @@ public class CheckMonthController extends BladeController { @GetMapping("/listNotDataScope") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页", notes = "查询条件：month,status,createDept") + @OperationAnnotation(moduleName = "安全管理", + title = "月度自查核查",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + action = "分页") public R> listNotDataScope(CheckMonthEntity req, Query query) { R> pageR = checkMonthlyService.pageNotDataScope(req, query); IPage page = pageR.getData(); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java index bc11634..81f5068 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DangerSourceController.java @@ -2,6 +2,9 @@ package com.hnac.hzims.safeproduct.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.safeproduct.dto.DangerSourceDTO; import com.hnac.hzims.safeproduct.entity.DangerSourceEntity; import com.hnac.hzims.safeproduct.service.IDangerSourceService; @@ -78,6 +81,9 @@ public class DangerSourceController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页", notes = "查询条件：eqId,level,`dangerEle,applyType,type") + @OperationAnnotation(moduleName = "安全管理",title = "危险点列表",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "分页") public R> list(DangerSourceEntity req, Query query) { return dangerSourceService.pageCondition(req, query); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java index 413dd5a..307abc0 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/EmergencyPlanController.java @@ -79,7 +79,8 @@ public class EmergencyPlanController extends BladeController { @ApiLog @GetMapping("/list") @ApiOperationSupport(order = 50) - @OperationAnnotation(title = "应急预案文件",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "安全管理",title = "应急预案文件",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页条件") @ApiOperation(value = "分页", notes = "查询条件：typeId,fileStatus,fileName") public R> list(EmergencyPlanListDTO req, Query query) { diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonCameraInfoController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonCameraInfoController.java index 9389b53..d99e0a9 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonCameraInfoController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ImsMonCameraInfoController.java @@ -3,6 +3,9 @@ package com.hnac.hzims.safeproduct.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.common.logs.annotation.OperationAnnotation; +import com.hnac.hzims.common.logs.enums.BusinessType; +import com.hnac.hzims.common.logs.enums.OperatorType; import com.hnac.hzims.safeproduct.entity.ImsMonCameraInfoEntity; import com.hnac.hzims.safeproduct.service.IImsMonCameraInfoService; import io.swagger.annotations.*; @@ -76,6 +79,10 @@ public class ImsMonCameraInfoController extends BladeController { @ApiImplicitParam(name = "isControl", value = "是否云台控制", paramType = "query", dataType = "Integer"), @ApiImplicitParam(name = "isHikvideo", value = "是否平台接入", paramType = "query", dataType = "Integer"), }) + @OperationAnnotation(moduleName = "巡检管理", title = "智能巡检配置", + operatorType = OperatorType.MOBILE, + businessType = BusinessType.GENCODE, + action = "分页") public R> list(@ApiIgnore @RequestParam Map cameraInfo, Query query) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (!Func.isEmpty(cameraInfo.get("tenantId"))) { diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.java index 20685f3..1c835a9 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafeEquipmentTrialController.java @@ -57,7 +57,8 @@ public class SafeEquipmentTrialController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime") - @OperationAnnotation(title = "设备试验",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "设备管理",title = "设备试验",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页条件") public R> list(SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) { return service.pageCondition(safeEquipmentTrialDTO, query); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java index 48156f3..677242c 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SystemFileController.java @@ -85,7 +85,8 @@ public class SystemFileController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页", notes = "查询条件：fTypeId,fileStatus,fileName") - @OperationAnnotation(title = "体系文件",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "安全管理",title = "体系文件",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "分页条件") public R> list(SystemFileListDTO req, Query query) { return systemFileService.pageCondition(req, query); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/controller/OperRepairController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/controller/OperRepairController.java index f2a6831..1c2fe07 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/controller/OperRepairController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/controller/OperRepairController.java @@ -56,7 +56,8 @@ public class OperRepairController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 1) @ApiOperation(value = "确认抢修单", notes = "流程对象") - @OperationAnnotation(title = "两票管理(应急单)",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, + @OperationAnnotation(moduleName = "两票管理",title = "应急单",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, action = "确认抢修单") public R> list(RepairEntity entity, Query query) { return R.data(service.pages(entity,query)); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 47bb99b..92cfce7 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -415,11 +415,12 @@ public class TicketProcessServiceImpl implements TicketProcessService { message.setPushType(MessageConstants.IMMEDIATELY); //您有一张工作票待审批，工作内容：*****，审批环节：*****； String countent = - "您有一张工作票待审批,工作内容：".concat(workTicketInfo.getWorkContent()) - .concat("，审批环节：") + "您有一张工作票待审批,工作内容: ".concat(workTicketInfo.getWorkContent()) + .concat(",审批环节: ") .concat(response.getTaskName()); message.setContent(countent); message.setDeptId(workTicketInfo.getCreateDept()); + message.setCreateDept(workTicketInfo.getCreateDept()); R deptName = sysClient.getDeptName(workTicketInfo.getCreateDept()); if (deptName.isSuccess()) { message.setDeptName(deptName.getData()); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java index f92e35e..c9fbc87 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java @@ -156,7 +156,7 @@ public class WorkTicketInfoController { @GetMapping("/userListByRoleAlias") @ApiOperationSupport(order = 100) @OperationAnnotation(moduleName = "两票管理", - title = "两票管理(工作票)", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, + title = "工作票", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, action = "获取某机构下角色的人员列表") @ApiOperation(value = "获取某机构下角色的人员列表") public R userListByRoleAlias(@RequestParam("roleAlias") @ApiParam("角色别称") String roleAlias) {