From e40e5235b571cfb8d3eeca93109d34d0bcdcdf0d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 六月 2025 09:09:54 +0800
Subject: [PATCH] 调整参数
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java | 5 ++++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java | 8 ++++----
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java | 4 ++--
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java | 5 ++++-
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
index b11f82f..220bc66 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
@@ -17,7 +17,7 @@
@Data
@Document(collection = "upload_real_time_monitoring_data") //指定要对应的文档名（表名）
@Accessors(chain = true)
-public class UploadRealTimeMonitoringData extends BaseModel {
+public class UploadRealTimeMonitoringData {
@Id
private String id;
private String transaction_serial_number; // 交易流水号
@@ -63,6 +63,9 @@
@ApiModelProperty(value = "删除按钮权限 ")
private Boolean authDelete = true;
+ private Date create_time=new Date();
+ private Date last_time = new Date();
+
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java
index 725abc1..ec3353e 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java
@@ -46,12 +46,15 @@
Date oneDayAgoTime = format.parse(oneDayAgo);
Date sevenDayAgoTime = format.parse(sevenDayAgo);
ArrayList<LargeChargingPowerVo> largeChargingPowerVos = new ArrayList<>();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
List<UploadRealTimeMonitoringData> rangeTimeData = uploadRealTimeMonitoringDataService.getRangeTimeData(sevenDayAgoTime,oneDayAgoTime );
for (int count = 7; count > 0; count--) {
LargeChargingPowerVo largeChargingPowerVo = new LargeChargingPowerVo();
String time = LocalDate.now().minusDays(count).toString();
- List<UploadRealTimeMonitoringData> list = rangeTimeData.stream().filter(e -> e.getCreateTime().contains(time)).collect(Collectors.toList());
+
+ List<UploadRealTimeMonitoringData> list = rangeTimeData.stream().filter(e -> simpleDateFormat.format(e.getCreate_time()).contains(time)).collect(Collectors.toList());
if(!list.isEmpty()){
+ System.out.println(list);
BigDecimal powerAverage = list.stream().map(UploadRealTimeMonitoringData::getPower).reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(list.size()), 0, RoundingMode.HALF_UP);
largeChargingPowerVo.setPower(powerAverage);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java
index 3dd359e..9fc1fe5 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java
@@ -101,9 +101,9 @@
BigDecimal total = vo.getPhotovoltaic().add(vo.getEnergyStorage()).add(vo.getCharge());
vo.setTotal(total);
//计算比率
- vo.setPhotovoltaicRate(calculateRatio(vo.getPhotovoltaic(),vo.getTotal()));
- vo.setEnergyStorageRate(calculateRatio(vo.getEnergyStorage(),vo.getTotal()));
- vo.setChargeRate(calculateRatio(vo.getCharge(),vo.getTotal()));
+ vo.setPhotovoltaicRate(calculateRatio(vo.getPhotovoltaic(),vo.getTotal()).multiply(new BigDecimal("100")));
+ vo.setEnergyStorageRate(calculateRatio(vo.getEnergyStorage(),vo.getTotal()).multiply(new BigDecimal("100")));
+ vo.setChargeRate(calculateRatio(vo.getCharge(),vo.getTotal()).multiply(new BigDecimal("100")));
return vo;
}
@@ -119,7 +119,7 @@
throw new ArithmeticException("分母不能为零");
}
- return part.divide(total, 2, RoundingMode.HALF_UP);
+ return part.divide(total, 4, RoundingMode.HALF_UP);
}
@Override
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java
index d8086c5..3dfe2ac 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java
@@ -8,9 +8,9 @@
@Data
public class EnergyStorageDischargeVO {
@ApiModelProperty("储能配置")
- private Integer config=100;
+ private Integer config=115;
@ApiModelProperty("今日储能")
- private Integer todayStorage=100;
+ private Integer todayStorage=230;
@ApiModelProperty("今日放能")
private BigDecimal todayDischarge;
--
Gitblit v1.7.1