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; 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; 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); } 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); } 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> 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); } 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); } }
