1.开启健康监控节点-用于迁移内网后往公司邮箱发送每日健康监控

2.修改通道数据选择场站时，带入风机名称bug
3.待做项和注意项备注

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

@@ -1,7 +1,6 @@
 package com.jiayue.biz.job;
 
 
-import ch.qos.logback.classic.spi.STEUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
@@ -23,10 +22,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
-import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -234,7 +231,7 @@ public class AirDensityJob {
         }
     }
 
-    //存储杨总数据
+    //TODO 迁移内网后需要修改此处，使用杨总提供接口，接收下面的数据  每日更新，更新时间待确认
 //    @Scheduled(cron = "0 30 14 6 7 ?")
     public void saveJsonY() {
 //        String s = apiHDY.jsonY(DateUtil.format(new Date(), "yyyyMMdd"));
@@ -313,13 +310,11 @@ public class AirDensityJob {
             List<FanModelData> modelDataList = fanModelDataList.stream().filter(f -> f.getStationId().equals(stationInfo.getId())
                     && f.getModelName().equals(modelName)).collect(Collectors.toList());
             if (modelDataList.size() > 0) {
-//                    System.out.println("删除");
-//                    fanModelDataService.deleteFanModelData(modelDataList.get(0).getId());
-//
+                    fanModelDataService.deleteFanModelData(modelDataList.get(0).getId());
             }
-//                System.out.println("新增");
-//                mongoTemplate.save(fanModelData);
-//
+
+            mongoTemplate.save(fanModelData);
+
         }
     }
 

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

@@ -1058,10 +1058,6 @@ public class AnalysisDataImpl {
 
     //解析eol文件
     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数据
-//        File file = FileUtil.file(s);
 
         CsvReader reader = CsvUtil.getReader();
         CsvData data = reader.read(fileCsv);
@@ -1121,8 +1117,6 @@ public class AnalysisDataImpl {
                 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();
                 }

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

@@ -127,8 +127,6 @@ public class EmailImpl extends ServiceImpl<EmailMapper, Email> implements EmailS
                     }
                 }
 
-                //得到收件箱中的所有邮件并且删除邮件
-                //deleteMessage(messages);
                 //释放资源
                 folder.close(true);
                 store.close();
@@ -138,9 +136,10 @@ public class EmailImpl extends ServiceImpl<EmailMapper, Email> implements EmailS
         }
     }
 
-    public void parseMessage(Message... messages) throws MessagingException, IOException, InterruptedException {
-        if (messages == null || messages.length < 1)
+    public void parseMessage(Message... messages) throws MessagingException, IOException {
+        if (messages == null || messages.length < 1) {
             throw new MessagingException("未找到要解析的邮件!");
+        }
 
         // 解析所有邮件
         for (int i = 0, count = messages.length; i < count; i++) {
@@ -448,7 +447,7 @@ public class EmailImpl extends ServiceImpl<EmailMapper, Email> implements EmailS
     }
 
     /**
-     * 执行命令通过软件解压rld文件到D:\out\new\下
+     * 执行命令通过软件解压rld/rwd文件到D:\out\new\下
      */
     public void systemCommand() {
         try {

neim-biz/src/main/resources/application.yml

@@ -42,7 +42,7 @@ management:
     web:
       exposure:
         #        include: ["health", "info", "logfile", "mappings"]
-        include: [ "logfile" ]
+        include: [ "health","logfile" ]
   endpoint:
     health:
       show-details: always

neim-ui/src/views/dataExchange/tunnelInfo/index.vue

@@ -62,7 +62,7 @@
                   <el-option
                     v-for="(item,index) in stationInfo"
                     :key="index"
-                    :label="item.name"
+                    :label="item.stationName"
                     :value="item.id">
                   </el-option>
                 </el-select>
@@ -193,6 +193,7 @@ export default {
     getStationInfo(){
       listElectricStation().then(res=>{
        this.stationInfo = res.data
+
       }).catch(err=>{
         console.log('获取场站信息异常：'+ err)
         this.$message.error('获取场站信息异常：'+ err)
@@ -202,6 +203,7 @@ export default {
     getEquipmentInfo(){
       listAllInfo().then(res=>{
        this.equipmentInfo = res.rows
+        console.log(this.equipmentInfo)
       }).catch(err=>{
         console.log('获取设备信息异常：'+ err)
         this.$message.error('获取设备信息异常：'+ err)

neim-ui/src/views/largeScreenPage/components/3DbigeMap.vue

@@ -49,6 +49,7 @@ export default {
         // var center = [104.73673266358675,31.463626972537455];
         // console.log(center, 154);
         // window.bmgl.Config.HTTP_URL ='http://www.bigemap.com:9000';
+        //TODO 修改地址和端口的时候要同步修改下面的TODO
         window.bmgl.Config.HTTP_URL = 'http://49.4.78.194:17143';
         // window.bmgl.Config.HTTP_URL = 'http://localhost:9000';
         let viewer = new bmgl.Viewer('container', {
@@ -70,6 +71,7 @@ export default {
         let helper = new bmgl.EventHelper();
         helper.add(viewer.scene.globe.tileLoadProgressEvent, e => {
           var layer=viewer.imageryLayers.get(0);
+          // TODO 改端口了这里需要屏蔽或者跟着调整
           layer.imageryProvider._imageryProvider._resource._url=layer.imageryProvider._imageryProvider._resource._url.replace('9000','17143');
           console.log(layer.imageryProvider._imageryProvider._resource._url)
           helper.removeAll();