设备管理

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<IPage<EmDefinitionEntity>> getEmDefinitionPage(EmDefinitionEntity emDefinition, Query query) {
         LambdaQueryWrapper<EmDefinitionEntity> wrapper = new LambdaQueryWrapper<>();
         if (Func.isNotEmpty(emDefinition.getStationType())) {

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<MainPageConfEntity>> list (MainPageConfDto req) {
 		return R.data(mainPageConfService.list(req));

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("调用查询设备档案数据成功");
+	}
+
+
 }

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<IPage<StandardTicketInfoVO>> queryList(StandardTicketInfoDto req, Query query) {
         return standardTicketInfoService.queryList(req, query);
     }

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<IPage<WorkTicketInfoVO>> queryList(WorkTicketInfoDto req, Query query) {
         return workTicketInfoService.queryList(req, query);
     }