Skip to content

D
device-new-platform
Commit a950cbd5 authored by 赵啸非's avatar 赵啸非
Browse files
Options

调整pom文件

parent 3a02ebb6
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 13 deletions
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @ a950cbd5
......@@ -31,7 +31,6 @@ 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;
......@@ -249,9 +248,9 @@ public class DeviceApiController {
entity.setId(deviceEntity.getId());
entity.setOnlineTime(new Date());
entity.setDeviceStatus(DeviceStatusEnum.在线.getValue());
cacheService.lpush(RedisKey.KEY_DEVICE_ONLINE_QUEUE, entity);
//cacheService.lpush(RedisKey.KEY_DEVICE_ONLINE_QUEUE, entity);
//deviceService.getDeviceDao().update(deviceEntity);
deviceService.getDeviceDao().update(deviceEntity);
rsp.setData(deviceResp);
SendThirdPartyTask sendThirdPartyTask = new SendThirdPartyTask(deviceEntity, productEntity, platformEntity, deviceService);
sendTaskThreadPool.execute(sendThirdPartyTask);
......@@ -441,8 +440,8 @@ public class DeviceApiController {
updateDevice(req, platformEntity, productEntity, deviceEntity);
deviceEntity.setUpdateTime(new Date());
deviceEntity.setUpdateUserId(1L);
cacheService.lpush(RedisKey.KEY_DEVICE_UPDATE_QUEUE, deviceEntity);
//deviceService.update(deviceEntity, null);
//cacheService.lpush(RedisKey.KEY_DEVICE_UPDATE_QUEUE, deviceEntity);
deviceService.update(deviceEntity, null);
}
if (deviceEntity.getDeviceStatus() == DeviceStatusEnum.未激活.getValue()) {
......@@ -930,8 +929,7 @@ public class DeviceApiController {
deviceEntity.setDeviceInFloor(req.getDeviceInFloor());
deviceEntity.setDeviceInBuilding(req.getDeviceInBuilding());
cacheService.lpush(RedisKey.KEY_DEVICE_UPDATE_QUEUE, deviceEntity);
//deviceService.update(deviceEntity);
deviceService.update(deviceEntity);
}
......@@ -955,8 +953,7 @@ public class DeviceApiController {
deviceEntity.setUpdateTime(new Date());
deviceEntity.setUpdateUserId(1L);
deviceEntity.setSwitchSend(false);
cacheService.lpush(RedisKey.KEY_DEVICE_UPDATE_QUEUE, deviceEntity);
//deviceService.update(deviceEntity);
deviceService.update(deviceEntity);
}
......@@ -970,8 +967,7 @@ public class DeviceApiController {
deviceEntity.setSwitchSend(false);
deviceEntity.setUpdateTime(new Date());
deviceEntity.setUpdateUserId(1L);
cacheService.lpush(RedisKey.KEY_DEVICE_UPDATE_QUEUE, deviceEntity);
//deviceService.update(deviceEntity);
deviceService.update(deviceEntity);
}
private void deviceStop(DeviceReq req) throws AppException {
......@@ -983,8 +979,7 @@ public class DeviceApiController {
deviceEntity.setSwitchSend(false);
deviceEntity.setUpdateTime(new Date());
deviceEntity.setUpdateUserId(1L);
cacheService.lpush(RedisKey.KEY_DEVICE_UPDATE_QUEUE, deviceEntity);
//deviceService.update(deviceEntity);
deviceService.update(deviceEntity);
}
private DeviceEntity checkDeviceExist(DeviceReq req) {
......
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