健康小屋环境信息

src/main/java/com/sky/ioc/entity/Environment.java

@@ -2,9 +2,6 @@ package com.sky.ioc.entity;
 
 import lombok.Data;
 
-import java.lang.reflect.Type;
-import java.util.concurrent.ThreadLocalRandom;
-
 /**
  * TODO
  * @Description 环境检测
@@ -23,11 +20,10 @@ public class Environment {
     private String type;
 
 
-    public Environment(String key1, String keyName,String type1){
-        ThreadLocalRandom current = ThreadLocalRandom.current();
+    public Environment(String key1, String keyName,String type1, String value1){
         key = key1;
         title = keyName;
-        value = current.nextInt(50,100)+"";
+        value = value1;
         type = type1;
     }
 

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

@@ -6,13 +6,13 @@ import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.fitness.HealthService;
-import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * TODO 健康小屋
@@ -71,14 +71,15 @@ public class HealthServiceImpl implements HealthService {
     @Override
     public ReturnMsg getEnvironmentalDetection(IocParam iocParam) {
         List<Environment> arrayList = new ArrayList<>();
-        arrayList.add(new Environment("pm","pm2.5","1"));
-        arrayList.add(new Environment("pm","pm2.5","2"));
+        ThreadLocalRandom current = ThreadLocalRandom.current();
+        arrayList.add(new Environment("pm","pm2.5","1", current.nextInt(50,100)+""));
+        arrayList.add(new Environment("pm","pm2.5","2", current.nextInt(100,150)+""));
 
-        arrayList.add(new Environment("hm","湿度","1"));
-        arrayList.add(new Environment("hm","湿度","2"));
+        arrayList.add(new Environment("hm","湿度","1", current.nextInt(35,50)+""));
+        arrayList.add(new Environment("hm","湿度","2", current.nextInt(20,35)+""));
 
-        arrayList.add(new Environment("tm","温度","1"));
-        arrayList.add(new Environment("tm","温度","2"));
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST3);
+        arrayList.add(new Environment("tm","温度","1", current.nextInt(20,26)+""));
+        arrayList.add(new Environment("tm","温度","2", current.nextInt(15,30)+""));
+        return ReturnMsg.ok(arrayList);
     }
 }