修改图表时间范围

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

@@ -6,6 +6,7 @@ import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.Cake;
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.assets.AssetService;
+import com.sky.ioc.tool.DateUtil;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
@@ -118,7 +119,8 @@ public class AssetServiceImpl implements AssetService {
     @Override
     public ReturnMsg getAssetAnalysis(IocParam iocParam) {
         String[] param = {"investment1","investment2","investment3","investment4","rateReturn"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -175,7 +177,8 @@ public class AssetServiceImpl implements AssetService {
     @Override
     public ReturnMsg getAssetAge(IocParam iocParam) {
         String[] param = {"assetsName","rateReturn"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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

@@ -304,7 +304,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getCarbonInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -373,7 +374,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getVehicleInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -431,7 +433,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getPrintInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -447,7 +450,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getPhotovoltaicInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -632,7 +636,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseWater(IocParam iocParam) {
         String[] param = {"tapWater","recycledWater"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -640,7 +645,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalysePower(IocParam iocParam) {
         String[] param = {"tip","seal","flat","valley"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -648,7 +654,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseHot(IocParam iocParam) {
         String[] param = {"heatConsumption"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -656,7 +663,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseCold(IocParam iocParam) {
         String[] param = {"refrigerationCapacity","energyConsumption"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -664,7 +672,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseCpv(IocParam iocParam) {
         String[] param = {"powerGeneration","outputPower"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -672,7 +681,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsTotal(IocParam iocParam) {
         String[] param = {"water","cpv","cold","hot","power"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -680,7 +690,8 @@ public class CarbonServiceImpl implements CarbonService {
     @Override
     public ReturnMsg getEnergyTrendsAnalyseCpvInfo(IocParam iocParam) {
         String[] param = {"governmentSubsidies","save"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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/personnel/impl/PersonnelServiceImpl.java

@@ -112,7 +112,8 @@ public class PersonnelServiceImpl implements PersonnelService {
     @Override
     public ReturnMsg getPopulationPerson(IocParam iocParam) {
         String[] param = {"numberPeople"};
-        String[] labKey = {"0时","2时","4时","6时","8时","10时","12时","14时","16时","18时","20时","22时"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -120,7 +121,8 @@ public class PersonnelServiceImpl implements PersonnelService {
     @Override
     public ReturnMsg getPassengerFlow(IocParam iocParam) {
         String[] param = {"Freelance","other"};
-        String[] labKey = {"0时","2时","4时","6时","8时","10时","12时","14时","16时","18时","20时","22时"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        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

@@ -7,6 +7,7 @@ import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.Cake;
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.security.SecurityService;
+import com.sky.ioc.tool.DateUtil;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
@@ -63,7 +64,8 @@ public class SecurityServiceImpl implements SecurityService {
     @Override
     public ReturnMsg getAlarmTrend(IocParam iocParam) {
         String[] param = {"commonly","important","urgent"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -71,7 +73,8 @@ public class SecurityServiceImpl implements SecurityService {
     @Override
     public ReturnMsg getAlarmClassification(IocParam iocParam) {
         String[] param = {"alarmNumber"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -79,9 +82,23 @@ public class SecurityServiceImpl implements SecurityService {
     @Override
     public ReturnMsg getEquipmentOnline(IocParam iocParam) {
         String[] param = {"camera","waterImmersion"};
-        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);
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
+        ThreadLocalRandom random = ThreadLocalRandom.current();
+        List<Label> list = new ArrayList<>();
+        for (int i = 0; i < labKey.length; i++) {
+            Label label = new Label();
+            JSONObject jsonObject = new JSONObject();
+            int i2 = random.nextInt(70, 90);
+            int i1 = random.nextInt(70,90);
+            jsonObject.put(param[0],i1);
+            jsonObject.put(param[1],i2);
+            label.setJsonObject(jsonObject);
+            label.setLabel(labKey[i]);
+            list.add(label);
+        }
+      //  List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(list);
     }
 
     @Override

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

@@ -13,6 +13,7 @@ import com.sky.ioc.mapper.AccessSpaceMapper;
 import com.sky.ioc.mapper.BuildingSpaceMapper;
 import com.sky.ioc.mapper.MeetingMapper;
 import com.sky.ioc.service.space.SpaceService;
+import com.sky.ioc.tool.DateUtil;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
@@ -153,7 +154,8 @@ public class SpaceServiceImpl implements SpaceService {
     @Override
     public ReturnMsg getMeetingCostTrend(IocParam iocParam) {
         String[] param = {"shichang", "bangong", "chanpin", "zhihui", "yewu", "qita"};
-        String[] labKey = {"1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
@@ -161,7 +163,8 @@ public class SpaceServiceImpl implements SpaceService {
     @Override
     public ReturnMsg getSpaceInfo(IocParam iocParam) {
         String[] param = {"administrativeArea", "leisureArea"};
-        String[] labKey = {"1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"};
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }