图表数据增加部门查询

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

@@ -38,8 +38,21 @@ public class AssetServiceImpl implements AssetService {
     public ReturnMsg getAssetLife() {
         String[] param = {"serviceLife","standardLife"};
         String[] labKey = {"资产1","资产2","资产3","资产4","资产5","资产6"};
-        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
-        return ReturnMsg.ok(labels1);
+        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(2, 40);
+            int i1 = random.nextInt(2, i2);
+            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/canteen/impl/RestaurantServiceImpl.java

@@ -171,12 +171,16 @@ public class RestaurantServiceImpl implements RestaurantService {
             Label label = new Label();
             JSONObject jsonObject = new JSONObject();
             IocParam iocParam1 = new IocParam();
+            iocParam1.setCompanyId(iocParam.getCompanyId());
+            iocParam1.setDeptId(iocParam.getDeptId());
             IocTimeRange iocTimeRange = new IocTimeRange();
             iocTimeRange.setStartDate(labKey[i]+" 00:00:00");
             iocTimeRange.setEndDate(labKey[i]+" 10:00:00");
             iocParam1.setTimeRange(iocTimeRange);
 
             IocParam iocParam2 = new IocParam();
+            iocParam2.setCompanyId(iocParam.getCompanyId());
+            iocParam2.setDeptId(iocParam.getDeptId());
             IocTimeRange iocTimeRange2 = new IocTimeRange();
             iocTimeRange2.setStartDate(labKey[i]+" 10:00:00");
             iocTimeRange2.setEndDate(labKey[i]+" 15:00:00");
@@ -287,6 +291,8 @@ public class RestaurantServiceImpl implements RestaurantService {
             Label label = new Label();
             JSONObject jsonObject = new JSONObject();
             IocParam iocParam1 = new IocParam();
+            iocParam1.setCompanyId(iocParam.getCompanyId());
+            iocParam1.setDeptId(iocParam.getDeptId());
             IocTimeRange iocTimeRange = new IocTimeRange();
             iocTimeRange.setStartDate(labKey[i]+" 00:00:00");
             iocTimeRange.setEndDate(labKey[i]+" 23:59:00");

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

@@ -103,6 +103,8 @@ public class CarbonServiceImpl implements CarbonService {
             Label label = new Label();
             JSONObject jsonObject = new JSONObject();
             IocParam iocParam1 = new IocParam();
+            iocParam1.setCompanyId(iocParam.getCompanyId());
+            iocParam1.setDeptId(iocParam.getDeptId());
             IocTimeRange iocTimeRange = new IocTimeRange();
             iocTimeRange.setStartDate(labKey[i]+" 00:00:00");
             iocTimeRange.setEndDate(labKey[i]+" 23:59:00");

src/main/java/com/sky/ioc/service/fitness/impl/HealthServiceImpl.java

@@ -70,6 +70,8 @@ public class HealthServiceImpl implements HealthService {
             Label label = new Label();
             JSONObject jsonObject = new JSONObject();
             IocParam iocParam1 = new IocParam();
+            iocParam1.setCompanyId(iocParam.getCompanyId());
+            iocParam1.setDeptId(iocParam.getDeptId());
             IocTimeRange iocTimeRange = new IocTimeRange();
             iocTimeRange.setStartDate(labKey[i]+" 00:00:00");
             iocTimeRange.setEndDate(labKey[i]+" 23:59:59");

src/main/java/com/sky/ioc/service/supermarket/impl/SupermarketServiceImpl.java

@@ -87,14 +87,14 @@ public class SupermarketServiceImpl implements SupermarketService {
         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);
         List<Label> labels1 = new ArrayList<>();
         DecimalFormat decimalFormat = new DecimalFormat("#.0");
         for (int i = 0; i < labKey.length; i++) {
             Label label = new Label();
             JSONObject jsonObject = new JSONObject();
             IocParam iocParam1 = new IocParam();
+            iocParam1.setCompanyId(iocParam.getCompanyId());
+            iocParam1.setDeptId(iocParam.getDeptId());
             IocTimeRange iocTimeRange = new IocTimeRange();
             iocTimeRange.setStartDate(labKey[i]+" 00:00:00");
             iocTimeRange.setEndDate(labKey[i]+" 12:00:00");
@@ -150,6 +150,8 @@ public class SupermarketServiceImpl implements SupermarketService {
             Label label = new Label();
             JSONObject jsonObject = new JSONObject();
             IocParam iocParam1 = new IocParam();
+            iocParam1.setCompanyId(iocParam.getCompanyId());
+            iocParam1.setDeptId(iocParam.getDeptId());
             IocTimeRange iocTimeRange = new IocTimeRange();
             iocTimeRange.setStartDate(labKey[i]+" 00:00:00");
             iocTimeRange.setEndDate(labKey[i]+" 23:59:59");

src/main/java/com/sky/ioc/tool/GeneralMethod.java

@@ -42,6 +42,9 @@ public class GeneralMethod {
             JSONObject jsonObject = new JSONObject();
             for (int j = 0; j < paramSize.length; j++) {
                 int i1 = random.nextInt(50, 150);
+                if(paramSize[j].equals("rateReturn")){
+                    i1 = random.nextInt(10, 100);
+                }
                 jsonObject.put(paramSize[j],i1);
             }
             label.setJsonObject(jsonObject);