修改配置文件

info-publish-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceCallbackController.java

@@ -12,8 +12,6 @@ import com.mortals.xhx.common.pdu.device.DeviceReq;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
-import com.mortals.xhx.module.room.model.RoomDeviceEntity;
-import com.mortals.xhx.module.room.service.RoomDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -35,8 +33,6 @@ public class DeviceCallbackController {
 
     @Autowired
     private DeviceService deviceService;
-    @Autowired
-    private RoomDeviceService roomDeviceService;
 
     @PostMapping("callback")
     @UnAuth
@@ -148,10 +144,7 @@ public class DeviceCallbackController {
         //根据设备编码查询设备
         DeviceEntity deviceEntity = checkDeviceExist(req);
         deviceService.remove(new Long[]{deviceEntity.getId()}, null);
-        //关联删除
-        RoomDeviceEntity condition = new RoomDeviceEntity();
-        condition.setDeviceId(deviceEntity.getId());
-        roomDeviceService.getDao().delete(condition);
+
 
 
     }

info-publish-manager/src/main/java/com/mortals/xhx/common/code/ResolutionEnum.java

-package com.mortals.xhx.common.code;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
-* 分辨率(0.1920*1080,1.1366*768,2.1080*1920)枚举类
-*
-* @author zxfei
-*/
-public enum ResolutionEnum {
-    1920*1080(0, "1920*1080"),
-    1366*768(1, "1366*768"),
-    1080*1920(2, "1080*1920");
-    private Integer value;
-    private String desc;
-
-    ResolutionEnum(Integer value, String desc) {
-        this.value = value;
-        this.desc = desc;
-    }
-
-    public Integer getValue() {
-        return this.value;
-    }
-
-    public String getDesc() {
-        return this.desc;
-    }
-
-    public static ResolutionEnum getByValue(Integer value) {
-        for (ResolutionEnum resolutionEnum : ResolutionEnum.values()) {
-            if (resolutionEnum.getValue() == value) {
-                return resolutionEnum;
-            }
-        }
-        return null;
-    }
-
-    /**
-    * 获取Map集合
-    *
-    * @param eItem 不包含项
-    * @return
-    */
-    public static Map<String, String> getEnumMap(Integer... eItem) {
-        Map<String, String> resultMap = new LinkedHashMap<>();
-        for (ResolutionEnum item : ResolutionEnum.values()) {
-            try {
-                boolean hasE = false;
-                for (Integer e : eItem) {
-                    if (item.getValue() == e) {
-                        hasE = true;
-                        break;
-                    }
-                }
-                if (!hasE) {
-                    resultMap.put(item.getValue() + "", item.getDesc());
-                }
-            } catch (Exception ex) {
-
-            }
-        }
-        return resultMap;
-    }
-}
\ No newline at end of file

info-publish-manager/src/main/java/com/mortals/xhx/daemon/task/SyncMeetStatusTaskImpl.java

-package com.mortals.xhx.daemon.task;
-
-import cn.hutool.core.date.DateUtil;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.service.ITask;
-import com.mortals.framework.service.ITaskExcuteService;
-import com.mortals.xhx.common.code.FinishMethodEnum;
-import com.mortals.xhx.common.code.MeetStatusEnum;
-import com.mortals.xhx.module.metting.model.MettingRecordEntity;
-import com.mortals.xhx.module.metting.model.MettingRecordQuery;
-import com.mortals.xhx.module.metting.service.MettingRecordService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 同步更新会议状态
- */
-@Slf4j
-@Service("SyncMeetStatusTask")
-public class SyncMeetStatusTaskImpl implements ITaskExcuteService {
-
-    @Autowired
-    private MettingRecordService mettingRecordService;
-
-
-    @Override
-    public void excuteTask(ITask task) throws AppException {
-        log.debug("同步更新会议状态");
-        syncMeetStatus();
-        log.debug("同步更新会议状态完成");
-
-    }
-
-
-    private void syncMeetStatus() {
-        MettingRecordQuery mettingRecordQuery = new MettingRecordQuery();
-        //mettingRecordQuery.setFinishMethod(FinishMethodEnum.自动结束.getValue());
-        mettingRecordQuery.setMeetStatus(MeetStatusEnum.等待中.getValue());
-        List<MettingRecordEntity> recordEntities = mettingRecordService.find(mettingRecordQuery);
-        for (MettingRecordEntity recordEntity : recordEntities) {
-
-
-            if(new Date().getTime()>recordEntity.getMeetTimeStart().getTime()){
-                //更新状态
-                recordEntity.setMeetStatus(MeetStatusEnum.进行中.getValue());
-                recordEntity.setUpdateTime(new Date());
-                recordEntity.setUpdateUserId(1L);
-                mettingRecordService.update(recordEntity);
-            }
-/*
-            //判断当前时间是否已经在区间范围内，如果在 更新状态
-            boolean in = DateUtil.isIn(new Date(), recordEntity.getMeetTimeStart(), recordEntity.getMeetTimeEnd());
-            if (in) {
-                //更新状态
-                recordEntity.setMeetStatus(MeetStatusEnum.进行中.getValue());
-                recordEntity.setUpdateTime(new Date());
-                recordEntity.setUpdateUserId(1L);
-                mettingRecordService.update(recordEntity);
-            }*/
-        }
-
-        mettingRecordQuery = new MettingRecordQuery();
-        //mettingRecordQuery.setFinishMethod(FinishMethodEnum.自动结束.getValue());
-        mettingRecordQuery.setMeetStatus(MeetStatusEnum.进行中.getValue());
-        List<MettingRecordEntity> pendRecordEntities = mettingRecordService.find(mettingRecordQuery);
-        for (MettingRecordEntity pendRecordEntity : pendRecordEntities) {
-            boolean in = DateUtil.isIn(new Date(), pendRecordEntity.getMeetTimeStart(), pendRecordEntity.getMeetTimeEnd());
-            if (!in) {
-                //更新状态
-                pendRecordEntity.setMeetStatus(MeetStatusEnum.已结束.getValue());
-                pendRecordEntity.setFinishMethod(FinishMethodEnum.自动结束.getValue());
-                pendRecordEntity.setUpdateTime(new Date());
-                pendRecordEntity.setUpdateUserId(1L);
-                mettingRecordService.update(pendRecordEntity);
-            }
-        }
-
-    }
-
-
-    @Override
-    public void stopTask(ITask task) throws AppException {
-
-    }
-
-}

info-publish-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java

@@ -153,7 +153,6 @@ public class DeviceEntity extends DeviceVo {
             this.roomName = "";
             this.deviceCode = "";
             this.deviceMac = "";
-            this.siteId = 1;
             this.siteCode = "";
             this.siteName = "";
             this.productCode = "";