diff --git a/common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java b/common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java index b3ac774a562ece43c0832aed452f865c22277742..2ba5af6ef3e754ad84afc067183cc2ded664b4a4 100644 --- a/common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java +++ b/common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java @@ -56,7 +56,7 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb @Override protected List<GetResponse> doPoll(long durationInMillis) { - List<GetResponse> result = queues.stream() + List<GetResponse> result = queues.parallelStream() .map(queue -> { try { GetResponse getResponse = channel.basicGet(queue, true); 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 5705abc9388fe18b5c4f6b9667b30782b30a8ca1..d407ab138ea5338586e24e8f1dde84ffa06a21b2 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 @@ -113,7 +113,7 @@ public class DeviceApiController { rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue()); DeviceResp deviceResp = new DeviceResp(); try { - DeviceEntity deviceEntity = checkDeviceExist(req); + DeviceEntity deviceEntity = checkDeviceExistAndCreate(req); if (deviceEntity.getDeviceStatus() == DeviceStatusEnum.鏈縺娲�.getValue()) { throw new AppException(DEVICE_UNACTIVE, DEVICE_UNACTIVE_CONTENT); } @@ -659,6 +659,18 @@ public class DeviceApiController { } private DeviceEntity checkDeviceExist(DeviceReq req) { + if (ObjectUtils.isEmpty(req.getDeviceCode())) { + throw new AppException(DEVICE_CODE_IS_EMPTY, DEVICE_CODE_IS_EMPTY_CONTENT); + } + DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode()); + if (ObjectUtils.isEmpty(deviceEntity)) { + throw new AppException(DEVICE_NOT_EXIST, DEVICE_NOT_EXIST_CONTENT); + + } + return deviceEntity; + } + + private DeviceEntity checkDeviceExistAndCreate(DeviceReq req) { if (ObjectUtils.isEmpty(req.getDeviceCode())) { throw new AppException(DEVICE_CODE_IS_EMPTY, DEVICE_CODE_IS_EMPTY_CONTENT); } @@ -678,4 +690,5 @@ public class DeviceApiController { } return deviceEntity; } + } diff --git a/device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java b/device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java index 25d82b75179f39e0dd0dcc2c545b815ab8b6f4fa..ece3e83c0e3fea66b7a9fa2f9055caa24f61ddf5 100644 --- a/device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java +++ b/device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java @@ -105,4 +105,7 @@ public interface ErrorCode { public static final int DEVICE_CONFIG_IS_EMPTY = 1008; public static final String DEVICE_CONFIG_IS_EMPTY_CONTENT = "璁惧鍒涘缓锛岃瀹屽杽璁惧閰嶇疆淇℃伅锛�"; + + public static final int DEVICE_NOT_EXIST = 1009; + public static final String DEVICE_NOT_EXIST_CONTENT = "褰撳墠璁惧涓嶅瓨鍦紒"; } diff --git a/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http b/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http index 5b2dd033e814179c7535d03872485c203be62731..4b314e3940d2762aeff188d0965b3517226fb3ad 100644 --- a/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http +++ b/device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http @@ -136,7 +136,7 @@ Content-Type: application/json Authorization: {{authToken}} { - "deviceCode": "B02", + "deviceCode": "B03", "action": "upload" }