controller,当月每日发电量,日购网电量,日上网电量

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

@@ -0,0 +1,43 @@
+package com.gyee.gaia.meter.controller;
+
+import com.gyee.gaia.meter.entity.vo.MeterInfoVO;
+import com.gyee.gaia.meter.entity.vo.Result;
+import com.gyee.gaia.meter.service.meterinfo.GetWindStationInfo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 21
+ **/
+@RestController
+@RequestMapping("/meter")
+public class MeterController {
+    @Resource
+    GetWindStationInfo getWindStationInfo;
+
+
+
+    @GetMapping("/fc")
+    public List<MeterInfoVO> getMeterInfoFDC() {
+        //查询返回当月日发电量,上网电量,购网电量
+        return getWindStationInfo.getMeterInfoFDC();
+
+    }
+
+    @GetMapping("/fdc")
+    public Result<List<MeterInfoVO>> getMeterInfoFDCAll1() {
+        //查询返回当月日发电量,上网电量,购网电量
+        List<MeterInfoVO> meterInfoFDC = getWindStationInfo.getMeterInfoFDC();
+        return new Result<>(200, "获取数据成功!", meterInfoFDC);
+
+    }
+
+
+
+
+}

electricity/meter/src/main/java/com/gyee/gaia/meter/entity/vo/MeterInfoVO.java

@@ -0,0 +1,25 @@
+package com.gyee.gaia.meter.entity.vo;
+
+import cn.hutool.core.date.DateTime;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 22
+ **/
+@Data
+public class MeterInfoVO {
+    public DateTime date;
+    public String timestr;
+    //    public BigDecimal rfdl;
+//    public BigDecimal rswdl;
+//    public BigDecimal rgwdl;
+    public BigDecimal value1;
+    public BigDecimal value2;
+    public BigDecimal value3;
+    public BigDecimal speed;
+
+
+}

electricity/meter/src/main/java/com/gyee/gaia/meter/entity/vo/Result.java

@@ -0,0 +1,32 @@
+package com.gyee.gaia.meter.entity.vo;
+
+import lombok.Data;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 22
+ **/
+@Data
+public class Result<T> {
+    private int code;
+    private String message;
+    private T data;
+
+    public Result(int code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public T getData() {
+        return data;
+    }
+}

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

@@ -13,4 +13,5 @@ import com.gyee.gaia.meter.entity.MeterInfoCalculating;
  */
 public interface IMeterInfoCalculatingService extends IService<MeterInfoCalculating> {
 
+
 }

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

@@ -32,13 +32,6 @@ public class SaveMeterInfoHistoryMonthYearTest {
     MeterPointServiceImpl meterPointService;
     @Resource
     MeterInfoBottomcodeServiceImpl meterInfoBottomcodeService;
-    @Resource
-    LineServiceImpl lineService;
-    @Resource
-    ProjectServiceImpl projectService;
-    @Resource
-    PowerStationServiceImpl powerStationService;
-
 
     @Value("${start.time}")
     private String startTimeString;
@@ -638,7 +631,7 @@ public class SaveMeterInfoHistoryMonthYearTest {
         LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
         LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
         long between = ChronoUnit.DAYS.between(day1, day2);
-        System.out.println("相差天数:"+between);
+        System.out.println("相差天数:" + between);
 
 
         DateTime dateTime1 = DateTime.of(0);
@@ -1113,12 +1106,14 @@ public class SaveMeterInfoHistoryMonthYearTest {
 
 
         DateTime dateTime1 = DateTime.of(0);
-        double monthValue = 0.0;
+
+
 
 
         for (int i = 0; i <= between; i++) {
+            double monthValue = 0.0;
             //开始时间00:00:00
-            dateTime1 = DateUtil.offsetMonth(startDateTime, i);
+            dateTime1 = DateUtil.offsetDay(startDateTime, i);
 
             //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路项目期次侧)
             List<MeterInfoCalculating> meterInfoCalculatingDay = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).like("code", "%_SWDL_P0"));
@@ -1128,25 +1123,25 @@ public class SaveMeterInfoHistoryMonthYearTest {
                     monthValue = monthValue + meterInfoCalculating.getValue().doubleValue();
                 }
             }
-        }
 
 
-        // 将每个场站的每个月的value值存入到MeterInfoCalculating
-        MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
-        meterInfoCalculating.setName(meterPoint.getName());
-        meterInfoCalculating.setCode(meterPoint.getNemCode());
-        //LocalDateTime只显示年月(实际为每月的1号00:00:00)
-        meterInfoCalculating.setDate(dateTime1.toLocalDateTime().withDayOfMonth(1).withNano(0).withSecond(0).withMinute(0).withHour(0));
-        meterInfoCalculating.setValue(BigDecimal.valueOf(monthValue));
-        meterInfoCalculating.setUpdateTime(LocalDateTime.now());
+            // 将每个场站的每个月的value值存入到MeterInfoCalculating
+            MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
+            meterInfoCalculating.setName(meterPoint.getName());
+            meterInfoCalculating.setCode(meterPoint.getNemCode());
+            //LocalDateTime只显示年月(实际为每月的1号00:00:00)
+            meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
+            meterInfoCalculating.setValue(BigDecimal.valueOf(monthValue));
+            meterInfoCalculating.setUpdateTime(LocalDateTime.now());
 
-        QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", dateTime1.toLocalDateTime().withDayOfMonth(1).withNano(0).withSecond(0).withMinute(0).withHour(0));
-        List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
-        if (list.size() > 0) {
-            meterInfoCalculating.update(queryWrapper);
-        } else {
-            meterInfoCalculating.insert();
+            QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", dateTime1.toLocalDateTime());
+            List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
+            if (list.size() > 0) {
+                meterInfoCalculating.update(queryWrapper);
+            } else {
+                meterInfoCalculating.insert();
+            }
         }
 
     }
