碳排放 接口还原

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

@@ -68,8 +68,14 @@ public class CarCarbonServiceImpl implements CarCarbonService {
 
     @Override
     public ReturnMsg getVehicleInfo(IocParam iocParam) {
-       // String[] param = {"中迅","北京规划院","郑分","广分","上分","成分"};
-        Company company =  companyMapper.selectById(1);
+        String[] param = {"中迅","北京规划院","郑分","广分","上分","成分"};
+        String startStr = iocParam.getTimeRange().getStartDate();
+        String endStr = iocParam.getTimeRange().getEndDate();
+        List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
+        String[] labKey = lists.toArray(new String[0]);
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
+        /*Company company =  companyMapper.selectById(1);
         Department department = departmentMapper.selectById(company.getOfficeId());
         List<Department> departments =departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getParentId,department.getOriId()));
         String[] param = departments.stream().map(Department::getName).collect(Collectors.toList()).toArray(new String[0]);
@@ -96,7 +102,7 @@ public class CarCarbonServiceImpl implements CarCarbonService {
             labels1.add(label);
         }
        // List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
-        return ReturnMsg.ok(labels1);
+        return ReturnMsg.ok(labels1);*/
     }
 
     @Override

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

@@ -337,7 +337,14 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getCarbonInfo(IocParam iocParam) {
-        List<Company> companies =  companyMapper.selectList(null);
+        String[] param = {"中迅","北京规划院","郑分","广分","上分","成分"};
+        String startStr = iocParam.getTimeRange().getStartDate();
+        String endStr = iocParam.getTimeRange().getEndDate();
+        List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
+        String[] labKey = lists.toArray(new String[0]);
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
+        /*List<Company> companies =  companyMapper.selectList(null);
         List<String> params = companies.stream().map(Company::getCompanyName).collect(Collectors.toList());
         String[] param = params.toArray(new String[0]);
         String startStr = iocParam.getTimeRange().getStartDate();
@@ -362,7 +369,7 @@ public class CarbonServiceImpl implements CarbonService {
             label.setLabel(labKey[i]);
             list.add(label);
         }
-        return ReturnMsg.ok(list);
+        return ReturnMsg.ok(list);*/
     }
 
     @Override

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

@@ -67,7 +67,14 @@ public class PrintCarbonServiceImpl implements PrintCarbonService {
 
     @Override
     public ReturnMsg getPrintInfo(IocParam iocParam) {
-        Company company =  companyMapper.selectById(1);
+        String[] param = {"中迅","北京规划院","郑分","广分","上分","成分"};
+        String startStr = iocParam.getTimeRange().getStartDate();
+        String endStr = iocParam.getTimeRange().getEndDate();
+        List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
+        String[] labKey = lists.toArray(new String[0]);
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
+        /*Company company =  companyMapper.selectById(1);
         Department department = departmentMapper.selectById(company.getOfficeId());
         List<Department> departments =departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getParentId,department.getOriId()));
         String[] param = departments.stream().map(Department::getName).collect(Collectors.toList()).toArray(new String[0]);
@@ -94,7 +101,7 @@ public class PrintCarbonServiceImpl implements PrintCarbonService {
             labels1.add(label);
         }
         // List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
-        return ReturnMsg.ok(labels1);
+        return ReturnMsg.ok(labels1);*/
     }
 
     @Override