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-13 09:21:31 +08:00
parent 60b43bb231
commit 3699748b42
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -456,13 +456,22 @@ 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 + "/transportOrders"; agvurl = agvurl + ":" + agvport + "/blockGroupStatus";
try {
HttpResponse result = HttpRequest.get(agvurl)
.body(String.valueOf(param))//表单内容
.timeout(20000)//超时，毫秒
.execute();
String body = result.body();
if (StrUtil.isNotEmpty(body)){
JSONArray jsonArray = JSONArray.parseArray(result.body());
return jsonArray;
}
return null;
} catch (Exception e) {
return null;
}
HttpResponse result = HttpRequest.get(agvurl)
.body(String.valueOf(param))//表单内容
.timeout(20000)//超时，毫秒
.execute();
return JSONArray.parseArray(result.body());
} else { } else {
return null; return null;
} }

4
acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -1390,7 +1390,9 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
} else if (headtype.startsWith("REAL")) { } else if (headtype.startsWith("REAL")) {
datatype = "REAL"; datatype = "REAL";
} }
} else { }else if (datatype.startsWith("000")){
datatype = "Boolean";
}else {
//西门子200 //西门子200
if (datatype.indexOf(".") == -1) { if (datatype.indexOf(".") == -1) {
datatype = "Byte"; datatype = "Byte";

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

@@ -58,8 +58,10 @@ public class QueryXZAgvDeviceStatus {
String task_type = "0"; String task_type = "0";
if (StrUtil.isNotEmpty(inst_code)) { if (StrUtil.isNotEmpty(inst_code)) {
Instruction inst = instructionService.findByCodeFromCache(inst_code); Instruction inst = instructionService.findByCodeFromCache(inst_code);
//任务类型 if (ObjectUtil.isNotEmpty(inst)){
task_type = inst.getInstruction_type(); //任务类型
task_type = inst.getInstruction_type();
}
} }
//x坐标 //x坐标
int x = Double.valueOf(rbk_report.getString("x")).intValue(); int x = Double.valueOf(rbk_report.getString("x")).intValue();
@@ -87,8 +89,14 @@ public class QueryXZAgvDeviceStatus {
MaGangAgvDeviceDriver maGangAgvDeviceDriver; MaGangAgvDeviceDriver maGangAgvDeviceDriver;
if (device.getDeviceDriver() instanceof MaGangAgvDeviceDriver) { if (device.getDeviceDriver() instanceof MaGangAgvDeviceDriver) {
maGangAgvDeviceDriver = (MaGangAgvDeviceDriver) device.getDeviceDriver(); maGangAgvDeviceDriver = (MaGangAgvDeviceDriver) device.getDeviceDriver();
maGangAgvDeviceDriver.writing("status", status); String kepStatus = String.valueOf(maGangAgvDeviceDriver.getStatus());
maGangAgvDeviceDriver.writing("type", task_type); String kepType = String.valueOf(maGangAgvDeviceDriver.getType());
if (!StrUtil.equals(kepStatus,status)){
maGangAgvDeviceDriver.writing("status", status);
}
if (!StrUtil.equals(kepType,task_type)){
maGangAgvDeviceDriver.writing("type", task_type);
}
maGangAgvDeviceDriver.writing("x_coordinate", String.valueOf(x)); maGangAgvDeviceDriver.writing("x_coordinate", String.valueOf(x));
maGangAgvDeviceDriver.writing("y_coordinate", String.valueOf(y)); maGangAgvDeviceDriver.writing("y_coordinate", String.valueOf(y));
} }