Merge branch 'master' of http://39.105.126.192:3000/DR3_server/sky_ioc_server

 Conflicts:

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

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

@@ -7,8 +7,7 @@ import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * TODO
- *
- * @Description
+ * @Description  告警
  * @Author LunCe
  * @Date 2023/3/14 15:01
  **/

src/main/java/com/sky/ioc/entity/life/Cuisine.java → src/main/java/com/sky/ioc/entity/canteen/Cuisine.java

@@ -1,10 +1,8 @@
-package com.sky.ioc.entity.life;
+package com.sky.ioc.entity.canteen;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -30,12 +28,7 @@ public class Cuisine {
     /*
      *  价格
      */
-    private JSONObject Price;
-    /*
-     *  销量
-     */
-    private Integer salesVolume;
-
+    private String Price;
 
 
     public Cuisine(String name){
@@ -43,11 +36,10 @@ public class Cuisine {
         cuisineImg = "https://img.zcool.cn/community/018aeb5dc37c46a801209e1fb5e4d6.jpg@1280w_1l_2o_100sh.jpg";
         cuisineType = current.nextInt(0,3);
         cuisineTypeTwo = current.nextInt(0,4);
-        salesVolume = current.nextInt(100,2000);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("大",16);
         jsonObject.put("小",8);
-        Price = jsonObject;
+        Price = jsonObject+"";
         cuisineName = name;
     }
 

src/main/java/com/sky/ioc/entity/canteen/Order.java

@@ -0,0 +1,55 @@
+package com.sky.ioc.entity.canteen;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ * @Description  菜品订单表
+ * @Author LunCe
+ * @Date 2023/3/21 13:49
+ **/
+
+
+@Data
+public class Order {
+
+
+    /**
+     * 菜品信息
+     */
+    private List<Cuisine> cuisineList;
+    /**
+     * 订单ID
+     */
+    private Integer  orderId;
+    /**
+     * 人员ID
+     */
+    private Integer  userId;
+    /**
+     * 部门ID
+     */
+    private Integer  departmentId;
+    /**
+     * 价格
+     */
+    private Double  orderPrice;
+    /**
+     * 就餐时间
+     */
+    private String  orderTime;
+
+    /**
+     * 支付类型  1.人脸，扫码，刷卡，线下
+     */
+    private Integer  payType;
+
+
+
+
+
+
+
+}

src/main/java/com/sky/ioc/entity/fitness/Fitnes.java

@@ -0,0 +1,33 @@
+package com.sky.ioc.entity.fitness;
+
+import lombok.Data;
+
+/**
+ * TODO
+ * @Description  健康小屋 ----体检
+ * @Author LunCe
+ * @Date 2023/3/21 15:03
+ **/
+
+@Data
+public class Fitnes {
+
+
+    /**是否进仓*/
+    private String warehouse;
+    /**检查时间*/
+    private String time;
+    /**健康情况 1. 健康 2.亚健康  3.不健康*/
+    private Integer fitnesType;
+    /**患病问题类型*/
+    private String fallIll;
+    /**用户id*/
+    private Integer userId;
+    /**用户名称*/
+    private String userName;
+    /**单位ID*/
+    private String companyId;
+    /**单位名称*/
+    private String company;
+
+}

src/main/java/com/sky/ioc/entity/meeting/Meeting.java

@@ -0,0 +1,35 @@
+package com.sky.ioc.entity.meeting;
+
+import lombok.Data;
+
+/**
+ * TODO
+ * @Description  会议室情况
+ * @Author LunCe
+ * @Date 2023/3/21 16:49
+ **/
+
+@Data
+public class Meeting {
+
+
+    /**会议主题*/
+    private String  total;
+    /**预约部门*/
+    private String  departmentId;
+    /**预约部门名称*/
+    private String  departmentName;
+
+    /**参会人员(多个id逗号分割)*/
+    private String userIdStr;
+
+    /**会议费用*/
+    private String meetingPirce;
+    /**会议成本*/
+    private String meetingCost;
+    /**会议配置*/
+    private Integer allocation;
+
+
+
+}

src/main/java/com/sky/ioc/entity/parking/Park.java

@@ -0,0 +1,36 @@
+package com.sky.ioc.entity.parking;
+
+import lombok.Data;
+
+/**
+ * TODO
+ * @Description  停车记录
+ * @Author LunCe
+ * @Date 2023/3/21 14:22
+ **/
+
+@Data
+public class Park {
+
+
+
+    /**拥有者ID*/
+    private Integer userId;
+    /**拥有者*/
+    private String people;
+
+    /**单位ID*/
+    private String companyId;
+
+    /**单位名称*/
+    private String company;
+    /**车牌号*/
+    private String licencePlate;
+    /**进入时间*/
+    private String entryTime;
+    /**离开时间*/
+    private String departureTime;
+    /**是否违停*/
+    private Integer type;
+
+}

src/main/java/com/sky/ioc/entity/life/Parking.java → src/main/java/com/sky/ioc/entity/parking/Parking.java

@@ -1,4 +1,4 @@
-package com.sky.ioc.entity.life;
+package com.sky.ioc.entity.parking;
 
 import lombok.Data;
 import lombok.NonNull;
@@ -8,8 +8,7 @@ import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * TODO
- *
- * @Description
+ * @Description  停车位
  * @Author LunCe
  * @Date 2023/3/14 11:08
  **/
@@ -18,15 +17,20 @@ import java.util.concurrent.ThreadLocalRandom;
 public class Parking {
 
 
+
     /**车位*/
     private String position;
+
+    /**拥有者ID*/
+    private Integer userId;
     /**拥有者*/
     private String people;
-    /**单位*/
-    private String company;
-    /**停车时间*/
-    private String prkingDuration;
 
+    /**单位ID*/
+    private String companyId;
+
+    /**单位名称*/
+    private String company;
 
     /**最长停车时间*/
     private String prkingDurationLong;
@@ -36,12 +40,14 @@ public class Parking {
 
 
 
+
+
+
     public Parking(String param1 , @NonNull String param2 , String param3,String param4 , String param5){
         ThreadLocalRandom current = ThreadLocalRandom.current();
         position = param1;
         people = param2;
         company = param3;
-        prkingDuration = ""+ current.nextInt(1,10);
         prkingDurationLong  = param4;
         prkingDurationBreak = param5;
     }

src/main/java/com/sky/ioc/entity/space/AccessSpace.java

@@ -0,0 +1,33 @@
+package com.sky.ioc.entity.space;
+
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @Description 当日门禁进入人员
+ * @Author LunCe
+ * @Date 2023/3/21 16:16
+ **/
+
+@Data
+public class AccessSpace {
+
+    /**用户id*/
+    private Integer userId;
+    /**用户名称*/
+    private String name;
+    /**单位ID*/
+    private String companyId;
+    /**单位名称*/
+    private String company;
+    /**楼层*/
+    private String tier;
+    /**部门Id*/
+    private String departmentId;
+    /**部门名称*/
+    private String departmentName;
+    /**进入时间*/
+    private String endDate;
+
+}

src/main/java/com/sky/ioc/entity/space/BuildingSpace.java

@@ -0,0 +1,36 @@
+package com.sky.ioc.entity.space;
+
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @Description  楼宇空间
+ * @Author LunCe
+ * @Date 2023/3/21 16:06
+ **/
+
+
+@Data
+public class BuildingSpace {
+
+
+    /**领导办公室面积*/
+    private Double leadArea;
+    /**会议室面积*/
+    private Double meetingArea;
+    /**工作区面积*/
+    private Double wordArea;
+    /**打印区面积*/
+    private Double printArea;
+    /**其他区域面积*/
+    private Double restArea;
+
+    /**楼层*/
+    private String tier;
+
+    /**工位总数*/
+    private Integer stationCount;
+
+
+}

src/main/java/com/sky/ioc/entity/life/Supermarket.java → src/main/java/com/sky/ioc/entity/supermarket/Supermarket.java

@@ -1,4 +1,4 @@
-package com.sky.ioc.entity.life;
+package com.sky.ioc.entity.supermarket;
 
 import lombok.Data;
 
@@ -6,8 +6,7 @@ import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * TODO
- *
- * @Description
+ * @Description  商品信息
  * @Author LunCe
  * @Date 2023/3/14 14:15
  **/
@@ -15,9 +14,10 @@ import java.util.concurrent.ThreadLocalRandom;
 @Data
 public class Supermarket {
 
+    private Integer id;
     private String img;
     private String name;
-    private String salesVolume;
+    /**商品单价*/
     private String price;
 
 
@@ -25,7 +25,7 @@ public class Supermarket {
         ThreadLocalRandom current = ThreadLocalRandom.current();
         img = "https://p0.itc.cn/q_70/images03/20220604/eb9166efe6fe47bcb80dcb81cb2bebce.jpeg";
         name = param1 ;
-        salesVolume = current.nextInt(1,1000)+"";
+        //salesVolume = current.nextInt(1,1000)+"";
         price = current.nextInt(1,30)+"";
     }
 }

src/main/java/com/sky/ioc/entity/supermarket/SupermarketOrder.java

@@ -0,0 +1,39 @@
+package com.sky.ioc.entity.supermarket;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ * @Description  商品订单表
+ * @Author LunCe
+ * @Date 2023/3/21 14:42
+ **/
+
+@Data
+public class SupermarketOrder {
+
+
+
+    /**订单id*/
+    private Integer orderId;
+    /**订单类型*/
+    private Integer orderType;
+    /**订单金额*/
+    private Double  orderPrice;
+    /**用户id*/
+    private Integer userId;
+    /**用户名称*/
+    private String userName;
+    /**单位ID*/
+    private String companyId;
+    /**单位名称*/
+    private String company;
+    /**支付时间*/
+    private String orderTime;
+    /**商品信息*/
+    private List<Supermarket> supermarketList;
+
+
+}

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.Cake;
-import com.sky.ioc.entity.life.Parking;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.FalseData;
@@ -12,11 +11,7 @@ import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
-import java.text.DecimalFormat;
 import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
 
 /**
  * TODO 智慧停车
@@ -32,28 +27,6 @@ public class ParkingServiceImpl implements ParkingService {
     public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
-        /*ThreadLocalRandom random = ThreadLocalRandom.current();
-        int totalParking = random.nextInt(1000, 3000);
-        int dayParking = random.nextInt(1000,3000);
-        while (dayParking>totalParking){
-            dayParking  = random.nextInt(1000,3000);
-        }
-        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(1).put("value",dayParking);
-        objects.get(1).put("compare",compare);
-
-        objects.get(2).put("value",breakRuleParking);
-        objects.get(2).put("compare",-compare);
-
-        objects.get(3).put("value",unParking);
-        objects.get(3).put("compare",compare);*/
         objects.get(0).put("value",2000);
         objects.get(0).put("compare",0.4);
 

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

@@ -1,8 +1,8 @@
 package com.sky.ioc.tool;
 
-import com.sky.ioc.entity.life.Cuisine;
-import com.sky.ioc.entity.life.Parking;
-import com.sky.ioc.entity.life.Supermarket;
+import com.sky.ioc.entity.canteen.Cuisine;
+import com.sky.ioc.entity.parking.Parking;
+import com.sky.ioc.entity.supermarket.Supermarket;
 import com.sky.ioc.entity.work.Access;
 import org.springframework.stereotype.Service;
 
@@ -69,7 +69,6 @@ public class FalseData {
         CUISINELIST.add(new Cuisine("麻酱凤尾"));
         CUISINELIST.add(new Cuisine("麻酱凤尾"));
         CUISINELIST.add(new Cuisine("麻酱凤尾"));
-        Collections.sort(CUISINELIST, (o1, o2) -> o2.getSalesVolume() - o1.getSalesVolume());
 
 
         PARKINGLIST.add(new Parking("B201","张三","北京电信规划设计院","8","0"));
@@ -105,8 +104,6 @@ public class FalseData {
         SUPERMARKETLIST.add(new Supermarket("雪碧"));
         SUPERMARKETLIST.add(new Supermarket("牛板筋"));
         SUPERMARKETLIST.add(new Supermarket("牛肉干"));
-        Collections.sort(SUPERMARKETLIST, (o1, o2) -> Integer.valueOf(o2.getSalesVolume())-Integer.valueOf(o1.getSalesVolume()));
-