修改通知去重复

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java

@@ -82,17 +82,17 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                 for (MettingRecordEntity mettingRecord : list) {
 
                     //格式化分钟
-                    Date meetTimeStart1 =  DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeStart(), "yyyy-MM-dd HH:mm")+":00");
-                    Date meetTimeEnd1 =  DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeEnd(), "yyyy-MM-dd HH:mm")+":00");
+                    Date meetTimeStart1 = DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeStart(), "yyyy-MM-dd HH:mm") + ":00");
+                    Date meetTimeEnd1 = DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeEnd(), "yyyy-MM-dd HH:mm") + ":00");
                     // DateRange range1 = DateUtil.range(meetTimeStart, meetTimeEnd, DateField.MINUTE);
                     //DateRange range2 = DateUtil.range(meetTimeStart1, meetTimeEnd1, DateField.MINUTE);
                     boolean in = belongCalendar(meetTimeStart, meetTimeStart1, meetTimeEnd1);
                     boolean in1 = belongCalendar(meetTimeEnd, meetTimeStart1, meetTimeEnd1);
 
-                    log.info("in:{},in1:{}",in,in1);
+                    log.info("in:{},in1:{}", in, in1);
 
-                   // Boolean aBoolean = checkTimesHasOverlap(meetTimeStart, meetTimeEnd, meetTimeStart1, meetTimeEnd1);
-                    if (in||in1) {
+                    // Boolean aBoolean = checkTimesHasOverlap(meetTimeStart, meetTimeEnd, meetTimeStart1, meetTimeEnd1);
+                    if (in || in1) {
                         bool = true;
                         log.info("meetTimeStart:{},meetTimeEnd:{}, meetTimeStart1:{}, meetTimeEnd1:{}",
                                 DateUtil.date(meetTimeStart).toTimeStr(), DateUtil.date(meetTimeEnd).toTimeStr(),
@@ -128,7 +128,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
      */
     public Boolean checkTimesHasOverlap(Date dynaStartTime, Date dynaEndTime, Date fixedStartTime, Date fixedEndTime) {
 
-       // dynaStartTime=DateUtil.date(dynaStartTime).getMinutes();
+        // dynaStartTime=DateUtil.date(dynaStartTime).getMinutes();
 
 
         return !(dynaEndTime.getTime() <= fixedStartTime.getTime() || dynaStartTime.getTime() >= fixedEndTime.getTime());
@@ -189,6 +189,26 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
 
     }
 
+
+    @Override
+    protected void updateBefore(MettingRecordEntity entity, Context context) throws AppException {
+        super.updateBefore(entity, context);
+
+        //判断是否是手动结束会议
+        MettingRecordEntity mettingRecordEntity = this.get(entity.getId());
+        if (mettingRecordEntity.getMeetStatus() == MeetStatusEnum.进行中.getValue() && entity.getMeetStatus() == MeetStatusEnum.已结束.getValue()) {
+            //手动结束会议 发送刷新通知
+            UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+            RoomEntity roomEntity = roomService.get(mettingRecordEntity.getRoomId(), context);
+            if (!ObjectUtils.isEmpty(roomEntity)) {
+                uploadDeviceReq.setDeviceCodeList(roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i -> i.getDeviceCode()).collect(Collectors.toList()));
+                uploadDeviceReq.setAction("refreshMetting");
+                Rest<String> rest = messageFeign.downMsg(uploadDeviceReq);
+                log.info("手动结束会议记录后发送消息：{}", JSON.toJSONString(rest));
+            }
+        }
+    }
+
     @Override
     public int remove(Long[] ids, Context context) throws AppException {
         this.removeBefore(ids, context);
@@ -198,7 +218,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         List<MettingRecordEntity> mettingRecordEntities = this.find(mettingRecordQuery);
         log.info("删除会议记录：{}", mettingRecordEntities.size());
 
-        mettingRecordEntities.forEach(entity ->{
+        mettingRecordEntities.forEach(entity -> {
             UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
             RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
             if (!ObjectUtils.isEmpty(roomEntity)) {
@@ -220,7 +240,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         super.removeAfter(ids, context, result);
     }
 
-    public  boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
+    public boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
         Calendar date = Calendar.getInstance();
         date.setTime(nowTime);
 
@@ -241,10 +261,10 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
 
         //meetTimeStart:09:30:00,meetTimeEnd:10:00:00, meetTimeStart1:09:21:00, meetTimeEnd1:09:30:00
 
-        DateTime meetTimeStart=DateUtil.parseTime("09:30:59");
-        DateTime meetTimeEnd=DateUtil.parseTime("09:22:00");
-        DateTime meetTimeStart1=DateUtil.parseTime("09:21:00");
-        DateTime meetTimeEnd1=DateUtil.parseTime("09:30:00");
+        DateTime meetTimeStart = DateUtil.parseTime("09:30:59");
+        DateTime meetTimeEnd = DateUtil.parseTime("09:22:00");
+        DateTime meetTimeStart1 = DateUtil.parseTime("09:21:00");
+        DateTime meetTimeEnd1 = DateUtil.parseTime("09:30:00");
 
 
 /*        boolean in = MettingRecordServiceImpl.belongCalendar(meetTimeStart, meetTimeStart1, meetTimeEnd1);