添加数智双碳数据报表接口

src/main/java/com/sky/ioc/controller/carbon/PhotovoltaicController.java

@@ -47,7 +47,7 @@ public class PhotovoltaicController {
 
 
 
-    @ApiOperation("车辆排放排名")
+    @ApiOperation("光伏排放排名")
     @PostMapping("/getPhotovoltaicInfoOrder")
     public ReturnMsg getPhotovoltaicInfoOrder(@RequestBody IocDateParam iocDateParam){
         return carbonService.getPhotovoltaicInfoOrder(iocDateParam);

src/main/java/com/sky/ioc/controller/carbon/PrintController.java

@@ -40,7 +40,7 @@ public class PrintController {
     }
 
 
-    @ApiOperation("车辆排放情况")
+    @ApiOperation("文印排放分析")
     @PostMapping("/getPrintInfo")
     public ReturnMsg getPrintInfo(@RequestBody IocDateParam iocDateParam){
         return carbonService.getPrintInfo(iocDateParam);
@@ -49,7 +49,7 @@ public class PrintController {
 
 
 
-    @ApiOperation("车辆排放排名")
+    @ApiOperation("文印排放排名")
     @PostMapping("/getPrintInfoOrder")
     public ReturnMsg getPrintInfoOrder(@RequestBody IocDateParam iocDateParam){
         return carbonService.getPrintInfoOrder(iocDateParam);

src/main/java/com/sky/ioc/controller/operation/AssetController.java

@@ -40,12 +40,18 @@ public class AssetController {
     }
 
 
-    @ApiOperation("资产分析")
+    @ApiOperation("投资分析")
     @PostMapping("/getAssetAnalysis")
     public ReturnMsg getAssetAnalysis(@RequestBody IocDateParam iocDateParam){
         return assetService.getAssetAnalysis(iocDateParam);
     }
 
+    @ApiOperation("资产年限")
+    @PostMapping("/getAssetAge")
+    public ReturnMsg getAssetAge(@RequestBody IocDateParam iocDateParam){
+        return assetService.getAssetAge(iocDateParam);
+    }
+
 
 
 

src/main/java/com/sky/ioc/service/assets/AssetService.java

@@ -26,4 +26,6 @@ public interface AssetService {
     ReturnMsg getScrapAndMaintain(IocDateParam iocDateParam);
 
     ReturnMsg getAssetCoreIndicators();
+
+    ReturnMsg getAssetAge(IocDateParam iocDateParam);
 }

src/main/java/com/sky/ioc/service/assets/impl/AssetServiceImpl.java

@@ -2,9 +2,11 @@ package com.sky.ioc.service.assets.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
+import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.assets.AssetService;
 import com.sky.ioc.tool.FalseData;
+import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
@@ -23,12 +25,18 @@ import java.util.Map;
 public class AssetServiceImpl implements AssetService {
     @Override
     public ReturnMsg getInvestmentDistribution() {
-        return ReturnMsg.ok( FalseData.REPORTFORMSMAP);
+        String[] param = {"investment1","investment2","investment3","investment4","rateReturn"};
+        String[] labKey = {"1季度","2季度","3季度","4季度"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
     public ReturnMsg getAssetLife() {
-        return ReturnMsg.ok( FalseData.REPORTFORMSMAP);
+        String[] param = {"serviceLife","standardLife"};
+        String[] labKey = {"资产1","资产2","资产3","资产4","资产5","资产6"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
@@ -66,7 +74,10 @@ public class AssetServiceImpl implements AssetService {
 
     @Override
     public ReturnMsg getAssetAnalysis(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"investment1","investment2","investment3","investment4","rateReturn"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
@@ -97,4 +108,12 @@ public class AssetServiceImpl implements AssetService {
         indeicator.setList(objects);
         return ReturnMsg.ok(indeicator);
     }
+
+    @Override
+    public ReturnMsg getAssetAge(IocDateParam iocDateParam) {
+        String[] param = {"assetsName","rateReturn"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
+    }
 }

src/main/java/com/sky/ioc/service/carbon/impl/CarbonServiceImpl.java

@@ -139,12 +139,18 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getCarbonInfo(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
     public ReturnMsg getCarbonQuotaComposition(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"stock","consume"};
+        String[] labKey = {"中旬","规划院","成分","上分","广分","郑分"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
@@ -179,12 +185,18 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getVehicleInfo(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
     public ReturnMsg getVehicleInfoOrder(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"Vehicle"};
+        String[] labKey = {"中旬","规划院","成分","上分","广分","郑分"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
@@ -209,22 +221,34 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getPrintInfoOrder(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"Print"};
+        String[] labKey = {"中旬","规划院","成分","上分","广分","郑分"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
     public ReturnMsg getPrintInfo(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
     public ReturnMsg getPhotovoltaicInfoOrder(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"Photovoltaic"};
+        String[] labKey = {"中旬","规划院","成分","上分","广分","郑分"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
     public ReturnMsg getPhotovoltaicInfo(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override

src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java

@@ -31,7 +31,7 @@ public class SpaceServiceImpl implements SpaceService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("builtArea",112893);
         jsonObject.put("layersInt",21);
-        jsonObject.put("serviceLife ",60);
+        jsonObject.put("serviceLife",60);
         jsonObject.put("constructionPeriod",80);
         return ReturnMsg.ok(jsonObject);
     }