接口调整---

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsServiceImpl.java

@@ -345,7 +345,7 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
             StringUtils.getMapData("注册用户数", "registerNum", platBasics.getRegisterNum(), tempMap);
             StringUtils.getMapData("活跃人数", "orderNum", platBasics.getOrderNum(), tempMap);
             double result = (double) platBasics.getOrderNum() / platBasics.getRegisterNum();
-            String formattedResult = String.format("%.1f%%", result * 100);
+            String formattedResult = String.format("%.1f", result * 100);
             tempMap.put("onlineRate", formattedResult);
         }
         return tempMap;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatBuildingService.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface IPlatBuildingService{
-    List<String> getPowerAndWaterMonth();
+    List<Map<String, Object>> getPowerAndWaterMonth();
 
     List<Map<String, Object>> getAirCondition();
 
@@ -12,7 +12,7 @@ public interface IPlatBuildingService{
 
     List<Map<String, Object>> useElectricity();
 
-    List<Map<String, Object>> greenElectricity();
+    Map<String, Object> greenElectricity();
 
     List<Map<String, Object>> carbon();
 

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatBuildingServiceImpl.java

@@ -20,8 +20,9 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
     @Autowired
     private PlatBuildingMapper platBuildingMapper;
 
-    public List<String> getPowerAndWaterMonth(){
-        List<String> list = new ArrayList<>();
+    public List<Map<String, Object>> getPowerAndWaterMonth(){
+        List<Map<String, Object>> resultList = new ArrayList<>();
+
         String json = platBuildingMapper.getPowerAndWaterMonth();
         if (StringUtils.isEmpty(json)){
             return null;
@@ -29,10 +30,14 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         JSONArray dataArray = JSONArray.parseArray(json);
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
+            String key = dataItem.getString("key");
             String value = dataItem.getString("value");
-            list.add(value);
+            Map<String, Object> data = new HashMap<>();
+            data.put("name", key);
+            data.put("value", value);
+            resultList.add(data);
         }
-        return list;
+        return resultList;
     }
 
     public List<Map<String, Object>> getAirCondition(){
@@ -104,8 +109,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
     }
 
 
-    public List<Map<String, Object>> greenElectricity(){
-        List<Map<String, Object>> resultList = new ArrayList<>();
+    public Map<String, Object> greenElectricity(){
 
         String json = platBuildingMapper.greenElectricity();
         if (StringUtils.isEmpty(json)){
@@ -115,10 +119,9 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         String publicEnergy = jsonObject.getString("publicEnergy");
         String grennEnergy = jsonObject.getString("grennEnergy");
         Map<String, Object> data = new HashMap<>();
-        data.put("publicEnergy", publicEnergy);
-        data.put("grennEnergy", grennEnergy);
-        resultList.add(data);
-        return resultList;
+        data.put("普通", publicEnergy);
+        data.put("绿电", grennEnergy);
+        return data;
     }
 
     public List<Map<String, Object>> carbon(){