修改核心指标数据

src/main/java/com/sky/ioc/controller/dashboard/AssetController.java

@@ -26,10 +26,10 @@ public class AssetController {
     private AssetService assetsService;
 
 
-    @ApiOperation("查询智能看板资产画像的汇总信息")
-    @GetMapping("getAssetCount")
-    public ReturnMsg getAssetCount(){
-        return assetsService.getAssetCount();
+    @ApiOperation("查询智能看板资产画像的核心指标")
+    @GetMapping("getAssetCoreIndicators")
+    public ReturnMsg getAssetCoreIndicators(){
+        return assetsService.getAssetCoreIndicators();
     }
 
 

src/main/java/com/sky/ioc/entity/params/IocDateParam.java

@@ -8,8 +8,8 @@ import java.util.Date;
 @Data
 public class IocDateParam extends IocParam {
     /** 开始时间 */
-    private Date startDate;
+    private String startDate;
 
     /** 结束时间 */
-    private Date endDate;
+    private String endDate;
 }

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

@@ -1,11 +1,15 @@
 package com.sky.ioc.service.Parking.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * TODO 智慧停车
  * @Description
@@ -18,7 +22,22 @@ public class ParkingServiceImpl implements ParkingService {
 
     @Override
     public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",2000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",180);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",20);
+        objects.get(2).put("compare",-0.4);
+
+        objects.get(3).put("value",40);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("建议增加停车位180个");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override

src/main/java/com/sky/ioc/service/assets/AssetService.java

@@ -24,4 +24,6 @@ public interface AssetService {
     ReturnMsg getAssetShareRanking(IocDateParam iocDateParam);
 
     ReturnMsg getScrapAndMaintain(IocDateParam iocDateParam);
+
+    ReturnMsg getAssetCoreIndicators();
 }

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

@@ -78,4 +78,23 @@ public class AssetServiceImpl implements AssetService {
     public ReturnMsg getScrapAndMaintain(IocDateParam iocDateParam) {
         return null;
     }
+
+    @Override
+    public ReturnMsg getAssetCoreIndicators() {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",12000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",2100);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",21);
+        objects.get(2).put("compare",-0.4);
+
+        objects.get(3).put("value",12);
+        indeicator.setWorthAttention("内容");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
+    }
 }

src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java

@@ -44,7 +44,22 @@ public class RestaurantServiceImpl implements RestaurantService {
      */
     @Override
     public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",400);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",2000);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",18);
+        objects.get(2).put("compare",-0.4);
+
+        objects.get(3).put("value",18);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("员工偏爱川菜，建议增加");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     /**

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

@@ -1,11 +1,15 @@
 package com.sky.ioc.service.fitness.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.fitness.HealthService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * TODO 健康小屋
  * @Description
@@ -17,7 +21,20 @@ import org.springframework.stereotype.Service;
 public class HealthServiceImpl implements HealthService {
     @Override
     public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",100);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",20);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",21);
+        objects.get(2).put("compare",-0.4);
+        objects.get(3).put("value","高血压");
+        indeicator.setWorthAttention("员工腰椎问题持续上升");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override

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

@@ -58,18 +58,14 @@ public class SpaceServiceImpl implements SpaceService {
     public ReturnMsg getFloorCoreIndicators(IocDateParam iocDateParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
-        objects.get(0).put("value",1.3);
-        objects.get(0).put("compare",0.4);
-
-        objects.get(1).put("value",5000);
-        objects.get(1).put("compare",0.4);
-
-        objects.get(2).put("value","项目1");
-        objects.get(2).put("compare",60);
-
-        objects.get(3).put("value","工业互联网");
-        objects.get(3).put("compare",60);
-        indeicator.setWorthAttention("13笔记本即将到报废年限");
+        objects.get(0).put("value",90);
+        objects.get(1).put("value",500);
+        objects.get(2).put("value",380);
+        objects.get(3).put("value",80);
+        objects.add(new JSONObject());
+        objects.add(new JSONObject());
+        objects.get(4).put("value",40);
+        objects.get(5).put("value",20);
         indeicator.setList(objects);
         return ReturnMsg.ok(indeicator);
     }

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

@@ -21,7 +21,22 @@ import java.util.List;
 public class SupermarketServiceImpl implements SupermarketService {
     @Override
     public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
-        return  ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",100);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",2100);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",21);
+        objects.get(2).put("compare",-0.4);
+
+        objects.get(3).put("value",1);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("本月盈利将达12万元");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override