Jelajahi Sumber

修改双碳概览和空间分析核心指标

ZhangManMan 2 tahun lalu
induk
melakukan
a08c6a9cb6

+ 2 - 8
src/main/java/com/sky/ioc/service/carbon/impl/CarbonServiceImpl.java

@@ -299,7 +299,6 @@ public class CarbonServiceImpl implements CarbonService {
         Long expend = carbonQuotaMapper.getExpendByCompany("",year);
         long discharge = carbonMapper.getDischargeByTime(iocParam);
         long deEmission = carbonMapper.getDeEmissionByTime(iocParam);
-        long area =0;//总面积 暂无数据
         long person = 0;//总人数 暂无数据
         Double  compare = random.nextDouble(-1,1);
         DecimalFormat decimalFormat = new DecimalFormat("#.0");
@@ -308,15 +307,10 @@ public class CarbonServiceImpl implements CarbonService {
 
         objects.get(1).put("value",discharge);
         objects.get(1).put("compare",compare);
-
-        objects.get(2).put("value",MathUtils.division(discharge,area,2));
+        objects.get(2).put("value",MathUtils.division(discharge,person,2));
         objects.get(2).put("compare",compare);
-
-        objects.get(3).put("value",MathUtils.division(discharge,person,2));
+        objects.get(3).put("value",deEmission);
         objects.get(3).put("compare",compare);
-        objects.add(new JSONObject());
-        objects.get(4).put("value",deEmission);
-        objects.get(4).put("compare",compare);
 
         indeicator.setWorthAttention("节能减排绿色出行");
         indeicator.setList(objects);

+ 0 - 3
src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java

@@ -249,9 +249,6 @@ public class SpaceServiceImpl implements SpaceService {
 
         objects.get(3).put("value", fixedStation);
         objects.get(3).put("compare", compare);
-        objects.add(new JSONObject());
-        objects.get(4).put("value", playCount + "/" + workCount);
-        objects.get(4).put("compare", compare);
 
         indeicator.setWorthAttention("会议室使⽤率过低,建议考虑改变空间类型");
         indeicator.setList(objects);