明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
无关风月
2024-11-01 bf954ec42f6f36742b8c5e36a4c3e9ad3f4470fc 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java


@@ -284,9 +284,17 @@


      if(null != dataList){


         //在MongoDB中获取数据


         SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");


         List<String> time = dataList.stream().map(s -> sdf.format(s.getCreate_time())).collect(Collectors.toList());


         List<BigDecimal> outputVoltage = dataList.stream().map(UploadRealTimeMonitoringData::getOutput_voltage).collect(Collectors.toList());


         List<BigDecimal> outputCurrent = dataList.stream().map(UploadRealTimeMonitoringData::getOutput_current).collect(Collectors.toList());


         List<UploadRealTimeMonitoringData> dataLists = new ArrayList<>();


         String t = "";


         for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : dataList) {


            if(!sdf.format(uploadRealTimeMonitoringData.getCreate_time()).equals(t)){


               dataLists.add(uploadRealTimeMonitoringData);


            }


         }


			


         List<String> time = dataLists.stream().map(s -> sdf.format(s.getCreate_time())).collect(Collectors.toList());


         List<BigDecimal> outputVoltage = dataLists.stream().map(UploadRealTimeMonitoringData::getOutput_voltage).collect(Collectors.toList());


         List<BigDecimal> outputCurrent = dataLists.stream().map(UploadRealTimeMonitoringData::getOutput_current).collect(Collectors.toList());


         List<Map<String, Object>> currentAndVoltage = new ArrayList<>();


         for (int i = 0; i < time.size(); i++) {


            Map<String, Object> map = new HashMap<>();


@@ -299,8 +307,8 @@


         }


         myChargingOrderInfo.setCurrentAndVoltage(currentAndVoltage);


         //在MongoDB中获取数据


         List<Integer> soc = dataList.stream().map(UploadRealTimeMonitoringData::getSoc).collect(Collectors.toList());


         List<BigDecimal> po = dataList.stream().map(s -> s.getOutput_current().multiply(s.getOutput_voltage()).divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN)).collect(Collectors.toList());


         List<Integer> soc = dataLists.stream().map(UploadRealTimeMonitoringData::getSoc).collect(Collectors.toList());


         List<BigDecimal> po = dataLists.stream().map(s -> s.getOutput_current().multiply(s.getOutput_voltage()).divide(new BigDecimal(1000),2, RoundingMode.HALF_DOWN)).collect(Collectors.toList());


         List<Map<String, Object>> power = new ArrayList<>();


         for (int i = 0; i < time.size(); i++) {


            Map<String, Object> map = new HashMap<>();


@@ -2627,18 +2635,22 @@




   @Override


   public PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto) {


      String startTime = null;


      String endTime = null;


      if (StringUtils.hasLength(dto.getStartTime())){


         dto.setType(1);


         String[] split = dto.getStartTime().split(" - ");


         dto.setStartTime(split[0]);


         dto.setEndTime(split[1]);


         startTime = split[0];


         endTime = split[1];


      }


      if (StringUtils.hasLength(dto.getEndTime())){


         dto.setType(2);


         String[] split = dto.getStartTime().split(" - ");


         dto.setStartTime(split[0]);


         dto.setEndTime(split[1]);


         String[] split = dto.getEndTime().split(" - ");


         startTime = split[0];


         endTime = split[1];


      }


      dto.setStartTime(startTime);


      dto.setEndTime(endTime);


      PageInfo<TSettlementConfirm> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());


      List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto);


      for (TSettlementConfirm tSettlementConfirm : list) {