Merge remote-tracking branch 'origin/master'

src/main/java/com/gyee/frame/service/health/HealthMainService.java

@@ -15,6 +15,8 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
+
 @Service
 public class HealthMainService {
 
@@ -538,6 +540,14 @@ public class HealthMainService {
 
         }
         map.put("wpmap",wpmapls);
+
+        Collections.sort(stoptypels, new Comparator<Map<String, String>>() {
+            public int compare(Map<String, String> o1, Map<String, String> o2) {
+                String stopTime1 = o1.get("stopTime");
+                String stopTime2 = o2.get("stopTime");
+                return stopTime2.compareTo(stopTime1);
+            }
+        });
         map.put("gzls", stoptypels);
         return map;
     }

src/main/resources/application.yml

@@ -195,8 +195,8 @@ exportcode:
     XS_FDC: XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0135
   #测风塔数据
   template2cft:
-    MHS_FDC: MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0106,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLD70,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLTEM,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLPRE,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLHUM
-    NSS_FDC: NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0106,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLD70,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLTEM,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLPRE,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLHUM
-    QS_FDC: QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0106,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT018,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT019,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT020,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT021
+    MHS_FDC: MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLS30,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLD70,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLTEM,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLPRE,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLHUM
+    NSS_FDC: NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLS30,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLD70,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLTEM,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLPRE,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLHUM
+    QS_FDC: QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT003,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT018,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT019,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT020,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT021
     SBQ_FDC: SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0106,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLD70,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLTEM,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLPRE,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLHUM
-    XS_FDC: XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0106,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLD70,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLTEM,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLPRE,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLHUM
+    XS_FDC: XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLS30,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLD70,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLTEM,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLPRE,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLHUM