From 0156b6db1248403e43f58abc314e2bc5abccb267 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 22 七月 2025 18:16:14 +0800
Subject: [PATCH] 大屏替换路径
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java | 4 ++--
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
index 42537a7..65ceb4d 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
@@ -118,7 +118,7 @@
}
@Override
- public R<BigDecimal> getGreenElectricity(List<Integer> siteIds) {
+ public R<BigDecimal> getGreenElectricity() {
return R.fail("远程调用获取配置失败:"+throwable.getMessage());
}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java
index bf71b6e..e873e50 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java
@@ -133,7 +133,7 @@
//累计绿电消纳电量
- R<BigDecimal> r2 = otherClient.getGreenElectricity(siteIds);
+ R<BigDecimal> r2 = otherClient.getGreenElectricity();
if (r2.getCode()==200){
greenElectricity=r2.getData();
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
index 56faece..ac12260 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
@@ -81,8 +81,8 @@
@PostMapping(value = "/getGreenElectricity")
@ResponseBody
- public R<BigDecimal> getGreenElectricity(@RequestBody List<Integer> siteIds){
- BigDecimal greenElectricity = screenContentMapper.getGreenElectricity(siteIds);
+ public R<BigDecimal> getGreenElectricity(){
+ BigDecimal greenElectricity = screenContentMapper.getGreenElectricity(Arrays.asList(26,25));
return R.ok(greenElectricity);
}
--
Gitblit v1.7.1