liuhaotian 2 жил өмнө
parent
commit
3b5c9c5851

+ 35 - 0
src/main/java/com/sky/ioc/entity/Environment.java

@@ -0,0 +1,35 @@
+package com.sky.ioc.entity;
+
+import lombok.Data;
+
+import java.lang.reflect.Type;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * TODO
+ * @Description 环境检测
+ * @Author LunCe
+ * @Date 2023/3/14 17:45
+ **/
+
+@Data
+public class Environment {
+
+
+
+    private String key;
+    private String title;
+    private String value;
+    private String type;
+
+
+    public Environment(String key1, String keyName,String type1){
+        ThreadLocalRandom current = ThreadLocalRandom.current();
+        key = key1;
+        title = keyName;
+        value = current.nextInt(50,100)+"";
+        type = type1;
+    }
+
+
+}

+ 1 - 1
src/main/java/com/sky/ioc/entity/life/Parking.java

@@ -41,7 +41,7 @@ public class Parking {
         position = param1;
         people = param2;
         company = param3;
-        prkingDuration = ""+current.nextDouble(0.1,10.5);
+        prkingDuration = ""+ current.nextInt(1,10);
         prkingDurationLong  = param4;
         prkingDurationBreak = param5;
     }

+ 1 - 1
src/main/java/com/sky/ioc/entity/work/Access.java

@@ -26,6 +26,6 @@ public class Access {
     public Access(){
         name = "章峰";
         company = "创新产品研发中心";
-        endDate = ""+new Date(System.currentTimeMillis());
+        endDate = "2023-08-01 12:01:00";
     }
 }

+ 11 - 0
src/main/java/com/sky/ioc/service/fitness/impl/HealthServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sky.ioc.service.fitness.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Environment;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.params.IocDateParam;
@@ -10,6 +11,7 @@ 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;
 
 /**
@@ -49,6 +51,15 @@ public class HealthServiceImpl implements HealthService {
 
     @Override
     public ReturnMsg getEnvironmentalDetection(IocDateParam iocDateParam) {
+        List<Environment> arrayList = new ArrayList<>();
+        arrayList.add(new Environment("pm","pm2.5","1"));
+        arrayList.add(new Environment("pm","pm2.5","2"));
+
+        arrayList.add(new Environment("hm","湿度","1"));
+        arrayList.add(new Environment("hm","湿度","2"));
+
+        arrayList.add(new Environment("tm","温度","1"));
+        arrayList.add(new Environment("tm","温度","2"));
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST3);
     }
 }

+ 2 - 1
src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java

@@ -6,6 +6,7 @@ import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.space.SpaceService;
+import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
@@ -56,7 +57,7 @@ public class SpaceServiceImpl implements SpaceService {
 
     @Override
     public ReturnMsg getAccessPersonnel(IocDateParam iocDateParam) {
-        return null;
+        return ReturnMsg.ok(FalseData.ACCESSLIST);
     }
 
     @Override