智能看板图表横坐标修改

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

@@ -9,13 +9,16 @@ import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.mapper.ParkMapper;
 import com.sky.ioc.mapper.ParkingMapper;
 import com.sky.ioc.service.Parking.ParkingService;
+import com.sky.ioc.tool.DateUtil;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.DecimalFormat;
 import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * TODO 智慧停车
@@ -38,21 +41,30 @@ public class ParkingServiceImpl implements ParkingService {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
 
-        Integer totalParking = parkingMapper.getTotalParkingByCompanyIdAndDeptId(iocParam);
+      /*  Integer totalParking = parkingMapper.getTotalParkingByCompanyIdAndDeptId(iocParam);
         Integer totalPark = parkMapper.getTotalParkByCompanyIdAndDeptId(iocParam);
-        Integer total = parkMapper.getTotalParkByCompanyIdAndDeptIdAndType(iocParam,1);//违停
+        Integer total = parkMapper.getTotalParkByCompanyIdAndDeptIdAndType(iocParam,1);//违停*/
 
-        objects.get(0).put("value",2000);
-        objects.get(0).put("compare",0.4);
+        ThreadLocalRandom random = ThreadLocalRandom.current();
+        int totalParking = random.nextInt(1000, 3000);
+        int dayParking = random.nextInt(1000,totalParking);
 
-        objects.get(1).put("value",180);
-        objects.get(1).put("compare",0.4);
+        int breakRuleParking = random.nextInt(10,50);
+        int unParking = totalParking - dayParking;
+        float compare = (float) Math.random();
+        DecimalFormat decimalFormat = new DecimalFormat("#.0");
+        compare = Float.parseFloat(decimalFormat.format(compare));
+        objects.get(0).put("value",totalParking);
+        objects.get(0).put("compare",compare);
 
-        objects.get(2).put("value",20);
-        objects.get(2).put("compare",-0.4);
+        objects.get(1).put("value",dayParking);
+        objects.get(1).put("compare",compare);
 
-        objects.get(3).put("value",40);
-        objects.get(3).put("compare",0.4);
+        objects.get(2).put("value",breakRuleParking);
+        objects.get(2).put("compare",-compare);
+
+        objects.get(3).put("value",unParking);
+        objects.get(3).put("compare",compare);
         indeicator.setWorthAttention("建议增加停车位180个");
         indeicator.setList(objects);
         return ReturnMsg.ok(indeicator);
@@ -61,11 +73,11 @@ public class ParkingServiceImpl implements ParkingService {
     @Override
     public ReturnMsg getTrafficflowSituation(IocParam iocParam) {
         String[] param = {"getInto","leave"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
-
-        Integer totalEntry = parkMapper.getTotalParkByCompanyIdAndDeptIdAndEntryTime(iocParam);
-        Integer totalLeave = parkMapper.getTotalParkByCompanyIdAndDeptIdAndDepartureTime(iocParam);
-
+        String startStr = iocParam.getTimeRange().getStartDate();
+        String endStr = iocParam.getTimeRange().getEndDate();
+        List<String> list = DateUtil.getBetweenDays(startStr, endStr);
+        String[] labKey = list.toArray(new String[0]);
+      //  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);
     }
@@ -76,7 +88,7 @@ public class ParkingServiceImpl implements ParkingService {
     }
     @Override
     public ReturnMsg getParkingSpaceDetails(IocParam iocParam) {
-        List<Parking> list = parkingMapper.getListByCompanyIdAndDeptId(iocParam);
+        //List<Parking> list = parkingMapper.getListByCompanyIdAndDeptId(iocParam);
         return ReturnMsg.ok(FalseData.PARKINGLIST);
     }
 

src/main/java/com/sky/ioc/service/energy/impl/EnergyServiceImpl.java

@@ -5,6 +5,7 @@ import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.Cake;
 import com.sky.ioc.service.energy.EnergyService;
+import com.sky.ioc.tool.DateUtil;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
@@ -53,7 +54,9 @@ public class EnergyServiceImpl implements EnergyService {
     @Override
     public ReturnMsg getElectricityInfoList() {
         String[] param = {"powerConsumption"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        //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);
     }
@@ -61,11 +64,11 @@ public class EnergyServiceImpl implements EnergyService {
     @Override
     public ReturnMsg getElectricityCircleInfoList() {
         List<Cake> list = new ArrayList<>();
-        list.add(new Cake("qita"));
-        list.add(new Cake("gonggong"));
-        list.add(new Cake("xinxi"));
-        list.add(new Cake("zhaoming"));
-        list.add(new Cake("dongli"));
+        list.add(new Cake("其他"));
+        list.add(new Cake("公共"));
+        list.add(new Cake("信息"));
+        list.add(new Cake("照明"));
+        list.add(new Cake("动力"));
         return ReturnMsg.ok(list);
     }
 
@@ -99,7 +102,9 @@ public class EnergyServiceImpl implements EnergyService {
     @Override
     public ReturnMsg getWaterInfoList() {
         String[] param = {"water"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+      /*  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);
     }
@@ -107,8 +112,8 @@ public class EnergyServiceImpl implements EnergyService {
     @Override
     public ReturnMsg getWaterCircleInfoList() {
         List<Cake> list = new ArrayList<>();
-        list.add(new Cake("tapWater"));
-        list.add(new Cake("recycledWater"));
+        list.add(new Cake("自来水"));
+        list.add(new Cake("可循环水"));
         return ReturnMsg.ok(list);
     }
 
@@ -141,7 +146,9 @@ public class EnergyServiceImpl implements EnergyService {
     @Override
     public ReturnMsg getUseColdInfoList() {
         String[] param = {"coolingCapacity","temperature"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+       /* 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 +182,9 @@ public class EnergyServiceImpl implements EnergyService {
     @Override
     public ReturnMsg getUseHeatInfoList() {
         String[] param = {"heatConsumption","temperature"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+      /*  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

@@ -5,6 +5,7 @@ import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.personnel.PersonnelService;
+import com.sky.ioc.tool.DateUtil;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
@@ -58,10 +59,9 @@ public class PersonnelServiceImpl implements PersonnelService {
     //查询智能看板统计画像的统计人员信息报表
     @Override
     public ReturnMsg getPersonnelInfoList() {
-
         String[] param = {"ownEmployees","outsourcingStaff","visitors"};
-        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
-     //   List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        List<String> lists = DateUtil.getBetweenDays("2023/03/01", "2023/03/31");
+        String[] labKey = lists.toArray(new String[0]);
         List<Label> list = new ArrayList<>();
         ThreadLocalRandom random = ThreadLocalRandom.current();
         for (int i = 0; i < labKey.length; i++) {
@@ -69,7 +69,7 @@ public class PersonnelServiceImpl implements PersonnelService {
             JSONObject jsonObject = new JSONObject();
             int ownEmployees = random.nextInt(50, 150);
             int outsourcingStaff = random.nextInt(0, ownEmployees);
-            int visitors = random.nextInt(0, ownEmployees);
+            int visitors = random.nextInt(0, 50);
             jsonObject.put(param[0],ownEmployees);
             jsonObject.put(param[1],outsourcingStaff);
             jsonObject.put(param[2],visitors);