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

修正循环依赖

parent e7dc9d26
...@@ -220,7 +220,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi ...@@ -220,7 +220,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
} }
//获取exchange, //获取exchange,
PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString()); PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId().toString());
String phpInUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_IN_HTTP_URL, "http://172.15.28.116:8090"); String phpInUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_IN_HTTP_URL, "http://127.0.0.1:11078/zwfw_api");
if (!Constant.MESSAGETYPE_HEARTBEAT.equalsIgnoreCase(messageType) if (!Constant.MESSAGETYPE_HEARTBEAT.equalsIgnoreCase(messageType)
&& !ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(platformEntity)
&& platformEntity.getSendSwitch() == YesNoEnum.YES.getValue()) { && platformEntity.getSendSwitch() == YesNoEnum.YES.getValue()) {
......
...@@ -44,7 +44,7 @@ public class DeviceSendThirdPartyService implements IApplicationStartedService { ...@@ -44,7 +44,7 @@ public class DeviceSendThirdPartyService implements IApplicationStartedService {
try { try {
DeviceReq deviceReq = cacheService.blpop(KEY_DEVICE_THIRDPARTY_QUEUE,10, DeviceReq.class); DeviceReq deviceReq = cacheService.blpop(KEY_DEVICE_THIRDPARTY_QUEUE,10, DeviceReq.class);
if (!ObjectUtils.isEmpty(deviceReq)) { if (!ObjectUtils.isEmpty(deviceReq)) {
String phpInUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_IN_HTTP_URL, "http://172.15.28.116:8090"); String phpInUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_IN_HTTP_URL, "http://127.0.0.1:11078/zwfw_api");
ApiResp<String> resp = messageService.sendThirdParty(UrlBuilder.of(phpInUrl).addPath(thirdPartyPath).build(), deviceReq); ApiResp<String> resp = messageService.sendThirdParty(UrlBuilder.of(phpInUrl).addPath(thirdPartyPath).build(), deviceReq);
log.info("sendThirty resp ==>{}", JSON.toJSONString(resp)); log.info("sendThirty resp ==>{}", JSON.toJSONString(resp));
} }
......
...@@ -123,7 +123,10 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDCacheServiceI ...@@ -123,7 +123,10 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDCacheServiceI
} catch (Exception e) { } catch (Exception e) {
log.error("异常", e); log.error("异常", e);
} }
ZipUtil.unzip(targetFilePath, disPath, Charset.forName(fileEncode)); ZipUtil.unzip(targetFilePath, disPath, Charset.forName(fileEncode));
// ZipReader.of(disPath,fileEncode).setMaxSizeDiff(1024 * 1024 * 1024)
//更新 //更新
distributeEntity.setDistributeFilePath(disPath); distributeEntity.setDistributeFilePath(disPath);
distributeEntity.setDistribute(YesNoEnum.YES.getValue()); distributeEntity.setDistribute(YesNoEnum.YES.getValue());
......
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