Skip to content

T
traffic-signal-platform
Commit 9a62f7df authored by duanruiming's avatar duanruiming
Browse files
Options

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

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