Commit 47457c03 authored by 赵啸非's avatar 赵啸非

修改校验

parent ba56485c
...@@ -60,7 +60,7 @@ public class DeviceDownMsgThread extends AbstractThread { ...@@ -60,7 +60,7 @@ public class DeviceDownMsgThread extends AbstractThread {
@Override @Override
protected void process() { protected void process() {
//log.info("DeviceDownMsgThread process"); log.info("DeviceDownMsgThread process");
List<DeviceMsgReq> deviceMsgReqs = new ArrayList<>(); List<DeviceMsgReq> deviceMsgReqs = new ArrayList<>();
while (true) { while (true) {
DeviceMsgReq deviceMsgReq = cacheService.lpop(KEY_DEVICE_DOWN_MSG_QUEUE, DeviceMsgReq.class); DeviceMsgReq deviceMsgReq = cacheService.lpop(KEY_DEVICE_DOWN_MSG_QUEUE, DeviceMsgReq.class);
...@@ -124,9 +124,6 @@ public class DeviceDownMsgThread extends AbstractThread { ...@@ -124,9 +124,6 @@ public class DeviceDownMsgThread extends AbstractThread {
@Override @Override
protected void threadClosed() { protected void threadClosed() {
// TODO Auto-generated method stub
super.close(); super.close();
} }
} }
...@@ -60,23 +60,12 @@ public class SendThirdPartyThread extends AbstractThread { ...@@ -60,23 +60,12 @@ public class SendThirdPartyThread extends AbstractThread {
deviceMsgReqs.add(deviceReq); deviceMsgReqs.add(deviceReq);
} }
if (!ObjectUtils.isEmpty(deviceMsgReqs)) { if (!ObjectUtils.isEmpty(deviceMsgReqs)) {
// DeviceReq deviceReq = cacheService.lpop(KEY_DEVICE_THIRDPARTY_QUEUE, DeviceReq.class); for (DeviceReq deviceMsgReq : deviceMsgReqs) {
if (!ObjectUtils.isEmpty(deviceMsgReqs)) { 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(), deviceMsgReq);
for (DeviceReq deviceMsgReq : deviceMsgReqs) { log.info("sendThirty req==>deviceCode:{} TYPE:{} \n resp ==>{}", deviceMsgReq.getDeviceCode(), DeviceMethodEnum.getByValue(deviceMsgReq.getDeviceStatus()).getDesc(), JSON.toJSONString(resp));
//设备上下线信息 不更新通知
/* if (DeviceMethodEnum.ONLINE.getValue() == deviceMsgReq.getDeviceStatus() || DeviceMethodEnum.OFFLINE.getValue() == deviceMsgReq.getDeviceStatus()) {
return;
}*/
//deviceReq.getReceiveMethod()
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(), deviceMsgReq);
log.info("sendThirty req==>deviceCode:{} TYPE:{} \n resp ==>{}",deviceMsgReq.getDeviceCode(),DeviceMethodEnum.getByValue(deviceMsgReq.getDeviceStatus()).getDesc(), JSON.toJSONString(resp));
}
} }
} }
} }
......
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