|
@@ -96,7 +96,7 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter {
|
|
|
if (nowTime - swm.getActiveTime() > INTERVAL_TIME
|
|
|
&& nowTime - swm.getSwitchTime() > INTERVAL_TIME) {
|
|
|
// 如果当前状态为A 紧急模式
|
|
|
- Integer workType = (3 == swm.getWorkType()) ? 1 : 3;
|
|
|
+ Integer workType = (3 == swm.getWorkType()) ? 2 : 3;
|
|
|
swm.setSwitchTime(nowTime);
|
|
|
swm.setWorkType(workType);
|
|
|
switchMap.put(deviceId, swm);
|
|
@@ -119,7 +119,7 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter {
|
|
|
SwitchWorkModel swm = new SwitchWorkModel();
|
|
|
swm.setActiveTime(time);
|
|
|
swm.setSwitchTime(time);
|
|
|
- swm.setWorkType(3);
|
|
|
+ swm.setWorkType(2);//1:正常模式,2:省电模式,3:紧急模式
|
|
|
switchMap.put(deviceId, swm);
|
|
|
logger.warn("初始化数据》》》》》》》》》》" + JSON.toJSONString(swm));
|
|
|
}
|