diff --git a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java b/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java index 2228be66d3bc528c6b1f9609a3c9fe68565c3e5b..2f9dff9059cfdebfb5f48520bbf6dfe44ed88680 100644 --- a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java +++ b/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java @@ -31,6 +31,7 @@ import com.mortals.xhx.busiz.rsp.*; import com.mortals.xhx.common.code.*; import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.QueueKey; +import com.mortals.xhx.common.key.RedisKey; import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders; import com.mortals.xhx.common.model.MessageHeader; import com.mortals.xhx.common.pdu.DeviceReq; @@ -243,15 +244,17 @@ public class DeviceApiController { deviceEntity.setDeviceStatus(DeviceStatusEnum.鍦ㄧ嚎.getValue()); deviceEntity.setDeviceVersion(req.getDeviceVersion() == null ? "" : req.getDeviceVersion()); - DeviceEntity entity = new DeviceEntity(); - entity.setId(deviceEntity.getId()); - entity.setOnlineTime(new Date()); - entity.setDeviceStatus(DeviceStatusEnum.鍦ㄧ嚎.getValue()); - - deviceService.getDeviceDao().update(deviceEntity); + if(deviceEntity.getDeviceStatus()== DeviceStatusEnum.绂荤嚎.getValue()){ + DeviceEntity entity = new DeviceEntity(); + entity.setId(deviceEntity.getId()); + entity.setOnlineTime(new Date()); + entity.setDeviceStatus(DeviceStatusEnum.鍦ㄧ嚎.getValue()); + cacheService.lpush(RedisKey.KEY_DEVICE_THIRDPARTY_QUEUE, entity); + } + // deviceService.getDeviceDao().update(deviceEntity); rsp.setData(deviceResp); - SendThirdPartyTask sendThirdPartyTask = new SendThirdPartyTask(deviceEntity, productEntity, platformEntity, deviceService); - sendTaskThreadPool.execute(sendThirdPartyTask); +/* SendThirdPartyTask sendThirdPartyTask = new SendThirdPartyTask(deviceEntity, productEntity, platformEntity, deviceService); + sendTaskThreadPool.execute(sendThirdPartyTask);*/ } catch (AppException e) { //log.error("鎺ユ敹鏁版嵁澶辫触", e); rsp.setCode(e.getCode());