diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java index ba8baea..233466e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java @@ -136,6 +136,9 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements VW7016 = this.itemProtocol.getVW7016(); VW7018 = this.itemProtocol.getVW7018(); VW7020 = this.itemProtocol.getVW7020(); + if("GHS01".equals(devicecode)){ + log.info("123"); + } VW7022 = this.itemProtocol.getVW7022(); VW7024 = this.itemProtocol.getVW7024(); VW7026 = this.itemProtocol.getVW7026(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/ItemProtocol.java index cdb49a7..7a25790 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/ItemProtocol.java @@ -46,13 +46,13 @@ public class ItemProtocol { //写入信号 public static String item_VW70040 = "VW70040"; public static String item_VW70041 = "VW70041"; - public static String item_VW70042 = "VW70042"; +// public static String item_VW70042 = "VW70042"; public static String item_VW70043 = "VW70043"; public static String item_VW70044 = "VW70044"; public static String item_VW70045 = "VW70045"; public static String item_VW70050 = "VW70050"; public static String item_VW70051 = "VW70051"; - public static String item_VW70052 = "VW70052"; +// public static String item_VW70052 = "VW70052"; public static String item_VW70053 = "VW70053"; public static String item_VW70054 = "VW70054"; @@ -248,13 +248,13 @@ public class ItemProtocol { ArrayList list = new ArrayList(); list.add(new ItemDto(item_VW70040, "RGV小车开前门请求信号", "VW7004.0")); list.add(new ItemDto(item_VW70041, "RGV小车在进板中", "VW7004.1")); - list.add(new ItemDto(item_VW70042, "", "VW7004.2")); +// list.add(new ItemDto(item_VW70042, "", "VW7004.2")); list.add(new ItemDto(item_VW70043, "极板已进满信号", "VW7004.3")); list.add(new ItemDto(item_VW70044, "RCV小车关前门请求信号", "VW7004.4")); list.add(new ItemDto(item_VW70045, "RGV在下班时未进满信号", "VW7004.5")); list.add(new ItemDto(item_VW70050, "RGV小车开后门请求信号", "VW7005.0")); list.add(new ItemDto(item_VW70051, "RGV小车在出板中", "VW7005.1")); - list.add(new ItemDto(item_VW70052, "", "VW7005.2")); +// list.add(new ItemDto(item_VW70052, "", "VW7005.2")); list.add(new ItemDto(item_VW70053, "极板已出完信号", "VW7005.3")); list.add(new ItemDto(item_VW70054, "RCV小车关后门请求信号", "VW7005.4")); return list; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java index ad50d83..18b6afc 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java @@ -413,13 +413,13 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD } String result=acsToWmsService.applyTaskToWms(jsonObject); JSONObject res_jo = JSONObject.parseObject(result); - if (StrUtil.equals(res_jo.getString("code"), "200")) { +// if (StrUtil.equals(res_jo.getString("code"), "200")) { this.writing(type); this.setRequireSucess(true); log.info("acs申请任务", this.device_code, "任务申请成功!"); - }else{ - this.writing(99); - } +// }else{ +// this.writing(99); +// } return true; } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java index 69b892e..795343d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java @@ -81,6 +81,7 @@ public class SyncDeviceStatus { } else if (device.getDeviceDriver() instanceof GuhuashiSiteDeviceDriver) { GuhuashiSiteDeviceDriver guhuashiSiteDeviceDriver=(GuhuashiSiteDeviceDriver)device.getDeviceDriver(); JSONObject json = new JSONObject(); + json.put("device_code", guhuashiSiteDeviceDriver.getDeviceCode()); json.put("temperature_setting", guhuashiSiteDeviceDriver.getVW7010()); json.put("temperature", guhuashiSiteDeviceDriver.getVW7012()); json.put("humidity_setting", guhuashiSiteDeviceDriver.getVW7014());