From 299b1469c9f19c1d45948bcc050aa37c86c965cd Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 13 六月 2025 17:53:07 +0800
Subject: [PATCH] mdc设备添加图片，设备监控、大屏修改设备图片来源及添加设备状态为故障的类型
---
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 3 +
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 39 +++++++++++++------
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 6 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 19 ++++++++-
4 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index f7873d5..b2e6977 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -164,6 +164,12 @@
@ApiModelProperty(value = "鏄惁MDC璁惧")
private String deviceTypeMdc;
+ /**
+ * 璁惧鍥剧墖
+ */
+ @ApiModelProperty(value = "璁惧鍥剧墖")
+ private String equipmentImage;
+
/**閮ㄩ棬鍚嶇О*/
@Excel(name = "閮ㄩ棬鍚嶇О", width = 15)
private transient String orgCodeTxt;
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 3d0755f..4e876b7 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -106,19 +106,34 @@
<!--鏌ヨ璁惧鐩戞帶淇℃伅-->
<select id="checkStatusFromEquipmentIds" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentMonitor">
SELECT
- t1.equipment_id,
- t2.CollectTime,
- t1.equipment_name,
- t2.Oporation,
- t1.id,
- t1.equipment_status,
- t1.equipment_type equipmentType,
- t3.equipment_type_pictures
+ t1.equipment_id,
+ t2.CollectTime,
+ t1.equipment_name,
+ CASE
+
+ WHEN repair.count > 0 THEN
+ '5' ELSE t2.Oporation
+ END AS Oporation,
+ t1.id,
+ t1.equipment_status,
+ t1.equipment_type equipmentType,
+ t1.equipment_image equipmentTypePictures
+
FROM
- mdc_equipment t1
- LEFT JOIN Equipment t2 ON t1.equipment_id = t2.EquipmentID
- LEFT JOIN mdc_equipment_type t3 ON t1.equipment_type = t3.equipment_type_name
- WHERE equipment_id IN
+ mdc_equipment t1
+ LEFT JOIN Equipment t2 ON t1.equipment_id = t2.EquipmentID
+ LEFT JOIN (
+ SELECT
+ e1.equipment_code,
+ COUNT(1) COUNT
+ FROM
+ eam_report_repair r1
+ INNER JOIN eam_equipment e1 ON e1.id = r1.equipment_id
+ WHERE
+ r1.report_status NOT IN ('COMPLETE', 'ABOLISH')
+ GROUP BY
+ e1.equipment_code) repair ON repair.equipment_code = t1.equipment_id
+ WHERE t1.equipment_id IN
<foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 9fa5fb6..49944e5 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -430,6 +430,9 @@
case 22:
mdcEquipmentMonitor.setOporationDict("鎶ヨ");
break;
+ case 5:
+ mdcEquipmentMonitor.setOporationDict("鏁呴殰");
+ break;
default:
mdcEquipmentMonitor.setOporationDict("鍏虫満");
break;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
index e286929..b3a2f9a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -9,8 +9,12 @@
a.EquipmentID equipmentId,
me.equipment_name equipmentName,
me.equipment_type equipmentType,
- met.equipment_type_pictures equipmentImage,
- a.Oporation equipmentStatus,
+ me.equipment_image equipmentImage,
+ CASE
+
+ WHEN repair.count > 0 THEN
+ '5' ELSE a.Oporation
+ END AS equipmentStatus,
mew.coordinate_left coordinateLeft,
mew.coordinate_top coordinateTop,
mew.vw vw,
@@ -24,6 +28,17 @@
INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
AND a.CollectTime= b.maxgdtime
AND mew.workshop_id = #{ workshopId }
+ LEFT JOIN (
+ SELECT
+ e1.equipment_code,
+ COUNT(1) COUNT
+ FROM
+ eam_report_repair r1
+ INNER JOIN eam_equipment e1 ON e1.id = r1.equipment_id
+ WHERE
+ r1.report_status NOT IN ('COMPLETE', 'ABOLISH')
+ GROUP BY
+ e1.equipment_code) repair ON repair.equipment_code = me.equipment_id
</select>
<select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">
--
Gitblit v1.9.3