sis首页完善

electricity/meter/src/main/java/com/gyee/gaia/meter/controller/MeterController.java

@@ -42,7 +42,7 @@ public class MeterController {
         if ("0".equals(id)) {
             //所有光伏+风电
 
-            // 查询返回所有当月每日的, 日发电量.上网电量.购网电量(暂无).风速(暂无),前端为日发电量图表
+            // 查询返回所有光伏+风电当月每日的, 日发电量.上网电量.购网电量(暂无).风速(暂无),前端为日发电量图表
             List<MeterVO> meterInfoFDC = getWindStationInfo.getMeterInfo_FDC_GDC_Day();
 
             //查询返所有, 日发电量,月发电量,月利用小时,年发电量,年利用小时,日上网电量,装机容量
@@ -60,7 +60,7 @@ public class MeterController {
             // 查询返回所有光伏当月每日的, 日发电量.上网电量.购网电量(暂无).风速(暂无),前端为日发电量图表
             List<MeterVO> meterInfoFDC = getWindStationInfo.getMeterInfoGDC_Day();
 
-            //查询返光伏, 日发电量,月发电量,月利用小时,年发电量,年利用小时,日上网电量,装机容量
+            //查询返回光伏, 日发电量,月发电量,月利用小时,年发电量,年利用小时,日上网电量,装机容量
             MeterVO meterInfoFDCFDLDayMonthYear = getWindStationInfo.getMeterInfoGDCFDL_DayMonthYear();
 
             HashMap<Object, Object> map = new HashMap<>();
@@ -110,10 +110,10 @@ public class MeterController {
             return new Result<>(200, "获取数据成功!", map);
 
         } else if (id.contains("_GC")) {
-            // 查询返回各个期次当月每日的, 日发电量.上网电量.购网电量.风速(暂无),前端为日发电量图表
+            // 查询返回风场各个期次当月每日的, 日发电量.上网电量.购网电量.风速(暂无),前端为日发电量图表
             List<MeterVO> meterInfoFDC = getProjectInfoById.getMeterInfoFDC_Day(id);
 
-            //查询返各个期次总, 日发电量,月发电量,年发电量,日上网电量,装机容量
+            //查询返回风场各个期次总, 日发电量,月发电量,年发电量,日上网电量,装机容量
             MeterVO meterInfoFDCFDLDayMonthYear = getProjectInfoById.getMeterInfoFDCFDL_DayMonthYear(id);
 
             HashMap<Object, Object> map = new HashMap<>();
@@ -122,10 +122,10 @@ public class MeterController {
             return new Result<>(200, "获取数据成功!", map);
 
         } else if (id.contains("_XL")) {
-            // 查询返回各个线路当月每日的, 日发电量.风速(暂无),前端为日发电量图表
+            // 查询返回风场各个线路当月每日的, 日发电量.风速(暂无),前端为日发电量图表
             List<MeterVO> meterInfoFDC = getLineInfoById.getMeterInfoFDC_Day(id);
 
-            //查询返各个线路总, 日发电量,月发电量,年发电量,装机容量
+            //查询返回风场各个线路总, 日发电量,月发电量,年发电量,装机容量
             MeterVO meterInfoFDCFDLDayMonthYear = getLineInfoById.getMeterInfoFDCFDL_DayMonthYear(id);
 
             HashMap<Object, Object> map = new HashMap<>();
@@ -138,7 +138,9 @@ public class MeterController {
         }
     }
 
-
+    /**
+     * @return sisView页面展示数据
+     */
     @GetMapping("/sisView")
     public Result<Object> getView() {
         SisViewVO view = getView.getView();

electricity/meter/src/main/java/com/gyee/gaia/meter/job/MeterJob.java

@@ -37,19 +37,15 @@ public class MeterJob {
         saveEquipmentFDL.saveEquipmentRfdl();
         //期次风机发电量(14个期次)
         saveEquipmentFDL.saveCalculatingFJFDL();
-
         //底码表数据,起始底码,截止底码,日电量
         saveBottomcode.saveBottomCode();
-
         //计算有公式的发电量,场用电量等(由于后面数据需要用前面算出来的数,所以执行3-4次)
         saveCalculating.saveCalculating();
         saveCalculating.saveCalculating();
         saveCalculating.saveCalculating();
         saveCalculating.saveCalculating();
-
         //风机日月年发电量
         saveFDLDayMonthYear.sum();
-
         //风机日月年上网电量
         saveSWDLDayMonthYear.sum();
 
@@ -65,21 +61,17 @@ public class MeterJob {
     @XxlJob("MeterJob_GF")
     void meterJob_GF() {
 
-        //设备日发电量(407台风机)
+        //设备日发电量(383台逆变器)
         saveEquipmentFDL.saveEquipmentRfdl_GF();
-        //期次风机发电量(14个期次)
+        //场站逆变器发电量
         saveEquipmentFDL.saveCalculatingNBQFDL();
-
         //底码表数据,起始底码,截止底码,日电量
         saveBottomcode.saveBottomCode_GF();
-
+        //计算点
         saveCalculating.saveCalculating_GF();
-
-
-        //风机日月年发电量
+        //光伏日月年发电量
         saveFDLDayMonthYear.sum_GF();
-
-        //风机日月年上网电量
+        //光伏日月年上网电量
         saveSWDLDayMonthYear.sum_GF();
 
     }
@@ -91,25 +83,20 @@ public class MeterJob {
     }
 
 
-
     @XxlJob("MeterJob_GF_FD")
     void meterJob_GF_FD() {
 
-        //设备日发电量(光伏)
+        //设备日发电量(383逆变器)
         saveEquipmentFDL.saveEquipmentRfdl_GF();
-        //期次风机发电量(14个期次)
+        //场站逆变器发电量
         saveEquipmentFDL.saveCalculatingNBQFDL();
-
         //底码表数据,起始底码,截止底码,日电量
         saveBottomcode.saveBottomCode_GF();
-
+        //计算点
         saveCalculating.saveCalculating_GF();
-
-
-        //风机日月年发电量
+        //光伏日月年发电量
         saveFDLDayMonthYear.sum_GF();
-
-        //风机日月年上网电量
+        //光伏日月年上网电量
         saveSWDLDayMonthYear.sum_GF();
 
 
@@ -117,34 +104,26 @@ public class MeterJob {
         saveEquipmentFDL.saveEquipmentRfdl();
         //期次风机发电量(14个期次)
         saveEquipmentFDL.saveCalculatingFJFDL();
-
         //底码表数据,起始底码,截止底码,日电量
         saveBottomcode.saveBottomCode();
-
         //计算有公式的发电量,场用电量等(由于后面数据需要用前面算出来的数,所以执行3-4次)
         saveCalculating.saveCalculating();
         saveCalculating.saveCalculating();
         saveCalculating.saveCalculating();
         saveCalculating.saveCalculating();
-
         //风机日月年发电量
         saveFDLDayMonthYear.sum();
-
         //风机日月年上网电量
         saveSWDLDayMonthYear.sum();
-
     }
 
     @XxlJob("SaveMeterInfoYesterday_GF_FD")
     void meterJob_GF_FD_Yesterday() {
-
         saveMeterInfoYesterday.saveMeterInfoYesterday_GF();
         saveMeterInfoYesterday.saveMeterInfoYesterday_FD();
-
     }
 
 
-
     @XxlJob("saveLineFDL_15Min")
     void saveLineFDL_15Min(){
         saveLineFDL_15Min.saveLineFDL_15Min();

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meter/GetPowerStationInfoById.java

@@ -174,11 +174,11 @@ public class GetPowerStationInfoById {
 
             //根据时间和code查询光场日发电量,日上网电量
             MeterInfoCalculating oneFDL = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>()
-                    .likeLeft("code", "_GFJDXLFDL_P0")
+                    .likeLeft("code", "_GFJDXLFDL_PO")
                     .eq("date", dateTime1)
                     .eq("windpowerstation_id", nemCode));
             MeterInfoCalculating oneSWDL= meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>()
-                    .likeLeft("code", "_GFSWDL_P0")
+                    .likeLeft("code", "_GFSWDL_PO")
                     .eq("date", dateTime1)
                     .eq("windpowerstation_id", nemCode));
 
@@ -229,13 +229,13 @@ public class GetPowerStationInfoById {
 
         //根据时间场站ID和code查询各个光场日发电量,月发电量,年发电量,日上网电量
         MeterInfoCalculating dayFDL = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>()
-                .likeLeft("code", "_GFJDXLFDL_P0")
+                .likeLeft("code", "_GFJDXLFDL_PO")
                 .eq("date", beginOfDay)
                 .eq("windpowerstation_id", nemCode));
         MeterInfoCalculating monthFDL = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().like("code", "%_POWERSTATIONFDL_MONTH").eq("date", beginOfMonth).eq("windpowerstation_id", nemCode));
         MeterInfoCalculating yearFDL = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().like("code", "%_POWERSTATIONFDL_YEAR").eq("date", beginOfYear).eq("windpowerstation_id", nemCode));
         MeterInfoCalculating oneSWDL= meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>()
-                .likeLeft("code", "_GFSWDL_P0")
+                .likeLeft("code", "_GFSWDL_PO")
                 .eq("date", beginOfDay)
                 .eq("windpowerstation_id", nemCode));
 

electricity/meter/src/main/java/com/gyee/gaia/meter/service/saveHistory/SaveLineFDL15Min.java

@@ -60,7 +60,7 @@ class SaveLineFDL15Min {
                 .like("nem_code", "_FDC_"));
 
         for (PowerStation powerStation : powerStationList) {
-            //2,根据场站ID得到场站下所有测点
+            //2,根据场站ID,测点类型property=CD,一级分类,二级分类拿到集电线路发电量的测点
             List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>()
                     .eq("windpowerstation_id", powerStation.getId())
                     .eq("property", "CD")

electricity/meter/src/main/java/com/gyee/gaia/meter/service/saveHistory/SaveLineFDL15MinTest.java

@@ -54,7 +54,7 @@ class SaveLineFDL15MinTest {
                 .like("nem_code", "_FDC_"));
 
         for (PowerStation powerStation : powerStationList) {
-            //2,根据场站ID得到场站下所有测点
+            //2,根据场站ID,测点类型得到集电线路发电量的测点
             List<MeterPoint> meterPointList = meterPointService.list(new QueryWrapper<MeterPoint>()
                     .eq("windpowerstation_id", powerStation.getId())
                     .eq("property", "CD")

electricity/meter/src/main/java/com/gyee/gaia/meter/service/saveTDengine/TDSaveLineFDL15MinTest.java

@@ -43,9 +43,11 @@ class TDSaveLineFDL15MinTest {
     void TDSaveSaveLineFDL15Min() {
 
         //Service层拼接字符串
+
 //        tdLineFDL15MinService.saveBatch();
 
         //mapper@insert
+
 //        tdLineFDL15MinMapper.insertLineFDL15Min("MHSDJL_NX_GD_MHSF_DD_P1_L1_001_ZXYG044","场站","期次","名称",new Date().getTime(),444);