diff --git a/device-manager/src/main/java/com/mortals/xhx/base/framework/listener/CustomerKeyExpirationListener.java b/device-manager/src/main/java/com/mortals/xhx/base/framework/listener/CustomerKeyExpirationListener.java
index 587b7ea1296b9f47e98669ca6ed0b162950ef2bc..17109c35e38f1789c144b7625d52bb693d4a6bef 100644
--- a/device-manager/src/main/java/com/mortals/xhx/base/framework/listener/CustomerKeyExpirationListener.java
+++ b/device-manager/src/main/java/com/mortals/xhx/base/framework/listener/CustomerKeyExpirationListener.java
@@ -82,8 +82,8 @@ public class CustomerKeyExpirationListener implements MessageListener {
deviceService.putCache(deviceEntity.getId().toString(), deviceEntity);
log.info("deviceCode:{}锛宒eviceName:{}==>绂荤嚎", deviceEntity.getDeviceCode(), deviceEntity.getDeviceName());
// deviceService.update(deviceEntity);
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
//閫氱煡绗笁鏂瑰钩鍙�
deviceService.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.OFFLINE);
diff --git a/device-manager/src/main/java/com/mortals/xhx/base/framework/listener/DirectDynamicListener.java b/device-manager/src/main/java/com/mortals/xhx/base/framework/listener/DirectDynamicListener.java
index 8c9c5679b5ed1f69d3b54de5eef5564dc75e6b9e..9afe3d88b5d6b9782700c02c8de68d9519eb2c14 100644
--- a/device-manager/src/main/java/com/mortals/xhx/base/framework/listener/DirectDynamicListener.java
+++ b/device-manager/src/main/java/com/mortals/xhx/base/framework/listener/DirectDynamicListener.java
@@ -86,7 +86,7 @@ public class DirectDynamicListener implements MessageListener {
// deviceService.update(deviceEntity);
deviceService.putCache(deviceEntity.getId().toString(),deviceEntity);
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
ProductEntity productEntity = productService.get(deviceEntity.getProductId());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
//鏂板璁惧閫氱煡绗笁鏂瑰钩鍙�
@@ -110,7 +110,7 @@ public class DirectDynamicListener implements MessageListener {
deviceLogService.save(deviceLogEntity);
}
//鑾峰彇exchange,
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
String phpInUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_IN_HTTP_URL, "http://172.15.28.116:8090");
if (!Constant.MESSAGETYPE_HEARTBEAT.equalsIgnoreCase(messageType)
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 f357b1921c6e6a996170b4dc19a2566ee19bca22..7d41ca12224d0ceef0c22af2fc59c05238c440dc 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
@@ -664,12 +664,12 @@ public class DeviceApiController {
DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode());
if (!ObjectUtils.isEmpty(deviceEntity)) {
//灏嗕笂鎶ヤ俊鎭浆鍙戝埌mq涓�
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException("褰撳墠璁惧鏈厤缃墍灞炵郴缁熷钩鍙帮紝璇峰湪鍚庡彴閰嶇疆鍚庡啀婵€娲伙紒");
}
// authInfo.setHost(platformEntity.getPlatformSn());
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
if (ObjectUtils.isEmpty(productEntity)) {
throw new AppException("褰撳墠璁惧鏈厤缃墍灞炰骇鍝侊紝璇峰湪鍚庡彴閰嶇疆鍚庡啀婵€娲伙紒");
}
@@ -769,7 +769,7 @@ public class DeviceApiController {
if (ObjectUtils.isEmpty(productEntity)) {
throw new AppException(PRODUCT_IS_EMPTY, PRODUCT_IS_EMPTY_CONTENT);
}
- PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(productEntity.getPlatformId().toString());
if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException(PLATFORM_IS_EMPTY, PLATFORM_IS_EMPTY_CONTENT);
}
@@ -813,7 +813,7 @@ public class DeviceApiController {
throw new AppException(PRODUCT_IS_EMPTY, PRODUCT_IS_EMPTY_CONTENT);
}
- PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(productEntity.getPlatformId().toString());
if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException(PLATFORM_IS_EMPTY, PLATFORM_IS_EMPTY_CONTENT);
}
diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/DemoApiController.java b/device-manager/src/main/java/com/mortals/xhx/daemon/DemoApiController.java
index 48d350353f8955c41d1d12738f593771d9169970..92c9064394ed570dab777eb8f2c37c73de7f1f58 100644
--- a/device-manager/src/main/java/com/mortals/xhx/daemon/DemoApiController.java
+++ b/device-manager/src/main/java/com/mortals/xhx/daemon/DemoApiController.java
@@ -151,7 +151,7 @@ public class DemoApiController {
if (!ObjectUtils.isEmpty(deviceEntity)) {
//灏嗕笂鎶ヤ俊鎭浆鍙戝埌mq涓�
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException("褰撳墠璁惧鏈厤缃墍灞炵郴缁熷钩鍙帮紝璇峰湪鍚庡彴閰嶇疆鍚庡啀婵€娲伙紒");
}
diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java
index 49484c0405e8ea394847c0f73751b0d0d587072c..528be3240a9141e8380e03d6970df4826c315d53 100644
--- a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java
+++ b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java
@@ -49,8 +49,8 @@ public class DeviceComsumersRegisterService implements IApplicationStartedServic
deviceService.find(new DeviceEntity())
.stream()
- .filter(f -> !ObjectUtils.isEmpty(platformService.get(f.getPlatformId())))
- .filter(f -> !ObjectUtils.isEmpty(productService.get(f.getProductId()))).forEach(item -> {
+ .filter(f -> !ObjectUtils.isEmpty(platformService.getCache(f.getPlatformId().toString())))
+ .filter(f -> !ObjectUtils.isEmpty(productService.getCache(f.getProductId().toString()))).forEach(item -> {
String uploadQueue = Constant.UPLOAD_TOPIC + item.getDeviceCode();
String downQueue = Constant.DOWN_TOPIC + item.getDeviceCode();
messageProducer.queueAddAndBinds(QueueKey.DEFAULT_EXCHANGE, uploadQueue, uploadQueue);
@@ -59,8 +59,8 @@ public class DeviceComsumersRegisterService implements IApplicationStartedServic
String[] queues = deviceService.find(new DeviceEntity())
.stream()
- .filter(f -> !ObjectUtils.isEmpty(platformService.get(f.getPlatformId())))
- .filter(f -> !ObjectUtils.isEmpty(productService.get(f.getProductId())))
+ .filter(f -> !ObjectUtils.isEmpty(platformService.getCache(f.getPlatformId().toString())))
+ .filter(f -> !ObjectUtils.isEmpty(productService.getCache(f.getProductId().toString())))
.filter(f->!ObjectUtils.isEmpty(f.getDeviceCode()))
.map(item -> Constant.UPLOAD_TOPIC + item.getDeviceCode())
.toArray(String[]::new);
diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java
index de305cdd4534ea55c572ee6b49bf3fcfa94e7ace..bf757a29206c83534021a9adc3db132c2bbe199b 100644
--- a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java
+++ b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java
@@ -73,11 +73,11 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
//.status(StatusEnum.鍚敤.getValue())
)
.stream()
- .filter(f -> !ObjectUtils.isEmpty(platformService.get(f.getPlatformId())))
- .filter(f -> !ObjectUtils.isEmpty(productService.get(f.getProductId())))
+ .filter(f -> !ObjectUtils.isEmpty(platformService.getCache(f.getPlatformId().toString())))
+ .filter(f -> !ObjectUtils.isEmpty(productService.getCache(f.getProductId().toString())))
.map(item -> {
- PlatformEntity platformEntity = platformService.get(item.getPlatformId());
- ProductEntity productEntity = productService.get(item.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(item.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(item.getProductId().toString());
String exchangeName = platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode();
return new TopicPartitionInfo(Constant.UPLOAD_TOPIC + item.getDeviceCode(), null, exchangeName);
}
@@ -169,8 +169,8 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
deviceEntity.setDeviceStatus(DeviceStatusEnum.鍦ㄧ嚎.getValue());
deviceService.update(deviceEntity);
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
//鏂板璁惧閫氱煡绗笁鏂瑰钩鍙�
deviceService.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.ONLINE);
@@ -192,7 +192,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
deviceLogService.save(deviceLogEntity);
}
//鑾峰彇exchange,
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
String phpInUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_IN_HTTP_URL, "http://172.15.28.116:8090");
if (!Constant.MESSAGETYPE_HEARTBEAT.equalsIgnoreCase(messageType)
&& !ObjectUtils.isEmpty(platformEntity)
diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/RabbitMsgComsumerStartedService.java b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/RabbitMsgComsumerStartedService.java
index 42e9312f965bc7d0391dd6fb6bb796007742d0f1..63b607c602afd094152d503fd8ff0f8bcaf2def9 100644
--- a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/RabbitMsgComsumerStartedService.java
+++ b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/RabbitMsgComsumerStartedService.java
@@ -39,8 +39,8 @@ public class RabbitMsgComsumerStartedService implements IApplicationStartedServi
log.info("鏈嶅姟绔秷璐规秷鎭湇鍔″紑濮�..");
String[] queues = deviceService.find(new DeviceEntity())
.stream()
- .filter(f -> !ObjectUtils.isEmpty(platformService.get(f.getPlatformId())))
- .filter(f -> !ObjectUtils.isEmpty(productService.get(f.getProductId())))
+ .filter(f -> !ObjectUtils.isEmpty(platformService.getCache(f.getPlatformId().toString())))
+ .filter(f -> !ObjectUtils.isEmpty(productService.getCache(f.getProductId().toString())))
.map(item -> Constant.UPLOAD_TOPIC + item.getDeviceCode())
.distinct()
.toArray(String[]::new);
diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceStatTaskImpl.java b/device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceStatTaskImpl.java
index 109bd131cd1ca377da004b7dc7f527238235ee8b..0f4c112124f85c1a5d39a0744a31224bbb3176a5 100644
--- a/device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceStatTaskImpl.java
+++ b/device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceStatTaskImpl.java
@@ -76,8 +76,8 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
log.info("淇璁惧鏁伴噺:size:{}", deviceOfflineList.size());
deviceService.update(deviceOfflineList);
deviceOfflineList.forEach(deviceEntity -> {
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
//閫氱煡绗笁鏂瑰钩鍙�
deviceService.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.OFFLINE);
diff --git a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleUseServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleUseServiceImpl.java
index 54754402c1054a33d07b4afb7185c51dfba3e817..0ec90330d62bc8ca672774a6d56652d16eafd745 100644
--- a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleUseServiceImpl.java
+++ b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleUseServiceImpl.java
@@ -41,8 +41,8 @@ public class DeviceModuleUseServiceImpl extends AbstractCRUDServiceImpl<DeviceMo
list.stream().forEach(item -> {
DeviceEntity deviceEntity = deviceService.getExtCache(item.getDeviceId().toString());
if (!ObjectUtils.isEmpty(deviceEntity)) {
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
item.setPlatformAndProductName(platformEntity.getPlatformName() + "/" + productEntity.getProductName());
}
diff --git a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
index 49846c28db7896e16bdc3c859a515b2d2f8efe9c..66eb8ccf7633a7d692e846c0f8a847a6318d4dd7 100644
--- a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
+++ b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
@@ -210,8 +210,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
deviceEntity.setDeviceStatus(DeviceStatusEnum.绂荤嚎.getValue());
deviceEntity.setEnabled(EnabledEnum.鍚敤.getValue());
this.update(deviceEntity);
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
//娉ㄥ唽rabbmit鐩稿叧闃熷垪涓庣粦瀹�
messageProducer.queueAddAndBinds(QueueKey.DEFAULT_EXCHANGE, Constant.UPLOAD_TOPIC + deviceCode, Constant.UPLOAD_TOPIC + deviceCode);
@@ -292,8 +292,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
deviceEntity.setUpdateTime(new Date());
deviceEntity.setUpdateUserId(getContextUserId(context));
this.getDeviceDao().update(deviceEntity);
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
if (enabled == YesNoEnum.YES.getValue()) {
this.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.ENABLED);
} else {
@@ -306,8 +306,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
DeviceEntity deviceEntity = this.get(id, context);
if (ObjectUtils.isEmpty(deviceEntity)) throw new AppException("褰撳墠璁惧涓嶅瓨鍦紒");
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
String exchangeName = platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode();
TopicPartitionInfo topicPartitionInfo = new TopicPartitionInfo(Constant.UPLOAD_TOPIC + deviceEntity.getDeviceCode(), null, exchangeName);
@@ -326,8 +326,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
@Override
protected void saveAfter(DeviceEntity entity, Context context) throws AppException {
super.saveAfter(entity, context);
- PlatformEntity platformEntity = platformService.get(entity.getPlatformId());
- ProductEntity productEntity = productService.get(entity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(entity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(entity.getProductId().toString());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
//娉ㄥ唽rabbmit鐩稿叧闃熷垪涓庣粦瀹� 婵€娲诲悗鎵嶈ɑ鍐婄秮瀹氶殜鍒�
// registerRabbitQueue(entity, platformEntity, productEntity);
@@ -339,8 +339,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
@Override
protected void updateAfter(DeviceEntity entity, Context context) throws AppException {
super.updateAfter(entity, context);
- PlatformEntity platformEntity = platformService.get(entity.getPlatformId());
- ProductEntity productEntity = productService.get(entity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(entity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(entity.getProductId().toString());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
//鏂板璁惧閫氱煡绗笁鏂瑰钩鍙� 婵€娲诲悗鐨勮澶囨墠閫氱煡鍜屾洿鏂�
if (entity.getDeviceStatus() > 0) {
@@ -614,8 +614,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
Long[] removeIds = Arrays.asList(ids).stream().map(id -> {
DeviceEntity deviceEntity = this.get(id, context);
if (!ObjectUtils.isEmpty(deviceEntity)) {
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
Rest<String> thirtyRest = sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.DEL);
if (YesNoEnum.YES.getValue() == thirtyRest.getCode()) {
@@ -651,8 +651,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
@Override
protected void exportAfter(DeviceEntity params, Context context, List<DeviceEntity> list) throws AppException {
list.stream().forEach(deviceEntity -> {
- PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
- ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(deviceEntity.getProductId().toString());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
deviceEntity.setProductCode(productEntity.getProductCode());
deviceEntity.setPlatformCode(platformEntity.getPlatformSn());
@@ -695,7 +695,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
entity.setProductName(productEntity.getProductName());
//鏍规嵁浜у搧鏌ヨ骞冲彴
if (!ObjectUtils.isEmpty(productEntity.getPlatformId())) {
- PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(productEntity.getPlatformId().toString());
entity.setPlatformId(platformEntity.getId());
entity.setPlatformCode(platformEntity.getPlatformSn());
entity.setPlatformName(platformEntity.getPlatformName());
@@ -710,7 +710,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
entity.setProductName(productEntity.getProductName());
//鏍规嵁浜у搧鏌ヨ骞冲彴
if (!ObjectUtils.isEmpty(productEntity.getPlatformId())) {
- PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(productEntity.getPlatformId().toString());
entity.setPlatformId(platformEntity.getId());
entity.setPlatformCode(platformEntity.getPlatformSn());
entity.setPlatformName(platformEntity.getPlatformName());
@@ -732,8 +732,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
if (!ObjectUtils.isEmpty(entity.getDeviceStatus()) && entity.getDeviceStatus() > DeviceStatusEnum.鏈縺娲�.getValue()) {
//婵€娲昏澶囷紝娣诲姞闃熷垪璁㈤槄
container.addQueueNames(Constant.UPLOAD_TOPIC + entity.getDeviceCode());
- PlatformEntity platformEntity = platformService.get(entity.getPlatformId());
- ProductEntity productEntity = productService.get(entity.getProductId());
+ PlatformEntity platformEntity = platformService.getCache(entity.getPlatformId().toString());
+ ProductEntity productEntity = productService.getCache(entity.getProductId().toString());
sendThirdParty(entity, productEntity, platformEntity, DeviceMethodEnum.ADD);
sendThirdParty(entity, productEntity, platformEntity, DeviceMethodEnum.ACTIVE);
}
diff --git a/device-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java
index 28b3a0a3869d934bcb3c16fecc90f9f76ec54667..61fa16c1eee2d490cb132280dc0550c9fb92a33f 100644
--- a/device-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java
+++ b/device-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java
@@ -122,7 +122,7 @@ public class ProductServiceImpl extends AbstractCRUDCacheServiceImpl<ProductDao,
if (ObjectUtils.isEmpty(productEntity)) {
throw new AppException("褰撳墠璁惧鏈厤缃墍灞炰骇鍝侊紝璇峰湪鍚庡彴閰嶇疆鍚庡啀婵€娲伙紒");
}
- PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
+ PlatformEntity platformEntity = platformService.getCache(productEntity.getPlatformId().toString());
if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException("褰撳墠璁惧鏈厤缃墍灞炵郴缁熷钩鍙帮紝璇峰湪鍚庡彴閰嶇疆鍚庡啀婵€娲伙紒");
}