Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/gaia

electricity/meter/src/main/java/com/gyee/gaia/meter/adapter/Adapter.java

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Author: malijun
+ * Author: ma
  * Data  : 2023: 04: 27
  **/
 @FeignClient(name = "adapter", url = "${adapter.url}")

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

@@ -1,11 +1,11 @@
 package com.gyee.gaia.meter.controller;
 
-import com.gyee.gaia.meter.entity.vo.MeterInfoVO;
+import com.gyee.gaia.meter.entity.vo.MeterVO;
 import com.gyee.gaia.meter.entity.vo.Result;
-import com.gyee.gaia.meter.service.meterinfo.GetLineInfoById;
-import com.gyee.gaia.meter.service.meterinfo.GetPowerStationInfoById;
-import com.gyee.gaia.meter.service.meterinfo.GetProjectInfoById;
-import com.gyee.gaia.meter.service.meterinfo.GetWindStationInfo;
+import com.gyee.gaia.meter.service.meter.GetLineInfoById;
+import com.gyee.gaia.meter.service.meter.GetPowerStationInfoById;
+import com.gyee.gaia.meter.service.meter.GetProjectInfoById;
+import com.gyee.gaia.meter.service.meter.GetWindStationInfo;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +21,7 @@ import java.util.List;
  **/
 @RestController
 @CrossOrigin(origins = "*")
