pipIrr-SV.git - Gitblit

			@@ -1,9 +1,13 @@
			package com.dy.pipIrrGlobal.voPr;

			import com.alibaba.fastjson2.annotation.JSONField;
			import com.dy.common.po.BaseEntity;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.fasterxml.jackson.annotation.JsonPropertyOrder;
			import lombok.Data;

			import java.io.Serial;
			import java.util.Date;

			/**
			* @author ZhuBaoMin
			@@ -60,7 +64,13 @@


			/**
			* 报警信息Json数组
			* 报警信息Json数组和接收到报警时间
			*/
			private String alarm;

			/**
			* 接收到报警时间
			*/
			@JSONField(serialize = false)
			private Date alarmDt;
			}

			@@ -552,7 +552,8 @@
			<if test="onLineMap != null and onLineMap !='' and isOnLine != null">
			rtus.isOnLine,
			</if>
			alarm.alarm
			alarm.alarm,
			alarm.alarmDt
			FROM pr_intake inta
			INNER JOIN pr_controller con ON con.intakeId = inta.id
			LEFT JOIN rm_on_hour_report_last hou ON hou.intake_id = inta.id
			@@ -563,7 +564,8 @@
			IF(alarm_battery_volt = 1, '电池电压报警，', ''),
			IF(alarm_valve = 1, '阀门报警，', ''),
			IF(alarm_water_meter_fault = 1, '流量计故障报警，', '')
			) AS alarm
			) AS alarm,
			dt AS alarmDt
			FROM rm_alarm_state_last
			WHERE (alarm_loss = 1 OR alarm_battery_volt = 1 OR alarm_valve = 1 OR alarm_water_meter_fault = 1)
			AND dt >= DATE_SUB(NOW(), INTERVAL 12 HOUR)

			@@ -1,11 +1,13 @@
			package com.dy.pipIrrRemote.monitor;

			import cn.hutool.core.date.DateUtil;
			import com.alibaba.fastjson2.JSON;
			import com.alibaba.fastjson2.JSONArray;
			import com.alibaba.fastjson2.JSONObject;
			import com.dy.common.mw.protocol.Command;
			import com.dy.common.mw.protocol.CommandBackParam;
			import com.dy.common.mw.protocol.rtuState.RtuStatus;
			import com.dy.common.util.DateTime;
			import com.dy.common.webUtil.BaseResponse;
			import com.dy.common.webUtil.QueryResultVo;
			import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
			@@ -19,6 +21,8 @@
			import org.springframework.stereotype.Service;
			import org.springframework.web.client.RestTemplate;

			import java.text.DateFormat;
			import java.time.format.DateTimeFormatter;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			@@ -204,12 +208,14 @@
			rsVo.obj = records ;
			for(VoOnLineIntake rVo : records){
			if(rVo.getAlarm() != null && !rVo.getAlarm().trim().equals("") && rVo.getAlarm().endsWith("，")){
			rVo.setAlarm(rVo.getAlarm().substring(0, rVo.getAlarm().length() - 1)) ;
			if(rVo.getAlarmDt() != null){
			rVo.setAlarm(rVo.getAlarm().substring(0, rVo.getAlarm().length() - 1) + "\n" + DateTime.yyyy_MM_dd_HH_mm_ss(rVo.getAlarmDt()) ) ;
			}else{
			rVo.setAlarm(rVo.getAlarm().substring(0, rVo.getAlarm().length() - 1)) ;
			}
			}
			}
			return rsVo ;
			}



			}

	pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史