文件解析完善；日志配置

gdnxak102/src/main/java/com/gyee/edge/gdnxak/ApplicationBootstrap.java

@@ -33,6 +33,8 @@ public class ApplicationBootstrap implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
+
+
         log.info("国电宁夏光功率102数据采集程序启动..............");
         log.info("config : " + akConfig.toString());
 
@@ -101,6 +103,7 @@ public class ApplicationBootstrap implements CommandLineRunner {
             while(forcastModel != null) {
                 GYMessage msg = forcastService.ForcastModel2GYMessage(forcastModel);
                 if (msg != null) {
+                    log.info("gyfp2Message size: " + msg.getValues().length);
                     bridgeClient.sendGYMessage(msg);
                 }
                 forcastModel = forcastService.getForcastModel();

gdnxak102/src/main/java/com/gyee/edge/gdnxak/config/AkConfig.java

@@ -33,7 +33,10 @@ public class AkConfig {
     private int dqAddressStart = 16;
     //测风塔遥测点起始地址
     private int cftAddressStart = 304;
-
+    //气象站测点起始地址
+    private int qxzAddressStart = 304;
+    //理论超短期预测点起始地址
+    private int llcdqAddressStart = 312;
 
     @Override
     public String toString() {

gdnxak102/src/main/java/com/gyee/edge/gdnxak/forcast/ForcastService.java

@@ -6,10 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.ArrayBlockingQueue;
 
 /**
@@ -26,6 +23,16 @@ public class ForcastService {
 
     private ArrayBlockingQueue<ForcastModel> forcastQueue = new ArrayBlockingQueue<>(maxCacheCount);
 
+    private HashSet<String> typeSet = createTypeSet();
+
+    private HashSet<String> createTypeSet() {
+        HashSet<String> ret = new HashSet<>();
+        ret.add("UltraShortTermForcast_V2P");   //CDQ,LLCDQ
+        ret.add("ShortTermForcast");    //DQ
+        ret.add("MastData");    //CFT,QXZ
+        return ret;
+    }
+
     public void putForcastModel(ForcastModel forcastModel) {
         //如果队列已满，移除头部元素，腾出空间添加新元素
         if (forcastQueue.offer(forcastModel) == false) {
@@ -49,8 +56,8 @@ public class ForcastService {
         String[] lineArray = fileString.split("\r\n");
         //遍历数组lineArray
         for (int i = 0; i < lineArray.length; i++) {
-            //每行字符串line
-            String line = lineArray[i];
+            //每行字符串line, 多个空格替换为一个空格
+            String line = lineArray[i].replaceAll(" +"," ");
             //解析type和time，例子：<! Entity=ZWS05F type=CDQ time='2023-02-27_17:15' !>
             if (line.startsWith("<!")) {
                 //每行字符串按空格分割为fieldArray数组
@@ -80,10 +87,18 @@ public class ForcastService {
                 xmlFlag = fieldArray[0].substring(1);
             }
 
+            if (line.startsWith("</")) {
+                String[] fieldArray = line.split("::");
+                String endFlag = fieldArray[0].substring(2);
+                if (endFlag == xmlFlag) {
+                    return ret;
+                }
+            }
+
             //解析功率数据
             if (line.startsWith("#") && (Objects.equals(xmlFlag, "UltraShortTermForcast_V2P")
                     || Objects.equals(xmlFlag, "ShortTermForcast"))) {
-                String[] fieldArray = line.split("   ");
+                String[] fieldArray = line.split(" ");
                 if (fieldArray.length > 1) {
                     TelemetryData td = new TelemetryData();
                     td.setKey(fieldArray[0]);
@@ -108,6 +123,7 @@ public class ForcastService {
     }
 
     public GYMessage ForcastModel2GYMessage(ForcastModel forcastModel) {
+        //todo: 如何保障顺序？有没有最大数据项数量限制？
         GYMessage gyMessage = new GYMessage();
         if("CDQ".equals(forcastModel.getDataType())) {
             gyMessage.setAddressIndex(akConfig.getCdqAddressStart());
@@ -115,6 +131,10 @@ public class ForcastService {
             gyMessage.setAddressIndex(akConfig.getDqAddressStart());
         } else if ("CFT".equals(forcastModel.getDataType())) {
             gyMessage.setAddressIndex(akConfig.getCftAddressStart());
+        } else if ("QXZ".equals(forcastModel.getDataType())) {
+            gyMessage.setAddressIndex(akConfig.getCftAddressStart());
+        } else if ("LLCDQ".equals(forcastModel.getDataType())) {
+            gyMessage.setAddressIndex(akConfig.getLlcdqAddressStart());
         } else {
             //无效的采集数据类型
             return gyMessage;

gdnxak102/src/main/java/com/gyee/edge/gdnxak/iec102/FrameDecoder.java

@@ -4,15 +4,16 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 
 /**
  * 
 * @ClassName: Unpack104Util  
-* @Description: 解决TCP 拆包和沾包的问题 
-* @author sun 
+* @Description: 解决TCP 拆包和沾包的问题
  */
+@Slf4j
 public class FrameDecoder extends ByteToMessageDecoder {
 
 	@Override
@@ -29,6 +30,7 @@ public class FrameDecoder extends ByteToMessageDecoder {
             buffer.markReaderIndex();  
             // 读到了协议的开始标志，结束while循环
             byte header = buffer.readByte();
+            log.debug("header: " + header + " readableBytes: " + buffer.readableBytes());
             //第一种情况，单字节帧
             if (header == (byte)0xE5) {
                 buffer.readerIndex(beginReader);
@@ -38,22 +40,39 @@ public class FrameDecoder extends ByteToMessageDecoder {
             	//第二种情况： 固定6字节长度帧
                 // 标记当前包为新包
                 newDataLength = 6;
-                if (buffer.readableBytes() < newDataLength-1)
+                if (buffer.readableBytes() < newDataLength-1){
+                    buffer.readerIndex(beginReader);
                     break;
+                }
 
                 buffer.readerIndex(beginReader);
                 ByteBuf data = buffer.readBytes(newDataLength);
                 out.add(data);
             } else if (header == 0x68) {
-                if (buffer.readableBytes() < 10)
+                log.debug("0x680x680x680x680x680x680x680x680x68");
+                if (buffer.readableBytes() < 10) {
+                    buffer.readerIndex(beginReader);
                     break;
+                }
+
                 newDataLength = buffer.readShortLE();
 
-                if (buffer.readableBytes() < newDataLength-1)
+                //newDataLength是用户数据长度，帧长度位 4位帧头 + 用户数据 + 2位校验位
+                if (buffer.readableBytes() < newDataLength+3) {
+                    buffer.readerIndex(beginReader);
+                    break;
+                }
+
+                byte header2 = buffer.readByte();
+                if (header2 != (byte)0x68) {
+                    buffer.skipBytes(buffer.readableBytes());
                     break;
+                }
+
                 buffer.readerIndex(beginReader);
                 ByteBuf data = buffer.readBytes(newDataLength+6);
                 out.add(data);
+
             }
             continue;
         }

gdnxak102/src/main/java/com/gyee/edge/gdnxak/iec102/Iec102Client.java

@@ -132,10 +132,13 @@ public class Iec102Client {
             } else if (Iec102FrameType.Mutable == response.getFrameType()) {
                 //处理用户数据
                 log.info("收到用户消息，文件名：" + response.getDataFile());
-               // log.debug("文件内容：" + response.getDataContent());
+                log.info("文件内容：" + response.getDataContent());
                 //todo： 解析光功率预测文件
                 ForcastModel forcastModel = forcastService.readForcastFileString(response.getDataContent());
                 forcastService.putForcastModel(forcastModel);
+                if (forcastModel != null) {
+                    log.info(forcastModel.dataType + ", size = " + forcastModel.getForcastData().size());
+                }
 
             }
         } catch (Exception ex) {

gdnxak102/src/main/java/com/gyee/edge/gdnxak/iec102/Iec102ClientHandler.java

@@ -39,7 +39,7 @@ public class Iec102ClientHandler extends SimpleChannelInboundHandler<Iec102Messa
 	
 	@Override
 	public void channelRead0(ChannelHandlerContext ctx, Iec102Message msg102) throws IOException {
-//		log.debug("收到消息：" + msg102.getHexString());
+		log.debug("收到消息：" + msg102.getDataFile());
 
 		if (iec102Client != null) {
 			iec102Client.processMessage(msg102);
@@ -49,6 +49,7 @@ public class Iec102ClientHandler extends SimpleChannelInboundHandler<Iec102Messa
 	@Override
 	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
 		log.info("102连接异常断开，clientid =" + getClientId(ctx));
+		log.error("异常：" + cause);
 		cause.printStackTrace();
 
 

gdnxak102/src/main/java/com/gyee/edge/gdnxak/iec102/Iec102Encoder.java

@@ -22,7 +22,7 @@ public class Iec102Encoder extends MessageToByteEncoder<Iec102Message> {
 				//out.writeBytes(bytes);
 			}
 		} catch (Exception e) {
-//			log.error(e.getMessage());
+			log.error(e.getMessage());
 //			e.printStackTrace();
 			throw e;
 		}

gdnxak102/src/main/resources/MHS02F_20230331_1710_CFT.WPD

@@ -0,0 +1,50 @@
+// 2023-03-31_17:03:00
+<! Entity=MHS02F type=CFT time='2023-03-31_17:10' !>
+<MastData::MHS02F>
+@id 属性项 数值
+#1 WS_10 8.04
+#2 WS_30 7.71
+#3 WS_50 7.41
+#4 WS_60 -99
+#5 WS_70 8.16
+#6 WS_80 7.11
+#7 WS_90 -99
+#8 WS_100 -99
+#9 WD_10 319.90
+#10 WD_30 313.90
+#11 WD_50 308.30
+#12 WD_60 -99
+#13 WD_70 312.00
+#14 WD_80 303.20
+#15 WD_90 -99
+#16 WD_100 -99
+#17 WS_HubHeight 7.11
+#18 WD_HubHeight 303.20
+#19 T_8 14.69
+#20 P_8 83.20
+#21 H_8 12.02
+</MastData::MHS02F>
+<MastData::MHS02F>
+@id 属性项 数值
+#1 WS_10 -99
+#2 WS_30 -99
+#3 WS_50 -99
+#4 WS_60 -99
+#5 WS_70 -99
+#6 WS_80 -99
+#7 WS_90 -99
+#8 WS_100 -99
+#9 WD_10 -99
+#10 WD_30 -99
+#11 WD_50 -99
+#12 WD_60 -99
+#13 WD_70 -99
+#14 WD_80 -99
+#15 WD_90 -99
+#16 WD_100 -99
+#17 WS_HubHeight -99
+#18 WD_HubHeight -99
+#19 T_8 -99
+#20 P_8 -99
+#21 H_8 -99
+</MastData::MHS02F>

gdnxak102/src/main/resources/MHS02F_20230331_1730_CDQ.WPD

@@ -0,0 +1,27 @@
+// 2023-03-31_17:15:00
+<! Entity=MHS02F type=CDQ time='2023-03-31_17:30' !>
+
+<RunningCapacity::MHS02F>
+@id   实时开机容量
+#1    69.50
+</RunningCapacity::MHS02F>
+
+<UltraShortTermForcast_V2P::MHS02F>
+@id   超短期预测功率
+#1   23.96
+#2   22.46
+#3   20.96
+#4   18.67
+#5   15.57
+#6   12.47
+#7   9.38
+#8   7.46
+#9   6.73
+#10   6.01
+#11   5.28
+#12   5.32
+#13   6.12
+#14   6.93
+#15   7.73
+#16   10.04
+</UltraShortTermForcast_V2P::MHS02F>

gdnxak102/src/main/resources/MHS02F_20230331_1730_LLCDQ.WPD

@@ -0,0 +1,35 @@
+// 2023-03-31_17:15:00
+<! Entity=MHS02F type=LLCDQ time='2023-03-31_17:30' !>
+
+<RunningCapacity::MHS02F>
+@id   实时开机容量
+#1    69.50
+</RunningCapacity::MHS02F>
+
+<UltraShortTermForcast_V2P::MHS02F>
+@id   理论超短期预测功率
+#1    23.96
+#2    22.46
+#3    20.96
+#4    18.67
+#5    15.57
+#6    12.47
+#7    9.38
+#8    7.46
+#9    6.73
+#10    6.01
+#11    5.28
+#12    5.32
+#13    6.12
+#14    6.93
+#15    7.73
+#16    10.04
+#17    13.85
+#18    17.66
+#19    21.47
+#20    26.67
+#21    33.25
+#22    39.82
+#23    44.49
+#24    48.97
+</UltraShortTermForcast_V2P::MHS02F>

gdnxak102/src/main/resources/MHS02F_20230401_0000_DQ.WPD

@@ -0,0 +1,971 @@
+// 2023-03-31_06:45:00
+<! Entity=MHS02F type=DQ time='2023-04-01_00:00' !>
+
+<Capacity::MHS02F>
+@id   装机容量
+#1   69.50
+</Capacity::MHS02F>
+
+<ShortTermForcast::MHS02F>
+@id 短期预测功率 预计开机容量
+#1   42.90   69.50
+#2   45.25   69.50
+#3   46.56   69.50
+#4   47.88   69.50
+#5   49.19   69.50
+#6   50.06   69.50
+#7   50.48   69.50
+#8   50.90   69.50
+#9   51.32   69.50
+#10   51.65   69.50
+#11   51.88   69.50
+#12   52.11   69.50
+#13   52.34   69.50
+#14   52.68   69.50
+#15   53.14   69.50
+#16   53.59   69.50
+#17   54.04   69.50
+#18   54.39   69.50
+#19   54.63   69.50
+#20   54.87   69.50
+#21   55.11   69.50
+#22   55.47   69.50
+#23   55.96   69.50
+#24   56.45   69.50
+#25   56.94   69.50
+#26   57.43   69.50
+#27   57.92   69.50
+#28   58.42   69.50
+#29   58.91   69.50
+#30   59.32   69.50
+#31   59.65   69.50
+#32   59.97   69.50
+#33   60.30   69.50
+#34   60.57   69.50
+#35   60.77   69.50
+#36   60.97   69.50
+#37   61.18   69.50
+#38   61.27   69.50
+#39   61.25   69.50
+#40   61.23   69.50
+#41   61.21   69.50
+#42   61.17   69.50
+#43   61.10   69.50
+#44   61.03   69.50
+#45   60.96   69.50
+#46   60.88   69.50
+#47   60.80   69.50
+#48   60.71   69.50
+#49   60.62   69.50
+#50   60.56   69.50
+#51   60.51   69.50
+#52   60.47   69.50
+#53   60.42   69.50
+#54   60.24   69.50
+#55   59.91   69.50
+#56   59.58   69.50
+#57   59.26   69.50
+#58   58.88   69.50
+#59   58.46   69.50
+#60   58.04   69.50
+#61   57.62   69.50
+#62   57.16   69.50
+#63   56.67   69.50
+#64   56.17   69.50
+#65   55.67   69.50
+#66   55.15   69.50
+#67   54.61   69.50
+#68   54.06   69.50
+#69   53.52   69.50
+#70   53.17   69.50
+#71   53.01   69.50
+#72   52.86   69.50
+#73   52.70   69.50
+#74   52.62   69.50
+#75   52.62   69.50
+#76   52.61   69.50
+#77   52.60   69.50
+#78   52.73   69.50
+#79   52.99   69.50
+#80   53.24   69.50
+#81   53.50   69.50
+#82   53.78   69.50
+#83   54.10   69.50
+#84   54.41   69.50
+#85   54.72   69.50
+#86   55.07   69.50
+#87   55.45   69.50
+#88   55.82   69.50
+#89   56.20   69.50
+#90   56.22   69.50
+#91   55.89   69.50
+#92   55.56   69.50
+#93   55.23   69.50
+#94   54.64   69.50
+#95   53.79   69.50
+#96   52.94   69.50
+#97   52.09   69.50
+#98   50.91   69.50
+#99   49.42   69.50
+#100   47.92   69.50
+#101   46.42   69.50
+#102   44.78   69.50
+#103   43.01   69.50
+#104   41.24   69.50
+#105   39.46   69.50
+#106   37.97   69.50
+#107   36.75   69.50
+#108   35.53   69.50
+#109   34.31   69.50
+#110   33.24   69.50
+#111   32.32   69.50
+#112   31.40   69.50
+#113   30.48   69.50
+#114   30.08   69.50
+#115   30.19   69.50
+#116   30.31   69.50
+#117   30.42   69.50
+#118   30.56   69.50
+#119   30.72   69.50
+#120   30.88   69.50
+#121   31.04   69.50
+#122   31.28   69.50
+#123   31.59   69.50
+#124   31.91   69.50
+#125   32.22   69.50
+#126   32.32   69.50
+#127   32.20   69.50
+#128   32.07   69.50
+#129   31.95   69.50
+#130   31.80   69.50
+#131   31.62   69.50
+#132   31.44   69.50
+#133   31.27   69.50
+#134   31.05   69.50
+#135   30.79   69.50
+#136   30.53   69.50
+#137   30.27   69.50
+#138   30.09   69.50
+#139   30.01   69.50
+#140   29.92   69.50
+#141   29.83   69.50
+#142   29.83   69.50
+#143   29.91   69.50
+#144   29.98   69.50
+#145   30.06   69.50
+#146   29.76   69.50
+#147   29.08   69.50
+#148   28.40   69.50
+#149   27.72   69.50
+#150   27.31   69.50
+#151   27.19   69.50
+#152   27.06   69.50
+#153   26.94   69.50
+#154   26.73   69.50
+#155   26.43   69.50
+#156   26.14   69.50
+#157   25.85   69.50
+#158   25.58   69.50
+#159   25.35   69.50
+#160   25.11   69.50
+#161   24.88   69.50
+#162   24.85   69.50
+#163   25.02   69.50
+#164   25.19   69.50
+#165   25.36   69.50
+#166   25.38   69.50
+#167   25.26   69.50
+#168   25.14   69.50
+#169   25.02   69.50
+#170   24.93   69.50
+#171   24.87   69.50
+#172   24.82   69.50
+#173   24.77   69.50
+#174   24.75   69.50
+#175   24.78   69.50
+#176   24.81   69.50
+#177   24.83   69.50
+#178   25.05   69.50
+#179   25.46   69.50
+#180   25.88   69.50
+#181   26.29   69.50
+#182   26.62   69.50
+#183   26.87   69.50
+#184   27.12   69.50
+#185   27.37   69.50
+#186   27.60   69.50
+#187   27.81   69.50
+#188   28.02   69.50
+#189   28.22   69.50
+#190   28.29   69.50
+#191   28.22   69.50
+#192   28.14   69.50
+#193   28.06   69.50
+#194   28.17   69.50
+#195   28.45   69.50
+#196   28.73   69.50
+#197   29.01   69.50
+#198   29.07   69.50
+#199   28.90   69.50
+#200   28.73   69.50
+#201   28.56   69.50
+#202   28.52   69.50
+#203   28.61   69.50
+#204   28.69   69.50
+#205   28.78   69.50
+#206   28.82   69.50
+#207   28.81   69.50
+#208   28.80   69.50
+#209   28.79   69.50
+#210   28.72   69.50
+#211   28.61   69.50
+#212   28.49   69.50
+#213   28.38   69.50
+#214   28.28   69.50
+#215   28.20   69.50
+#216   28.13   69.50
+#217   28.06   69.50
+#218   27.94   69.50
+#219   27.78   69.50
+#220   27.62   69.50
+#221   27.46   69.50
+#222   27.36   69.50
+#223   27.34   69.50
+#224   27.31   69.50
+#225   27.29   69.50
+#226   27.44   69.50
+#227   27.78   69.50
+#228   28.12   69.50
+#229   28.46   69.50
+#230   28.76   69.50
+#231   29.04   69.50
+#232   29.32   69.50
+#233   29.60   69.50
+#234   29.94   69.50
+#235   30.34   69.50
+#236   30.75   69.50
+#237   31.16   69.50
+#238   31.47   69.50
+#239   31.69   69.50
+#240   31.91   69.50
+#241   32.14   69.50
+#242   32.25   69.50
+#243   32.25   69.50
+#244   32.25   69.50
+#245   32.25   69.50
+#246   32.28   69.50
+#247   32.32   69.50
+#248   32.37   69.50
+#249   32.42   69.50
+#250   32.48   69.50
+#251   32.56   69.50
+#252   32.63   69.50
+#253   32.71   69.50
+#254   32.72   69.50
+#255   32.66   69.50
+#256   32.61   69.50
+#257   32.55   69.50
+#258   32.37   69.50
+#259   32.07   69.50
+#260   31.77   69.50
+#261   31.46   69.50
+#262   31.03   69.50
+#263   30.47   69.50
+#264   29.90   69.50
+#265   29.34   69.50
+#266   28.72   69.50
+#267   28.05   69.50
+#268   27.38   69.50
+#269   26.71   69.50
+#270   26.02   69.50
+#271   25.30   69.50
+#272   24.58   69.50
+#273   23.86   69.50
+#274   23.31   69.50
+#275   22.92   69.50
+#276   22.53   69.50
+#277   22.14   69.50
+#278   21.84   69.50
+#279   21.62   69.50
+#280   21.40   69.50
+#281   21.18   69.50
+#282   20.91   69.50
+#283   20.59   69.50
+#284   20.27   69.50
+#285   19.95   69.50
+#286   19.51   69.50
+#287   18.97   69.50
+#288   18.42   69.50
+#289   17.87   69.50
+#290   17.43   69.50
+#291   17.09   69.50
+#292   16.75   69.50
+#293   16.41   69.50
+#294   16.15   69.50
+#295   15.98   69.50
+#296   15.80   69.50
+#297   15.62   69.50
+#298   15.57   69.50
+#299   15.64   69.50
+#300   15.71   69.50
+#301   15.78   69.50
+#302   15.96   69.50
+#303   16.27   69.50
+#304   16.57   69.50
+#305   16.88   69.50
+#306   17.18   69.50
+#307   17.50   69.50
+#308   17.81   69.50
+#309   18.12   69.50
+#310   18.21   69.50
+#311   18.08   69.50
+#312   17.95   69.50
+#313   17.82   69.50
+#314   17.72   69.50
+#315   17.64   69.50
+#316   17.56   69.50
+#317   17.48   69.50
+#318   17.44   69.50
+#319   17.44   69.50
+#320   17.45   69.50
+#321   17.46   69.50
+#322   17.51   69.50
+#323   17.61   69.50
+#324   17.71   69.50
+#325   17.82   69.50
+#326   17.86   69.50
+#327   17.84   69.50
+#328   17.82   69.50
+#329   17.80   69.50
+#330   17.85   69.50
+#331   17.97   69.50
+#332   18.09   69.50
+#333   18.22   69.50
+#334   18.50   69.50
+#335   18.95   69.50
+#336   19.40   69.50
+#337   19.86   69.50
+#338   20.32   69.50
+#339   20.81   69.50
+#340   21.30   69.50
+#341   21.78   69.50
+#342   22.23   69.50
+#343   22.63   69.50
+#344   23.03   69.50
+#345   23.43   69.50
+#346   23.71   69.50
+#347   23.88   69.50
+#348   24.05   69.50
+#349   24.22   69.50
+#350   24.36   69.50
+#351   24.47   69.50
+#352   24.58   69.50
+#353   24.69   69.50
+#354   24.80   69.50
+#355   24.90   69.50
+#356   25.00   69.50
+#357   25.10   69.50
+#358   25.15   69.50
+#359   25.15   69.50
+#360   25.15   69.50
+#361   25.15   69.50
+#362   25.00   69.50
+#363   24.69   69.50
+#364   24.39   69.50
+#365   24.08   69.50
+#366   23.83   69.50
+#367   23.61   69.50
+#368   23.40   69.50
+#369   23.19   69.50
+#370   23.06   69.50
+#371   23.02   69.50
+#372   22.97   69.50
+#373   22.92   69.50
+#374   23.04   69.50
+#375   23.33   69.50
+#376   23.61   69.50
+#377   23.89   69.50
+#378   24.35   69.50
+#379   24.98   69.50
+#380   25.62   69.50
+#381   26.25   69.50
+#382   26.79   69.50
+#383   27.24   69.50
+#384   27.68   69.50
+#385   28.13   69.50
+#386   28.48   69.50
+#387   28.73   69.50
+#388   28.98   69.50
+#389   29.24   69.50
+#390   29.43   69.50
+#391   29.55   69.50
+#392   29.67   69.50
+#393   29.80   69.50
+#394   29.91   69.50
+#395   30.02   69.50
+#396   30.13   69.50
+#397   30.24   69.50
+#398   30.31   69.50
+#399   30.36   69.50
+#400   30.41   69.50
+#401   30.46   69.50
+#402   30.47   69.50
+#403   30.43   69.50
+#404   30.40   69.50
+#405   30.36   69.50
+#406   30.19   69.50
+#407   29.89   69.50
+#408   29.59   69.50
+#409   29.28   69.50
+#410   29.01   69.50
+#411   28.75   69.50
+#412   28.49   69.50
+#413   28.24   69.50
+#414   28.06   69.50
+#415   27.95   69.50
+#416   27.84   69.50
+#417   27.73   69.50
+#418   27.67   69.50
+#419   27.65   69.50
+#420   27.63   69.50
+#421   27.61   69.50
+#422   27.65   69.50
+#423   27.74   69.50
+#424   27.82   69.50
+#425   27.92   69.50
+#426   28.06   69.50
+#427   28.26   69.50
+#428   28.45   69.50
+#429   28.65   69.50
+#430   28.81   69.50
+#431   28.93   69.50
+#432   29.04   69.50
+#433   29.16   69.50
+#434   29.53   69.50
+#435   30.16   69.50
+#436   30.79   69.50
+#437   31.42   69.50
+#438   32.05   69.50
+#439   32.69   69.50
+#440   33.33   69.50
+#441   33.96   69.50
+#442   34.46   69.50
+#443   34.81   69.50
+#444   35.15   69.50
+#445   35.50   69.50
+#446   35.50   69.50
+#447   35.15   69.50
+#448   34.80   69.50
+#449   34.46   69.50
+#450   34.10   69.50
+#451   33.75   69.50
+#452   33.39   69.50
+#453   33.04   69.50
+#454   32.67   69.50
+#455   32.30   69.50
+#456   31.92   69.50
+#457   31.55   69.50
+#458   31.19   69.50
+#459   30.85   69.50
+#460   30.52   69.50
+#461   30.18   69.50
+#462   29.84   69.50
+#463   29.49   69.50
+#464   29.15   69.50
+#465   28.80   69.50
+#466   28.63   69.50
+#467   28.64   69.50
+#468   28.65   69.50
+#469   28.66   69.50
+#470   28.62   69.50
+#471   28.52   69.50
+#472   28.42   69.50
+#473   28.32   69.50
+#474   28.32   69.50
+#475   28.43   69.50
+#476   28.54   69.50
+#477   28.65   69.50
+#478   28.89   69.50
+#479   29.25   69.50
+#480   29.61   69.50
+#481   29.98   69.50
+#482   30.36   69.50
+#483   30.75   69.50
+#484   31.15   69.50
+#485   31.55   69.50
+#486   31.90   69.50
+#487   32.20   69.50
+#488   32.50   69.50
+#489   32.80   69.50
+#490   32.96   69.50
+#491   32.97   69.50
+#492   32.98   69.50
+#493   32.99   69.50
+#494   32.95   69.50
+#495   32.87   69.50
+#496   32.78   69.50
+#497   32.69   69.50
+#498   32.56   69.50
+#499   32.37   69.50
+#500   32.19   69.50
+#501   32.01   69.50
+#502   31.78   69.50
+#503   31.51   69.50
+#504   31.23   69.50
+#505   30.96   69.50
+#506   30.68   69.50
+#507   30.40   69.50
+#508   30.12   69.50
+#509   29.85   69.50
+#510   29.58   69.50
+#511   29.33   69.50
+#512   29.07   69.50
+#513   28.82   69.50
+#514   28.61   69.50
+#515   28.43   69.50
+#516   28.26   69.50
+#517   28.08   69.50
+#518   27.98   69.50
+#519   27.94   69.50
+#520   27.91   69.50
+#521   27.87   69.50
+#522   27.89   69.50
+#523   27.96   69.50
+#524   28.03   69.50
+#525   28.10   69.50
+#526   28.16   69.50
+#527   28.20   69.50
+#528   28.25   69.50
+#529   28.30   69.50
+#530   28.30   69.50
+#531   28.25   69.50
+#532   28.20   69.50
+#533   28.15   69.50
+#534   28.07   69.50
+#535   27.96   69.50
+#536   27.85   69.50
+#537   27.74   69.50
+#538   27.55   69.50
+#539   27.28   69.50
+#540   27.00   69.50
+#541   26.72   69.50
+#542   26.39   69.50
+#543   25.99   69.50
+#544   25.60   69.50
+#545   25.20   69.50
+#546   24.76   69.50
+#547   24.27   69.50
+#548   23.79   69.50
+#549   23.30   69.50
+#550   22.81   69.50
+#551   22.32   69.50
+#552   21.84   69.50
+#553   21.35   69.50
+#554   20.95   69.50
+#555   20.63   69.50
+#556   20.32   69.50
+#557   20.00   69.50
+#558   19.69   69.50
+#559   19.37   69.50
+#560   19.06   69.50
+#561   18.74   69.50
+#562   18.54   69.50
+#563   18.47   69.50
+#564   18.39   69.50
+#565   18.31   69.50
+#566   18.27   69.50
+#567   18.26   69.50
+#568   18.25   69.50
+#569   18.24   69.50
+#570   18.24   69.50
+#571   18.25   69.50
+#572   18.26   69.50
+#573   18.27   69.50
+#574   18.33   69.50
+#575   18.44   69.50
+#576   18.55   69.50
+#577   18.66   69.50
+#578   18.80   69.50
+#579   18.98   69.50
+#580   19.15   69.50
+#581   19.32   69.50
+#582   19.45   69.50
+#583   19.55   69.50
+#584   19.64   69.50
+#585   19.73   69.50
+#586   19.77   69.50
+#587   19.77   69.50
+#588   19.76   69.50
+#589   19.76   69.50
+#590   19.72   69.50
+#591   19.65   69.50
+#592   19.58   69.50
+#593   19.50   69.50
+#594   19.42   69.50
+#595   19.34   69.50
+#596   19.25   69.50
+#597   19.16   69.50
+#598   19.09   69.50
+#599   19.03   69.50
+#600   18.98   69.50
+#601   18.92   69.50
+#602   18.82   69.50
+#603   18.68   69.50
+#604   18.53   69.50
+#605   18.39   69.50
+#606   18.28   69.50
+#607   18.19   69.50
+#608   18.11   69.50
+#609   18.02   69.50
+#610   17.92   69.50
+#611   17.80   69.50
+#612   17.69   69.50
+#613   17.57   69.50
+#614   17.59   69.50
+#615   17.74   69.50
+#616   17.90   69.50
+#617   18.05   69.50
+#618   18.25   69.50
+#619   18.51   69.50
+#620   18.77   69.50
+#621   19.03   69.50
+#622   19.31   69.50
+#623   19.63   69.50
+#624   19.94   69.50
+#625   20.25   69.50
+#626   20.53   69.50
+#627   20.78   69.50
+#628   21.02   69.50
+#629   21.27   69.50
+#630   21.43   69.50
+#631   21.51   69.50
+#632   21.58   69.50
+#633   21.66   69.50
+#634   21.70   69.50
+#635   21.70   69.50
+#636   21.70   69.50
+#637   21.71   69.50
+#638   21.63   69.50
+#639   21.46   69.50
+#640   21.29   69.50
+#641   21.13   69.50
+#642   20.97   69.50
+#643   20.82   69.50
+#644   20.66   69.50
+#645   20.51   69.50
+#646   20.38   69.50
+#647   20.26   69.50
+#648   20.15   69.50
+#649   20.03   69.50
+#650   19.91   69.50
+#651   19.79   69.50
+#652   19.67   69.50
+#653   19.55   69.50
+#654   19.45   69.50
+#655   19.36   69.50
+#656   19.28   69.50
+#657   19.20   69.50
+#658   19.14   69.50
+#659   19.09   69.50
+#660   19.04   69.50
+#661   19.00   69.50
+#662   18.96   69.50
+#663   18.92   69.50
+#664   18.88   69.50
+#665   18.84   69.50
+#666   18.88   69.50
+#667   18.99   69.50
+#668   19.10   69.50
+#669   19.22   69.50
+#670   19.47   69.50
+#671   19.86   69.50
+#672   20.26   69.50
+#673   20.66   69.50
+#674   21.11   69.50
+#675   21.61   69.50
+#676   22.12   69.50
+#677   22.62   69.50
+#678   23.10   69.50
+#679   23.54   69.50
+#680   23.98   69.50
+#681   24.42   69.50
+#682   24.79   69.50
+#683   25.09   69.50
+#684   25.40   69.50
+#685   25.70   69.50
+#686   25.97   69.50
+#687   26.19   69.50
+#688   26.41   69.50
+#689   26.63   69.50
+#690   26.80   69.50
+#691   26.93   69.50
+#692   27.05   69.50
+#693   27.17   69.50
+#694   27.27   69.50
+#695   27.35   69.50
+#696   27.42   69.50
+#697   27.50   69.50
+#698   27.61   69.50
+#699   27.76   69.50
+#700   27.90   69.50
+#701   28.05   69.50
+#702   28.15   69.50
+#703   28.19   69.50
+#704   28.23   69.50
+#705   28.27   69.50
+#706   28.30   69.50
+#707   28.31   69.50
+#708   28.32   69.50
+#709   28.33   69.50
+#710   28.27   69.50
+#711   28.14   69.50
+#712   28.02   69.50
+#713   27.89   69.50
+#714   27.77   69.50
+#715   27.66   69.50
+#716   27.55   69.50
+#717   27.44   69.50
+#718   27.33   69.50
+#719   27.22   69.50
+#720   27.11   69.50
+#721   27.00   69.50
+#722   26.87   69.50
+#723   26.74   69.50
+#724   26.60   69.50
+#725   26.47   69.50
+#726   26.36   69.50
+#727   26.27   69.50
+#728   26.18   69.50
+#729   26.10   69.50
+#730   25.99   69.50
+#731   25.86   69.50
+#732   25.73   69.50
+#733   25.59   69.50
+#734   25.42   69.50
+#735   25.20   69.50
+#736   24.99   69.50
+#737   24.77   69.50
+#738   24.56   69.50
+#739   24.36   69.50
+#740   24.15   69.50
+#741   23.95   69.50
+#742   23.80   69.50
+#743   23.70   69.50
+#744   23.60   69.50
+#745   23.50   69.50
+#746   23.39   69.50
+#747   23.29   69.50
+#748   23.18   69.50
+#749   23.08   69.50
+#750   22.96   69.50
+#751   22.82   69.50
+#752   22.69   69.50
+#753   22.56   69.50
+#754   22.40   69.50
+#755   22.24   69.50
+#756   22.06   69.50
+#757   21.89   69.50
+#758   21.73   69.50
+#759   21.58   69.50
+#760   21.43   69.50
+#761   21.28   69.50
+#762   21.18   69.50
+#763   21.13   69.50
+#764   21.07   69.50
+#765   21.02   69.50
+#766   21.06   69.50
+#767   21.19   69.50
+#768   21.33   69.50
+#769   21.46   69.50
+#770   21.65   69.50
+#771   21.90   69.50
+#772   22.15   69.50
+#773   22.40   69.50
+#774   22.70   69.50
+#775   23.05   69.50
+#776   23.40   69.50
+#777   23.74   69.50
+#778   23.99   69.50
+#779   24.15   69.50
+#780   24.31   69.50
+#781   24.47   69.50
+#782   24.55   69.50
+#783   24.55   69.50
+#784   24.54   69.50
+#785   24.54   69.50
+#786   24.51   69.50
+#787   24.44   69.50
+#788   24.37   69.50
+#789   24.30   69.50
+#790   24.21   69.50
+#791   24.09   69.50
+#792   23.97   69.50
+#793   23.85   69.50
+#794   23.79   69.50
+#795   23.77   69.50
+#796   23.76   69.50
+#797   23.74   69.50
+#798   23.71   69.50
+#799   23.66   69.50
+#800   23.61   69.50
+#801   23.56   69.50
+#802   23.54   69.50
+#803   23.55   69.50
+#804   23.57   69.50
+#805   23.58   69.50
+#806   23.65   69.50
+#807   23.77   69.50
+#808   23.90   69.50
+#809   24.02   69.50
+#810   24.18   69.50
+#811   24.38   69.50
+#812   24.57   69.50
+#813   24.76   69.50
+#814   24.96   69.50
+#815   25.15   69.50
+#816   25.34   69.50
+#817   25.54   69.50
+#818   25.73   69.50
+#819   25.92   69.50
+#820   26.10   69.50
+#821   26.29   69.50
+#822   26.38   69.50
+#823   26.36   69.50
+#824   26.34   69.50
+#825   26.33   69.50
+#826   26.19   69.50
+#827   25.93   69.50
+#828   25.67   69.50
+#829   25.41   69.50
+#830   25.08   69.50
+#831   24.69   69.50
+#832   24.29   69.50
+#833   23.89   69.50
+#834   23.45   69.50
+#835   22.98   69.50
+#836   22.50   69.50
+#837   22.02   69.50
+#838   21.55   69.50
+#839   21.08   69.50
+#840   20.62   69.50
+#841   20.15   69.50
+#842   19.77   69.50
+#843   19.47   69.50
+#844   19.16   69.50
+#845   18.86   69.50
+#846   18.63   69.50
+#847   18.46   69.50
+#848   18.29   69.50
+#849   18.12   69.50
+#850   18.05   69.50
+#851   18.07   69.50
+#852   18.08   69.50
+#853   18.10   69.50
+#854   18.20   69.50
+#855   18.38   69.50
+#856   18.57   69.50
+#857   18.76   69.50
+#858   19.02   69.50
+#859   19.36   69.50
+#860   19.70   69.50
+#861   20.04   69.50
+#862   20.41   69.50
+#863   20.82   69.50
+#864   21.22   69.50
+#865   21.63   69.50
+#866   22.15   69.50
+#867   22.78   69.50
+#868   23.42   69.50
+#869   24.05   69.50
+#870   24.51   69.50
+#871   24.80   69.50
+#872   25.09   69.50
+#873   25.38   69.50
+#874   25.45   69.50
+#875   25.29   69.50
+#876   25.14   69.50
+#877   24.99   69.50
+#878   24.73   69.50
+#879   24.36   69.50
+#880   24.00   69.50
+#881   23.63   69.50
+#882   23.28   69.50
+#883   22.96   69.50
+#884   22.63   69.50
+#885   22.31   69.50
+#886   22.08   69.50
+#887   21.96   69.50
+#888   21.83   69.50
+#889   21.71   69.50
+#890   21.68   69.50
+#891   21.73   69.50
+#892   21.79   69.50
+#893   21.84   69.50
+#894   22.05   69.50
+#895   22.40   69.50
+#896   22.75   69.50
+#897   23.10   69.50
+#898   23.62   69.50
+#899   24.33   69.50
+#900   25.03   69.50
+#901   25.73   69.50
+#902   26.48   69.50
+#903   27.27   69.50
+#904   28.07   69.50
+#905   28.86   69.50
+#906   29.63   69.50
+#907   30.37   69.50
+#908   31.11   69.50
+#909   31.85   69.50
+#910   32.57   69.50
+#911   33.27   69.50
+#912   33.97   69.50
+#913   34.67   69.50
+#914   35.19   69.50
+#915   35.54   69.50
+#916   35.88   69.50
+#917   36.22   69.50
+#918   36.45   69.50
+#919   36.58   69.50
+#920   36.70   69.50
+#921   36.83   69.50
+#922   36.82   69.50
+#923   36.66   69.50
+#924   36.50   69.50
+#925   36.35   69.50
+#926   36.09   69.50
+#927   35.74   69.50
+#928   35.38   69.50
+#929   35.03   69.50
+#930   34.60   69.50
+#931   34.10   69.50
+#932   33.59   69.50
+#933   33.08   69.50
+#934   32.59   69.50
+#935   32.11   69.50
+#936   31.63   69.50
+#937   31.14   69.50
+#938   30.66   69.50
+#939   30.19   69.50
+#940   29.71   69.50
+#941   29.23   69.50
+#942   28.78   69.50
+#943   28.34   69.50
+#944   27.91   69.50
+#945   27.47   69.50
+#946   27.13   69.50
+#947   26.88   69.50
+#948   26.63   69.50
+#949   26.38   69.50
+#950   26.13   69.50
+#951   25.88   69.50
+#952   25.64   69.50
+#953   25.40   69.50
+#954   25.25   69.50
+#955   25.20   69.50
+#956   25.15   69.50
+#957   25.10   69.50
+#958   25.13   69.50
+#959   25.23   69.50
+#960   25.33   69.50
+</ShortTermForcast::MHS02F>

gdnxak102/src/main/resources/SZ05GF_20230420_1420_QXZ.WPD

@@ -0,0 +1,15 @@
+// 2023-04-20_14:20:00
+<! Entity=SZ05GF type=QX time='2023-04-20_14:20' !>
+
+<MastData::SZ05GF>
+@id   ÊôÐÔÏî        ÊýÖµ
+#1    GlobalR        233.67
+#2    DirectR        186.93
+#3    DirruseR        46.73
+#4    AirT        11.50
+#5    CellT        11.50
+#6    WS        5.56
+#7    WD        213.33
+#8    P        867.00
+#9    RH        24.00
+</MastData::SZ05GF>

gdnxak102/src/main/resources/SZ05GF_20230420_1430_LLCDQ.WPD

@@ -0,0 +1,35 @@
+// 2023-04-20_14:15:00
+<! Entity=SZ05GF type=LLCDQ time='2023-04-20_14:30' !>
+
+<RunningCapacity::SZ05GF>
+@id   实时开机容量
+#1    10.00
+</RunningCapacity::SZ05GF>
+
+<UltraShortTermForcast_V2P::SZ05GF>
+@id   理论超短期预测功率
+#1    10.01
+#2    10.06
+#3    10.02
+#4    10.04
+#5    10.01
+#6    10.08
+#7    10.02
+#8    10.07
+#9    10.07
+#10    10.07
+#11    10.04
+#12    9.59
+#13    7.72
+#14    6.04
+#15    4.59
+#16    3.40
+#17    2.48
+#18    1.78
+#19    1.22
+#20    0.74
+#21    0.42
+#22    0.20
+#23    0.06
+#24    0.00
+</UltraShortTermForcast_V2P::SZ05GF>

gdnxak102/src/main/resources/SZ05GF_20230420_1530_CDQ.WPD

@@ -0,0 +1,27 @@
+// 2023-04-20_15:15:00
+<! Entity=SZ05GF type=CDQ time='2023-04-20_15:30' !>
+
+<RunningCapacity::SZ05GF>
+@id   实时开机容量
+#1    10.00
+</RunningCapacity::SZ05GF>
+
+<UltraShortTermForcast_V2P::SZ05GF>
+@id   超短期预测功率
+#1   1.71
+#2   1.57
+#3   1.43
+#4   1.29
+#5   1.14
+#6   0.99
+#7   0.85
+#8   0.71
+#9   0.57
+#10   0.43
+#11   0.31
+#12   0.22
+#13   0.15
+#14   0.11
+#15   0.07
+#16   0.04
+</UltraShortTermForcast_V2P::SZ05GF>

gdnxak102/src/main/resources/SZ05GF_20230421_0000_DQ.WPD

@@ -0,0 +1,683 @@
+// 2023-04-20_06:45:00
+<! Entity=SZ05GF type=DQ time='2023-04-21_00:00' !>
+
+<Capacity::SZ05GF>
+@id   装机容量
+#1   10.00
+</Capacity::SZ05GF>
+
+<ShortTermForcast::SZ05GF>
+@id 短期预测功率 预计开机容量
+#1   0.00   10.00
+#2   0.00   10.00
+#3   0.00   10.00
+#4   0.00   10.00
+#5   0.00   10.00
+#6   0.00   10.00
+#7   0.00   10.00
+#8   0.00   10.00
+#9   0.00   10.00
+#10   0.00   10.00
+#11   0.00   10.00
+#12   0.00   10.00
+#13   0.00   10.00
+#14   0.00   10.00
+#15   0.00   10.00
+#16   0.00   10.00
+#17   0.00   10.00
+#18   0.00   10.00
+#19   0.00   10.00
+#20   0.00   10.00
+#21   0.00   10.00
+#22   0.00   10.00
+#23   0.00   10.00
+#24   0.00   10.00
+#25   0.00   10.00
+#26   0.00   10.00
+#27   0.00   10.00
+#28   0.01   10.00
+#29   0.03   10.00
+#30   0.07   10.00
+#31   0.13   10.00
+#32   0.20   10.00
+#33   0.28   10.00
+#34   0.37   10.00
+#35   0.46   10.00
+#36   0.57   10.00
+#37   0.69   10.00
+#38   0.81   10.00
+#39   0.94   10.00
+#40   1.08   10.00
+#41   1.22   10.00
+#42   1.36   10.00
+#43   1.50   10.00
+#44   1.63   10.00
+#45   1.76   10.00
+#46   1.87   10.00
+#47   1.98   10.00
+#48   2.07   10.00
+#49   2.16   10.00
+#50   2.24   10.00
+#51   2.31   10.00
+#52   2.38   10.00
+#53   2.42   10.00
+#54   2.44   10.00
+#55   2.44   10.00
+#56   2.41   10.00
+#57   2.37   10.00
+#58   2.30   10.00
+#59   2.20   10.00
+#60   2.08   10.00
+#61   1.96   10.00
+#62   1.85   10.00
+#63   1.74   10.00
+#64   1.64   10.00
+#65   1.53   10.00
+#66   1.41   10.00
+#67   1.30   10.00
+#68   1.18   10.00
+#69   1.05   10.00
+#70   0.92   10.00
+#71   0.77   10.00
+#72   0.62   10.00
+#73   0.49   10.00
+#74   0.37   10.00
+#75   0.28   10.00
+#76   0.19   10.00
+#77   0.12   10.00
+#78   0.07   10.00
+#79   0.04   10.00
+#80   0.02   10.00
+#81   0.01   10.00
+#82   0.00   10.00
+#83   0.00   10.00
+#84   0.00   10.00
+#85   0.00   10.00
+#86   0.00   10.00
+#87   0.00   10.00
+#88   0.00   10.00
+#89   0.00   10.00
+#90   0.00   10.00
+#91   0.00   10.00
+#92   0.00   10.00
+#93   0.00   10.00
+#94   0.00   10.00
+#95   0.00   10.00
+#96   0.00   10.00
+#97   0.00   10.00
+#98   0.00   10.00
+#99   0.00   10.00
+#100   0.00   10.00
+#101   0.00   10.00
+#102   0.00   10.00
+#103   0.00   10.00
+#104   0.00   10.00
+#105   0.00   10.00
+#106   0.00   10.00
+#107   0.00   10.00
+#108   0.00   10.00
+#109   0.00   10.00
+#110   0.00   10.00
+#111   0.00   10.00
+#112   0.00   10.00
+#113   0.00   10.00
+#114   0.00   10.00
+#115   0.00   10.00
+#116   0.00   10.00
+#117   0.00   10.00
+#118   0.00   10.00
+#119   0.00   10.00
+#120   0.00   10.00
+#121   0.00   10.00
+#122   0.02   10.00
+#123   0.06   10.00
+#124   0.12   10.00
+#125   0.19   10.00
+#126   0.30   10.00
+#127   0.42   10.00
+#128   0.57   10.00
+#129   0.75   10.00
+#130   0.98   10.00
+#131   1.26   10.00
+#132   1.58   10.00
+#133   1.87   10.00
+#134   2.13   10.00
+#135   2.34   10.00
+#136   2.54   10.00
+#137   2.73   10.00
+#138   2.93   10.00
+#139   3.13   10.00
+#140   3.33   10.00
+#141   3.51   10.00
+#142   3.66   10.00
+#143   3.79   10.00
+#144   3.90   10.00
+#145   4.00   10.00
+#146   4.08   10.00
+#147   4.16   10.00
+#148   4.22   10.00
+#149   4.26   10.00
+#150   4.27   10.00
+#151   4.27   10.00
+#152   4.24   10.00
+#153   4.19   10.00
+#154   4.10   10.00
+#155   3.97   10.00
+#156   3.82   10.00
+#157   3.65   10.00
+#158   3.49   10.00
+#159   3.33   10.00
+#160   3.16   10.00
+#161   2.97   10.00
+#162   2.75   10.00
+#163   2.51   10.00
+#164   2.25   10.00
+#165   1.99   10.00
+#166   1.74   10.00
+#167   1.49   10.00
+#168   1.24   10.00
+#169   1.00   10.00
+#170   0.79   10.00
+#171   0.58   10.00
+#172   0.40   10.00
+#173   0.24   10.00
+#174   0.13   10.00
+#175   0.07   10.00
+#176   0.03   10.00
+#177   0.01   10.00
+#178   0.00   10.00
+#179   0.00   10.00
+#180   0.00   10.00
+#181   0.00   10.00
+#182   0.00   10.00
+#183   0.00   10.00
+#184   0.00   10.00
+#185   0.00   10.00
+#186   0.00   10.00
+#187   0.00   10.00
+#188   0.00   10.00
+#189   0.00   10.00
+#190   0.00   10.00
+#191   0.00   10.00
+#192   0.00   10.00
+#193   0.00   10.00
+#194   0.00   10.00
+#195   0.00   10.00
+#196   0.00   10.00
+#197   0.00   10.00
+#198   0.00   10.00
+#199   0.00   10.00
+#200   0.00   10.00
+#201   0.00   10.00
+#202   0.00   10.00
+#203   0.00   10.00
+#204   0.00   10.00
+#205   0.00   10.00
+#206   0.00   10.00
+#207   0.00   10.00
+#208   0.00   10.00
+#209   0.00   10.00
+#210   0.00   10.00
+#211   0.00   10.00
+#212   0.00   10.00
+#213   0.00   10.00
+#214   0.00   10.00
+#215   0.00   10.00
+#216   0.00   10.00
+#217   0.00   10.00
+#218   0.01   10.00
+#219   0.02   10.00
+#220   0.04   10.00
+#221   0.09   10.00
+#222   0.18   10.00
+#223   0.31   10.00
+#224   0.47   10.00
+#225   0.65   10.00
+#226   0.85   10.00
+#227   1.07   10.00
+#228   1.32   10.00
+#229   1.56   10.00
+#230   1.78   10.00
+#231   1.99   10.00
+#232   2.20   10.00
+#233   2.41   10.00
+#234   2.64   10.00
+#235   2.88   10.00
+#236   3.13   10.00
+#237   3.35   10.00
+#238   3.50   10.00
+#239   3.61   10.00
+#240   3.69   10.00
+#241   3.74   10.00
+#242   3.80   10.00
+#243   3.84   10.00
+#244   3.87   10.00
+#245   3.90   10.00
+#246   3.91   10.00
+#247   3.91   10.00
+#248   3.91   10.00
+#249   3.91   10.00
+#250   3.88   10.00
+#251   3.80   10.00
+#252   3.70   10.00
+#253   3.57   10.00
+#254   3.43   10.00
+#255   3.26   10.00
+#256   3.08   10.00
+#257   2.88   10.00
+#258   2.66   10.00
+#259   2.42   10.00
+#260   2.17   10.00
+#261   1.92   10.00
+#262   1.67   10.00
+#263   1.41   10.00
+#264   1.16   10.00
+#265   0.92   10.00
+#266   0.72   10.00
+#267   0.54   10.00
+#268   0.38   10.00
+#269   0.25   10.00
+#270   0.15   10.00
+#271   0.08   10.00
+#272   0.04   10.00
+#273   0.01   10.00
+#274   0.00   10.00
+#275   0.00   10.00
+#276   0.00   10.00
+#277   0.00   10.00
+#278   0.00   10.00
+#279   0.00   10.00
+#280   0.00   10.00
+#281   0.00   10.00
+#282   0.00   10.00
+#283   0.00   10.00
+#284   0.00   10.00
+#285   0.00   10.00
+#286   0.00   10.00
+#287   0.00   10.00
+#288   0.00   10.00
+#289   0.00   10.00
+#290   0.00   10.00
+#291   0.00   10.00
+#292   0.00   10.00
+#293   0.00   10.00
+#294   0.00   10.00
+#295   0.00   10.00
+#296   0.00   10.00
+#297   0.00   10.00
+#298   0.00   10.00
+#299   0.00   10.00
+#300   0.00   10.00
+#301   0.00   10.00
+#302   0.00   10.00
+#303   0.00   10.00
+#304   0.00   10.00
+#305   0.00   10.00
+#306   0.00   10.00
+#307   0.00   10.00
+#308   0.00   10.00
+#309   0.00   10.00
+#310   0.00   10.00
+#311   0.00   10.00
+#312   0.00   10.00
+#313   0.00   10.00
+#314   0.02   10.00
+#315   0.05   10.00
+#316   0.11   10.00
+#317   0.22   10.00
+#318   0.39   10.00
+#319   0.65   10.00
+#320   0.95   10.00
+#321   1.27   10.00
+#322   1.59   10.00
+#323   1.95   10.00
+#324   2.31   10.00
+#325   2.65   10.00
+#326   2.95   10.00
+#327   3.22   10.00
+#328   3.46   10.00
+#329   3.69   10.00
+#330   3.90   10.00
+#331   4.10   10.00
+#332   4.28   10.00
+#333   4.44   10.00
+#334   4.56   10.00
+#335   4.64   10.00
+#336   4.70   10.00
+#337   4.74   10.00
+#338   4.77   10.00
+#339   4.77   10.00
+#340   4.77   10.00
+#341   4.77   10.00
+#342   4.77   10.00
+#343   4.75   10.00
+#344   4.72   10.00
+#345   4.67   10.00
+#346   4.59   10.00
+#347   4.49   10.00
+#348   4.38   10.00
+#349   4.24   10.00
+#350   4.07   10.00
+#351   3.89   10.00
+#352   3.68   10.00
+#353   3.46   10.00
+#354   3.21   10.00
+#355   2.95   10.00
+#356   2.66   10.00
+#357   2.37   10.00
+#358   2.08   10.00
+#359   1.77   10.00
+#360   1.46   10.00
+#361   1.18   10.00
+#362   0.92   10.00
+#363   0.68   10.00
+#364   0.46   10.00
+#365   0.28   10.00
+#366   0.15   10.00
+#367   0.08   10.00
+#368   0.04   10.00
+#369   0.01   10.00
+#370   0.00   10.00
+#371   0.00   10.00
+#372   0.00   10.00
+#373   0.00   10.00
+#374   0.00   10.00
+#375   0.00   10.00
+#376   0.00   10.00
+#377   0.00   10.00
+#378   0.00   10.00
+#379   0.00   10.00
+#380   0.00   10.00
+#381   0.00   10.00
+#382   0.00   10.00
+#383   0.00   10.00
+#384   0.00   10.00
+#385   0.00   10.00
+#386   0.00   10.00
+#387   0.00   10.00
+#388   0.00   10.00
+#389   0.00   10.00
+#390   0.00   10.00
+#391   0.00   10.00
+#392   0.00   10.00
+#393   0.00   10.00
+#394   0.00   10.00
+#395   0.00   10.00
+#396   0.00   10.00
+#397   0.00   10.00
+#398   0.00   10.00
+#399   0.00   10.00
+#400   0.00   10.00
+#401   0.00   10.00
+#402   0.00   10.00
+#403   0.00   10.00
+#404   0.00   10.00
+#405   0.00   10.00
+#406   0.00   10.00
+#407   0.00   10.00
+#408   0.00   10.00
+#409   0.00   10.00
+#410   0.03   10.00
+#411   0.10   10.00
+#412   0.21   10.00
+#413   0.38   10.00
+#414   0.66   10.00
+#415   1.05   10.00
+#416   1.50   10.00
+#417   1.99   10.00
+#418   2.48   10.00
+#419   3.01   10.00
+#420   3.56   10.00
+#421   4.08   10.00
+#422   4.54   10.00
+#423   4.96   10.00
+#424   5.34   10.00
+#425   5.70   10.00
+#426   6.05   10.00
+#427   6.40   10.00
+#428   6.72   10.00
+#429   6.99   10.00
+#430   7.17   10.00
+#431   7.28   10.00
+#432   7.33   10.00
+#433   7.35   10.00
+#434   7.35   10.00
+#435   7.31   10.00
+#436   7.26   10.00
+#437   7.19   10.00
+#438   7.13   10.00
+#439   7.10   10.00
+#440   7.05   10.00
+#441   6.95   10.00
+#442   6.77   10.00
+#443   6.50   10.00
+#444   6.19   10.00
+#445   5.88   10.00
+#446   5.59   10.00
+#447   5.32   10.00
+#448   5.06   10.00
+#449   4.78   10.00
+#450   4.47   10.00
+#451   4.15   10.00
+#452   3.81   10.00
+#453   3.45   10.00
+#454   3.05   10.00
+#455   2.60   10.00
+#456   2.13   10.00
+#457   1.69   10.00
+#458   1.31   10.00
+#459   0.96   10.00
+#460   0.65   10.00
+#461   0.40   10.00
+#462   0.22   10.00
+#463   0.11   10.00
+#464   0.05   10.00
+#465   0.02   10.00
+#466   0.00   10.00
+#467   0.00   10.00
+#468   0.00   10.00
+#469   0.00   10.00
+#470   0.00   10.00
+#471   0.00   10.00
+#472   0.00   10.00
+#473   0.00   10.00
+#474   0.00   10.00
+#475   0.00   10.00
+#476   0.00   10.00
+#477   0.00   10.00
+#478   0.00   10.00
+#479   0.00   10.00
+#480   0.00   10.00
+#481   0.00   10.00
+#482   0.00   10.00
+#483   0.00   10.00
+#484   0.00   10.00
+#485   0.00   10.00
+#486   0.00   10.00
+#487   0.00   10.00
+#488   0.00   10.00
+#489   0.00   10.00
+#490   0.00   10.00
+#491   0.00   10.00
+#492   0.00   10.00
+#493   0.00   10.00
+#494   0.00   10.00
+#495   0.00   10.00
+#496   0.00   10.00
+#497   0.00   10.00
+#498   0.00   10.00
+#499   0.00   10.00
+#500   0.00   10.00
+#501   0.00   10.00
+#502   0.00   10.00
+#503   0.00   10.00
+#504   0.00   10.00
+#505   0.00   10.00
+#506   0.03   10.00
+#507   0.11   10.00
+#508   0.23   10.00
+#509   0.42   10.00
+#510   0.72   10.00
+#511   1.14   10.00
+#512   1.64   10.00
+#513   2.15   10.00
+#514   2.67   10.00
+#515   3.21   10.00
+#516   3.77   10.00
+#517   4.30   10.00
+#518   4.76   10.00
+#519   5.17   10.00
+#520   5.54   10.00
+#521   5.89   10.00
+#522   6.22   10.00
+#523   6.53   10.00
+#524   6.81   10.00
+#525   7.04   10.00
+#526   7.19   10.00
+#527   7.27   10.00
+#528   7.28   10.00
+#529   7.28   10.00
+#530   7.26   10.00
+#531   7.22   10.00
+#532   7.16   10.00
+#533   7.08   10.00
+#534   6.98   10.00
+#535   6.88   10.00
+#536   6.76   10.00
+#537   6.60   10.00
+#538   6.41   10.00
+#539   6.16   10.00
+#540   5.88   10.00
+#541   5.61   10.00
+#542   5.35   10.00
+#543   5.11   10.00
+#544   4.87   10.00
+#545   4.62   10.00
+#546   4.34   10.00
+#547   4.05   10.00
+#548   3.74   10.00
+#549   3.40   10.00
+#550   3.03   10.00
+#551   2.60   10.00
+#552   2.15   10.00
+#553   1.72   10.00
+#554   1.34   10.00
+#555   1.00   10.00
+#556   0.68   10.00
+#557   0.42   10.00
+#558   0.23   10.00
+#559   0.12   10.00
+#560   0.06   10.00
+#561   0.02   10.00
+#562   0.00   10.00
+#563   0.00   10.00
+#564   0.00   10.00
+#565   0.00   10.00
+#566   0.00   10.00
+#567   0.00   10.00
+#568   0.00   10.00
+#569   0.00   10.00
+#570   0.00   10.00
+#571   0.00   10.00
+#572   0.00   10.00
+#573   0.00   10.00
+#574   0.00   10.00
+#575   0.00   10.00
+#576   0.00   10.00
+#577   0.00   10.00
+#578   0.00   10.00
+#579   0.00   10.00
+#580   0.00   10.00
+#581   0.00   10.00
+#582   0.00   10.00
+#583   0.00   10.00
+#584   0.00   10.00
+#585   0.00   10.00
+#586   0.00   10.00
+#587   0.00   10.00
+#588   0.00   10.00
+#589   0.00   10.00
+#590   0.00   10.00
+#591   0.00   10.00
+#592   0.00   10.00
+#593   0.00   10.00
+#594   0.00   10.00
+#595   0.00   10.00
+#596   0.00   10.00
+#597   0.00   10.00
+#598   0.00   10.00
+#599   0.00   10.00
+#600   0.00   10.00
+#601   0.00   10.00
+#602   0.03   10.00
+#603   0.09   10.00
+#604   0.19   10.00
+#605   0.35   10.00
+#606   0.62   10.00
+#607   0.98   10.00
+#608   1.40   10.00
+#609   1.86   10.00
+#610   2.32   10.00
+#611   2.84   10.00
+#612   3.37   10.00
+#613   3.86   10.00
+#614   4.28   10.00
+#615   4.65   10.00
+#616   4.97   10.00
+#617   5.26   10.00
+#618   5.55   10.00
+#619   5.82   10.00
+#620   6.07   10.00
+#621   6.27   10.00
+#622   6.42   10.00
+#623   6.51   10.00
+#624   6.57   10.00
+#625   6.59   10.00
+#626   6.59   10.00
+#627   6.57   10.00
+#628   6.51   10.00
+#629   6.44   10.00
+#630   6.36   10.00
+#631   6.25   10.00
+#632   6.13   10.00
+#633   5.98   10.00
+#634   5.80   10.00
+#635   5.59   10.00
+#636   5.36   10.00
+#637   5.12   10.00
+#638   4.90   10.00
+#639   4.70   10.00
+#640   4.49   10.00
+#641   4.26   10.00
+#642   4.02   10.00
+#643   3.76   10.00
+#644   3.48   10.00
+#645   3.18   10.00
+#646   2.83   10.00
+#647   2.44   10.00
+#648   2.03   10.00
+#649   1.64   10.00
+#650   1.29   10.00
+#651   0.97   10.00
+#652   0.67   10.00
+#653   0.42   10.00
+#654   0.24   10.00
+#655   0.13   10.00
+#656   0.06   10.00
+#657   0.02   10.00
+#658   0.00   10.00
+#659   0.00   10.00
+#660   0.00   10.00
+#661   0.00   10.00
+#662   0.00   10.00
+#663   0.00   10.00
+#664   0.00   10.00
+#665   0.00   10.00
+#666   0.00   10.00
+#667   0.00   10.00
+#668   0.00   10.00
+#669   0.00   10.00
+#670   0.00   10.00
+#671   0.00   10.00
+#672   0.00   10.00
+</ShortTermForcast::SZ05GF>

gdnxak102/src/main/resources/application.yaml

@@ -1,20 +1,23 @@
 spring:
   application:
-  name: gdnxak102
+  name: gdnxglyc102
 
 #此处配置南瑞102服务的地址
 iec102:
-  iec102Ip: 127.0.0.1 #192.168.168.8
-  iec102Port: 8007 #3456
+  iec102Ip: 127.0.0.1
+  iec102Port: 8007
   #轮询102服务的时间间隔，默认5秒
-  scanInterval: 10000
+  scanInterval: 5000
   #心跳监测时间间隔
-  heartbeatInterval: 10000
+  heartbeatInterval: 5000
   #消息缓存最大数量
   maxCacheCount: 200
   #此处配置王博采集桥bridge服务的地址
-  bridgeIp: 127.0.0.1 #21.6.34.1
-  bridgePort: 8007 #31010
-  cdqAddressStart: 7400020
-  dqAddressStart: 7400036
-  cftAddressStart: 7400000
+  bridgeIp: 127.0.0.1
+  bridgePort: 8080
+  cdqAddressStart: 6400008
+  dqAddressStart: 6400060
+  cftAddressStart: 6400000
+  qxzAddressStart: 6400000
+  llcdqAddressStart: 6400016
+

gdnxak102/src/main/resources/log4j2.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Properties>
+        <Property name="Pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %5p %t %M(%F:%L) %m%n</Property>
+    </Properties>
+    <Filter type="ThresholdFilter" level="INFO"/>
+
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="${Pattern}"/>
+        </Console>
+        <RollingFile name="RollingFileInfo" fileName="logs/info.log"
+                     filePattern="logs/%d{yyyy-MM}/info-%d{yyyy-MM-dd}.%i.log">
+            <PatternLayout pattern="${Pattern}"/>
+            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+        <RollingFile name="RollingFileWarn" fileName="logs/warn.log"
+                     filePattern="logs/%d{yyyy-MM}/warn-%d{yyyy-MM-dd}.%i.log">
+            <PatternLayout pattern="${Pattern}"/>
+            <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+        <RollingFile name="RollingFileError" fileName="logs/error.log"
+                     filePattern="logs/%d{yyyy-MM}/error-%d{yyyy-MM-dd}.%i.log">
+            <PatternLayout pattern="${Pattern}"/>
+            <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+    </Appenders>
+
+    <Loggers>
+        <Root level="INFO">
+            <AppenderRef ref="Console"/>
+            <appender-ref ref="RollingFileInfo"/>
+            <appender-ref ref="RollingFileWarn"/>
+            <appender-ref ref="RollingFileError"/>
+        </Root>
+    </Loggers>
+</Configuration>