Commit 9a62f7df authored by duanruiming's avatar duanruiming

[add] 灯态控制模式缓存优化

parent ef35556f
......@@ -47,7 +47,6 @@ import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
/**
* @author duanruiming
......@@ -259,7 +258,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
} else {
jsonViewObject = wanJiControlCommandService.lockControl(commandVO);
}
}else {
} else {
jsonViewObject = viewObject;
}
} catch (Exception e) {
......@@ -315,20 +314,16 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
**/
private JsonViewObject checkControlStatus(String crossId) {
JsonViewObject jsonViewObject = null;
List<SignalCommandPO> signalCommandPOS = SignalCommandSyncTask.signalStatusRunModelList;
if (ObjectUtil.isNotEmpty(signalCommandPOS)) {
List<SignalCommandPO> collect = signalCommandPOS.stream().filter(x -> x.getCrossId().equals(crossId)).collect(Collectors.toList());
if (ObjectUtil.isNotEmpty(collect)) {
SignalCommandPO signalCommandPO = collect.get(0);
Integer status = signalCommandPO.getStatus();
String runMode = signalCommandPO.getRunMode();
if (status == 0) {
jsonViewObject = JsonViewObject.newInstance().fail("该路口处于离线状态,禁止执行指令");
jsonViewObject.setCode(HttpCode.NOT_IMPLEMENTED.value());
} else if ("31".equals(runMode)) {
jsonViewObject = JsonViewObject.newInstance().fail("该路口控制模式为手动控制,禁止执行指令");
jsonViewObject.setCode(HttpCode.NOT_EXTENDED.value());
}
SignalCommandPO signalCommandPO = SignalCommandSyncTask.signalStatusRunModelMap.get(crossId);
if (ObjectUtil.isNotEmpty(signalCommandPO)) {
Integer status = signalCommandPO.getStatus();
String runMode = signalCommandPO.getRunMode();
if (status == 0) {
jsonViewObject = JsonViewObject.newInstance().fail("该路口处于离线状态,禁止执行指令");
jsonViewObject.setCode(HttpCode.NOT_IMPLEMENTED.value());
} else if ("31".equals(runMode)) {
jsonViewObject = JsonViewObject.newInstance().fail("该路口控制模式为手动控制,禁止执行指令");
jsonViewObject.setCode(HttpCode.NOT_EXTENDED.value());
}
}
return jsonViewObject;
......@@ -561,7 +556,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
} else {
jsonViewObject = wanJiControlCommandService.tempSchemeDetail(tempSchemeSendVO);
}
}else {
} else {
jsonViewObject = viewObject;
}
} catch (Exception e) {
......
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