Commit 628bb3ab authored by duanruiming's avatar duanruiming

[add] 策略管理策略列表优化

parent bb6a4b8c
...@@ -45,4 +45,6 @@ public class StrategyControlDataEntity extends PageVO { ...@@ -45,4 +45,6 @@ public class StrategyControlDataEntity extends PageVO {
private String crossName; private String crossName;
@TableField(exist = false) @TableField(exist = false)
private String wkt; private String wkt;
@TableField(exist = false)
private String optMethod;
} }
...@@ -264,7 +264,8 @@ public class StrategyControlServiceImpl implements StrategyControlService { ...@@ -264,7 +264,8 @@ public class StrategyControlServiceImpl implements StrategyControlService {
String crossId = baseCrossInfoPO.getId(); String crossId = baseCrossInfoPO.getId();
strategyControlDataEntity.setBizType(0); strategyControlDataEntity.setBizType(0);
strategyControlDataEntity.setBizId(baseCrossInfoPO.getId()); strategyControlDataEntity.setBizId(baseCrossInfoPO.getId());
strategyControlDataEntity.setStrategy(null); // 转化成 0 畅通 1失衡 2拥堵 3溢出 4死锁 5空放 6干线拥堵 7干线缓行 8干线畅通
strategyControlDataEntity.setStrategy(0);
strategyControlDataEntity.setTime(null); strategyControlDataEntity.setTime(null);
strategyControlDataEntity.setStatus(0); strategyControlDataEntity.setStatus(0);
if (map.containsKey(crossId)) { if (map.containsKey(crossId)) {
...@@ -286,7 +287,7 @@ public class StrategyControlServiceImpl implements StrategyControlService { ...@@ -286,7 +287,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
String greenId = String.valueOf(greenwaveInfoPO.getId()); String greenId = String.valueOf(greenwaveInfoPO.getId());
strategyControlDataEntity.setBizType(1); strategyControlDataEntity.setBizType(1);
strategyControlDataEntity.setBizId(String.valueOf(greenId)); strategyControlDataEntity.setBizId(String.valueOf(greenId));
strategyControlDataEntity.setStrategy(null); strategyControlDataEntity.setStrategy(8);
strategyControlDataEntity.setTime(null); strategyControlDataEntity.setTime(null);
strategyControlDataEntity.setStatus(0); strategyControlDataEntity.setStatus(0);
if (map.containsKey(greenId)) { if (map.containsKey(greenId)) {
...@@ -389,6 +390,7 @@ public class StrategyControlServiceImpl implements StrategyControlService { ...@@ -389,6 +390,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
result.setWkt(greenwaveInfoPO.getWkt()); result.setWkt(greenwaveInfoPO.getWkt());
} }
} }
result.setOptMethod(StrategyControlEnum.getMethod(result.getStrategy()));
results.add(result); results.add(result);
} }
return results; return results;
......
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