Browse Source

完善代码

zhc
review512jwy@163.com 1 week ago
parent
commit
b8ebbd0a7e
  1. 2
      dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DeviceInfoMapperExt.java
  2. 10
      dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

2
dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DeviceInfoMapperExt.java

@ -34,8 +34,6 @@ public interface DeviceInfoMapperExt extends DeviceInfoMapper {
List<DeviceAlarmData> getDevice4AlarmDataByGroup(AlarmDataSearchParam pageSearchParam); List<DeviceAlarmData> getDevice4AlarmDataByGroup(AlarmDataSearchParam pageSearchParam);
List<String> selectAlertingDeviceIds(@Param("deviceIds") List<String> deviceIds);
List<DeviceTrendLogData> getDevice4TrendLogData(TrendLogDataSearchParam pageSearchParam); List<DeviceTrendLogData> getDevice4TrendLogData(TrendLogDataSearchParam pageSearchParam);
List<DeviceTrendLogData> getDevice4TrendLogDataByGroup(TrendLogDataSearchParam pageSearchParam); List<DeviceTrendLogData> getDevice4TrendLogDataByGroup(TrendLogDataSearchParam pageSearchParam);

10
dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

@ -466,16 +466,6 @@
<include refid="drrOrder"/> <include refid="drrOrder"/>
</select> </select>
<select id="selectAlertingDeviceIds" resultType="java.lang.String">
SELECT DISTINCT LOWER(device_id) AS device_id
FROM alert_history
WHERE device_id IN
<foreach collection="deviceIds" item="deviceId" open="(" close=")" separator=",">
#{deviceId}
</foreach>
AND (<include refid="Where_In_Alarm"/>)
</select>
<!-- 公共字段 --> <!-- 公共字段 -->
<sql id="commonDeviceSelectFields"> <sql id="commonDeviceSelectFields">
device_info.id, device_info.id,

Loading…
Cancel
Save