Commit cf3109ce authored by litengwei's avatar litengwei

Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

parents a87a29b3 cf0e3ab6
...@@ -214,7 +214,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap ...@@ -214,7 +214,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
pressurePumpInfo.getRecords().stream( pressurePumpInfo.getRecords().stream(
).map(item -> { ).map(item -> {
item.put("startAndStopInterval", finalDiffMinute); item.put("startAndStopInterval", finalDiffMinute);
if (finalDiffMinute > Long.valueOf(PressurePumpRelateEnum.START_FIVE.getValue())) { if (finalDiffMinute < Long.valueOf(PressurePumpRelateEnum.START_FIVE.getValue())) {
item.put("generalState", PressurePumpRelateEnum.PIPE_PRESSURE_ABNORMAL_STATUS.getValue()); item.put("generalState", PressurePumpRelateEnum.PIPE_PRESSURE_ABNORMAL_STATUS.getValue());
} else { } else {
item.put("generalState", PressurePumpRelateEnum.PIPE_PRESSURE_NORMAL_STATUS.getValue()); item.put("generalState", PressurePumpRelateEnum.PIPE_PRESSURE_NORMAL_STATUS.getValue());
......
...@@ -499,11 +499,12 @@ ...@@ -499,11 +499,12 @@
si.update_date, si.update_date,
si.equipment_index_key, si.equipment_index_key,
si.equipment_specific_name, si.equipment_specific_name,
es.position location, CONCAT_WS('-', es.position, wled.area) AS location, /*告警列表拼接详细地址*/
es.`iot_code` AS iotCode es.`iot_code` AS iotCode
FROM FROM
wl_equipment_specific_index si wl_equipment_specific_index si
LEFT JOIN wl_equipment_specific es ON si.equipment_specific_id = es.id LEFT JOIN wl_equipment_specific es ON si.equipment_specific_id = es.id
LEFT JOIN wl_equipment_detail wled ON es.equipment_detail_id = wled.id
<where> <where>
<if test="list != null and list.size > 0 and type = 'id'"> <if test="list != null and list.size > 0 and type = 'id'">
si.equipment_index_key IN si.equipment_index_key IN
......
...@@ -759,7 +759,6 @@ ...@@ -759,7 +759,6 @@
<if test='equipmentId != null'> <if test='equipmentId != null'>
and wlesal.equipment_id=#{equipmentId} and wlesal.equipment_id=#{equipmentId}
</if> </if>
and wlesal.status = true
</where> </where>
) d ) d
<where> <where>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment