新增测风塔层高 新文件解析 创建测风塔时只创建统计表

neim-biz/src/main/java/com/jiayue/biz/job/FileAnalysisJob.java

@@ -74,7 +74,7 @@ public class FileAnalysisJob {
 
     }
 //    @Scheduled(fixedDelay = 6000
-//   @Scheduled(fixedDelay = 60000 * 15)
+   @Scheduled(fixedDelay = 60000 * 15)
     public void eolFileAnalysis() {
 
         log.debug("eol文件解析定时任务执行开始");

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

@@ -1019,26 +1019,25 @@ public class AnalysisDataImpl {
             for (File file1 : files) {
                 if (file1.isDirectory()) {
                     File[] files1 = file1.listFiles();
-                    //筛选包含.elog后缀的文件
-                    List<File> fileNameList = Arrays.asList(files1).stream().filter(f -> f.getName().contains(".elog")).collect(Collectors.toList());
+                    //筛选包含.log后缀的文件
+                    List<File> fileNameList = Arrays.asList(files1).stream().filter(f ->  !f.isDirectory() &&  f.getName().substring(f.getName().lastIndexOf(".")).contains(".log")).collect(Collectors.toList());
                     //循环文件名
                     for (File fileNameForELog : fileNameList) {
-                        String fileName = fileNameForELog.getName().substring(0, fileNameForELog.getName().indexOf(".elog"));
+                        String fileName = fileNameForELog.getName().substring(0, fileNameForELog.getName().indexOf(".log"));
                         //找出wnd文件
                         List<File> wndFile = Arrays.stream(files1).filter(f -> f.getName().contains(".wnd") && f.getName().contains(fileName)).collect(Collectors.toList());
-                        HashMap<String, String> stringStringHashMap = this.parseWnd(wndFile.get(0));
-                        String eqNo = stringStringHashMap.get("SiteNumber");
 
-                        //移动原始文件
-                        com.jiayue.biz.util.FileUtil.move(fileNameForELog.getPath(), eolFilePath + File.separator + eqNo);
-                        //找出csv文件
-                        List<File> csvFile = Arrays.stream(files1).filter(f -> f.getName().contains(".csv") && f.getName().contains(fileName)).collect(Collectors.toList());
+                        if (wndFile.size() > 0) {
+                            HashMap<String, String> stringStringHashMap = this.parseWnd(wndFile.get(0));
+                            String eqNo = stringStringHashMap.get("SiteNumber");
+                            //找出csv文件
+                            List<File> csvFile = Arrays.stream(files1).filter(f -> f.getName().contains(".csv") && f.getName().contains(fileName)).collect(Collectors.toList());
 
-                        if (csvFile.size() > 0 && wndFile.size() > 0) {
-                            parseEol(csvFile.get(0), stringStringHashMap, eqNo);
+                            if (csvFile.size() > 0 && wndFile.size() > 0) {
+                                parseEol(csvFile.get(0), stringStringHashMap, eqNo, fileNameForELog);
 
+                            }
                         }
-
                     }
 
                 }
@@ -1050,8 +1049,9 @@ public class AnalysisDataImpl {
     }
 
 
+
     //解析eol文件
-    public void parseEol(File fileCsv, HashMap<String, String> stringStringHashMap, String eqNo) {
+    public void parseEol(File fileCsv, HashMap<String, String> stringStringHashMap, String eqNo, File fileNameForELog) {
         //todo 需要修改
 //        String s = "C:\\Users\\Administrator\\Desktop\\ID220810_20220919_180304_20230515_063537.log_20230515_063540.csv";
 //        //从文件中读取CSV数据
@@ -1092,6 +1092,7 @@ public class AnalysisDataImpl {
                 dataList.add(hashMap);
             }
         }
+        this.emailWindTowerInfoSave(eqNo);
         List<WindTowerInfo> list = windTowerInfoService.list();
         List<WindTowerInfo> collect = list.stream().filter(w -> w.getEquipmentNo().equals(eqNo)).collect(Collectors.toList());
         if (collect.size() > 0) {
@@ -1110,20 +1111,21 @@ public class AnalysisDataImpl {
                 windTowerInfo.setRecorderNo(stringStringHashMap.get("SiteNumber"));
                 windTowerInfo.setModelNumber("eol");
                 windTowerInfoService.saveOrUpdate(windTowerInfo);
-            }
+            }else{
+                try {
+                    //移动原始文件
+                    com.jiayue.biz.util.FileUtil.move(fileNameForELog.getPath(), eolFilePath + File.separator + eqNo);
+                    //移动csv文件
+//                    com.jiayue.biz.util.FileUtil.move(fileCsv.getPath(), eolFilePath + File.separator + eqNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
 
-        }
-        this.emailWindTowerInfoSave(eqNo);
+                windTowerDataParentTableService.packageData(dataList, eqNo, "", "eol", "");
+            }
 
-        try {
-            //移动csv文件
-            com.jiayue.biz.util.FileUtil.move(fileCsv.getPath(), eolFilePath + File.separator + eqNo);
-        } catch (Exception e) {
-            e.printStackTrace();
         }
 
-        windTowerDataParentTableService.packageData(dataList, eqNo, "", "eol", "");
-
     }
 
     //解析经纬度 记录仪编号 解析wnd文件
@@ -1161,12 +1163,16 @@ public class AnalysisDataImpl {
     }
 
     public void emailWindTowerInfoSave(String equipmentNo) {
-        List<EmailWindTowerInfo> emailWindTowerInfoList = emailWindTowerInfoService.list();
-        List<EmailWindTowerInfo> emailWindTowerInfos = emailWindTowerInfoList.stream().filter(e -> e.getEquipmentNo().equals(equipmentNo)).collect(Collectors.toList());
-        if (emailWindTowerInfos.size() == 0) {
+        List<EmailWindTowerInfo> emailWindTowerInfoList = emailWindTowerInfoService.lambdaQuery().eq(EmailWindTowerInfo::getEquipmentNo, equipmentNo).list();
+        if (emailWindTowerInfoList.size() == 0) {
             EmailWindTowerInfo emailWindTowerInfo = new EmailWindTowerInfo();
             emailWindTowerInfo.setId(UUID.randomUUID().toString());
             emailWindTowerInfo.setEquipmentNo(equipmentNo);
+            emailWindTowerInfoService.save(emailWindTowerInfo);
+        } else {
+            EmailWindTowerInfo emailWindTowerInfo = emailWindTowerInfoList.get(0);
+            emailWindTowerInfo.setEquipmentNo(equipmentNo);
+            emailWindTowerInfoService.saveOrUpdate(emailWindTowerInfo);
         }
 
     }
@@ -1228,7 +1234,7 @@ public class AnalysisDataImpl {
 
 
     public String assembleProperty(String property) {
-        String s = "";
+        String s = "Ave";
         if (property.contains("-")) {
             if (property.contains("STDev")) {
                 s = "Sta";

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

@@ -50,9 +50,7 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
      * @return
      */
     public boolean saveWindTowerInfo(WindTowerInfo windTowerInfo) {
-        baseMapper.createTable("wind_tower_data_child_table_" + windTowerInfo.getEquipmentNo());
         baseMapper.createCalculationTable("wind_tower_calculation_data_" + windTowerInfo.getEquipmentNo());
-        baseMapper.createParentTable("wind_tower_data_parent_table_" + windTowerInfo.getEquipmentNo());
         return this.save(windTowerInfo);
     }
 

neim-ui/src/api/biz/dataQuery/defaultOption.js

@@ -6,6 +6,306 @@ export default {
     }, {
       label: "时间",
       key: "time"
+    },{
+      label: "200A米风向瞬时值",
+      key: "wd_inst200A"
+    }, {
+      label: "200A米风向最大值",
+      key: "wd_max200A"
+    }, {
+      label: "200A米风向最小值",
+      key: "wd_min200A"
+    }, {
+      label: "200A米风向平均值",
+      key: "wd_ave200A"
+    }, {
+      label: "200A米风向标准偏差",
+      key: "wd_sta200A"
+    }, {
+      label: "200A米风速瞬时值",
+      key: "ws_inst200A"
+    }, {
+      label: "200A米风速最大值",
+      key: "ws_max200A"
+    }, {
+      label: "200A米风速最小值",
+      key: "ws_min200A"
+    }, {
+      label: "200A米风速平均值",
+      key: "ws_ave200A"
+    }, {
+      label: "200A米风速标准偏差",
+      key: "ws_sta200A"
+    },{
+      label: "200米风向瞬时值",
+      key: "wd_inst200"
+    }, {
+      label: "200米风向最大值",
+      key: "wd_max200"
+    }, {
+      label: "200米风向最小值",
+      key: "wd_min200"
+    }, {
+      label: "200米风向平均值",
+      key: "wd_ave200"
+    }, {
+      label: "200米风向标准偏差",
+      key: "wd_sta200"
+    }, {
+      label: "200米风速瞬时值",
+      key: "ws_inst200"
+    }, {
+      label: "200米风速最大值",
+      key: "ws_max200"
+    }, {
+      label: "200米风速最小值",
+      key: "ws_min200"
+    }, {
+      label: "200米风速平均值",
+      key: "ws_ave200"
+    }, {
+      label: "200米风速标准偏差",
+      key: "ws_sta200"
+    },{
+      label: "190A米风向瞬时值",
+      key: "wd_inst190A"
+    }, {
+      label: "190A米风向最大值",
+      key: "wd_max190A"
+    }, {
+      label: "190A米风向最小值",
+      key: "wd_min190A"
+    }, {
+      label: "190A米风向平均值",
+      key: "wd_ave190A"
+    }, {
+      label: "190A米风向标准偏差",
+      key: "wd_sta190A"
+    }, {
+      label: "190A米风速瞬时值",
+      key: "ws_inst190A"
+    }, {
+      label: "190A米风速最大值",
+      key: "ws_max190A"
+    }, {
+      label: "190A米风速最小值",
+      key: "ws_min190A"
+    }, {
+      label: "190A米风速平均值",
+      key: "ws_ave190A"
+    }, {
+      label: "190A米风速标准偏差",
+      key: "ws_sta190A"
+    },{
+      label: "190米风向瞬时值",
+      key: "wd_inst190"
+    }, {
+      label: "190米风向最大值",
+      key: "wd_max190"
+    }, {
+      label: "190米风向最小值",
+      key: "wd_min190"
+    }, {
+      label: "190米风向平均值",
+      key: "wd_ave190"
+    }, {
+      label: "190米风向标准偏差",
+      key: "wd_sta190"
+    }, {
+      label: "190米风速瞬时值",
+      key: "ws_inst190"
+    }, {
+      label: "190米风速最大值",
+      key: "ws_max190"
+    }, {
+      label: "190米风速最小值",
+      key: "ws_min190"
+    }, {
+      label: "190米风速平均值",
+      key: "ws_ave190"
+    }, {
+      label: "190米风速标准偏差",
+      key: "ws_sta190"
+    },{
+      label: "180A米风向瞬时值",
+      key: "wd_inst180A"
+    }, {
+      label: "180A米风向最大值",
+      key: "wd_max180A"
+    }, {
+      label: "180A米风向最小值",
+      key: "wd_min180A"
+    }, {
+      label: "180A米风向平均值",
+      key: "wd_ave180A"
+    }, {
+      label: "180A米风向标准偏差",
+      key: "wd_sta180A"
+    }, {
+      label: "180A米风速瞬时值",
+      key: "ws_inst180A"
+    }, {
+      label: "180A米风速最大值",
+      key: "ws_max180A"
+    }, {
+      label: "180A米风速最小值",
+      key: "ws_min180A"
+    }, {
+      label: "180A米风速平均值",
+      key: "ws_ave180A"
+    }, {
+      label: "180A米风速标准偏差",
+      key: "ws_sta180A"
+    },{
+      label: "180米风向瞬时值",
+      key: "wd_inst180"
+    }, {
+      label: "180米风向最大值",
+      key: "wd_max180"
+    }, {
+      label: "180米风向最小值",
+      key: "wd_min180"
+    }, {
+      label: "180米风向平均值",
+      key: "wd_ave180"
+    }, {
+      label: "180米风向标准偏差",
+      key: "wd_sta180"
+    }, {
+      label: "180米风速瞬时值",
+      key: "ws_inst180"
+    }, {
+      label: "180米风速最大值",
+      key: "ws_max180"
+    }, {
+      label: "180米风速最小值",
+      key: "ws_min180"
+    }, {
+      label: "180米风速平均值",
+      key: "ws_ave180"
+    }, {
+      label: "180米风速标准偏差",
+      key: "ws_sta180"
+    },{
+      label: "170A米风向瞬时值",
+      key: "wd_inst170A"
+    }, {
+      label: "170A米风向最大值",
+      key: "wd_max170A"
+    }, {
+      label: "170A米风向最小值",
+      key: "wd_min170A"
+    }, {
+      label: "170A米风向平均值",
+      key: "wd_ave170A"
+    }, {
+      label: "170A米风向标准偏差",
+      key: "wd_sta170A"
+    }, {
+      label: "170A米风速瞬时值",
+      key: "ws_inst170A"
+    }, {
+      label: "170A米风速最大值",
+      key: "ws_max170A"
+    }, {
+      label: "170A米风速最小值",
+      key: "ws_min170A"
+    }, {
+      label: "170A米风速平均值",
+      key: "ws_ave170A"
+    }, {
+      label: "170A米风速标准偏差",
+      key: "ws_sta170A"
+    },{
+      label: "170米风向瞬时值",
+      key: "wd_inst170"
+    }, {
+      label: "170米风向最大值",
+      key: "wd_max170"
+    }, {
+      label: "170米风向最小值",
+      key: "wd_min170"
+    }, {
+      label: "170米风向平均值",
+      key: "wd_ave170"
+    }, {
+      label: "170米风向标准偏差",
+      key: "wd_sta170"
+    }, {
+      label: "170米风速瞬时值",
+      key: "ws_inst170"
+    }, {
+      label: "170米风速最大值",
+      key: "ws_max170"
+    }, {
+      label: "170米风速最小值",
+      key: "ws_min170"
+    }, {
+      label: "170米风速平均值",
+      key: "ws_ave170"
+    }, {
+      label: "170米风速标准偏差",
+      key: "ws_sta170"
+    },{
+      label: "160A米风向瞬时值",
+      key: "wd_inst160A"
+    }, {
+      label: "160A米风向最大值",
+      key: "wd_max160A"
+    }, {
+      label: "160A米风向最小值",
+      key: "wd_min160A"
+    }, {
+      label: "160A米风向平均值",
+      key: "wd_ave160A"
+    }, {
+      label: "160A米风向标准偏差",
+      key: "wd_sta160A"
+    }, {
+      label: "160A米风速瞬时值",
+      key: "ws_inst160A"
+    }, {
+      label: "160A米风速最大值",
+      key: "ws_max160A"
+    }, {
+      label: "160A米风速最小值",
+      key: "ws_min160A"
+    }, {
+      label: "160A米风速平均值",
+      key: "ws_ave160A"
+    }, {
+      label: "160A米风速标准偏差",
+      key: "ws_sta160A"
+    },{
+      label: "160米风向瞬时值",
+      key: "wd_inst160"
+    }, {
+      label: "160米风向最大值",
+      key: "wd_max160"
+    }, {
+      label: "160米风向最小值",
+      key: "wd_min160"
+    }, {
+      label: "160米风向平均值",
+      key: "wd_ave160"
+    }, {
+      label: "160米风向标准偏差",
+      key: "wd_sta160"
+    }, {
+      label: "160米风速瞬时值",
+      key: "ws_inst160"
+    }, {
+      label: "160米风速最大值",
+      key: "ws_max160"
+    }, {
+      label: "160米风速最小值",
+      key: "ws_min160"
+    }, {
+      label: "160米风速平均值",
+      key: "ws_ave160"
+    }, {
+      label: "160米风速标准偏差",
+      key: "ws_sta160"
     },
     {
       label: "150米风向瞬时值",
@@ -37,7 +337,7 @@ export default {
     }, {
       label: "150米风速标准偏差",
       key: "ws_sta150"
-    },{
+    }, {
       label: "150A米风向瞬时值",
       key: "wd_inst150A"
     }, {
@@ -97,7 +397,7 @@ export default {
     }, {
       label: "140米风速标准偏差",
       key: "ws_sta140"
-    },{
+    }, {
       label: "140A米风向瞬时值",
       key: "wd_inst140A"
     }, {
@@ -157,7 +457,7 @@ export default {
     }, {
       label: "120米风向标准偏差",
       key: "wd_sta120"
-    },{
+    }, {
       label: "120A米风速瞬时值",
       key: "ws_inst120A"
     }, {
@@ -187,7 +487,7 @@ export default {
     }, {
       label: "120A米风向标准偏差",
       key: "wd_sta120A"
-    },{
+    }, {
       label: "110米风速瞬时值",
       key: "ws_inst110"
     }, {
@@ -217,7 +517,7 @@ export default {
     }, {
       label: "110米风向标准偏差",
       key: "wd_sta110"
-    },{
+    }, {
       label: "110A米风速瞬时值",
       key: "ws_inst110A"
     }, {
@@ -277,7 +577,7 @@ export default {
     }, {
       label: "100米风向标准偏差",
       key: "wd_sta100"
-    },{
+    }, {
       label: "100A米风速瞬时值",
       key: "ws_inst100A"
     }, {
@@ -367,7 +667,7 @@ export default {
     }, {
       label: "90A米风向标准偏差",
       key: "wd_sta90A"
-    },{
+    }, {
       label: "80米风速瞬时值",
       key: "ws_inst80"
     }, {
@@ -517,7 +817,7 @@ export default {
     }, {
       label: "60米风向标准偏差",
       key: "wd_sta60"
-    },{
+    }, {
       label: "60A米风速瞬时值",
       key: "ws_inst60A"
     }, {
@@ -547,7 +847,7 @@ export default {
     }, {
       label: "60A米风向标准偏差",
       key: "wd_sta60A"
-    },{
+    }, {
       label: "50米风速瞬时值",
       key: "ws_inst50"
     }, {
@@ -667,7 +967,7 @@ export default {
     }, {
       label: "30A米风向标准偏差",
       key: "wd_sta30A"
-    },{
+    }, {
       label: "10米风速瞬时值",
       key: "ws_inst10"
     }, {
@@ -769,7 +1069,7 @@ export default {
     }, {
       label: "气压平均值",
       key: "pa_ave"
-    },{
+    }, {
       label: "气压标准偏差",
       key: "pa_sta"
     }, {
@@ -778,6 +1078,16 @@ export default {
     }
   ],
   allHeightOptions: [
+    {value: '200A', label: '200Am'},
+    {value: '200', label: '200m'},
+    {value: '190A', label: '190Am'},
+    {value: '190', label: '190m'},
+    {value: '180A', label: '180Am'},
+    {value: '180', label: '180m'},
+    {value: '170A', label: '170Am'},
+    {value: '170', label: ' 170m'},
+    {value: '160A', label: '160Am'},
+    {value: '160', label: '160m'},
     {value: '150', label: '150m'},
     {value: '150A', label: '150Am'},
     {value: '140', label: '140m'},