From e1c71b083176f741c09050c2ad46816cd5e76abf 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 10:04:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmDefinitionController.java | 7 ++++++ .../screen/controller/MainPageConfController.java | 4 ---- .../controller/SafeEquipmentTrialController.java | 27 ++++++++++++++++++++++ .../controller/StandardTicketInfoController.java | 2 +- .../controller/WorkTicketInfoController.java | 2 +- 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java index 2fc3672..8f8c530 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java @@ -3,6 +3,9 @@ package com.hnac.hzims.equipment.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.dto.EmDefinitionDTO; import com.hnac.hzims.equipment.entity.EmDefinitionEntity; import com.hnac.hzims.equipment.entity.EmTreeEntity; @@ -51,6 +54,10 @@ public class EmDefinitionController extends BladeController { @ApiOperation(value = "分页") @ApiImplicitParams({ }) + @OperationAnnotation(moduleName = "设备管理", title = "设备定义" + , operatorType = OperatorType.MOBILE, businessType = + BusinessType.GENCODE, + action = "分页查询设备定义列表") public R> getEmDefinitionPage(EmDefinitionEntity emDefinition, Query query) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); if (Func.isNotEmpty(emDefinition.getStationType())) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/controller/MainPageConfController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/controller/MainPageConfController.java index 2743543..495a386 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/controller/MainPageConfController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/screen/controller/MainPageConfController.java @@ -77,10 +77,6 @@ public class MainPageConfController { @ApiLog @GetMapping("/list") @ApiOperation("更新大屏首页配置查询") - @OperationAnnotation( - moduleName = "实时画面", - title = "画面展示",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "更新大屏首页配置查询") @ApiOperationSupport(order = 5) public R> list (MainPageConfDto req) { return R.data(mainPageConfService.list(req)); 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 1c835a9..bf7dcdb 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 @@ -64,4 +64,31 @@ public class SafeEquipmentTrialController extends BladeController { return service.pageCondition(safeEquipmentTrialDTO, query); } + + /** + * 设备历史数据 + * @return + */ + @OperationAnnotation(moduleName = "设备管理",title = "设备历史数据",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "查询设备历史数据") + @GetMapping("/metadata") + public R metadata() { + return R.success("调用查询设备历史数据成功"); + } + + + /** + * 设备档案 + * @return + */ + @OperationAnnotation(moduleName = "设备管理",title = "设备档案",operatorType = OperatorType.MOBILE,businessType = + BusinessType.GENCODE, + action = "查询设备档案数据") + @GetMapping("/internaldevice") + public R internaldevice() { + return R.success("调用查询设备档案数据成功"); + } + + } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java index f2e930b..9303763 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java @@ -79,7 +79,7 @@ public class StandardTicketInfoController extends BladeController { @ApiOperation(value = "分页") @OperationAnnotation(moduleName = "两票管理", title = "操作票", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, - action = "分页") + action = "分页查询操作票列表") public R> queryList(StandardTicketInfoDto req, Query query) { return standardTicketInfoService.queryList(req, query); } 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 b062939..13feb97 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 @@ -103,7 +103,7 @@ public class WorkTicketInfoController { @OperationAnnotation(moduleName = "两票管理", title = "工作票" , operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, - action = "分页") + action = "分页查询工作票列表") public R> queryList(WorkTicketInfoDto req, Query query) { return workTicketInfoService.queryList(req, query); }