@@ -1265,6 +1260,72 @@ public class SaveMeterInfoHistoryMonthYearTest {
     }
 
 
+
+
+
+    @Test
+    void saveWindStationGwdl_Day() {
+
+        MeterPoint meterPoint = meterPointService.getOne(new QueryWrapper<MeterPoint>().eq("property", "JSD_FCGWDL_DAY"));
+        //设置取值开始时间
+        String startString = startTimeString;
+        DateTime startDateTime0 = DateUtil.parse(startString);
+        DateTime startDateTime = DateUtil.beginOfMonth(startDateTime0);
+
+        //设置取值结束时间
+        String endDateString = endTimeString;
+        DateTime endDateTime = DateUtil.parse(endDateString);
+//        DateTime endDateTime = DateUtil.endOfMonth(startDateTime0);
+
+        //开始日期到结束日期的天数
+        LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+        LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+        long between = ChronoUnit.DAYS.between(day1, day2);
+
+        //2,meterPointJSD_YFDLList
+
+
+        DateTime dateTime1 = DateTime.of(0);
+
+
+
+        for (int i = 0; i <= between; i++) {
+            double monthValue = 0.0;
+            //开始时间00:00:00
+            dateTime1 = DateUtil.offsetDay(startDateTime, i);
+
+            //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路项目期次侧)
+            List<MeterInfoCalculating> meterInfoCalculatingDay = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).like("code", "%_GWDL_P0"));
+            //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
+            if (meterInfoCalculatingDay.size() > 0) {
+                for (MeterInfoCalculating meterInfoCalculating : meterInfoCalculatingDay) {
+                    monthValue = monthValue + meterInfoCalculating.getValue().doubleValue();
+                }
+            }
+
+
+            // 将每个场站的每个月的value值存入到MeterInfoCalculating
+            MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
+            meterInfoCalculating.setName(meterPoint.getName());
+            meterInfoCalculating.setCode(meterPoint.getNemCode());
+            //LocalDateTime只显示年月(实际为每月的1号00:00:00)
+            meterInfoCalculating.setDate(dateTime1.toLocalDateTime());
+            meterInfoCalculating.setValue(BigDecimal.valueOf(monthValue));
+            meterInfoCalculating.setUpdateTime(LocalDateTime.now());
+
+            QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", dateTime1.toLocalDateTime());
+            List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
+            if (list.size() > 0) {
+                meterInfoCalculating.update(queryWrapper);
+            } else {
+                meterInfoCalculating.insert();
+            }
+        }
+
+    }
+
+
     @Test
     void sum() {
         this.saveLineFdl_Month();
@@ -1291,6 +1352,9 @@ public class SaveMeterInfoHistoryMonthYearTest {
         this.saveWindStationSwdl_Year();
 
 
+        this.saveWindStationGwdl_Day();
+
+
     }
 }
 

electricity/meter/src/main/java/com/gyee/gaia/meter/service/impl/MeterInfoCalculatingServiceImpl.java

@@ -10,4 +10,5 @@ import org.springframework.stereotype.Service;
 @Service
 public class MeterInfoCalculatingServiceImpl extends ServiceImpl<MeterInfoCalculatingMapper, MeterInfoCalculating> implements IMeterInfoCalculatingService {
 
+
 }

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterinfo/GetWindStationInfo.java

