[add] 绿波图优化；海信方案环图入库1

signal-optimize-service/src/main/java/net/wanji/opt/dto/SchemeGreenDirGreenTimeDTO.java

@@ -31,5 +31,6 @@ public class SchemeGreenDirGreenTimeDTO {
     private Integer end;
     private Integer dir;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(value = "query_date")
     private Date date;
 }

signal-optimize-service/src/main/java/net/wanji/opt/task/HisenseGreenChartTask.java

@@ -47,8 +47,8 @@ public class HisenseGreenChartTask {
     private GreenChartSchemeHistMapper greenChartSchemeHistMapper;
 
 
-    @Scheduled(fixedRate = 10 * 60 * 1000, initialDelay = 1 * 60 * 1000)
-    //@Scheduled(fixedRate = 1 * 60 * 1000, initialDelay = 30 * 1000)
+    @Scheduled(fixedRate = 1 * 60 * 1000, initialDelay = 1 * 60 * 1000)
+    //@Scheduled(fixedRate = 10 * 60 * 1000, initialDelay = 30 * 1000)
     public void getGreenChart() {
         try {
             ObjectMapper mapper = JacksonUtils.getInstance();
@@ -153,6 +153,17 @@ public class HisenseGreenChartTask {
                     getGreenwaveStartGroup(greenBeltChartDTOS, backGreenwaveStartGroup, greenId, backValue, 2);
                     greenBeltChartDTOS.forEach(item -> {
                         if (Objects.equals(greenId, item.getGreenId())) {
+                            Map<String, List<List<Double>>> backCrossRedTimesMap = item.getBackCrossRedTimesMap();
+                            List<Map.Entry<String, List<List<Double>>>> entries = new ArrayList<>(backCrossRedTimesMap.entrySet());
+                            Collections.reverse(entries);
+                            Map<String, List<List<Double>>> reverseMap = entries.stream()
+                                    .collect(Collectors.toMap(
+                                            Map.Entry::getKey,
+                                            Map.Entry::getValue,
+                                            (e1, e2) -> e1,
+                                            LinkedHashMap::new
+                                    ));
+                            item.setBackCrossRedTimesMap(reverseMap);
                             item.setGreenwaveStartGroup(greenwaveStartGroup);
                             item.setBackGreenwaveStartGroup(backGreenwaveStartGroup);
                             results.add(item);
@@ -256,8 +267,13 @@ public class HisenseGreenChartTask {
                                         }
                                     }
                                 }
-                                firstGreenStartList.add(Arrays.asList(start, end));
-                                secondGreenStartList.add(Arrays.asList(start2, end2));
+                                if (00 != start && 00 != end) {
+                                    firstGreenStartList.add(Arrays.asList(start, end));
+                                }
+                                if (00 != start2 && 00 != end2) {
+                                    secondGreenStartList.add(Arrays.asList(start2, end2));
+                                }
+
                             }
                         }
                         greenStartMap.put(firstCrossId, firstGreenStartList);