Jelajahi Sumber

会议管理增加按房间号统计会议时长

ZhangManMan 2 tahun lalu
induk
melakukan
034c22bb5a

+ 3 - 4
src/main/java/com/sky/ioc/controller/scene/StrategyController.java

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.sql.Array;
 import java.util.List;
 
 @Api(tags ="智慧场景----智能策略")
@@ -23,8 +24,6 @@ public class StrategyController {
     @Autowired
     StrategyService strategyService;
 
-
-
     @ApiOperation("创建策略")
     @PostMapping(value = "/add")
     public ReturnMsg addStrategy(@RequestBody Strategy strategy){
@@ -61,8 +60,8 @@ public class StrategyController {
 
 
     public static void main(String[] args){
-
-
+        int[] arr = new int[2];
+        System.out.println(arr.length);
     }
 
 

+ 9 - 0
src/main/java/com/sky/ioc/controller/work/MeetingController.java

@@ -3,6 +3,7 @@ package com.sky.ioc.controller.work;
 import com.sky.ioc.entity.domain.meeting.MeetingRecord;
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.meeting.MeetingRecordService;
+import com.sky.ioc.service.meeting.MeetingRoomService;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -35,6 +36,9 @@ public class MeetingController {
     @Autowired
     private MeetingRecordService meetingRecordService;
 
+    @Autowired
+    MeetingRoomService meetingRoomService;
+
 
     @ApiOperation("核心指标")
     @PostMapping("/getMeetingCoreIndicators")
@@ -49,6 +53,11 @@ public class MeetingController {
         return spaceService.getMeetingCostTrend(iocParam);
     }
 
+    @ApiOperation("会议时长")
+    @PostMapping("/getMeetingHours")
+    public ReturnMsg getMeetingHours(@RequestBody IocParam iocParam){
+        return meetingRoomService.getMeetingInfo(iocParam);
+    }
 
 
 

+ 2 - 2
src/main/java/com/sky/ioc/message/MessageReceiver.java

@@ -33,8 +33,8 @@ public class MessageReceiver {
         notice.setTitle(jsonObject.getString("title"));
         notice.setContent(jsonObject.getString("content"));
         notice.setReceived(jsonObject.get("staff").toString());
-        if(jsonObject.get("time")!=null){
-            notice.setTime(jsonObject.getString("time"));
+        if(jsonObject.get("send_time")!=null){
+            notice.setTime(jsonObject.getString("send_time"));
         }else{
             notice.setTime(new Date()+"");
         }

+ 2 - 0
src/main/java/com/sky/ioc/service/meeting/MeetingRoomService.java

@@ -8,5 +8,7 @@ public interface MeetingRoomService {
 
     ReturnMsg getMeetingRoomStatus(String date);
 
+    ReturnMsg  getMeetingInfo(IocParam iocParam);
+
 
 }

+ 35 - 0
src/main/java/com/sky/ioc/service/meeting/impl/MeetingRoomServiceImpl.java

@@ -1,14 +1,22 @@
 package com.sky.ioc.service.meeting.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.sky.ioc.config.RestTemplateConfig;
+import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.domain.meeting.MeetingRecord;
 import com.sky.ioc.entity.domain.meeting.MeetingRoom;
 import com.sky.ioc.entity.domain.space.BuildingFloor;
+import com.sky.ioc.entity.domain.space.Company;
+import com.sky.ioc.entity.domain.space.Department;
+import com.sky.ioc.entity.params.IocParam;
+import com.sky.ioc.entity.params.IocTimeRange;
 import com.sky.ioc.mapper.meeting.MeetingRecordMapper;
 import com.sky.ioc.mapper.meeting.MeetingRoomMapper;
 import com.sky.ioc.mapper.space.BuildingFloorMapper;
 import com.sky.ioc.service.meeting.MeetingRoomService;
+import com.sky.ioc.tool.DateUtil;
 import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,8 +27,10 @@ import org.springframework.web.client.RestTemplate;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -135,4 +145,29 @@ public class MeetingRoomServiceImpl implements MeetingRoomService {
         }
         return ReturnMsg.ok(mapList);
     }
+
+    @Override
+    public ReturnMsg getMeetingInfo(IocParam iocParam) {
+        ThreadLocalRandom random = ThreadLocalRandom.current();
+        Integer floorId = iocParam.getFloorId()==null?7:iocParam.getFloorId();
+        String[] param ={floorId+"01",floorId+"02",floorId+"03"};
+        String startStr = iocParam.getTimeRange().getStartDate();
+        String endStr = iocParam.getTimeRange().getEndDate();
+        List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
+        String[] labKey = lists.toArray(new String[0]);
+        List<Label> labels1 = new ArrayList<>();
+        for (int i = 0; i < labKey.length; i++) {
+            Label label = new Label();
+            JSONObject jsonObject = new JSONObject();
+            for (int j = 0; j < param.length; j++) {
+                int hours = random.nextInt(1,10);
+                jsonObject.put(param[j],hours);
+            }
+            label.setJsonObject(jsonObject);
+            label.setLabel(labKey[i]);
+            labels1.add(label);
+        }
+        // List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
+    }
 }