-@RequestMapping("/meterinfo")
+@RequestMapping("/meterinfo1")
 public class MeterController {
     @Resource
     GetWindStationInfo getWindStationInfo;
@@ -39,10 +39,10 @@ public class MeterController {
         //所有风场,-1
         if ("-1".equals(id)) {
             // 查询返回所有风场当月每日的, 日发电量.上网电量.购网电量.风速(暂无),前端为日发电量图表
-            List<MeterInfoVO> meterInfoFDC = getWindStationInfo.getMeterInfoFDC_Day();
+            List<MeterVO> meterInfoFDC = getWindStationInfo.getMeterInfoFDC_Day();
 
             //查询返所有风场总, 日发电量,月发电量,年发电量,日上网电量,装机容量
-            MeterInfoVO meterInfoFDCFDLDayMonthYear = getWindStationInfo.getMeterInfoFDCFDL_DayMonthYear();
+            MeterVO meterInfoFDCFDLDayMonthYear = getWindStationInfo.getMeterInfoFDCFDL_DayMonthYear();
 
             HashMap<Object, Object> map = new HashMap<>();
             map.put("rdlmap", meterInfoFDC);
@@ -52,10 +52,10 @@ public class MeterController {
         } else if (id.contains("_FDC")) {
 
             // 查询返回各个风场当月每日的, 日发电量.上网电量.购网电量.风速(暂无),前端为日发电量图表
-            List<MeterInfoVO> meterInfoFDC = getPowerStationInfo.getMeterInfoFDC_Day(id);
+            List<MeterVO> meterInfoFDC = getPowerStationInfo.getMeterInfoFDC_Day(id);
 
             //查询返各个风场总, 日发电量,月发电量,年发电量,日上网电量,装机容量
-            MeterInfoVO meterInfoFDCFDLDayMonthYear = getPowerStationInfo.getMeterInfoFDCFDL_DayMonthYear(id);
+            MeterVO meterInfoFDCFDLDayMonthYear = getPowerStationInfo.getMeterInfoFDCFDL_DayMonthYear(id);
 
             HashMap<Object, Object> map = new HashMap<>();
             map.put("rdlmap", meterInfoFDC);
@@ -64,10 +64,10 @@ public class MeterController {
 
         } else if (id.contains("_GC")) {
             // 查询返回各个期次当月每日的, 日发电量.上网电量.购网电量.风速(暂无),前端为日发电量图表
-            List<MeterInfoVO> meterInfoFDC = getProjectInfoById.getMeterInfoFDC_Day(id);
+            List<MeterVO> meterInfoFDC = getProjectInfoById.getMeterInfoFDC_Day(id);
 
             //查询返各个期次总, 日发电量,月发电量,年发电量,日上网电量,装机容量
-            MeterInfoVO meterInfoFDCFDLDayMonthYear = getProjectInfoById.getMeterInfoFDCFDL_DayMonthYear(id);
+            MeterVO meterInfoFDCFDLDayMonthYear = getProjectInfoById.getMeterInfoFDCFDL_DayMonthYear(id);
 
             HashMap<Object, Object> map = new HashMap<>();
             map.put("rdlmap", meterInfoFDC);
@@ -76,10 +76,10 @@ public class MeterController {
 
         } else if (id.contains("_XL")) {
             // 查询返回各个线路当月每日的, 日发电量.风速(暂无),前端为日发电量图表
-            List<MeterInfoVO> meterInfoFDC = getLineInfoById.getMeterInfoFDC_Day(id);
+            List<MeterVO> meterInfoFDC = getLineInfoById.getMeterInfoFDC_Day(id);
 
             //查询返各个线路总, 日发电量,月发电量,年发电量,装机容量
-            MeterInfoVO meterInfoFDCFDLDayMonthYear = getLineInfoById.getMeterInfoFDCFDL_DayMonthYear(id);
+            MeterVO meterInfoFDCFDLDayMonthYear = getLineInfoById.getMeterInfoFDCFDL_DayMonthYear(id);
 
             HashMap<Object, Object> map = new HashMap<>();
             map.put("rdlmap", meterInfoFDC);

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

@@ -0,0 +1,143 @@
+package com.gyee.gaia.meter.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gaia.meter.entity.PowerStation;
+import com.gyee.gaia.meter.entity.vo.MeterInfoVo;
+import com.gyee.gaia.meter.entity.vo.Result;
+import com.gyee.gaia.meter.service.impl.PowerStationServiceImpl;
+import com.gyee.gaia.meter.service.meterInfo.GetMeterInfo;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 24
+ **/
+@RestController
+@CrossOrigin(origins = "*")
+public class MeterInfoController {
+
+    @Resource
+    GetMeterInfo getMeterInfo;
+    @Resource
+    PowerStationServiceImpl powerStationService;
+
+
+    @GetMapping("/meter/infoall")
+    public Result<Object> getPowerstation() {
+        List<PowerStation> powerStations = powerStationService.list(new QueryWrapper<PowerStation>().eq("wind_type", "-1"));
+
+        ArrayList<MeterInfoVo> meterInfoVos = new ArrayList<>();
+        for (PowerStation powerStation: powerStations ) {
+            MeterInfoVo meterInfoVo = new MeterInfoVo();
+            meterInfoVo.setName(powerStation.getName());
+            meterInfoVo.setNemCode(powerStation.getNemCode());
+            meterInfoVos.add(meterInfoVo);
+        }
+
+        Map<String, Object> response = new HashMap<>();
+        response.put("fdc", meterInfoVos);
+
+        return new Result<>(200, "成功", response);
+
+    }
+
+
+    @GetMapping("/meterinfo/bottom")
+    public Result<Object> getBottomInfo(
+            @RequestParam(required = false) String windId,
+            @RequestParam(required = false) long startTime,
+            @RequestParam(required = false) long endTime,
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "25") int perPage
+    ) {
+        ArrayList<MeterInfoVo> meterInfoByWindIdList = getMeterInfo.getBottomInfoByWindId(windId, startTime, endTime);
+        // 进行分页处理
+        int totalItems = meterInfoByWindIdList.size();
+        int startIndex = (page - 1) * perPage;
+        int endIndex = Math.min(startIndex + perPage, totalItems);
+
+        List<MeterInfoVo> paginatedList = meterInfoByWindIdList.subList(startIndex, endIndex);
+
+        // 构建响应
+        Map<String, Object> response = new HashMap<>();
+        response.put("bottom", paginatedList);
+        response.put("totalItems", totalItems);
+        response.put("page", page);
+        response.put("perPage", perPage);
+        return new Result<>(200, "成功", response);
+
+    }
+
+
+
+    @GetMapping("/meterinfo/equipment")
+    public Result<Object> getEquipmentInfo(
+            @RequestParam(required = false) String windId,
+            @RequestParam(required = false) String startTime,
+            @RequestParam(required = false) String endTime,
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "25") int perPage
+    ) {
+        ArrayList<MeterInfoVo> meterInfoByWindIdList = getMeterInfo.getEquipmentInfoByWindId(windId, startTime, endTime);
+
+        // 进行排序
+        meterInfoByWindIdList.sort(Comparator.comparing(MeterInfoVo::getName));
+
+        // 进行分页处理
+        int totalItems = meterInfoByWindIdList.size();
+        int startIndex = (page - 1) * perPage;
+        int endIndex = Math.min(startIndex + perPage, totalItems);
+
+        List<MeterInfoVo> paginatedList = meterInfoByWindIdList.subList(startIndex, endIndex);
+
+        // 构建响应
+        Map<String, Object> response = new HashMap<>();
+        response.put("equipment", paginatedList);
+        response.put("totalItems", totalItems);
+        response.put("page", page);
+        response.put("perPage", perPage);
+        return new Result<>(200, "成功", response);
+
+    }
+
+
+    @GetMapping("/meterinfo/calculating")
+    public Result<Object> getCalculatingInfo(
+            @RequestParam(required = false) String windId,
+            @RequestParam(required = false) String startTime,
+            @RequestParam(required = false) String endTime,
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "25") int perPage
+    ) {
+        ArrayList<MeterInfoVo> meterInfoByWindIdList = getMeterInfo.getCalculatingInfoByWindId(windId, startTime, endTime);
+
+        // 进行排序
+        meterInfoByWindIdList.sort(Comparator.comparing(MeterInfoVo::getName));
+
+        // 进行分页处理
+        int totalItems = meterInfoByWindIdList.size();
+        int startIndex = (page - 1) * perPage;
+        int endIndex = Math.min(startIndex + perPage, totalItems);
+
+        List<MeterInfoVo> paginatedList = meterInfoByWindIdList.subList(startIndex, endIndex);
+
+        // 构建响应
+        Map<String, Object> response = new HashMap<>();
+        response.put("calculating", paginatedList);
+        response.put("totalItems", totalItems);
+        response.put("page", page);
+        response.put("perPage", perPage);
+        return new Result<>(200, "成功", response);
+
+    }
+
+
+
+
+}

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

@@ -0,0 +1,23 @@
+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: 24
+ **/
+@Data
+public class MeterInfoVo {
+
+    private String name;
+    private String nemCode;
+    private DateTime date;
+    private BigDecimal startCode;
+    private BigDecimal endCode;
+    private BigDecimal rdl;
+
+
+}

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

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
  * Data  : 2023: 05: 22
  **/
 @Data
-public class MeterInfoVO {
+public class MeterVO {
     public DateTime date;
     public String timestr;
     //    public BigDecimal rfdl;
@@ -27,11 +27,15 @@ public class MeterInfoVO {
     public BigDecimal speed;
 
     //总风场日发电量
-    public BigDecimal dayFDL;
+    public BigDecimal rfdl;
     //总风场月发电量
-    public BigDecimal monthFDL;
+    public BigDecimal yfdl;
     //总风场年发电量
-    public BigDecimal yearFDL;
+    public BigDecimal nfdl;
+
+    public BigDecimal swdl;
+
+
 
     //装机容量
     public BigDecimal zjrl;

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.meter.job;
 
-import com.gyee.gaia.meter.service.meterinfo.*;
+import com.gyee.gaia.meter.service.meter.*;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
 

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

@@ -0,0 +1,94 @@
+package com.gyee.gaia.meter.service;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.gyee.gaia.meter.adapter.Adapter;
+import com.gyee.gaia.meter.entity.PointData;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 23
+ **/
+@SpringBootTest
+public class OneTest {
+
+
+    @Value("${start.time}")
+    private String startTimeString;
+    @Value("${end.time}")
+    private String endTimeString;
+    @Resource
+    Adapter adapter;
+
+
+    @org.junit.jupiter.api.Test
+    void test() {
+        //设置取值开始时间
+        String startString = startTimeString;
+        DateTime startDateTime = DateUtil.parse(startString);
+
+        //设置取值结束时间
+        String endDateString = endTimeString;
+        DateTime endDateTime = DateUtil.parse(endDateString);
+
+        //指定开始日期到结束日期的天数
+        LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+        LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+        long between = ChronoUnit.DAYS.between(day1, day2);
+
+        for (int i = 0; i <= between; i++) {
+
+            DateTime dateTime1 = DateUtil.offsetDay(startDateTime, i);
+            DateTime dateTime2 = DateUtil.offsetDay(startDateTime, i + 1);
+
+            //8,结束点发电量减去开始点发电量得到日发电量(单位Kwh)
+            List<PointData> historyRaw = adapter.getHistoryRaw("SBQFJ.NX_GD_SBQF_FJ_P2_L4_043_AI0064", dateTime1.getTime(), dateTime2.getTime());
+
+            BigDecimal rfdl = new BigDecimal(0);
+
+            if (historyRaw.size() > 0) {
+                BigDecimal bigDecimal1 = new BigDecimal(Double.toString(historyRaw.get(0).getValue()));
+                BigDecimal bigDecimal2 = new BigDecimal(Double.toString(historyRaw.get(historyRaw.size() - 1).getValue()));
+                rfdl = bigDecimal2.subtract(bigDecimal1);
+
+                if (rfdl.doubleValue() > 50000 || rfdl.doubleValue() < 0) {
+
+                    ArrayList<Double> arrayList = new ArrayList<>();
+                    for (PointData pointData : historyRaw) {
+                        arrayList.add(pointData.getValue());
+                    }
+
+                    int index = -1;
+                    for (int j = 1; j < arrayList.size(); j++) {
+                        double current = arrayList.get(j);
+                        double previous = arrayList.get(j - 1);
+                        double difference = current - previous;
+                        if (difference > 50000 || difference < -1) {
+                            index = j;
+                            break;
+                        }
+                    }
+                    if (index != -1) {
+                        double valueGrow2 = arrayList.get(index);
+                        BigDecimal bigDecimalGrow2 = new BigDecimal(Double.toString(valueGrow2));
+                        double valueGrow1 = arrayList.get(index - 1);
+                        BigDecimal bigDecimalGrow1 = new BigDecimal(Double.toString(valueGrow1));
+                        rfdl = (bigDecimal2.subtract(bigDecimalGrow2)).add(bigDecimalGrow1.subtract(bigDecimal1));
+                        System.out.println("重新赋值后:"+rfdl);
+                    }
+                }
+
+            }
+        }
+    }
+}

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

@@ -45,7 +45,6 @@ class SaveMeterInfoHistoryDayTest {
     @Resource
     MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
 
-
     @Value("${start.time}")
     private String startTimeString;
     @Value("${end.time}")
@@ -106,7 +105,7 @@ class SaveMeterInfoHistoryDayTest {
                             double current = arrayList.get(j);
                             double previous = arrayList.get(j - 1);
                             double difference = current - previous;
-                            if (difference > 50000 || difference < 0) {
+                            if (difference > 50000 || difference < -1) {
                                 index = j;
                                 break;
                             }
@@ -116,7 +115,7 @@ class SaveMeterInfoHistoryDayTest {
                             BigDecimal bigDecimalGrow2 = new BigDecimal(Double.toString(valueGrow2));
                             double valueGrow1 = arrayList.get(index - 1);
                             BigDecimal bigDecimalGrow1 = new BigDecimal(Double.toString(valueGrow1));
-                            rfdl = (bigDecimal2.subtract(bigDecimalGrow2).add(bigDecimalGrow1).subtract(bigDecimal1));
+                            rfdl = (bigDecimal2.subtract(bigDecimalGrow2)).add(bigDecimalGrow1.subtract(bigDecimal1));
                         }
                     }
                 }
@@ -131,6 +130,7 @@ class SaveMeterInfoHistoryDayTest {
                 meterInfoEquipment.setName(thingId1.getName());
                 meterInfoEquipment.setDate(dateTime1.toLocalDateTime());
                 meterInfoEquipment.setRfdl(rfdl);
+                meterInfoEquipment.setUpdateTime(LocalDateTime.now());
                 QueryWrapper<MeterInfoEquipment> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("equipment_nem_code", thingId1.getNemCode()).eq("date", dateTime1.toLocalDateTime());
                 List<MeterInfoEquipment> list = meterInfoEquipmentService.list(queryWrapper);
@@ -418,8 +418,8 @@ class SaveMeterInfoHistoryDayTest {
     //调用上面4个,第四个需要3-4次
     @Test
     void saveCalculating3() {
-//        this.saveEquipmentRfdl();
-//        this.saveBottomCode();
+        this.saveEquipmentRfdl();
+        this.saveBottomCode();
         this.saveCalculatingProjectFDL();
         this.saveCalculating();
         this.saveCalculating();

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

@@ -1,10 +1,10 @@
-package com.gyee.gaia.meter.service.meterinfo;
+package com.gyee.gaia.meter.service.meter;
 
 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.*;
-import com.gyee.gaia.meter.entity.vo.MeterInfoVO;
+import com.gyee.gaia.meter.entity.vo.MeterVO;
 import com.gyee.gaia.meter.service.impl.*;
 import org.springframework.stereotype.Service;
 
@@ -30,7 +30,7 @@ public class GetLineInfoById {
     @Resource
     LineServiceImpl lineService;
 
-    public List<MeterInfoVO> getMeterInfoFDC_Day(String id) {
+    public List<MeterVO> getMeterInfoFDC_Day(String id) {
         //根据id传过来的code,拿到线路nem_code
         Line line = lineService.getOne(new QueryWrapper<Line>().eq("code", id));
         String nemCode = line .getNemCode();
@@ -46,7 +46,7 @@ public class GetLineInfoById {
         MeterPoint oneMeterPointFDL = meterPointService.getOne(new QueryWrapper<MeterPoint>().eq("line_id", nemCode).eq("meter_type", "线路"));
 
         //创建一个MeterInfoVO的list集合
-        List<MeterInfoVO> list = new ArrayList<>();
+        List<MeterVO> list = new ArrayList<>();
 
         //循环遍历每一天,取每天的数据
         for (int i = 1; i <= days; i++) {
@@ -65,15 +65,15 @@ public class GetLineInfoById {
             }
 
 
-            MeterInfoVO meterInfoVO = new MeterInfoVO();
-            meterInfoVO.setTimestr(String.valueOf(i));
-            meterInfoVO.setDate(dateTime1);
-            meterInfoVO.setValue1(rfdl.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
-            meterInfoVO.setValue2(BigDecimal.valueOf(0));
-            meterInfoVO.setValue3(BigDecimal.valueOf(0));
-            meterInfoVO.setSpeed(speed);
+            MeterVO meterVO = new MeterVO();
+            meterVO.setTimestr(String.valueOf(i));
+            meterVO.setDate(dateTime1);
+            meterVO.setValue1(rfdl.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
+            meterVO.setValue2(BigDecimal.valueOf(0));
+            meterVO.setValue3(BigDecimal.valueOf(0));
+            meterVO.setSpeed(speed);
 
-            list.add(meterInfoVO);
+            list.add(meterVO);
 
         }
 
@@ -81,7 +81,7 @@ public class GetLineInfoById {
     }
 
 
-    public MeterInfoVO getMeterInfoFDCFDL_DayMonthYear(String id) {
+    public MeterVO getMeterInfoFDCFDL_DayMonthYear(String id) {
 
         //根据id传过来的code,拿到线路nem_code
         Line line = lineService.getOne(new QueryWrapper<Line>().eq("code", id));
@@ -136,13 +136,13 @@ public class GetLineInfoById {
         }
 
 
-        MeterInfoVO meterInfoVO = new MeterInfoVO();
-        meterInfoVO.setDayFDL(rfdl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
-        meterInfoVO.setMonthFDL(yfdl);
-        meterInfoVO.setYearFDL(nfdl);
-        meterInfoVO.setValue2(BigDecimal.valueOf(0));
-        meterInfoVO.setZjrl(zjrl.divide(BigDecimal.valueOf(10000),2, RoundingMode.HALF_EVEN));
-        return meterInfoVO;
+        MeterVO meterVO = new MeterVO();
+        meterVO.setRfdl(rfdl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
+        meterVO.setYfdl(yfdl);
+        meterVO.setNfdl(nfdl);
+        meterVO.setSwdl(BigDecimal.valueOf(0));
+        meterVO.setZjrl(zjrl.divide(BigDecimal.valueOf(10000),2, RoundingMode.HALF_EVEN));
+        return meterVO;
 
     }
 }

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

@@ -1,11 +1,11 @@
-package com.gyee.gaia.meter.service.meterinfo;
+package com.gyee.gaia.meter.service.meter;
 
 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.PowerStation;
-import com.gyee.gaia.meter.entity.vo.MeterInfoVO;
+import com.gyee.gaia.meter.entity.vo.MeterVO;
 import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
 import com.gyee.gaia.meter.service.impl.PowerStationServiceImpl;
 import org.springframework.stereotype.Service;
@@ -28,7 +28,7 @@ public class GetPowerStationInfoById {
     @Resource
     PowerStationServiceImpl powerStationService;
 
-    public List<MeterInfoVO> getMeterInfoFDC_Day(String id) {
+    public List<MeterVO> getMeterInfoFDC_Day(String id) {
         //根据id传过来的code,拿到场站的nem_code
         PowerStation powerStation = powerStationService.getOne(new QueryWrapper<PowerStation>().eq("code", id));
         String nemCode = powerStation.getNemCode();
@@ -41,7 +41,7 @@ public class GetPowerStationInfoById {
         int days = DateUtil.dayOfMonth(now);
 
         //创建一个MeterInfoVO的list集合
-        List<MeterInfoVO> list = new ArrayList<>();
+        List<MeterVO> list = new ArrayList<>();
 
         //循环遍历每一天,取每天的数据
         for (int i = 1; i <= days; i++) {
@@ -68,15 +68,15 @@ public class GetPowerStationInfoById {
                 rgwdl = oneGWDL.getValue();
             }
 
-            MeterInfoVO meterInfoVO = new MeterInfoVO();
-            meterInfoVO.setTimestr(String.valueOf(i));
-            meterInfoVO.setDate(dateTime1);
-            meterInfoVO.setValue1(rfdl);
-            meterInfoVO.setValue2(rswdl);
-            meterInfoVO.setValue3(rgwdl.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
-            meterInfoVO.setSpeed(speed);
+            MeterVO meterVO = new MeterVO();
+            meterVO.setTimestr(String.valueOf(i));
+            meterVO.setDate(dateTime1);
+            meterVO.setValue1(rfdl);
+            meterVO.setValue2(rswdl);
+            meterVO.setValue3(rgwdl.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
+            meterVO.setSpeed(speed);
 
-            list.add(meterInfoVO);
+            list.add(meterVO);
 
         }
 
@@ -84,7 +84,7 @@ public class GetPowerStationInfoById {
     }
 
 
-    public MeterInfoVO getMeterInfoFDCFDL_DayMonthYear(String id) {
+    public MeterVO getMeterInfoFDCFDL_DayMonthYear(String id) {
 
         //根据id传过来的code,拿到nem_code
         PowerStation onePowerStation = powerStationService.getOne(new QueryWrapper<PowerStation>().eq("code", id));
@@ -134,13 +134,13 @@ public class GetPowerStationInfoById {
         }
 
 
-        MeterInfoVO meterInfoVO = new MeterInfoVO();
-        meterInfoVO.setDayFDL(rfdl);
-        meterInfoVO.setMonthFDL(yfdl);
-        meterInfoVO.setYearFDL(nfdl);
-        meterInfoVO.setValue2(rswdl);
-        meterInfoVO.setZjrl(zjrl);
-        return meterInfoVO;
+        MeterVO meterVO = new MeterVO();
+        meterVO.setRfdl(rfdl);
+        meterVO.setYfdl(yfdl);
+        meterVO.setNfdl(nfdl);
+        meterVO.setSwdl(rswdl);
+        meterVO.setZjrl(zjrl);
+        return meterVO;
 
     }
 }

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

@@ -1,4 +1,4 @@
-package com.gyee.gaia.meter.service.meterinfo;
+package com.gyee.gaia.meter.service.meter;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.gaia.meter.entity.MeterInfoCalculating;
 import com.gyee.gaia.meter.entity.MeterPoint;
 import com.gyee.gaia.meter.entity.Project;
-import com.gyee.gaia.meter.entity.vo.MeterInfoVO;
+import com.gyee.gaia.meter.entity.vo.MeterVO;
 import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
 import com.gyee.gaia.meter.service.impl.MeterPointServiceImpl;
 import com.gyee.gaia.meter.service.impl.ProjectServiceImpl;
@@ -34,7 +34,7 @@ public class GetProjectInfoById {
 
 
 
-    public List<MeterInfoVO> getMeterInfoFDC_Day(String id) {
+    public List<MeterVO> getMeterInfoFDC_Day(String id) {
         //根据id传过来的旧code,拿到新nem_code
         Project oneProject = projectService.getOne(new QueryWrapper<Project>().eq("code", id));
         String nemCode = oneProject.getNemCode();
@@ -52,7 +52,7 @@ public class GetProjectInfoById {
         MeterPoint oneMeterPointGWDL = meterPointService.getOne(new QueryWrapper<MeterPoint>().eq("project_id", nemCode).eq("meter_type", "购网电量"));
 
         //创建一个MeterInfoVO的list集合
-        List<MeterInfoVO> list = new ArrayList<>();
+        List<MeterVO> list = new ArrayList<>();
 
         //循环遍历每一天,取每天的数据
         for (int i = 1; i <= days; i++) {
@@ -86,23 +86,23 @@ public class GetProjectInfoById {
             }
 
             //VO对象属性赋值
-            MeterInfoVO meterInfoVO = new MeterInfoVO();
-            meterInfoVO.setTimestr(String.valueOf(i));
-            meterInfoVO.setDate(dateTime1);
-            meterInfoVO.setValue1(rfdl);
-            meterInfoVO.setValue2(rswdl);
-            meterInfoVO.setValue3(rgwdl.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
-            meterInfoVO.setSpeed(speed);
+            MeterVO meterVO = new MeterVO();
+            meterVO.setTimestr(String.valueOf(i));
+            meterVO.setDate(dateTime1);
+            meterVO.setValue1(rfdl);
+            meterVO.setValue2(rswdl);
+            meterVO.setValue3(rgwdl.divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_EVEN));
+            meterVO.setSpeed(speed);
 
             //添加入集合
-            list.add(meterInfoVO);
+            list.add(meterVO);
 
         }
         return list;
     }
 
 
-    public MeterInfoVO getMeterInfoFDCFDL_DayMonthYear(String id) {
+    public MeterVO getMeterInfoFDCFDL_DayMonthYear(String id) {
 
         Project oneProject = projectService.getOne(new QueryWrapper<Project>().eq("code", id));
         String nemCode = oneProject.getNemCode();
@@ -156,13 +156,13 @@ public class GetProjectInfoById {
         }
 
 
-        MeterInfoVO meterInfoVO = new MeterInfoVO();
-        meterInfoVO.setDayFDL(rfdl);
-        meterInfoVO.setMonthFDL(yfdl);
-        meterInfoVO.setYearFDL(nfdl);
-        meterInfoVO.setValue2(rswdl);
-        meterInfoVO.setZjrl(zjrl.divide(BigDecimal.valueOf(10000), 2,RoundingMode.HALF_EVEN));
-        return meterInfoVO;
+        MeterVO meterVO = new MeterVO();
+        meterVO.setRfdl(rfdl);
+        meterVO.setYfdl(yfdl);
+        meterVO.setNfdl(nfdl);
+        meterVO.setSwdl(rswdl);
+        meterVO.setZjrl(zjrl.divide(BigDecimal.valueOf(10000), 2,RoundingMode.HALF_EVEN));
+        return meterVO;
 
     }
 }

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

@@ -1,11 +1,11 @@
-package com.gyee.gaia.meter.service.meterinfo;
+package com.gyee.gaia.meter.service.meter;
 
 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.PowerStation;
-import com.gyee.gaia.meter.entity.vo.MeterInfoVO;
+import com.gyee.gaia.meter.entity.vo.MeterVO;
 import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
 import com.gyee.gaia.meter.service.impl.PowerStationServiceImpl;
 import org.springframework.stereotype.Service;
@@ -27,7 +27,7 @@ public class GetWindStationInfo {
     @Resource
     PowerStationServiceImpl powerStationService;
 
-    public List<MeterInfoVO> getMeterInfoFDC_Day() {
+    public List<MeterVO> getMeterInfoFDC_Day() {
 
         //当前时间
         DateTime now = DateTime.now();
@@ -37,7 +37,7 @@ public class GetWindStationInfo {
         int days = DateUtil.dayOfMonth(now);
 
         //创建一个MeterInfoVO的list集合
-        List<MeterInfoVO> list = new ArrayList<>();
+        List<MeterVO> list = new ArrayList<>();
 
         //循环遍历每一天,取每天的数据
         for (int i = 1; i <= days; i++) {
@@ -67,23 +67,23 @@ public class GetWindStationInfo {
             }
 
             //VO对象设置属性值
-            MeterInfoVO meterInfoVO = new MeterInfoVO();
-            meterInfoVO.setTimestr(String.valueOf(i));
-            meterInfoVO.setDate(dateTime1);
-            meterInfoVO.setValue1(rfdl);
-            meterInfoVO.setValue2(rswdl);
-            meterInfoVO.setValue3(rgwdl);
-            meterInfoVO.setSpeed(speed);
+            MeterVO meterVO = new MeterVO();
+            meterVO.setTimestr(String.valueOf(i));
+            meterVO.setDate(dateTime1);
+            meterVO.setValue1(rfdl);
+            meterVO.setValue2(rswdl);
+            meterVO.setValue3(rgwdl);
+            meterVO.setSpeed(speed);
 
             //加入集合
-            list.add(meterInfoVO);
+            list.add(meterVO);
 
         }
         //返回VO对象集合
         return list;
     }
 
-    public MeterInfoVO getMeterInfoFDCFDL_DayMonthYear() {
+    public MeterVO getMeterInfoFDCFDL_DayMonthYear() {
         //当前时间
         DateTime now = DateTime.now();
         //当天开始时间
@@ -131,14 +131,14 @@ public class GetWindStationInfo {
         }
 
         //VO对象属性设置值
-        MeterInfoVO meterInfoVO = new MeterInfoVO();
-        meterInfoVO.setDayFDL(rfdl);
-        meterInfoVO.setMonthFDL(yfdl);
-        meterInfoVO.setYearFDL(nfdl);
-        meterInfoVO.setValue2(rswdl);
-        meterInfoVO.setZjrl(zjrl);
-
-        return meterInfoVO;
+        MeterVO meterVO = new MeterVO();
+        meterVO.setRfdl(rfdl);
+        meterVO.setYfdl(yfdl);
+        meterVO.setNfdl(nfdl);
+        meterVO.setSwdl(rswdl);
+        meterVO.setZjrl(zjrl);
+
+        return meterVO;
 
     }
 }

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

@@ -1,4 +1,4 @@
-package com.gyee.gaia.meter.service.meterinfo;
+package com.gyee.gaia.meter.service.meter;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;

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

@@ -1,4 +1,4 @@
-package com.gyee.gaia.meter.service.meterinfo;
+package com.gyee.gaia.meter.service.meter;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;

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

@@ -1,4 +1,4 @@
-package com.gyee.gaia.meter.service.meterinfo;
+package com.gyee.gaia.meter.service.meter;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;

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

@@ -1,4 +1,4 @@
-package com.gyee.gaia.meter.service.meterinfo;
+package com.gyee.gaia.meter.service.meter;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;

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

@@ -1,4 +1,4 @@
-package com.gyee.gaia.meter.service.meterinfo;
+package com.gyee.gaia.meter.service.meter;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterInfo/GetMeterInfo.java

@@ -0,0 +1,176 @@
+package com.gyee.gaia.meter.service.meterInfo;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gaia.meter.entity.MeterInfoBottomcode;
+import com.gyee.gaia.meter.entity.MeterInfoCalculating;
+import com.gyee.gaia.meter.entity.MeterInfoEquipment;
+import com.gyee.gaia.meter.entity.vo.MeterInfoVo;
+import com.gyee.gaia.meter.service.impl.MeterInfoBottomcodeServiceImpl;
+import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
+import com.gyee.gaia.meter.service.impl.MeterInfoEquipmentServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 24
+ **/
+@Service
+public class GetMeterInfo {
+
+    @Resource
+    MeterInfoBottomcodeServiceImpl meterInfoBottomcodeService;
+    @Resource
+    MeterInfoEquipmentServiceImpl meterInfoEquipmentService;
+    @Resource
+    MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
+
+    //根据场站ID,开始时间,结束时间,查询获取场站下所有数据
+    public ArrayList<MeterInfoVo> getBottomInfoByWindId(String windId, long startTime, long endTime) {
+
+        Date date1 = new Date(startTime);
+        Date date2 = new Date(endTime);
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String format1 = simpleDateFormat.format(date1);
+        String format2 = simpleDateFormat.format(date2);
+
+        //设置取值开始时间
+        DateTime startDateTime = DateUtil.parse(format1);
+
+        //设置取值结束时间
+        DateTime endDateTime = DateUtil.parse(format2);
+
+
+        //指定开始日期到结束日期的天数
+        LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+        LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+        long between = ChronoUnit.DAYS.between(day1, day2);
+
+
+        ArrayList<MeterInfoVo> meterInfoVos = new ArrayList<>();
+
+        for (int i = 0; i <= between; i++) {
+
+            DateTime dateTime1 = DateUtil.offsetDay(startDateTime, i);
+            DateTime dateTime2 = DateUtil.offsetDay(startDateTime, i + 1);
+
+            List<MeterInfoBottomcode> meterInfoBottomcodeList = meterInfoBottomcodeService.list(new QueryWrapper<MeterInfoBottomcode>().eq("windpowerstation_id", windId).eq("start_time", dateTime1));
+            //遍历集合
+
+
+            for (MeterInfoBottomcode meterInfoBottomcode : meterInfoBottomcodeList) {
+
+                MeterInfoVo meterInfoVo = new MeterInfoVo();
+                meterInfoVo.setDate(dateTime1);
+                meterInfoVo.setName(meterInfoBottomcode.getName());
+                meterInfoVo.setStartCode(meterInfoBottomcode.getStartValue());
+                meterInfoVo.setEndCode(meterInfoBottomcode.getEndValue());
+                meterInfoVo.setRdl(meterInfoBottomcode.getDayValue());
+                meterInfoVos.add(meterInfoVo);
+            }
+        }
+        System.out.println(meterInfoVos.size());
+
+        return meterInfoVos;
+
+
+    }
+
+
+    //根据场站ID,开始时间,结束时间,查询获取场站下所有数据
+    public ArrayList<MeterInfoVo> getEquipmentInfoByWindId(String windId, String startTime, String endTime) {
+
+        //设置取值开始时间
+        DateTime startDateTime = DateUtil.parse(startTime);
+
+        //设置取值结束时间
+        DateTime endDateTime = DateUtil.parse(endTime);
+
+        //指定开始日期到结束日期的天数
+        LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+        LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+        long between = ChronoUnit.DAYS.between(day1, day2);
+
+
+        ArrayList<MeterInfoVo> meterInfoVos = new ArrayList<>();
+
+        for (int i = 0; i <= between; i++) {
+
+            DateTime dateTime1 = DateUtil.offsetDay(startDateTime, i);
+            DateTime dateTime2 = DateUtil.offsetDay(startDateTime, i + 1);
+
+            List<MeterInfoEquipment> meterInfoEquipmentList = meterInfoEquipmentService.list(new QueryWrapper<MeterInfoEquipment>().eq("powerstation_nem_code", windId).eq("date", dateTime1));
+            //遍历集合
+
+
+            for (MeterInfoEquipment meterInfoEquipment : meterInfoEquipmentList) {
+
+                MeterInfoVo meterInfoVo = new MeterInfoVo();
+                meterInfoVo.setDate(dateTime1);
+                meterInfoVo.setName(meterInfoEquipment.getName());
+                meterInfoVo.setRdl(meterInfoEquipment.getRfdl());
+                meterInfoVos.add(meterInfoVo);
+            }
+        }
+        System.out.println(meterInfoVos.size());
+
+        return meterInfoVos;
+
+
+    }
+
+
+    //根据场站ID,开始时间,结束时间,查询获取场站下所有数据
+    public ArrayList<MeterInfoVo> getCalculatingInfoByWindId(String windId, String startTime, String endTime) {
+
+        //设置取值开始时间
+        DateTime startDateTime = DateUtil.parse(startTime);
+
+        //设置取值结束时间
+        DateTime endDateTime = DateUtil.parse(endTime);
+
+        //指定开始日期到结束日期的天数
+        LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+        LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+        long between = ChronoUnit.DAYS.between(day1, day2);
+
+
+        ArrayList<MeterInfoVo> meterInfoVos = new ArrayList<>();
+
+        for (int i = 0; i <= between; i++) {
+
+            DateTime dateTime1 = DateUtil.offsetDay(startDateTime, i);
+            DateTime dateTime2 = DateUtil.offsetDay(startDateTime, i + 1);
+
+            List<MeterInfoCalculating> meterInfoCalculatingList = meterInfoCalculatingService.list(new QueryWrapper<MeterInfoCalculating>().eq("windpowerstation_id", windId).eq("date", dateTime1));
+            //遍历集合
+
+
+            for (MeterInfoCalculating meterInfoCalculating : meterInfoCalculatingList) {
+
+                MeterInfoVo meterInfoVo = new MeterInfoVo();
+                meterInfoVo.setDate(dateTime1);
+                meterInfoVo.setName(meterInfoCalculating.getName());
+                meterInfoVo.setRdl(meterInfoCalculating.getValue());
+                meterInfoVos.add(meterInfoVo);
+            }
+        }
+        System.out.println(meterInfoVos.size());
+
+        return meterInfoVos;
+
+
+    }
+
+}

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterInfo/MeterInfoTest.java

@@ -0,0 +1,99 @@
+package com.gyee.gaia.meter.service.meterInfo;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gaia.meter.adapter.Adapter;
+import com.gyee.gaia.meter.entity.MeterInfoBottomcode;
+import com.gyee.gaia.meter.entity.vo.MeterInfoVo;
+import com.gyee.gaia.meter.service.impl.*;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 24
+ **/
+@SpringBootTest
+public class MeterInfoTest {
+    @Resource
+    Adapter adapter;
+    @Resource
+    TestingPointServiceImpl testingPointService;
+    @Resource
+    EquipmentServiceImpl equipmentService;
+    @Resource
+    PowerStationServiceImpl powerStationService;
+    @Resource
+    MeterPointServiceImpl meterPointService;
+    @Resource
+    MeterInfoBottomcodeServiceImpl meterInfoBottomcodeService;
+    @Resource
+    MeterInfoEquipmentServiceImpl meterInfoEquipmentService;
+    @Resource
+    MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
+
+    @Value("${start.time}")
+    private String startTimeString;
+    @Value("${end.time}")
+    private String endTimeString;
+
+
+    //根据场站ID,开始时间,结束时间,查询获取场站下所有数据单日
+    @Test
+//      void getMeterInfoByWindId(String windId ,String startTime ,String endTime){
+    void getMeterInfoByWindId() {
+
+        String windId = "NX_GDDL_MHS_FDC_STA";
+
+
+        //设置取值开始时间
+        DateTime startDateTime = DateUtil.parse(startTimeString);
+
+        //设置取值结束时间
+        DateTime endDateTime = DateUtil.parse(endTimeString);
+
+        //指定开始日期到结束日期的天数
+        LocalDateTime day1 = LocalDateTimeUtil.of(startDateTime);
+        LocalDateTime day2 = LocalDateTimeUtil.of(endDateTime);
+        long between = ChronoUnit.DAYS.between(day1, day2);
+
+
+        HashMap<Object, Object> map = new HashMap<>();
+        ArrayList<MeterInfoVo> meterInfoVos = new ArrayList<>();
+
+        for (int i = 0; i <= between; i++) {
+
+            DateTime dateTime1 = DateUtil.offsetDay(startDateTime, i);
+            DateTime dateTime2 = DateUtil.offsetDay(startDateTime, i + 1);
+
+            List<MeterInfoBottomcode> meterInfoBottomcodeList = meterInfoBottomcodeService.list(new QueryWrapper<MeterInfoBottomcode>().eq("windpowerstation_id", windId).eq("start_time", dateTime1));
+            //遍历集合
+
+
+            for (MeterInfoBottomcode meterInfoBottomcode : meterInfoBottomcodeList) {
+
+                MeterInfoVo meterInfoVo = new MeterInfoVo();
+                meterInfoVo.setDate(dateTime1);
+                meterInfoVo.setName(meterInfoBottomcode.getName());
+                meterInfoVo.setStartCode(meterInfoBottomcode.getStartValue());
+                meterInfoVo.setEndCode(meterInfoBottomcode.getEndValue());
+                meterInfoVo.setRdl(meterInfoBottomcode.getDayValue());
+                meterInfoVos.add(meterInfoVo);
+            }
+        }
+        map.put("底码数据",meterInfoVos);
+        System.out.println(meterInfoVos.size());
+        System.out.println(map);
+    }
+
+}

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

@@ -1,16 +0,0 @@
-##需要动态配置的属性##
-
-#动态配置适配器的地址
-#adapter.url=http://192.168.10.18:8011/ts
-#adapter.url=http://192.168.10.18:8013/ts
-adapter.url=http://192.168.1.67:8011/ts
-
-#动态配置开始日期
-start.time=2023-05-1
-#动态配置结束日期
-end.time=2023-05-23
-
-meter.stations=MHS_FDC,NSS_FDC
-
-test.abcd=123456
-

electricity/meter/src/main/resources/bootstrap.yaml

@@ -1,6 +1,3 @@
-server:
-  port: 8021
-
 spring:
   application:
     name: meter
@@ -11,86 +8,19 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.10.18:8848
+        server-addr: 192.168.1.67:8848
+        group: meter
       config:
         # 配置中心地址
-        server-addr: 192.168.10.18:8848
+        server-addr: 192.168.1.67:8848
         # 配置文件格式
         file-extension: yml
+        #开发环境配置命名空间
+        namespace: fe339fbd-7113-405f-8d2a-70659c5d53e4
+        #生产环境配置命名空间
+#        namespace: d148acca-95e7-4e07-a566-9a69012bcf01
+        group: meter
+        refresh-enabled: true
         # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-  cache:
-    type: SIMPLE
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.10.18:5432/nx_dev
-    username: gdprod
-    password: gyee123
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      max-active: 20
-      initial-size: 1
-      min-idle: 3
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-    default-property-inclusion: always
-
-
-
-mybatis-plus:
-  typeAliasesPackage: com.gyee.gaia.meter.entity
-  mapper-locations: classpath:mappers-postgresql/*.xml
-  global-config:
-    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-    id-type: 3
-    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-    field-strategy: 2
-    #驼峰下划线转换
-    db-column-underline: true
-    #mp2.3+ 全局表前缀 mp_
-    #table-prefix: mp_
-    #刷新mapper 调试神器
-    #refresh-mapper: true
-    #数据库大写下划线转换
-    #capital-mode: true
-    # Sequence序列接口实现类配置
-    key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
-    #逻辑删除配置（下面3个配置）
-    logic-delete-value: 1
-    logic-not-delete-value: 0
-    #sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-    #自定义填充策略接口实现
-    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
-  configuration:
-    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as： select user_id as userId）
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    #配置JdbcTypeForNull, oracle数据库必须配置
-    jdbc-type-for-null: 'null'
-    callSettersOnNulls: true
-
-xxl:
-  job:
-    admin:
-      addresses: http://192.168.10.18:8080/xxl-job-admin
-    accessToken:
-    executor:
-      appname: meter
-      address:
-      ip:
-      port: 9999
-      logpath: c:/xxl-job/meter/logs
-      logretentiondays: 30
-
-
-
-test:
-  abcd:
+#        shared-configs:
+#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

electricity/meter/src/main/resources/cross.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script type="text/javascript">
-  var xhr = new XMLHttpRequest();
-  xhr.open('GET', 'http://192.168.10.24:8021/meterinfo?id=-1'); // 换为自己的接口地址
-  xhr.send(null);
-  xhr.onload = function(e) {
-    var xhr = e.target;
-    console.log(xhr.responseText);
-  }
-</script>
-</html>