| | |
| | | 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; |
| | |
| | | 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; |
| | |
| | | rsVo.obj = records ; |
| | | for(VoOnLineIntake rVo : records){ |
| | | if(rVo.getAlarm() != null && !rVo.getAlarm().trim().equals("") && rVo.getAlarm().endsWith(",")){ |
| | | 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 ; |
| | | } |
| | | |
| | | |
| | | |
| | | } |