修改通知去重复

smart-office-manager-ui/admin/src/main.js

@@ -16,6 +16,7 @@ import * as echarts from 'echarts'
 
 Vue.prototype.$echarts = echarts;
 Vue.config.productionTip = false
+Vue.config.silent = true;
 Vue.use(ElementUI);
 Vue.use(Prototype);
 Vue.use(Filter);

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

@@ -2,7 +2,9 @@ package com.mortals.xhx.module.metting.service.impl;
 
 import cn.hutool.core.date.*;
 import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.DateUtils;
 import com.mortals.xhx.common.code.MeetStatusEnum;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.UploadDeviceReq;
@@ -29,6 +31,7 @@ import org.springframework.util.ObjectUtils;
 
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -83,8 +86,8 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                     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 = DateUtil.isIn(meetTimeStart, meetTimeStart1, meetTimeEnd1);
-                    boolean in1 = DateUtil.isIn(meetTimeEnd, meetTimeStart1, meetTimeEnd1);
+                    boolean in = belongCalendar(meetTimeStart, meetTimeStart1, meetTimeEnd1);
+                    boolean in1 = belongCalendar(meetTimeEnd, meetTimeStart1, meetTimeEnd1);
 
                     log.info("in:{},in1:{}",in,in1);
 
@@ -201,7 +204,9 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
             if (!ObjectUtils.isEmpty(roomEntity)) {
                 uploadDeviceReq.setDeviceCodeList(roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i -> i.getDeviceCode()).collect(Collectors.toList()));
                 uploadDeviceReq.setAction("refreshMetting");
-                messageFeign.downMsg(uploadDeviceReq);
+                Rest<String> rest = messageFeign.downMsg(uploadDeviceReq);
+                log.info("删除会议记录后发送消息：{}", JSON.toJSONString(rest));
+
             }
         });
 
@@ -215,23 +220,46 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         super.removeAfter(ids, context, result);
     }
 
+    public  boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
+        Calendar date = Calendar.getInstance();
+        date.setTime(nowTime);
+
+        Calendar begin = Calendar.getInstance();
+        begin.setTime(beginTime);
+
+        Calendar end = Calendar.getInstance();
+        end.setTime(endTime);
+
+        if (date.after(begin) && date.before(end)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public static void main(String[] args) {
 
-        DateTime meetTimeStart=DateUtil.parseTime("18:00:00");
-        DateTime meetTimeEnd=DateUtil.parseTime("18:00:00");
-        DateTime meetTimeStart1=DateUtil.parseTime("18:00:00");
-        DateTime meetTimeEnd1=DateUtil.parseTime("18:00:00");
-/*
+        //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");
+
+
+/*        boolean in = MettingRecordServiceImpl.belongCalendar(meetTimeStart, meetTimeStart1, meetTimeEnd1);
+        System.out.println(in);
+
+        boolean in1 = DateUtil.isIn(meetTimeEnd, meetTimeStart1, meetTimeEnd1);
+
+        System.out.println(in1);*/
 
-        !(dynaEndTime.getTime() <= fixedStartTime.getTime() || dynaStartTime.getTime() >= fixedEndTime.getTime());
+/*        boolean in = DateUtil.isIn(meetTimeStart, meetTimeStart1, meetTimeEnd1);
+        boolean in1 = DateUtil.isIn(meetTimeEnd, meetTimeStart1, meetTimeEnd1);
 
-*/
+        System.out.println(in);
 
-        Date date = new Date();
-        String format = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm");
-/*        DateUtil.parse(format).
+        System.out.println(in1);*/
 
-        DateUtil.date(date).
-        System.out.println(  DateUtil.date(date).minute());*/
     }
 }
\ No newline at end of file