Skip to content

W
wj-datacenter-platform
Commit 68a4a66c authored by duanruiming's avatar duanruiming
Browse files
Options

[update] 优化绿波停止入库逻辑

parent 07732afd
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 97 deletions
wj-datacenter-service/src/main/java/net/wanji/datacenter/service/impl/GreenBeltInfoServiceImpl.java
View file @ 68a4a66c
......@@ -205,18 +205,19 @@ public class GreenBeltInfoServiceImpl implements GreenBeltInfoService {
ObjectMapper mapper = JacksonUtils.getInstance();
GreenBeltKafkaDTO kafkaDTO = mapper.readValue(message, GreenBeltKafkaDTO.class);
if (-1 == kafkaDTO.getControlMethod()) {
GreenBeltOptInfoVO greenBeltOptInfoVO = new GreenBeltOptInfoVO();
greenBeltOptInfoVO.setGreenId(kafkaDTO.getGreenbeltId());
greenBeltOptInfoVO.setLength(kafkaDTO.getGreenbeltLength());
greenBeltOptInfoVO.setCycle(kafkaDTO.getMaxCycle());
greenBeltOptInfoVO.setControlTime(kafkaDTO.getControlTime());
greenBeltOptInfoVO.setControlDuration(kafkaDTO.getControlDuration());
greenBeltOptInfoVO.setType(kafkaDTO.getGreenbeltType());
greenBeltOptInfoVO.setDynamic(kafkaDTO.getDynamic());
greenBeltOptInfoVO.setControlMethod(kafkaDTO.getControlMethod());
greenBeltOptInfoVO.setDirGreenDetails(Collections.emptyList());
greenBeltOptInfoVO.setKeyCross(kafkaDTO.getKeyCross());
return greenBeltOptInfoVO;
StrategyGreenOptHistEntity entity = new StrategyGreenOptHistEntity();
entity.setGreenId(kafkaDTO.getGreenbeltId());
entity.setLength(kafkaDTO.getGreenbeltLength());
entity.setCycle(kafkaDTO.getMaxCycle());
entity.setControlTime(kafkaDTO.getControlTime());
entity.setControlDuration(kafkaDTO.getControlDuration());
entity.setControlMethod(kafkaDTO.getControlMethod());
entity.setType(kafkaDTO.getGreenbeltType());
entity.setDynamic(kafkaDTO.getDynamic());
entity.setCrossGreenDetail(JacksonUtils.getInstance().writeValueAsString(Collections.emptyList()));
entity.setKeyCross(kafkaDTO.getKeyCross());
strategyGreenOptHistMapper.insert(entity);
return null;
}
// 正反绿波容器
List<GreenBeltOptInfoVO.DirGreenDetail> dirGreenDetails = new ArrayList<>();
......@@ -382,122 +383,122 @@ public class GreenBeltInfoServiceImpl implements GreenBeltInfoService {
}
public static String greenBeltInfoData = "{\n" +
" \"backward_direction\": \"e2w\",\n" +
" \"backward_direction\": \"n2s\",\n" +
" \"belt_start_backward\": {\n" +
" \"13MQV0B5KE0\": 13.0,\n" +
" \"13MRN0B5MV0\": 39.0,\n" +
" \"13MSS0B5NT0\": 3.0,\n" +
" \"13MVM0B5OV0\": 10.0,\n" +
" \"13N0C0B5P30\": 0.0\n" +
" \"13MNM0B5OE0\": 98.0,\n" +
" \"13MNM0B5OR0\": 82.0,\n" +
" \"13MO70B5QM0\": 23.0,\n" +
" \"13MO90B5RM0\": 126.0,\n" +
" \"13MOD0B5SI0\": 0.0\n" +
" },\n" +
" \"belt_start_forward\": {\n" +
" \"13MQV0B5KE0\": 0.0,\n" +
" \"13MRN0B5MV0\": 10.0,\n" +
" \"13MSS0B5NT0\": 50.0,\n" +
" \"13MVM0B5OV0\": 29.0,\n" +
" \"13N0C0B5P30\": 55.0\n" +
" \"13MNM0B5OE0\": 0.0,\n" +
" \"13MNM0B5OR0\": 26.0,\n" +
" \"13MO70B5QM0\": 89.0,\n" +
" \"13MO90B5RM0\": 10.0,\n" +
" \"13MOD0B5SI0\": 15.0\n" +
" },\n" +
" \"control_duration\": 1800,\n" +
" \"control_method\": 1,\n" +
" \"control_time\": \"2024-12-15T10:33:00\",\n" +
" \"control_time\": \"2024-12-15T16:00:00\",\n" +
" \"cycle\": {\n" +
" \"13MQV0B5KE0\": 140.0,\n" +
" \"13MRN0B5MV0\": 140.0,\n" +
" \"13MSS0B5NT0\": 140.0,\n" +
" \"13MVM0B5OV0\": 140.0,\n" +
" \"13N0C0B5P30\": 140.0\n" +
" \"13MNM0B5OE0\": 220.0,\n" +
" \"13MNM0B5OR0\": 220.0,\n" +
" \"13MO70B5QM0\": 220.0,\n" +
" \"13MO90B5RM0\": 220.0,\n" +
" \"13MOD0B5SI0\": 220.0\n" +
" },\n" +
" \"distance_backward\": {\n" +
" \"13MQV0B5KE0\": -1.0,\n" +
" \"13MRN0B5MV0\": 947.2222222222222,\n" +
" \"13MSS0B5NT0\": 574.85,\n" +
" \"13MVM0B5OV0\": 807.7222222222222,\n" +
" \"13N0C0B5P30\": 204.28571428571428\n" +
" \"13MNM0B5OE0\": -1.0,\n" +
" \"13MNM0B5OR0\": 163.33333333333334,\n" +
" \"13MO70B5QM0\": 664.7801587301587,\n" +
" \"13MO90B5RM0\": 345.1047619047619,\n" +
" \"13MOD0B5SI0\": 313.4746031746032\n" +
" },\n" +
" \"distance_forward\": {\n" +
" \"13MQV0B5KE0\": 947.2222222222222,\n" +
" \"13MRN0B5MV0\": 575.745238095238,\n" +
" \"13MSS0B5NT0\": 797.542857142857,\n" +
" \"13MVM0B5OV0\": 203.57142857142858,\n" +
" \"13N0C0B5P30\": -1.0\n" +
" \"13MNM0B5OE0\": 158.65,\n" +
" \"13MNM0B5OR0\": 663.1,\n" +
" \"13MO70B5QM0\": 347.5888888888889,\n" +
" \"13MO90B5RM0\": 312.79285714285714,\n" +
" \"13MOD0B5SI0\": -1.0\n" +
" },\n" +
" \"dynamic\": 1,\n" +
" \"forward_direction\": \"w2e\",\n" +
" \"green_width_backward\": 56.99999999999998,\n" +
" \"green_width_forward\": 57.0,\n" +
" \"forward_direction\": \"s2n\",\n" +
" \"green_width_backward\": 42.0,\n" +
" \"green_width_forward\": 36.0,\n" +
" \"greenbelt_direction\": 2,\n" +
" \"greenbelt_id\": \"3\",\n" +
" \"greenbelt_length\": 2518.0,\n" +
" \"greenbelt_type\": 1,\n" +
" \"key_cross\": \"13MRN0B5MV0\",\n" +
" \"max_cycle\": 140,\n" +
" \"max_speed_backward\": 55.0,\n" +
" \"max_speed_forward\": 60.0,\n" +
" \"min_speed_backward\": 45.0,\n" +
" \"min_speed_forward\": 50.0,\n" +
" \"model_select\": 1,\n" +
" \"greenbelt_id\": \"6\",\n" +
" \"greenbelt_length\": 1491.0,\n" +
" \"greenbelt_type\": 2,\n" +
" \"key_cross\": \"13MNM0B5OR0\",\n" +
" \"max_cycle\": 220,\n" +
" \"max_speed_backward\": 42.0,\n" +
" \"max_speed_forward\": 35.0,\n" +
" \"min_speed_backward\": 32.0,\n" +
" \"min_speed_forward\": 25.0,\n" +
" \"model_select\": 0,\n" +
" \"offset\": {\n" +
" \"13MQV0B5KE0\": 113.0,\n" +
" \"13MRN0B5MV0\": 25.0,\n" +
" \"13MSS0B5NT0\": 18.0,\n" +
" \"13MVM0B5OV0\": 90.0,\n" +
" \"13N0C0B5P30\": 82.0\n" +
" \"13MNM0B5OE0\": 188.0,\n" +
" \"13MNM0B5OR0\": 183.0,\n" +
" \"13MO70B5QM0\": 183.0,\n" +
" \"13MO90B5RM0\": 48.0,\n" +
" \"13MOD0B5SI0\": 183.0\n" +
" },\n" +
" \"phase_end_backward\": {\n" +
" \"13MQV0B5KE0\": 117.0,\n" +
" \"13MRN0B5MV0\": 96.0,\n" +
" \"13MSS0B5NT0\": 113.0,\n" +
" \"13MVM0B5OV0\": 105.0,\n" +
" \"13N0C0B5P30\": 68.0\n" +
" \"13MNM0B5OE0\": 172.0,\n" +
" \"13MNM0B5OR0\": 127.0,\n" +
" \"13MO70B5QM0\": 147.0,\n" +
" \"13MO90B5RM0\": 168.0,\n" +
" \"13MOD0B5SI0\": 220.0\n" +
" },\n" +
" \"phase_end_forward\": {\n" +
" \"13MQV0B5KE0\": 92.0,\n" +
" \"13MRN0B5MV0\": 96.0,\n" +
" \"13MSS0B5NT0\": 113.0,\n" +
" \"13MVM0B5OV0\": 105.0,\n" +
" \"13N0C0B5P30\": 112.0\n" +
" \"13MNM0B5OE0\": 107.0,\n" +
" \"13MNM0B5OR0\": 92.0,\n" +
" \"13MO70B5QM0\": 144.0,\n" +
" \"13MO90B5RM0\": 130.0,\n" +
" \"13MOD0B5SI0\": 220.0\n" +
" },\n" +
" \"phase_start_backward\": {\n" +
" \"13MQV0B5KE0\": 0.0,\n" +
" \"13MRN0B5MV0\": 0.0,\n" +
" \"13MSS0B5NT0\": 0.0,\n" +
" \"13MVM0B5OV0\": 0.0,\n" +
" \"13N0C0B5P30\": 0.0\n" +
" \"13MNM0B5OE0\": 0.0,\n" +
" \"13MNM0B5OR0\": 0.0,\n" +
" \"13MO70B5QM0\": 0.0,\n" +
" \"13MO90B5RM0\": 35.0,\n" +
" \"13MOD0B5SI0\": 169.0\n" +
" },\n" +
" \"phase_start_forward\": {\n" +
" \"13MQV0B5KE0\": 0.0,\n" +
" \"13MRN0B5MV0\": 0.0,\n" +
" \"13MSS0B5NT0\": 0.0,\n" +
" \"13MVM0B5OV0\": 0.0,\n" +
" \"13N0C0B5P30\": 0.0\n" +
" \"13MNM0B5OE0\": 0.0,\n" +
" \"13MNM0B5OR0\": 0.0,\n" +
" \"13MO70B5QM0\": 0.0,\n" +
" \"13MO90B5RM0\": 35.0,\n" +
" \"13MOD0B5SI0\": 169.0\n" +
" },\n" +
" \"speed_backward\": {\n" +
" \"13MQV0B5KE0\": -1.0,\n" +
" \"13MRN0B5MV0\": 55.0,\n" +
" \"13MSS0B5NT0\": 49.27285714285715,\n" +
" \"13MVM0B5OV0\": 46.9,\n" +
" \"13N0C0B5P30\": 40.857142857142854\n" +
" \"13MNM0B5OE0\": -1.0,\n" +
" \"13MNM0B5OR0\": 28.0,\n" +
" \"13MO70B5QM0\": 40.56285714285714,\n" +
" \"13MO90B5RM0\": 38.824285714285715,\n" +
" \"13MOD0B5SI0\": 33.191428571428574\n" +
" },\n" +
" \"speed_forward\": {\n" +
" \"13MQV0B5KE0\": 55.0,\n" +
" \"13MRN0B5MV0\": 62.808571428571426,\n" +
" \"13MSS0B5NT0\": 56.29714285714285,\n" +
" \"13MVM0B5OV0\": 40.714285714285715,\n" +
" \"13N0C0B5P30\": -1.0\n" +
" \"13MNM0B5OE0\": 27.19714285714286,\n" +
" \"13MNM0B5OR0\": 37.89142857142857,\n" +
" \"13MO70B5QM0\": 30.52,\n" +
" \"13MO90B5RM0\": 20.852857142857143,\n" +
" \"13MOD0B5SI0\": -1.0\n" +
" },\n" +
" \"travel_time_backward\": {\n" +
" \"13MQV0B5KE0\": -1.0,\n" +
" \"13MRN0B5MV0\": 62.0,\n" +
" \"13MSS0B5NT0\": 42.0,\n" +
" \"13MVM0B5OV0\": 62.0,\n" +
" \"13N0C0B5P30\": 18.0\n" +
" \"13MNM0B5OE0\": -1.0,\n" +
" \"13MNM0B5OR0\": 21.0,\n" +
" \"13MO70B5QM0\": 59.0,\n" +
" \"13MO90B5RM0\": 32.0,\n" +
" \"13MOD0B5SI0\": 34.0\n" +
" },\n" +
" \"travel_time_forward\": {\n" +
" \"13MQV0B5KE0\": 62.0,\n" +
" \"13MRN0B5MV0\": 33.0,\n" +
" \"13MSS0B5NT0\": 51.0,\n" +
" \"13MVM0B5OV0\": 18.0,\n" +
" \"13N0C0B5P30\": -1.0\n" +
" \"13MNM0B5OE0\": 21.0,\n" +
" \"13MNM0B5OR0\": 63.0,\n" +
" \"13MO70B5QM0\": 41.0,\n" +
" \"13MO90B5RM0\": 54.0,\n" +
" \"13MOD0B5SI0\": -1.0\n" +
" }\n" +
"}";
}
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