@@ -0,0 +1,79 @@
+package com.gyee.gaia.meter.service.meterinfo;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gaia.meter.entity.MeterInfoCalculating;
+import com.gyee.gaia.meter.entity.vo.MeterInfoVO;
+import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 22
+ **/
+
+@Service
+public class GetWindStationInfo {
+    @Resource
+    MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
+
+    //查询当月天数,返回当月每天的数据,日发电量,日上网电量,日购网电量
+
+    public List<MeterInfoVO> getMeterInfoFDC() {
+
+        //当前时间
+        DateTime now = DateTime.now();
+        //当月开始时间
+        DateTime beginOfMonth = DateUtil.beginOfMonth(now);
+        //当月天数
+        int days = DateUtil.dayOfMonth(now);
+
+        //创建一个MeterInfoVO的list集合
+        List<MeterInfoVO> list = new ArrayList<>();
+
+        //循环遍历每一天,取每天的数据
+        for (int i = 1; i <= days; i++) {
+            //开始时间
+            DateTime dateTime1 = DateUtil.offsetDay(beginOfMonth, i - 1);
+
+            //根据时间和code查询风场日发电量,日上网电量
+            MeterInfoCalculating oneFDL = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("code", "DL.NX_GD_WINDSTATIONFDL_DAY").eq("date", dateTime1));
+            MeterInfoCalculating oneSWDL = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("code", "DL.NX_GD_WINDSTATIONSWDL_DAY").eq("date", dateTime1));
+            MeterInfoCalculating oneGWDL = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("code", "DL.NX_GD_WINDSTATIONGWDL_DAY").eq("date", dateTime1));
+
+            BigDecimal rfdl = BigDecimal.valueOf(0);
+            BigDecimal rswdl = BigDecimal.valueOf(0);
+            BigDecimal rgwdl = BigDecimal.valueOf(0);
+            BigDecimal speed = BigDecimal.valueOf(0);
+
+            if (oneFDL != null) {
+                rfdl = oneFDL.getValue();
+            }
+            if (oneSWDL != null) {
+                rswdl = oneSWDL.getValue();
+            }
+            if (oneSWDL != null) {
+                rgwdl = oneGWDL.getValue();
+            }
+
+            MeterInfoVO meterInfoVO = new MeterInfoVO();
+            meterInfoVO.setTimestr(String.valueOf(i));
+            meterInfoVO.setDate(dateTime1);
+            meterInfoVO.setValue1(rfdl);
+            meterInfoVO.setValue2(rswdl);
+            meterInfoVO.setValue3(rgwdl);
+            meterInfoVO.setSpeed(speed);
+
+            list.add(meterInfoVO);
+
+        }
+
+        return list;
+    }
+}

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterinfo/SaveFDL_Day_Month_Year.java

@@ -132,154 +132,6 @@ public class SaveFDL_Day_Month_Year {
                 }
             }
 
-
-//            if (meterPoint.getNemCode().endsWith("_L1_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).like("code", "%_LINEFDL_L1_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L2_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l2_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L3_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l3_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L4_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l4_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L5_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l5_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L6_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l6_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L7_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l7_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L8_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l8_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L9_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l9_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L10_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l10_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            } else if (meterPoint.getNemCode().endsWith("_L11_YEAR")) {
-//                for (int i = 0; i <= between; i++) {
-//                    //开始时间00:00:01
-//                    dateTime1 = DateUtil.offsetMonth(startDateTime, i);
-//
-//                    //根据每个场站的id,dateTime1,和集电线路总发电量的code拿到产站日发电量(集电线路期次)
-//                    MeterInfoCalculating meterInfoCalculating = meterInfoCalculatingService.getOne(new QueryWrapper<MeterInfoCalculating>().eq("date", dateTime1.toLocalDateTime()).eq("code", "%_LINEFDL_l11_MONTH"));
-//
-//                    //MeterInfoCalculating,拿到每个记录的value值并累加到monthValue
-//                    if (meterInfoCalculating != null) {
-//                        yearValue = yearValue + meterInfoCalculating.getValue().doubleValue();
-//                    }
-//                }
-//            }
-
-
-            // 将每个场站的每个月的value值存入到MeterInfoCalculating
             MeterInfoCalculating meterInfoCalculating = new MeterInfoCalculating();
             meterInfoCalculating.setName(meterPoint.getName());
             meterInfoCalculating.setCode(meterPoint.getNemCode());

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterinfo/SaveSWDL_Day_Month_Year.java

@@ -352,12 +352,12 @@ public class SaveSWDL_Day_Month_Year {
         meterInfoCalculating.setName(meterPoint.getName());
         meterInfoCalculating.setCode(meterPoint.getNemCode());
         //LocalDateTime只显示年月(实际为每月的1号00:00:00)
-        meterInfoCalculating.setDate(startDateTime.toLocalDateTime().withDayOfMonth(1).withNano(0).withSecond(0).withMinute(0).withHour(0));
+        meterInfoCalculating.setDate(startDateTime.toLocalDateTime());
         meterInfoCalculating.setValue(BigDecimal.valueOf(monthValue));
         meterInfoCalculating.setUpdateTime(LocalDateTime.now());
 
         QueryWrapper<MeterInfoCalculating> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", startDateTime.toLocalDateTime().withDayOfMonth(1).withNano(0).withSecond(0).withMinute(0).withHour(0));
+        queryWrapper.eq("code", meterPoint.getNemCode()).eq("date", startDateTime.toLocalDateTime());
         List<MeterInfoCalculating> list = meterInfoCalculatingService.list(queryWrapper);
         if (list.size() > 0) {
             meterInfoCalculating.update(queryWrapper);

electricity/meter/src/main/resources/application.properties

@@ -8,7 +8,7 @@ adapter.url=http://192.168.1.67:8011/ts
 #动态配置开始日期
 start.time=2023-05-01
 #动态配置结束日期
-end.time=2023-05-01
+end.time=2023-05-22
 
 meter.stations=MHS_FDC,NSS_FDC