From c7407795cfa74ab3706a104aa047f209fa5be506 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 27 八月 2025 16:07:48 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml | 4 ++--
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentLog.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 2 +-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml | 8 ++++----
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java
index 6b9f0c1..78df9ef 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java
@@ -20,7 +20,7 @@
* @Version: V1.0
*/
@Data
-@TableName("Equipment")
+@TableName("equipment")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "Equipment瀵硅薄", description = "閲囬泦璁惧琛�")
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java
index 7a9cd62..6c5a8ee 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java
@@ -16,7 +16,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName("EquipmentLog")
+@TableName("equipmentLog")
@ApiModel(value = "璁惧鍘嗗彶琛�")
public class EquipmentLog implements Serializable {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
index bed9ddd..e190796 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
@@ -55,7 +55,7 @@
try {
List<Equipment> list = equipmentService.list();
Equipment info = new Equipment();
- info.setSavetablename("EquipmentLog");
+ info.setSavetablename("equipmentLog");
list.add(info);
String day = DateUtils.format(DateUtils.plusTime(DateUtils.getNow(), -30), DateUtils.STR_DATE_TIME_SMALL);
for (Equipment equipment : list) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml
index 2bd8cc0..e141dfd 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentLogMapper.xml
@@ -3,11 +3,11 @@
<mapper namespace="org.jeecg.modules.mdc.mapper.EquipmentLogMapper">
<select id="getRow" resultType="org.jeecg.modules.mdc.entity.EquipmentLog">
- SELECT * FROM EquipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime <= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC LIMIT 1
+ SELECT * FROM equipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime <= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC LIMIT 1
</select>
<select id="selectEquipmentOporation" resultType="org.jeecg.modules.mdc.entity.EquipmentLog">
- SELECT * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC LIMIT 1
+ SELECT * FROM equipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC LIMIT 1
</select>
</mapper>
\ No newline at end of file
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..a96d71d 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
@@ -17,7 +17,7 @@
mew.vh vh,
me.id equId
FROM
- EquipmentLog a
+ equipmentLog a
INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentLog.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentLog.java
index e73de0a..de6b8c8 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentLog.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentLog.java
@@ -16,7 +16,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName("EquipmentLog")
+@TableName("equipmentLog")
@ApiModel(value = "璁惧鍘嗗彶琛�")
public class EquipmentLog implements Serializable {
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml
index c542c3b..04bc0c8 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml
@@ -3,11 +3,11 @@
<mapper namespace="org.jeecg.modules.iot.mdc.mapper.EquipmentLogMapper">
<select id="getRow" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
- SELECT top 1 * FROM EquipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime <= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC
+ SELECT top 1 * FROM equipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime <= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC
</select>
<select id="selectEquipmentOporation" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
- SELECT TOP 1 * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC
+ SELECT TOP 1 * FROM equipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC
</select>
<!--鏌ヨ璁惧鏈�鏂颁竴鏉℃暟鎹�-->
@@ -15,8 +15,8 @@
SELECT
t1.*
FROM
- EquipmentLog t1
- INNER JOIN ( SELECT MAX ( CollectTime ) AS CollectTime, EquipmentID FROM EquipmentLog GROUP BY EquipmentID ) t2 ON t1.CollectTime= t2.CollectTime
+ equipmentLog t1
+ INNER JOIN ( SELECT MAX ( CollectTime ) AS CollectTime, EquipmentID FROM equipmentLog GROUP BY EquipmentID ) t2 ON t1.CollectTime= t2.CollectTime
AND t1.EquipmentID= t2.EquipmentID
<if test="equipmentIdList != null and equipmentIdList.size() > 0">
AND t1.EquipmentID IN
--
Gitblit v1.9.3