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

opt: 接口日志显示优化

Browse Source
This commit is contained in:
yanps
2024-07-09 13:40:06 +08:00
parent d652148c1f
commit 44ed477346
3 changed files with 66 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/ItemProtocol.java
View File

@@ -117,7 +117,7 @@ public class ItemProtocol {
}
Boolean isonline;
Boolean isError;
Boolean isError = false;
public int getOpcIntegerValue(String protocol) {
Integer value = this.driver.getIntegeregerValue(protocol);

42
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -769,7 +769,8 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
@Override
public JSONObject getDeviceStatusName() {
JSONObject jo = new JSONObject();
Map<String, Object> map = new LinkedHashMap<>();
String move_1 = "";
String move_2 = "";
String action = "";
@@ -840,25 +841,26 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
iserror = false;
}
}
jo.put("requireSucess", requireSucess);
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("move_1", move_1);
jo.put("move_2", move_2);
jo.put("action", action);
jo.put("walk_y", walk_y);
jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
jo.put("task", this.getTask());
jo.put("isOnline", this.getIsonline());
jo.put("isError", this.getIserror());
jo.put("is_disable1", this.getIs_disable());
jo.put("is_disable", is_disable);
jo.put("message", message);
jo.put("is_click", true);
jo.put("driver_type", "slit_two_manipulator");
jo.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage));
jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
jo.put("feedMessage", LangProcess.msg(feedMessage));
map.put("device_name", this.getDevice().getDevice_name());
map.put("mode", mode);
map.put("action", action);
map.put("walk_y", walk_y);
map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
map.put("task", this.getTask());
map.put("isOnline", this.getIsonline());
map.put("isError", this.getIserror());
map.put("is_disable1", this.getIs_disable());
map.put("is_disable", is_disable);
map.put("is_click", true);
map.put("driver_type", "slit_two_manipulator");
map.put("requireSucess", requireSucess);
map.put("move_1", move_1);
map.put("move_2", move_2);
map.put("message", message);
map.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage));
map.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
map.put("feedMessage", LangProcess.msg(feedMessage));
JSONObject jo = new JSONObject(map);
return jo;
}