新文件格式基本信息

neim-biz/src/main/java/com/jiayue/biz/service/impl/AnalysisDataImpl.java

@@ -1050,6 +1050,8 @@ public class AnalysisDataImpl {
         List<WindTowerInfo> list = windTowerInfoService.list();
         List<WindTowerInfo> collect = list.stream().filter(w -> w.getEquipmentNo().equals(numberFromString)).collect(Collectors.toList());
         if(collect.size() > 0){
+            HashMap<String, String> stringStringHashMap = this.dome1();
+
             String wsH = this.heightReverseOrder(wsHeight);
             String wdH = this.heightReverseOrder(wdHeight);
             WindTowerInfo windTowerInfo = new WindTowerInfo();
@@ -1059,6 +1061,9 @@ public class AnalysisDataImpl {
             windTowerInfo.setType("email");
             windTowerInfo.setHeights(wsH);
             windTowerInfo.setWdHeights(wdH);
+            windTowerInfo.setLatitude(CalculationUtil.getBigDecimal(stringStringHashMap.get("Latitude")));
+            windTowerInfo.setLongitude(CalculationUtil.getBigDecimal(stringStringHashMap.get("Longitude")));
+            windTowerInfo.setRecorderNo(stringStringHashMap.get("SiteNumber"));
             windTowerInfoService.saveOrUpdate(windTowerInfo);
         }
         this.emailWindTowerInfoSave(numberFromString);
@@ -1069,7 +1074,7 @@ public class AnalysisDataImpl {
     }
 
     //解析经纬度 记录仪编号
-    public void dome1() {
+    public HashMap<String, String> dome1() {
         //todo 需要写文件夹判断wnd文件再将文件转移
         String s = "C:\\Users\\Administrator\\Desktop\\";
         String fileName = "ID220810_20220919_180304_20230424_023957.log_20230424_024000.wnd";
@@ -1084,17 +1089,22 @@ public class AnalysisDataImpl {
         String Longitude = "";
         String Latitude = "";
         String SiteNumber = "";
+        HashMap<String, String> hashMap = new HashMap<>();
         for (String s1 : row) {
             if(s1.contains("Longitude")){
                 Longitude = CalculationUtil.getNumberFromStringForDian(s1);
+                hashMap.put("Longitude",Longitude);
             }else if (s1.contains("Latitude")){
                 Latitude = CalculationUtil.getNumberFromStringForDian(s1);
+                hashMap.put("Latitude",Latitude);
             }else if (s1.contains("SiteNumber")){
                 SiteNumber = CalculationUtil.getNumberFromString(s1);
+                hashMap.put("SiteNumber",SiteNumber);
             }
 
         }
-        System.out.println("SiteNumber = " + SiteNumber);
+        return hashMap;
+
 
     }