root/maGang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
gengby
2022-12-22 11:31:08 +08:00
parent ad4da7489e
commit 871688ba8e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -455,21 +456,21 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue();
String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue(); String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue();
agvurl = agvurl + ":" + agvport + "/blockGroupStatus"; agvurl = agvurl + ":" + agvport + "/blockGroupStatus";
log.info("获取互斥组参数:{},请求路径:{}", String.valueOf(param), agvurl); log.info("获取互斥组参数:{},请求路径:{},请求参数:{}", String.valueOf(param), agvurl, String.valueOf(param));
try { try {
HttpResponse result = HttpRequest.get(agvurl) HttpResponse result = HttpRequest.post(agvurl)
.body(String.valueOf(param))//表单内容 .body(JSON.toJSONString(param))//表单内容
.timeout(20000)//超时，毫秒 .timeout(20000)//超时，毫秒
.execute(); .execute();
String body = result.body(); String body = result.body();
if (StrUtil.isNotEmpty(body)) { if (StrUtil.isNotEmpty(body)) {
JSONArray jsonArray = JSONArray.parseArray(result.body()); JSONArray jsonArray = JSONArray.parseArray(result.body());
log.info("获取互斥组参数:{},请求路径:{},响应参数{}", String.valueOf(param), agvurl, String.valueOf(jsonArray)); log.info("获取互斥组参数:{},请求路径:{},请求参数:{},响应参数{}", String.valueOf(param), agvurl, String.valueOf(param), String.valueOf(jsonArray));
return jsonArray; return jsonArray;
} }
return null; return null;
} catch (Exception e) { } catch (Exception e) {
log.info("获取互斥组参数:{},请求路径:{},响应参数{}", String.valueOf(param), agvurl, e.getMessage()); log.error("获取互斥组参数:{},请求路径:{},请求参数:{},响应参数{}", String.valueOf(param), agvurl, String.valueOf(param), e.getMessage());
return null; return null;
} }

6
acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvDeviceStatus.java
View File

@@ -129,6 +129,9 @@ public class QueryXZAgvDeviceStatus {
if (status) { if (status) {
String name = jsonObject.getString("name"); String name = jsonObject.getString("name");
Device device = deviceAppService.findDeviceByCode(name); Device device = deviceAppService.findDeviceByCode(name);
if (ObjectUtil.isEmpty(device)) {
continue;
}
MaGangLedDeviceDriver maGangLedDeviceDriver; MaGangLedDeviceDriver maGangLedDeviceDriver;
if (device.getDeviceDriver() instanceof MaGangLedDeviceDriver) { if (device.getDeviceDriver() instanceof MaGangLedDeviceDriver) {
maGangLedDeviceDriver = (MaGangLedDeviceDriver) device.getDeviceDriver(); maGangLedDeviceDriver = (MaGangLedDeviceDriver) device.getDeviceDriver();
@@ -137,6 +140,9 @@ public class QueryXZAgvDeviceStatus {
} else { } else {
String name = jsonObject.getString("name"); String name = jsonObject.getString("name");
Device device = deviceAppService.findDeviceByCode(name); Device device = deviceAppService.findDeviceByCode(name);
if (ObjectUtil.isEmpty(device)) {
continue;
}
MaGangLedDeviceDriver maGangLedDeviceDriver; MaGangLedDeviceDriver maGangLedDeviceDriver;
if (device.getDeviceDriver() instanceof MaGangLedDeviceDriver) { if (device.getDeviceDriver() instanceof MaGangLedDeviceDriver) {
maGangLedDeviceDriver = (MaGangLedDeviceDriver) device.getDeviceDriver(); maGangLedDeviceDriver = (MaGangLedDeviceDriver) device.getDeviceDriver();