修改图表横坐标范围

src/main/java/com/sky/ioc/service/Parking/impl/ParkingServiceImpl.java

@@ -96,10 +96,10 @@ public class ParkingServiceImpl implements ParkingService {
     public ReturnMsg getStopViolation(IocParam iocParam) {
       //  List<Map<String,String>> lists = parkMapper.getListByCompanyIdAndDeptIdAndType(iocParam,1);
         List<Cake> list = new ArrayList<>();
-        list.add(new Cake("其他单位"));
+        list.add(new Cake("郑分"));
         list.add(new Cake("北京规划院"));
         list.add(new Cake("中讯院"));
-        list.add(new Cake("单位"));
+        list.add(new Cake("广分"));
         return ReturnMsg.ok(list);
     }
 
@@ -107,10 +107,10 @@ public class ParkingServiceImpl implements ParkingService {
     public ReturnMsg getOccupationOfParkingSpace(IocParam iocParam) {
         //List<Map<String,String>> lists = parkMapper.getListByCompanyIdAndDeptIdAndType(iocParam,null);
         List<Cake> list = new ArrayList<>();
-        list.add(new Cake("其他单位"));
+        list.add(new Cake("郑分"));
         list.add(new Cake("北京规划院"));
         list.add(new Cake("中讯院"));
-        list.add(new Cake("单位"));
+        list.add(new Cake("广分"));
         return ReturnMsg.ok(list);
     }
 

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

@@ -192,7 +192,9 @@ public class AssetServiceImpl implements AssetService {
     @Override
     public ReturnMsg getAssetAnalysis(IocParam iocParam) {
         String[] param = {"investment1","investment2","investment3","investment4","rateReturn"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -250,7 +252,9 @@ public class AssetServiceImpl implements AssetService {
     @Override
     public ReturnMsg getAssetAge(IocParam iocParam) {
         String[] param = {"assetsName","rateReturn"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);

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

@@ -307,7 +307,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getCarbonInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -377,7 +379,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getVehicleInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -436,7 +440,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getPrintInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -453,7 +459,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getPhotovoltaicInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -639,7 +647,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseWater(IocParam iocParam) {
         String[] param = {"tapWater","recycledWater"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -648,7 +658,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalysePower(IocParam iocParam) {
         String[] param = {"tip","seal","flat","valley"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -657,7 +669,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseHot(IocParam iocParam) {
         String[] param = {"heatConsumption"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -666,7 +680,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseCold(IocParam iocParam) {
         String[] param = {"refrigerationCapacity","energyConsumption"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -675,7 +691,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseCpv(IocParam iocParam) {
         String[] param = {"powerGeneration","outputPower"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -684,7 +702,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsTotal(IocParam iocParam) {
         String[] param = {"water","cpv","cold","hot","power"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -693,7 +713,9 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseCpvInfo(IocParam iocParam) {
         String[] param = {"governmentSubsidies","save"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -703,10 +725,10 @@ public class CarbonServiceImpl implements CarbonService {
     public ReturnMsg getEnergyAnalysisWater(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("office"));
-        list.add(new Cake("computerRoom"));
-        list.add(new Cake("restaurant"));
-        list.add(new Cake("parkingLot"));
-        list.add(new Cake("qita"));
+        list.add(new Cake("信息机房"));
+        list.add(new Cake("餐厅"));
+        list.add(new Cake("停车场"));
+        list.add(new Cake("其他"));
         return ReturnMsg.ok(list);
     }
 

src/main/java/com/sky/ioc/service/personnel/impl/PersonnelServiceImpl.java

@@ -113,7 +113,9 @@ public class PersonnelServiceImpl implements PersonnelService {
     @Override
     public ReturnMsg getPopulationPerson(IocParam iocParam) {
         String[] param = {"numberPeople"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -122,7 +124,9 @@ public class PersonnelServiceImpl implements PersonnelService {
     @Override
     public ReturnMsg getPassengerFlow(IocParam iocParam) {
         String[] param = {"Freelance","other"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);

src/main/java/com/sky/ioc/service/security/impl/SecurityServiceImpl.java

@@ -64,7 +64,9 @@ public class SecurityServiceImpl implements SecurityService {
     @Override
     public ReturnMsg getAlarmTrend(IocParam iocParam) {
         String[] param = {"commonly","important","urgent"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -73,7 +75,9 @@ public class SecurityServiceImpl implements SecurityService {
     @Override
     public ReturnMsg getAlarmClassification(IocParam iocParam) {
         String[] param = {"alarmNumber"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -82,7 +86,9 @@ public class SecurityServiceImpl implements SecurityService {
     @Override
     public ReturnMsg getEquipmentOnline(IocParam iocParam) {
         String[] param = {"camera","waterImmersion"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String startStr = iocParam.getTimeRange().getStartDate();
+        String endStr = iocParam.getTimeRange().getEndDate();
+        List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
         String[] labKey = lists.toArray(new String[0]);
         ThreadLocalRandom random = ThreadLocalRandom.current();
         List<Label> list = new ArrayList<>();

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

@@ -154,7 +154,9 @@ public class SpaceServiceImpl implements SpaceService {
     @Override
     public ReturnMsg getMeetingCostTrend(IocParam iocParam) {
         String[] param = {"shichang", "bangong", "chanpin", "zhihui", "yewu", "qita"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);
@@ -163,7 +165,9 @@ public class SpaceServiceImpl implements SpaceService {
     @Override
     public ReturnMsg getSpaceInfo(IocParam iocParam) {
         String[] param = {"administrativeArea", "leisureArea"};
-        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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);