From fa1f4cdd548662fc2619c4675588b9797e0dd9fa Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 27 八月 2025 16:16:16 +0800
Subject: [PATCH] update
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/impl/EquipmentLogServiceImpl.java | 35 -----------------
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentLogMapper.java | 4 --
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/IEquipmentLogService.java | 16 --------
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentAlarm.java | 2 -
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentLog.java | 1
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentAlarmMapper.java | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml | 19 ---------
7 files changed, 1 insertions(+), 78 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentAlarm.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentAlarm.java
index 804ad92..22db604 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentAlarm.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/entity/EquipmentAlarm.java
@@ -1,8 +1,6 @@
package org.jeecg.modules.iot.mdc.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
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 de6b8c8..7000e29 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
@@ -1,6 +1,5 @@
package org.jeecg.modules.iot.mdc.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentAlarmMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentAlarmMapper.java
index 3c2ffdc..88bdfd9 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentAlarmMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentAlarmMapper.java
@@ -13,6 +13,6 @@
*/
@Component("iotEquipmentAlarmMapper")
public interface EquipmentAlarmMapper extends BaseMapper<EquipmentAlarm> {
- @Select("SELECT TOP 1 * FROM EquipmentAlarm WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC")
+ @Select("SELECT * FROM EquipmentAlarm WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC LIMIT 1")
EquipmentAlarm selectEquipmentAlarmByEquipmentId(@Param("equipmentId") String equipmentId);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentLogMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentLogMapper.java
index e307149..fad9a36 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentLogMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/EquipmentLogMapper.java
@@ -15,12 +15,8 @@
@Component("iotEquipmentLogMapper")
public interface EquipmentLogMapper extends BaseMapper<EquipmentLog> {
-
- EquipmentLog getRow(@Param("equipmentid") String equipmentid, @Param("startTime") Date startTime);
-
EquipmentLog selectEquipmentOporationMySql(@Param("equipmentId") String equipmentId);
EquipmentLog selectEquipmentOporationSqlServer(@Param("equipmentId") String equipmentId);
- List<EquipmentLog> getEquipmentStatusList(@Param("equipmentIdList") List<String> equipmentIdList);
}
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 730b94a..b56591a 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
@@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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>
-
<select id="selectEquipmentOporationSqlServer" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
SELECT TOP 1 * FROM equipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC
</select>
@@ -14,19 +10,4 @@
SELECT * FROM equipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC LIMIT 1
</select>
- <!--鏌ヨ璁惧鏈�鏂颁竴鏉℃暟鎹�-->
- <select id="getEquipmentStatusList" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
- SELECT
- t1.*
- FROM
- 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
- <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")">
- #{id}
- </foreach>
- </if>
- </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/IEquipmentLogService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/IEquipmentLogService.java
index 25e5097..72459b7 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/IEquipmentLogService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/IEquipmentLogService.java
@@ -12,24 +12,8 @@
*/
public interface IEquipmentLogService extends IService<EquipmentLog> {
- /**
- * 鏌ヨ鏌愪釜璁惧鏌愪釜鏃堕棿鐐逛箣鍚庣殑鏁版嵁
- */
- List<EquipmentLog> findEquipmentLogByEndTime(String equipmentId, Date maxDate);
-
- /**
- * 鏌ヨ鏌愪釜璁惧鏌愪釜鏃堕棿鐐逛箣鍚庣殑鏁版嵁(鎶ヨ鏁版嵁)
- */
- List<EquipmentLog> findEquipmentLogByErrorEndTime(String equipmentId, Date endTime);
-
- /**
- * 鑾峰彇璁惧鏌愪釜鏃堕棿鐐逛箣鍚庣殑鏈�鏂颁竴鏉℃暟鎹�
- */
- EquipmentLog getRow(String equipmentid, Date startTime);
-
EquipmentLog selectEquipmentOporationSqlServer(String equipmentId);
EquipmentLog selectEquipmentOporationMySql(String equipmentId);
- List<EquipmentLog> getEquipmentStatusList(List<String> equipmentIdList);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/impl/EquipmentLogServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/impl/EquipmentLogServiceImpl.java
index a7acf49..d47108e 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/impl/EquipmentLogServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/service/impl/EquipmentLogServiceImpl.java
@@ -18,37 +18,6 @@
@Service("EquipmentLogServiceImpl")
public class EquipmentLogServiceImpl extends ServiceImpl<EquipmentLogMapper, EquipmentLog> implements IEquipmentLogService {
-
- @Override
- public List<EquipmentLog> findEquipmentLogByEndTime(String equipmentId, Date maxDate) {
- LambdaQueryChainWrapper<EquipmentLog> lambdaQuery = this.lambdaQuery();
- lambdaQuery.eq(EquipmentLog::getEquipmentId, equipmentId);
- if (maxDate != null) {
- lambdaQuery.ge(EquipmentLog::getCollectTime, maxDate);
- }
- lambdaQuery.ne(EquipmentLog::getOporation, 22);
- lambdaQuery.ne(EquipmentLog::getOporation, 23);
- lambdaQuery.orderByAsc(EquipmentLog::getCollectTime);
- return lambdaQuery.list();
- }
-
- @Override
- public List<EquipmentLog> findEquipmentLogByErrorEndTime(String equipmentId, Date endTime) {
- LambdaQueryChainWrapper<EquipmentLog> lambdaQuery = this.lambdaQuery();
- lambdaQuery.eq(EquipmentLog::getEquipmentId, equipmentId);
- if (endTime != null) {
- lambdaQuery.ge(EquipmentLog::getCollectTime, endTime);
- }
- lambdaQuery.in(EquipmentLog::getOporation, Arrays.asList(0, 22, 23));
- lambdaQuery.orderByAsc(EquipmentLog::getCollectTime);
- return lambdaQuery.list();
- }
-
- @Override
- public EquipmentLog getRow(String equipmentid, Date startTime) {
- return this.baseMapper.getRow(equipmentid, startTime);
- }
-
@Override
public EquipmentLog selectEquipmentOporationMySql(String equipmentId) {
return this.baseMapper.selectEquipmentOporationMySql(equipmentId);
@@ -59,8 +28,4 @@
return this.baseMapper.selectEquipmentOporationSqlServer(equipmentId);
}
- @Override
- public List<EquipmentLog> getEquipmentStatusList(List<String> equipmentIdList) {
- return this.baseMapper.getEquipmentStatusList(equipmentIdList);
- }
}
--
Gitblit v1.9.3