增加上报模板

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/BaseUploadFileService.java

@@ -180,7 +180,7 @@ public abstract class BaseUploadFileService extends BaseService {
               for (int k = 0; k < uploadFileType.length; k++) {
                 if (uploadFileType[k].equals(fileType)) {
                   // 上报文件目录
-                  destFileDir = FileUtil.getFileUploadPath() + File.separator + stationCode+File.separator+"process" + File.separator + uploadObject.getObjectNo() + File.separator + fileType;
+                  destFileDir = FileUtil.getFileUploadPath() + File.separator +"process" + File.separator + uploadObject.getObjectNo() + File.separator + fileType;
                   File destDir = new File(destFileDir);
                   if (!destDir.exists()) {// 如果目录不存在则创建uploadFileEndTime目录
                     boolean b = destDir.mkdirs();

ipfcst-console/src/test/java/com/jiayue/ipfcst/fileupload/service/E63UploadFileServiceTest.java

@@ -0,0 +1,27 @@
+package com.jiayue.ipfcst.fileupload.service;
+
+import com.jiayue.ipfcst.BaseTest;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.xml.ws.Action;
+
+import java.util.Date;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * 文件生成测试类
+ *
+ * @author xsl
+ * @version 3.0
+ */
+public class E63UploadFileServiceTest extends BaseTest {
+  @Autowired
+  E63UploadFileService e63UploadFileService;
+
+  @Test
+  public void testCreateFile() {
+    e63UploadFileService.generateE1File(new Date());
+  }
+}

ipfcst-console/src/test/resources/vms/E63/CDQ.vm

@@ -0,0 +1,14 @@
+// ${currentTime}
+<! Entity=${sign} type=CDQ time='${uploadTime}' !>
+
+<RunningCapacity::${sign}>
+@id    实时开机容量
+#1      ${capacity}
+</RunningCapacity::${sign}>
+
+<UltraShortTermForcast::${sign}>
+@id   超短期预测功率
+#foreach( $cdq in $vList )
+#${velocityCount}  ${cdq.ableValue}
+#end
+</UltraShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/CDQFS.vm

@@ -0,0 +1,8 @@
+// ${currentTime}
+<! Entity=${sign}  type=CDQFS  time='${uploadTime}'  !>
+<UltraShortTermForcast::${sign}>
+@id  超短期预测风速 超短期预测风向
+#foreach( $dqfs in $vList )
+#${velocityCount}  ${dqfs.ws10}  ${dqfs.wd10}
+#end
+</UltraShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/CDQFZD.vm

@@ -0,0 +1,8 @@
+// ${currentTime}
+<! Entity=${sign} type=CDQFZD time='${uploadTime}' !>
+<UltraShortTermForcast::${sign}>
+@id   超短期预测辐照度
+#foreach( $dq in $vList )
+#${velocityCount}  ${dq.swr}
+#end
+</UltraShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/CDQ_F.vm

@@ -0,0 +1,14 @@
+// ${currentTime}
+<! Entity=${sign}  type=CDQ  time='${uploadTime}' !>
+
+<RunningCapacity::${sign}>
+@id   实时开机容量
+#1    ${capacity}
+</RunningCapacity::${sign}>
+
+<UltraShortTermForcast::${sign}>
+@id   超短期预测功率
+#foreach( $cdq in $vList )
+#${velocityCount}    ${cdq.ableValue}
+#end
+</UltraShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/CDQ_USE.vm

@@ -0,0 +1,9 @@
+// ${currentTime}
+<! Entity=${sign} type=CDQ_USE time='${uploadTime}' !>
+
+<UltraShortTermForcast::${sign}>
+@id   超短期可用功率
+#foreach( $cdq in $vList )
+#${velocityCount}	${cdq.ableValue}
+#end
+</UltraShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/CDQ_USE_F.vm

@@ -0,0 +1,9 @@
+// ${currentTime}
+<! Entity=${sign}  type=CDQ_USE  time='${uploadTime}' !>
+
+<UltraShortTermForcast::${sign}>
+@id   超短期可用功率
+#foreach( $cdq in $vList )
+#${velocityCount}    ${cdq.ableValue}
+#end
+</UltraShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/CFT.vm

@@ -0,0 +1,27 @@
+// ${currentTime}
+<! Entity=${sign}  type=CFT  time='${uploadTime}' !>
+
+<MastData::${sign}>
+@id   属性项        数值
+#1    WS_10        ${WS_10}
+#2    WD_10        ${WD_10}
+#3    WS_30        ${WS_30}
+#4    WD_30        ${WD_30}
+#5    WS_50        ${WS_50}
+#6    WD_50        ${WD_50}
+#7    WS_60        ${WS_60}
+#8    WD_60        ${WD_60}
+#9    WS_70        ${WS_70}
+#10   WS_70        ${WD_70}
+#11   WS_80        ${WS_80}
+#12   WD_80        ${WD_80}
+#13   WS_90        ${WS_90}
+#14   WD_90        ${WD_90}
+#15   WS_100       ${WS_100}
+#16   WD_100       ${WD_100}
+#17   WS_HubHeight ${WS_HubHeight}
+#18   WD_HubHeight ${WD_HubHeight}
+#19   T_8         ${T_8}
+#20   P_8         ${P_8}
+#21   H_8         ${RH_8}
+</MastData::${sign}>

ipfcst-console/src/test/resources/vms/E63/DQ.vm

@@ -0,0 +1,14 @@
+// ${currentTime}
+<!Entity=${sign} type=DQ time='${uploadTime}' !>
+
+<Capacity::${sign}>
+@id   装机容量
+#1    ${capacity}
+</Capacity::${sign}>
+
+<ShortTermForcast::${sign}>
+@id        短期预测功率        预计开机容量
+#foreach( $dq in $vList )
+#${velocityCount}       ${dq.ableValue}       ${dq.capacity}
+#end
+</ShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/DQFS.vm

@@ -0,0 +1,8 @@
+//  ${currentTime}
+<! Entity=${sign} type=DQFS  time='${uploadTime}'  !>
+<ShortTermForcast::${sign}>
+@id  短期预测风速  短期预测风向
+#foreach( $dqfs in $vList )
+#${velocityCount}	${dqfs.ws10}	${dqfs.wd10}
+#end
+</ShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/DQFZD.vm

@@ -0,0 +1,8 @@
+// ${currentTime}
+<! Entity=${sign}  type=DQFZD  time='${uploadTime}' !>
+<ShortTermForcast::${sign}>
+@id 短期预测辐照度
+#foreach( $dq in $vList )
+#${velocityCount}   ${dq.swr}
+#end
+</ShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/DQ_F.vm

@@ -0,0 +1,14 @@
+// ${currentTime}
+<! Entity=${sign}  type=DQ  time='${uploadTime}' !>
+
+<Capacity::${sign}>
+@id   装机容量
+#1    ${capacity}
+</Capacity::${sign}>
+
+<ShortTermForcast::${sign}>
+@id 短期预测功率 预计开机容量
+#foreach( $dq in $vList )
+#${velocityCount}   ${dq.ableValue}   ${dq.capacity}
+#end
+</ShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/DQ_USE.vm

@@ -0,0 +1,9 @@
+// ${currentTime}
+<!Entity=${sign} type=DQ_USE time='${uploadTime}' !>
+
+<ShortTermForcast::${sign}>
+@id        短期可用功率
+#foreach( $dq in $vList )
+#${velocityCount}       ${dq.ableValue}
+#end
+</ShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/DQ_USE_F.vm

@@ -0,0 +1,9 @@
+// ${currentTime}
+<! Entity=${sign}  type=DQ_USE time='${uploadTime}' !>
+
+<ShortTermForcast::${sign}>
+@id 短期可用功率
+#foreach( $dq in $vList )
+#${velocityCount}   ${dq.ableValue}
+#end
+</ShortTermForcast::${sign}>

ipfcst-console/src/test/resources/vms/E63/FJ.vm

@@ -0,0 +1,14 @@
+//${currentTime}
+<!	Entity=${sign}	type=FJ	time='${uploadTime}'	!>
+
+<RatedCapacity::${sign}>
+@id	机组额定容量总加
+#1	${capacity}
+</RatedCapacity::${sign}>
+
+<FANDATA::${sign}>
+@	标识	风电场名称	风机集电线名称	风机名称	风机类型	额定容量	是否样板机	运行状态	有功功率	无功功率	电压	电流	功率因数	机头风速	机头风向	当日发电量	累计发电量	发电机转速	浆距角
+#foreach( $fj in $vList )
+#	${velocityCount}	${fj.elName}	${fj.collectorCircuit}	${fj.name}	${fj.modelNumber}	${fj.RatedCapacity}	${fj.sample}	${fj.dtaStatus}	${fj.ActivePower}	${fj.ReActivePower}	${fj.Voltage}	${fj.GalvanicCurrent}	${fj.PowerFactor}	${fj.WS}	${fj.WD}	${fj.DayElectricQuantity}	${fj.GeneratingCap}	${fj.RotationlSpeed}	${fj.PropellerPitchAngle}
+#end
+</FANDATA::${sign}>

ipfcst-console/src/test/resources/vms/E63/INDICATORS.vm

@@ -0,0 +1,21 @@
+{
+  "gid": "${gid}",
+  "date": "${date}",
+  "data": [
+    {
+      "rateType": "${dq}",
+      "reportrate": "${dqReportrate}",
+      "accurate": "${dqAccurate}"
+    },
+    {
+      "rateType": "${cdq}",
+      "reportrate": "${cdqReportrate}",
+      "accurate": "${cdqAccurate}"
+    }
+  ],
+  "singlePoint": {
+#foreach( $val in $vList )
+    ${val.name}: ${val.value}
+#end
+  }
+}

ipfcst-console/src/test/resources/vms/E63/JSONLOG.vm

@@ -0,0 +1,11 @@
+{
+  "gid": "${gid}",
+  "type": "${type}",
+  "source": "${source}",
+  "service": "${service}",
+  "since": "${since}",
+  "timestamp": "${timestamp}",
+  "file": "${file}",
+  "status": "${status}",
+  "reporttype": "${reporttype}"
+}

ipfcst-console/src/test/resources/vms/E63/NBQ.vm

@@ -0,0 +1,14 @@
+//${currentTime}
+<! Entity=${sign} type=NBQ time='${uploadTime}' !>
+
+<RatedCapacity::${sign}>
+@id	额定容量总加
+#1	${capacity}
+</RatedCapacity::${sign}>
+
+<FANDATA::${sign}>
+@	标识	光伏站名称	光伏集电线名称	逆变器名称	逆变器类型	额定容量	是否样板机	有功功率	无功功率	电压	电流	功率因数	当日发电量	累计发电量	是否组串式逆变器	运行状态
+#foreach( $nbq in $vList )
+# ${velocityCount} ${nbq.czmc} ${nbq.CollectorCircuit} ${nbq.name} ${nbq.modelNumber} ${nbq.RatedCapacity} ${nbq.sample} ${nbq.NbqActivePower} ${nbq.NbqReActivePower} ${nbq.Voltage} ${nbq.GalvanicCurrent} ${nbq.PowerFactor} ${nbq.NbqDailyOutPut} ${nbq.GeneratingCap} ${nbq.IsString} ${nbq.status}
+#end
+</FANDATA::${sign}>

ipfcst-console/src/test/resources/vms/E63/QXZ.vm

@@ -0,0 +1,15 @@
+// ${currentTime}
+<! Entity=${sign}  type=QX  time='${uploadTime}' !>
+
+<MastData::${sign}>
+@id	属性项	数值
+#1	GlobalR	${GlobalR}
+#2	DirectR	${DirectR}
+#3	DiffuseR	${DiffuseR}
+#4	AirT	${AirT}
+#5	CellT	${CellT}
+#6	WS	${WS}
+#7	WD	${WD}
+#8	P	${P}
+#9	RH	${RH}
+</MastData::${sign}>

ipfcst-console/src/test/resources/vms/E63/SCF.vm

@@ -0,0 +1,6 @@
+// ${currentTime}
+<! Entity=${sign} type=SC time='${uploadTime}' !>
+<MastData::${sign}>
+@id 属性项 数值
+#1 SC ${value}
+</MastData::${sign}>

ipfcst-console/src/test/resources/vms/E63/SCG.vm

@@ -0,0 +1,6 @@
+// ${currentTime}
+<! Entity=${sign}  type=SC  time='${uploadTime}' !>
+<MastData::${sign}>
+@id  属性项   数值
+#1    SC     ${value}
+</MastData::${sign}>

ipfcst-console/src/test/resources/vms/E63/THEROY.vm

@@ -0,0 +1,8 @@
+// ${currentTime}
+<! Entity=${sign} type=THEROY time='${uploadTime}' !>
+
+<THEROY::${sign}>
+@id  描述 理论功率值
+#1 样板机法   ${ableValueAfter}
+#2 辐照仪法   ${theoryValueAfter}
+</THEROY::${sign}>

ipfcst-console/src/test/resources/vms/E63/THEROY_F.vm

@@ -0,0 +1,10 @@
+// ${currentTime}
+<! Entity=${sign}  type=THEROY  time='${uploadTime}' !>
+
+<THEROY::${sign}>
+@id  描述 理论功率值
+#1 样板机法   ${referencePowerBySampleAfter}
+#2 测风法   ${referencePowerByMeasuringAfter}
+#3 机头风速(所有风机)   ${theoryValueAfter}
+#4 机头风速(除检修的风机外)   ${ableValueAfter}
+</THEROY::${sign}>