Commit a671065e authored by 赵啸非's avatar 赵啸非

添加设备上线下线通知

parent 55c7d33d
package com.mortals.xhx.busiz.web; package com.mortals.xhx.busiz.web;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
...@@ -11,6 +12,8 @@ import com.mortals.xhx.common.pdu.device.DeviceReq; ...@@ -11,6 +12,8 @@ import com.mortals.xhx.common.pdu.device.DeviceReq;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.model.DeviceQuery; import com.mortals.xhx.module.device.model.DeviceQuery;
import com.mortals.xhx.module.device.service.DeviceService; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
...@@ -19,7 +22,9 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -19,7 +22,9 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List;
import static com.mortals.xhx.common.key.ErrorCode.*; import static com.mortals.xhx.common.key.ErrorCode.*;
...@@ -30,6 +35,8 @@ public class DeviceCallbackController { ...@@ -30,6 +35,8 @@ public class DeviceCallbackController {
@Autowired @Autowired
private DeviceService deviceService; private DeviceService deviceService;
@Autowired
private RoomDeviceService roomDeviceService;
@PostMapping("callback") @PostMapping("callback")
@UnAuth @UnAuth
...@@ -141,6 +148,11 @@ public class DeviceCallbackController { ...@@ -141,6 +148,11 @@ public class DeviceCallbackController {
//根据设备编码查询设备 //根据设备编码查询设备
DeviceEntity deviceEntity = checkDeviceExist(req); DeviceEntity deviceEntity = checkDeviceExist(req);
deviceService.remove(new Long[]{deviceEntity.getId()}, null); deviceService.remove(new Long[]{deviceEntity.getId()}, null);
//关联删除
RoomDeviceEntity condition = new RoomDeviceEntity();
condition.setDeviceId(deviceEntity.getId());
roomDeviceService.getDao().delete(condition);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment