修改通知去重复

smart-office-manager-ui/admin/src/assets/utils/table.js

@@ -9,7 +9,6 @@
  */
 const formatter = (tableData, column, val) => {
   const key = column.property;
-  console.log(val);
   val = val ? val : "--";
   if (tableData.dict && tableData.dict[key]) {
     const dict = tableData.dict[key];

smart-office-manager-ui/admin/src/views/metting/record/drawershow.vue

@@ -20,7 +20,7 @@
                   :picker-options="{
                                         start: '07:00',
                                         step: '00:30',
-                                        end: '20:00'
+                                        end: '24:00'
                                       }">
               </el-time-select>
 
@@ -35,7 +35,7 @@
                     :picker-options="{
                                         start: '07:00',
                                         step: '00:30',
-                                        end: '20:00',
+                                        end: '24:00',
                                         minTime:form.meetTimeStart
                                       }">
                 </el-time-select>

smart-office-manager/src/main/java/com/mortals/xhx/daemon/task/MeetSwitchTaskImpl.java

@@ -119,7 +119,7 @@ public class MeetSwitchTaskImpl implements ITaskExcuteService {
                         uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomDeviceEntity.getDeviceCode()));
                         uploadDeviceReq.setAction("preMeetStart");
                         uploadDeviceReq.setContent(JSON.toJSONString(recordEntity));
-                        log.info("preMeetStart send msg :{}",recordEntity.getDeviceCode());
+                        log.info("preMeetStart send msg :{}",roomDeviceEntity.getDeviceCode());
                         messageFeign.downMsg(uploadDeviceReq);
                     }
                 }

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

@@ -86,6 +86,8 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                     boolean in = DateUtil.isIn(meetTimeStart, meetTimeStart1, meetTimeEnd1);
                     boolean in1 = DateUtil.isIn(meetTimeEnd, meetTimeStart1, meetTimeEnd1);
 
+                    log.info("in:{},in1:{}",in,in1);
+
                    // Boolean aBoolean = checkTimesHasOverlap(meetTimeStart, meetTimeEnd, meetTimeStart1, meetTimeEnd1);
                     if (in||in1) {
                         bool = true;