From e87017017b42d5b63ced3be743e2cf57c5bf0280 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 15 一月 2024 11:35:56 +0800
Subject: [PATCH] 设备监控上报设备状态信息接口
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 14 +++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 16 ++++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java | 12 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java | 29 ++++++++++++++
4 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
index 31fb7bc..3cdb4be 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.controller;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -467,4 +468,32 @@
MdcEquipment mdcEquipment = mdcEquipmentService.getEquipmentByDepPid(pid, userId);
return Result.OK(mdcEquipment);
}
+
+ /**
+ * 鎵嬪姩涓婃姤璁惧寮傚父鍙婅鏄�
+ * @return
+ */
+ @AutoLog(value = "璁惧琛�-鎵嬪姩涓婃姤璁惧寮傚父鍙婅鏄�")
+ @ApiOperation(value = "璁惧琛�-鎵嬪姩涓婃姤璁惧寮傚父鍙婅鏄�", notes = "璁惧琛�-鎵嬪姩涓婃姤璁惧寮傚父鍙婅鏄�")
+ @PostMapping("/updateEquipmentStatus")
+ public Result<?> updateEquipmentStatus(@RequestBody MdcEquipmentMonitor mdcEquipmentMonitor) {
+ Result result = new Result<>();
+ try {
+ MdcEquipment mdcEquipment1 = mdcEquipmentService.getById(mdcEquipmentMonitor.getId());
+ if (mdcEquipment1 == null) {
+ result.error500("鏈壘鍒板搴斿疄浣�");
+ } else {
+ LambdaUpdateWrapper<MdcEquipment> updateWrapper = new LambdaUpdateWrapper<MdcEquipment>();
+ updateWrapper.eq(MdcEquipment::getId, mdcEquipmentMonitor.getId());
+ updateWrapper.set(MdcEquipment::getEquipmentStatus, mdcEquipmentMonitor.getEquipmentStatus());
+ updateWrapper.set(MdcEquipment::getEquipmentStatusRemark, mdcEquipmentMonitor.getEquipmentStatusRemark());
+ mdcEquipmentService.update(updateWrapper);
+ result.success("鍙嶉鎴愬姛!");
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("鎿嶄綔澶辫触");
+ }
+ return Result.OK("鍙嶉鎴愬姛锛�");
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index 7464415..6106a04 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -122,6 +122,20 @@
@ApiModelProperty(value = "璁惧鍔熺巼")
private String devicePower;
+ /**
+ * 璁惧鐘舵��
+ */
+ @Excel(name = "璁惧鐘舵��", width = 15)
+ @ApiModelProperty(value = "璁惧鐘舵��")
+ private Integer equipmentStatus;
+
+ /**
+ * 璁惧鐘舵�佽鏄�
+ */
+ @Excel(name = "璁惧鐘舵�佽鏄�", width = 15)
+ @ApiModelProperty(value = "璁惧鐘舵�佽鏄�")
+ private Integer equipmentStatusRemark;
+
/**閮ㄩ棬鍚嶇О*/
private transient String orgCodeTxt;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java
index e050cfb..c63525c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java
@@ -58,6 +58,18 @@
private String oporationDict;
/**
+ * 璁惧鐘舵��
+ */
+ @ApiModelProperty(value = "璁惧鐘舵��")
+ private Integer equipmentStatus;
+
+ /**
+ * 璁惧鐘舵�佽鏄�
+ */
+ @ApiModelProperty(value = "璁惧鐘舵�佽鏄�")
+ private Integer equipmentStatusRemark;
+
+ /**
* 閲囬泦鏃堕棿
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 893762f..6824c8a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -96,6 +96,8 @@
k.equipmentName,
MAX ( l.Oporation ) Oporation,
k.id,
+ k.equipment_status,
+ k.equipment_status_remark,
k.equipment_type equipmentType,
k.equipment_type_pictures
FROM
@@ -105,13 +107,15 @@
MAX ( t.equipmentName ) equipmentName,
MAX ( m.CollectTime ) CollectTime,
id,
+ equipment_status,
+ equipment_status_remark,
equipment_type,
equipment_type_pictures
FROM
- ( SELECT equipment_id EquipmentID, equipment_Name equipmentName, id, equipment_type FROM mdc_equipment WHERE equipment_id IN
- <foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
- #{id}
- </foreach>
+ ( SELECT equipment_id EquipmentID, equipment_Name equipmentName, id, equipment_type, equipment_status, equipment_status_remark FROM mdc_equipment WHERE equipment_id IN
+ <foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
) t
LEFT JOIN ( SELECT equipment_type_name, equipment_type_pictures FROM mdc_equipment_type) met ON t.equipment_type = met.equipment_type_name
LEFT JOIN ( SELECT EquipmentID, CollectTime, Oporation FROM EquipmentLog WHERE Oporation <![CDATA[ <> ]]> 23 ) m ON t.EquipmentID= m.EquipmentID
@@ -119,6 +123,8 @@
t.EquipmentID,
id,
equipment_type,
+ equipment_status,
+ equipment_status_remark,
equipment_type_pictures
) k
LEFT JOIN ( SELECT EquipmentID, CollectTime, Oporation FROM EquipmentLog WHERE Oporation <![CDATA[ <> ]]> 23 ) l ON k.CollectTime= l.CollectTime
@@ -128,6 +134,8 @@
k.CollectTime,
k.equipmentName,
k.id,
+ k.equipment_status,
+ k.equipment_status_remark,
k.equipment_type,
k.equipment_type_pictures
ORDER BY
--
Gitblit v1.9.3