Explorar el Código

智慧场景-会议数据分布饼状图接口

ZhangManMan hace 2 años
padre
commit
8469d50048

+ 11 - 0
src/main/java/com/sky/ioc/controller/scene/MeetingRoomController.java

@@ -62,4 +62,15 @@ public class MeetingRoomController {
     public ReturnMsg getMeetingMinutes(@RequestBody IocTimeRange iocTimeRange){
         return meetingRecordService.getMeetingAnalysissMinutes(iocTimeRange);
     }
+
+    @ApiOperation("统计分析--会议数据分布时长")
+    @PostMapping("/getMeetingCakeMinutes")
+    public ReturnMsg getMeetingCakeMinutes(@RequestBody IocTimeRange iocTimeRange){
+        return meetingRecordService.getMeetingCakeMinutes(iocTimeRange);
+    }
+    @ApiOperation("统计分析--会议数据分布人数")
+    @PostMapping("/getMeetingCakePerson")
+    public ReturnMsg getMeetingCakePerson(@RequestBody IocTimeRange iocTimeRange){
+        return meetingRecordService.getMeetingCakePerson(iocTimeRange);
+    }
 }

+ 2 - 2
src/main/java/com/sky/ioc/controller/security/PersonController.java

@@ -73,12 +73,12 @@ public class PersonController {
     }
 
     @Autowired
-    ParkService parkService;
+    MeetingRecordService meetingRecordService;
 
     @ApiOperation("")
     @PostMapping("/getData")
     public ReturnMsg getData(){
-        return parkService.getParkData();
+        return meetingRecordService.getMeetingRecordList();
     }
 
 

+ 4 - 0
src/main/java/com/sky/ioc/service/meeting/MeetingRecordService.java

@@ -26,5 +26,9 @@ public interface MeetingRecordService {
     ReturnMsg getMeetingAnalysissPerson(IocTimeRange iocTimeRange);
     ReturnMsg getMeetingAnalysissMinutes(IocTimeRange iocTimeRange);
 
+    ReturnMsg getMeetingCakeMinutes(IocTimeRange iocTimeRange);
+
+    ReturnMsg getMeetingCakePerson(IocTimeRange iocTimeRange);
+
 
 }

+ 88 - 1
src/main/java/com/sky/ioc/service/meeting/impl/MeetingRecordServiceImpl.java

@@ -3,6 +3,7 @@ package com.sky.ioc.service.meeting.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sky.ioc.config.RestTemplateConfig;
+import com.sky.ioc.entity.Cake;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.domain.meeting.MeetingRecord;
@@ -98,7 +99,7 @@ public class MeetingRecordServiceImpl implements MeetingRecordService {
                     meetingRecord.setEndTime(meetingDate+" "+json.get("endTime"));
                     Long minutes = DateUtil.minutesBetween(meetingDate+" "+json.get("startTime"),meetingDate+" "+json.get("endTime"));
                     meetingRecord.setMinutes(minutes);
-                    Integer personNum = random.nextInt(4,40);
+                    Integer personNum = random.nextInt(3,40);
                     meetingRecord.setPersonNum(personNum);
                     meetingRecord.setBookPerson((String) json.get("bookPerson"));
                     meetingRecord.setBookPhone((String) json.get("bookPhone"));
@@ -224,4 +225,90 @@ public class MeetingRecordServiceImpl implements MeetingRecordService {
         }
         return ReturnMsg.ok(labels1);
     }
+
+    @Override
+    public ReturnMsg getMeetingCakeMinutes(IocTimeRange iocTimeRange) {
+        List<Cake> lists = new ArrayList<>();
+        Cake cake30 = new Cake();
+        Cake cake60 = new Cake();
+        Cake cake90 = new Cake();
+        Cake cake120 = new Cake();
+        Cake cake150 = new Cake();
+        Cake cake180 = new Cake();
+        cake30.setName("30分钟以内");
+        cake60.setName("30-60分钟");
+        cake90.setName("60-90分钟");
+        cake120.setName("90-120分钟");
+        cake150.setName("120-150分钟");
+        cake180.setName("150分钟以上");
+        Long minutes30 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .lt(MeetingRecord::getMinutes,30));
+        Long minutes60 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getMinutes,30)
+                .lt(MeetingRecord::getMinutes,60));
+        Long minutes90 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getMinutes,60).lt(MeetingRecord::getMinutes,90));
+        Long minutes120 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getMinutes,90).lt(MeetingRecord::getMinutes,120));
+        Long minutes150 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getMinutes,120).lt(MeetingRecord::getMinutes,150));
+        Long minutes180 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getMinutes,150));
+        cake30.setValue(minutes30);
+        cake60.setValue(minutes60);
+        cake90.setValue(minutes90);
+        cake120.setValue(minutes120);
+        cake150.setValue(minutes150);
+        cake180.setValue(minutes180);
+        lists.add(cake30);
+        lists.add(cake60);
+        lists.add(cake90);
+        lists.add(cake120);
+        lists.add(cake150);
+        lists.add(cake180);
+        return ReturnMsg.ok(lists);
+    }
+
+    @Override
+    public ReturnMsg getMeetingCakePerson(IocTimeRange iocTimeRange) {
+        List<Cake> lists = new ArrayList<>();
+        Cake cake4 = new Cake();
+        Cake cake8 = new Cake();
+        Cake cake12 = new Cake();
+        Cake cake16 = new Cake();
+        Cake cake20 = new Cake();
+        Cake cakeMore = new Cake();
+        cake4.setName("4人以内");
+        cake8.setName("4-8人");
+        cake12.setName("8-12人");
+        cake16.setName("12-16人");
+        cake20.setName("16-20人");
+        cakeMore.setName("20人以上");
+        Long person4 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .lt(MeetingRecord::getPersonNum,4));
+        Long person8 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getPersonNum,4)
+                .lt(MeetingRecord::getPersonNum,8));
+        Long person12 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getPersonNum,8).lt(MeetingRecord::getPersonNum,12));
+        Long person16 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getPersonNum,12).lt(MeetingRecord::getPersonNum,16));
+        Long person20 = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getPersonNum,16).lt(MeetingRecord::getPersonNum,20));
+        Long personMore = meetingRecordMapper.selectCount(new LambdaQueryWrapper<MeetingRecord>()
+                .ge(MeetingRecord::getPersonNum,20));
+        cake4.setValue(person4);
+        cake8.setValue(person8);
+        cake12.setValue(person12);
+        cake16.setValue(person16);
+        cake20.setValue(person20);
+        cakeMore.setValue(personMore);
+        lists.add(cake4);
+        lists.add(cake8);
+        lists.add(cake12);
+        lists.add(cake16);
+        lists.add(cake20);
+        lists.add(cakeMore);
+        return ReturnMsg.ok(lists);
+    }
 }