Commit ff25ca82 authored by duanruiming's avatar duanruiming

[add] 海信灯态倒计时优化

parent fffcfd32
...@@ -198,8 +198,7 @@ public class SignalStatusServiceImpl implements SignalStatusService { ...@@ -198,8 +198,7 @@ public class SignalStatusServiceImpl implements SignalStatusService {
if (!CollectionUtils.isEmpty(hisenseLightStatusPojos)) { if (!CollectionUtils.isEmpty(hisenseLightStatusPojos)) {
for (HisenseLightStatusPojo hisenseLightStatusPojo : hisenseLightStatusPojos) { for (HisenseLightStatusPojo hisenseLightStatusPojo : hisenseLightStatusPojos) {
String bodyStr = hisenseLightStatusPojo.getBody(); String bodyStr = hisenseLightStatusPojo.getBody();
List<HisenseLightStatusPojo.Body> bodies = jackson.readValue(bodyStr, new TypeReference<List<HisenseLightStatusPojo.Body>>() { List<HisenseLightStatusPojo.Body> bodies = jackson.readValue(bodyStr, new TypeReference<List<HisenseLightStatusPojo.Body>>() {});
});
if (!CollectionUtils.isEmpty(bodies)) { if (!CollectionUtils.isEmpty(bodies)) {
for (HisenseLightStatusPojo.Body body : bodies) { for (HisenseLightStatusPojo.Body body : bodies) {
HisenseLightStatusPojo.ContentBody content = body.getContent(); HisenseLightStatusPojo.ContentBody content = body.getContent();
...@@ -222,7 +221,11 @@ public class SignalStatusServiceImpl implements SignalStatusService { ...@@ -222,7 +221,11 @@ public class SignalStatusServiceImpl implements SignalStatusService {
} }
Date date = new Date(); Date date = new Date();
Long time = date.getTime(); Long time = date.getTime();
// 推送超过1s过滤,防止相位倒计时增加情况
int offsetTime = (int) ((time - signalMachineStamp) / 1000); int offsetTime = (int) ((time - signalMachineStamp) / 1000);
if (offsetTime >= 1) {
continue;
}
log.info("海信灯态延迟时间:{}秒", offsetTime); log.info("海信灯态延迟时间:{}秒", offsetTime);
int cycleCountDown = content.getCycleCountDown() - Math.max(offsetTime, 0); int cycleCountDown = content.getCycleCountDown() - Math.max(offsetTime, 0);
int hiControlMode = content.getControlMode(); int hiControlMode = content.getControlMode();
......
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