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