diff --git a/acs/hd/nladmin-system/pom.xml b/acs/hd/nladmin-system/pom.xml index 26f5dcd..a6dc1ef 100644 --- a/acs/hd/nladmin-system/pom.xml +++ b/acs/hd/nladmin-system/pom.xml @@ -57,34 +57,11 @@ 4.8.1 - - org.apache.lucene - lucene-core - 8.4.0 - - - org.apache.lucene - lucene-analyzers-common - 8.4.0 - - - org.apache.lucene - lucene-analyzers-smartcn - 8.4.0 - - - - org.apache.lucene - lucene-queryparser - 8.4.0 - - - - - net.dreamlu - mica-ip2region - 2.5.6 + net.sf.json-lib + json-lib + 2.4 + jdk15 diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java index 6334880..fd5a136 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java @@ -14,16 +14,12 @@ import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; -import org.nl.acs.device_driver.lnsh.lnsh_package_site.LnshPackageSiteDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; -import org.nl.acs.device_driver.machines_site.MachinesSiteDeviceDriver; import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.device_driver.standard_manipulator_inspect_site.StandardManipulatorInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_storage.StandardStorageDeviceDriver; -import org.nl.acs.device_driver.weighing_site.WeighingSiteDeviceDriver; import org.nl.acs.ext.erp.service.AcsToErpService; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; @@ -719,7 +715,6 @@ public class AgvServiceImpl implements AgvService { StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver; LnshStationDeviceDriver lnshStationDeviceDriver; - LnshPackageSiteDeviceDriver lnshPackageSiteDeviceDriver; //请求进入 if ("onEntry".equals(type)) { @@ -759,23 +754,6 @@ public class AgvServiceImpl implements AgvService { } } } - //晟华包装线工位 - if (addressdevice.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) { - lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) addressdevice.getDeviceDriver(); - //请求取货 - if ("Load".equals(action)) { - if (lnshPackageSiteDeviceDriver.getMode() == 2 && lnshPackageSiteDeviceDriver.getMove() > 0) { - inst.setExecute_status("1"); - is_feedback = true; - } - //请求放货 - } else if ("Unload".equals(action)) { - if (lnshPackageSiteDeviceDriver.getMode() == 2 && lnshPackageSiteDeviceDriver.getMove() == 0) { - inst.setExecute_status("3"); - is_feedback = true; - } - } - } if (addressdevice.getDeviceDriver() instanceof SpecialOrdinarySiteDeviceDriver) { specialOrdinarySiteDeviceDriver = (SpecialOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); //请求取货 @@ -865,25 +843,6 @@ public class AgvServiceImpl implements AgvService { } } } - //晟华包装线工位 - if (addressdevice.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) { - lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) addressdevice.getDeviceDriver(); - //取货完成 - if ("Load".equals(action)) { - if (lnshPackageSiteDeviceDriver.getMode() == 2 && lnshPackageSiteDeviceDriver.getMove() == 0) { - inst.setExecute_device_code(processingVehicle); - inst.setExecute_status("2"); - is_feedback = true; - } - //放货完成 - } else if ("Unload".equals(action)) { - if (lnshPackageSiteDeviceDriver.getMode() == 2 && lnshPackageSiteDeviceDriver.getMove() > 0) { - inst.setExecute_device_code(address); - inst.setExecute_status("4"); - is_feedback = true; - } - } - } if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); //取货完成 @@ -991,9 +950,6 @@ public class AgvServiceImpl implements AgvService { Device device = deviceAppService.findDeviceByCode(newaddress); StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - MachinesSiteDeviceDriver machinesSiteDeviceDriver; - WeighingSiteDeviceDriver weighingSiteDeviceDriver; - StandardManipulatorInspectSiteDeviceDriver sandardManipulatorInspectSiteDeviceDriver; StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); @@ -1041,97 +997,6 @@ public class AgvServiceImpl implements AgvService { standardInspectSiteDeviceDriver.writing(1, 6); is_feedback = true; } - - } - if (device.getDeviceDriver() instanceof StandardManipulatorInspectSiteDeviceDriver) { - sandardManipulatorInspectSiteDeviceDriver = (StandardManipulatorInspectSiteDeviceDriver) device.getDeviceDriver(); - //请求进 - if (StrUtil.equals(type, "07") && address.endsWith("IQ") - && (sandardManipulatorInspectSiteDeviceDriver.getIo_action() == 1 || sandardManipulatorInspectSiteDeviceDriver.getIo_action() == 3)) { - sandardManipulatorInspectSiteDeviceDriver.writing(1, 7); - is_feedback = true; - } - //请求取货 - else if (StrUtil.equals(type, "01") && address.endsWith("IN") - && (sandardManipulatorInspectSiteDeviceDriver.getActoin() == 1 || sandardManipulatorInspectSiteDeviceDriver.getActoin() == 3) - && sandardManipulatorInspectSiteDeviceDriver.getMove() != 0) { - sandardManipulatorInspectSiteDeviceDriver.writing(1, 1); - is_feedback = true; - } - //取货完成 - else if (StrUtil.equals(type, "02")) { - sandardManipulatorInspectSiteDeviceDriver.writing(1, 2); - is_feedback = true; - } - //取货完成离开 - else if (StrUtil.equals(type, "05") && address.endsWith("OUT") - && sandardManipulatorInspectSiteDeviceDriver.getMove() == 0) { - sandardManipulatorInspectSiteDeviceDriver.writing(1, 5); - is_feedback = true; - } - //请求离开 - else if (StrUtil.equals(type, "08") && address.endsWith("OQ") - && (sandardManipulatorInspectSiteDeviceDriver.getIo_action() == 2 || sandardManipulatorInspectSiteDeviceDriver.getIo_action() == 3)) { - sandardManipulatorInspectSiteDeviceDriver.writing(1, 8); - is_feedback = true; - } - //请求放货 - else if (StrUtil.equals(type, "03") && address.endsWith("IN") - && (sandardManipulatorInspectSiteDeviceDriver.getActoin() == 2 || sandardManipulatorInspectSiteDeviceDriver.getActoin() == 3) - && sandardManipulatorInspectSiteDeviceDriver.getMove() == 0) { - sandardManipulatorInspectSiteDeviceDriver.writing(1, 3); - is_feedback = true; - } - //放货完成 - else if (StrUtil.equals(type, "04")) { - sandardManipulatorInspectSiteDeviceDriver.writing(1, 4); - is_feedback = true; - } - //放货完成离开 - else if (StrUtil.equals(type, "06") && address.endsWith("OUT") - && sandardManipulatorInspectSiteDeviceDriver.getMove() != 0) { - sandardManipulatorInspectSiteDeviceDriver.writing(1, 6); - is_feedback = true; - } - - } - if (device.getDeviceDriver() instanceof WeighingSiteDeviceDriver) { - weighingSiteDeviceDriver = (WeighingSiteDeviceDriver) device.getDeviceDriver(); - Instruction inst = instructionService.findByCodeFromCache(inst_code); - weighingSiteDeviceDriver.setInst(inst); - //调用erp接口 - if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.HASOTHERSYSTEM).toString(), "1")) { - log.info("请求ERP接口参数:{}", inst.getStart_device_code()); - JSONObject jo = acsToErpService.sendDeviceToWms(inst.getStart_device_code()); - log.info("ERP接口反馈:{}", jo); - } - is_feedback = true; - } - if (device.getDeviceDriver() instanceof MachinesSiteDeviceDriver) { - machinesSiteDeviceDriver = (MachinesSiteDeviceDriver) device.getDeviceDriver(); - //请求进 - if (address.endsWith("IN")) { - if (machinesSiteDeviceDriver.getIoaction() == 1 || machinesSiteDeviceDriver.getIoaction() == 3) { - is_feedback = true; - } else { - machinesSiteDeviceDriver.writing(6); - } - } - //请求离开 - else if (address.endsWith("OUT")) { - machinesSiteDeviceDriver.writing(6); - machinesSiteDeviceDriver.writing(6); - is_feedback = true; - - } else { - - if (machinesSiteDeviceDriver.getIoaction() == 2 || machinesSiteDeviceDriver.getIoaction() == 3) { - is_feedback = true; - } else { - machinesSiteDeviceDriver.writing(5); - machinesSiteDeviceDriver.writing(2, device.getAddress() == null ? 0 : Integer.parseInt(device.getAddress())); - } - } } JSONObject jo = new JSONObject(); if (is_feedback) { @@ -1170,7 +1035,6 @@ public class AgvServiceImpl implements AgvService { StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; StandardStorageDeviceDriver standardStorageDeviceDriver; LnshStationDeviceDriver lnshStationDeviceDriver; - LnshPackageSiteDeviceDriver lnshPackageSiteDeviceDriver; //mes = AgvClientXZ.mes(zlbh, device, type); //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 @@ -1218,26 +1082,6 @@ public class AgvServiceImpl implements AgvService { } } - if (addressdevice.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) { - lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) addressdevice.getDeviceDriver(); - flag = true; - log.info("agvstatus:" + lnshPackageSiteDeviceDriver.getFlag() + ""); - //取货完成离开 - if (lnshPackageSiteDeviceDriver.getFlag() == 2) { - if (lnshPackageSiteDeviceDriver.getMove() == 0) { - flag = true; - lnshPackageSiteDeviceDriver.setFlag(5); - } - } - //放货完成离开 - if (lnshPackageSiteDeviceDriver.getFlag() == 4) { - if (lnshPackageSiteDeviceDriver.getMove() == 1) { - flag = true; - lnshPackageSiteDeviceDriver.setFlag(6); - } - } - } - if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); flag = true; @@ -1622,83 +1466,15 @@ public class AgvServiceImpl implements AgvService { case 3: break; case 4: - if (StrUtil.equals(inst.getCompound_inst(), "1")) { - for (int i = 0; i < pathlist.size(); i++) { - String device_code = pathlist.get(i); - Device device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device)) { - throw new BadRequestException("未找到该设备【" + device_code + "】"); - } - - MachinesSiteDeviceDriver machinesSiteDeviceDriver; - if (device.getDeviceDriver() instanceof MachinesSiteDeviceDriver) { - ja.add(destination2(device_code + "IN", "Wait", "1", device_code + "IN" - + "-" + inst_code + "-" + "01")); - ja.add(destination2(device_code, "Wait", "1", device_code - + "-" + inst_code + "-" + "01")); - ja.add(destination2(device_code + "OUT", "Wait", "1", device_code + "OUT" - + "-" + inst_code + "-" + "01")); - - } else { - ja.add(destination2(device_code, "Wait", "1", device_code + "-" + inst_code + "-" + "01")); - } - } - - ja.add(destination2(inst.getNext_point_code(), "Wait", "1", inst.getNext_point_code() + "-" + inst_code + "-" + "01")); - - } else { - String startAddress = inst.getStart_device_code(); - String nextAddress = inst.getNext_device_code(); - //追加则下发目标点 不追加就下方起点、目标点 - if (StrUtil.equals("1", inst_type)) { - Device device = deviceAppService.findDeviceByCode(nextAddress); - MachinesSiteDeviceDriver machinesSiteDeviceDriver; - if (device.getDeviceDriver() instanceof MachinesSiteDeviceDriver) { - ja.add(destination2(startAddress, "Wait", "5", startAddress - + "-" + inst_code + "-" + "01")); - ja.add(destination2(nextAddress + "IN", "Wait", "1", nextAddress + "IN" - + "-" + inst_code + "-" + "01")); - ja.add(destination2(nextAddress, "Wait", "1", nextAddress - + "-" + inst_code + "-" + "01")); - ja.add(destination2(nextAddress + "OUT", "Wait", "1", nextAddress + "OUT" - + "-" + inst_code + "-" + "01")); - } else { - ja.add(destination2(startAddress, "Wait", "1", startAddress - + "-" + inst_code + "-" + "01")); - ja.add(destination2(nextAddress, "Wait", "1", nextAddress - + "-" + inst_code + "-" + "01")); - } - - } else { - ja.add(destination2(startAddress, "Wait", "1", startAddress - + "-" + inst_code + "-" + "01")); - ja.add(destination2(nextAddress, "Wait", "1", nextAddress - + "-" + inst_code + "-" + "01")); - } - } break; case 6: String startAddress = inst.getStart_device_code(); String nextAddress = inst.getNext_device_code(); Device startdevice = deviceAppService.findDeviceByCode(startAddress); Device nextdevice = deviceAppService.findDeviceByCode(nextAddress); - StandardManipulatorInspectSiteDeviceDriver standardManipulatorInspectSiteDeviceDriver; StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; //起点 - if (startdevice.getDeviceDriver() instanceof StandardManipulatorInspectSiteDeviceDriver) { - - ja.add(destination2(startAddress + "IQ", "Wait", "1", startAddress + "IQ" - + "-" + inst_code + "-" + "07")); - ja.add(destination2(startAddress + "IN", "Wait", "1", startAddress + "IN" - + "-" + inst_code + "-" + "01")); - ja.add(destination2(startAddress, "Load", "3", startAddress - + "-" + inst_code + "-" + "02")); - ja.add(destination2(startAddress + "OUT", "Wait", "1", startAddress + "OUT" - + "-" + inst_code + "-" + "05")); - ja.add(destination2(startAddress + "OQ", "Wait", "1", startAddress + "OQ" - + "-" + inst_code + "-" + "08")); - - } else if (startdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { + if (startdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { ja.add(destination2(startAddress + "IN", "Wait", "1", startAddress + "IN" + "-" + inst_code + "-" + "01")); @@ -1714,19 +1490,7 @@ public class AgvServiceImpl implements AgvService { + "-" + inst_code + "-" + "01")); } - //终点 - if (nextdevice.getDeviceDriver() instanceof StandardManipulatorInspectSiteDeviceDriver) { - ja.add(destination2(nextAddress + "IQ", "Wait", "1", nextAddress + "IQ" - + "-" + inst_code + "-" + "07")); - ja.add(destination2(nextAddress + "IN", "Wait", "1", nextAddress + "IN" - + "-" + inst_code + "-" + "03")); - ja.add(destination2(nextAddress, "ForkLoad", "3", nextAddress - + "-" + inst_code + "-" + "04")); - ja.add(destination2(nextAddress + "OUT", "Wait", "1", nextAddress + "OUT" - + "-" + inst_code + "-" + "06")); - ja.add(destination2(nextAddress + "OQ", "Wait", "1", nextAddress + "OQ" - + "-" + inst_code + "-" + "08")); - } else if (nextdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { + if (nextdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { ja.add(destination2(nextAddress + "IN", "Wait", "1", nextAddress + "IN" + "-" + inst_code + "-" + "03")); ja.add(destination2(nextAddress, "ForkLoad", "3", nextAddress diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java index 184229c..18d4869 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java @@ -15,16 +15,8 @@ public enum DriverTypeEnum { INSPECT_SITE(3, "standard_inspect_site", "检测站点", "station"), - NON_LINE_INSPECT_SITE(4, "non_line_inspect_site", "检测站点-无PLC", "station"), - - MACHINES_SITE(5, "machines_site", "机台设备-无光电", "station"), - - SPECIAL_SITE(6, "standard_special_inspect_site", "专机设备交互站点", "station"), - MANIPULATOR_SITE(7, "standard_manipulator_inspect_site", "区域管制设备交互站点", "station"), - NON_LINE_MANIPULATOR_SITE(8, "non_line_manipulator_inspect_site", "区域管制设备交互站点-无PLC", "station"), - AUTODOOR(9, "standard_autodoor", "标准版-自动门", "autodoor"), STACK_EMPUYPALLET_SITE(10, "standard_emptypallet_site", "标准版-空盘叠盘站点", "station"), @@ -43,77 +35,25 @@ public enum DriverTypeEnum { INSPECT_CONVEYOR_MONITOR(17, "standard_conveyor_monitor", "标准版-输送机-监控点", "conveyor"), - MANIPULATOR_INSPECT_SITE_NDC(18, "manipulator_inspect_site_NDC", "区域管制设备交互站点-NDC", "station"), - - FEEDBACK_AGV_STATUS_SITE(19, "feedback_agv_status_site", "上报AGV状态站点", "station"), - - MANIPULATOR_STACKING_SITE(20, "standard_manipulator_stacking_site", "机械手码垛驱动（区分托盘类型）", "conveyor"), - - PHOTOELECTRIC_INSPECT_SITE(21, "standard_photoelectric_inspect_site", "光电检测站点（优先出库）", "station"), - - HAILIANG_PACKING(22, "hailiang_packing", "海亮项目-包装机", "conveyor"), - - HAILIANG_LABELING(23, "hailiang_labeling", "海亮项目-贴标机", "conveyor"), - - HAILIANG_COATING(24, "hailiang_coating", "海亮项目-裹膜机", "conveyor"), - - NDXY_SPECIAL(25, "ndxy_special", "纽迪希亚专用", "station"), - - NDXY_SPECIAL_TWO(26, "ndxy_special_two", "纽迪希亚专用2", "station"), - - INSPECT_CONVEYOR_CONTROL_WITH_PLCSCANNER(27, "standard_conveyor_control_with_plcscanner", "标准版-输送机-控制点-PLC扫码", "conveyor"), - - WHXR_STORAGE_CONVEYOR(28, "whxr_storage_conveyor", "武汉新锐-立库对接位", "conveyor"), - - WHXR_BALL_MILL_DEVICE(29, "whxr_ball_mill", "武汉新锐-球磨机", "conveyor"), - - WHXR_SPRAY_TOWER_DEVICE(30, "whxr_spary_tower", "武汉新锐-喷雾塔", "conveyor"), - - WHXR_WEIGHT_DEVICE(31, "whxr_weight", "武汉新锐-称重设备", "conveyor"), - - ELECTRIC_FENCE(32, "electric_fence", "标准版-电子围栏", "safetydoor"), - - OUMULONGPLC(33, "oumulong_plc", "标准版-自动门-欧姆龙plc", "autodoor"), - - TRAFFIC_LIGHT(34, "traffic_light", "标准版-交通灯-欧姆龙plc", "alarmLamp"), - STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv"), - YKBK_SPECIAL(36, "ykbk_special", "伊科拜克默认物料", "station"), - - LNSH_MIXING_MILL(37, "lnsh_mixing_mill", "晟华-混碾机", "station"), - - LNSH_PRESS(38, "lnsh_press", "晟华-压力机", "station"), - LNSH_PALLETIZING_MANIPULATOR(39, "lnsh_palletizing_manipulator", "嘉耐-码垛机械手", "station"), - LNSH_KILN_TRUSS(40, "lnsh_kiln_truss", "晟华-入出窑桁架", "station"), - - LNSH_OUT_KILN_TRUSS(41, "lnsh_out_kiln_truss", "晟华-出窑桁架", "station"), - - LNSH_KILN_LANE(42, "lnsh_kiln_lane", "晟华-窑车道", "station"), - - LNSH_FOLD_DISC_SITE(43, "lnsh_fold_disc_site", "晟华-叠盘机", "station"), - - LNSH_PALLET_STORAGE(44, "lnsh_pallet_storage", "晟华-托盘存储线", "station"), + LNSH_KILN_LANE(42, "lnsh_kiln_lane", "嘉耐-窑车道", "station"), LNSH_PACKAGE_PALLET_MANIPULATOR(45, "lnsh_package_pallet_manipulator", "嘉耐-包装码垛机械手", "station"), - LNSH_LABELING_MACHINE(46, "lnsh_labeling_machine", "晟华-贴标机", "station"), - LNSH_SPLIT_MANIPULATOR(47, "lnsh_split_manipulator", "嘉耐-拆垛机械手", "station"), LNSH_RGV(48, "lnsh_rgv", "嘉耐双工位RGV", "rgv"), - LNSH_PACKAGE_LINE(49, "lnsh_package_line", "晟华-包装机", "station"), - LNSH_STATION(50, "lnsh_station", "嘉耐-工位(交互模板)", "station"), LNSH_LAMINATING_MACHINE(51, "lnsh_Laminating_machine", "嘉耐-缓存货架", "station"), LNSH_PACKAGE_SITE(52, "lnsh_package_site", "嘉耐-包装线工位", "station"), - LNSH_PACKAGE_PALLETSPLIT_MANIPULATOR(53, "lnsh_package_palletSplit_manipulator", "嘉耐-包装码拆垛机械手", "station"), + RLJN_PACKAGE_PALLETSPLIT_MANIPULATOR(53, "rljn_package_palletSplit_manipulator", "嘉耐-包装码拆垛机械手", "station"), LNSH_PALLETIZING_MANIPULATOR_SITE(54, "lnsh_palletizing_manipulator_site", "嘉耐-码垛机械手工位", "station"), diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java index 66dff9e..6088306 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java @@ -34,7 +34,7 @@ public class ItemProtocol { public int getOpcIntegerValue(String protocol) { Integer value = this.driver.getIntegeregerValue(protocol); if (value == null) { - log.error("读取错误!"); + } else { return value; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceService.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceService.java index 138e782..e48bf37 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceService.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceService.java @@ -222,7 +222,7 @@ public interface DeviceService { * * @param device_id */ - JSONObject queryDriverConfigByDeviceId(String device_id, String driver_code); + net.sf.json.JSONObject queryDriverConfigByDeviceId(String device_id, String driver_code); /** * DB测试读 diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 38d45d2..43205cc 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -20,7 +20,6 @@ import org.nl.acs.device.service.dto.*; import org.nl.acs.device_driver.DeviceDriverDefination; import org.nl.acs.device_driver.ScannerDeviceDriver; import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver; import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; @@ -41,8 +40,6 @@ import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; import org.openscada.opc.lib.da.Server; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -70,13 +67,8 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial List storageCells = new ArrayList<>(); private Map storage_address = new HashMap(); - Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class); - - @Override public Map queryAll(Map whereJson, Pageable page) { - logger.info("Hello World"); - HashMap param = new HashMap(); param.put("flag", "01"); if (whereJson.get("blurry") != null) { @@ -966,15 +958,6 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial } Device device = deviceAppService.findDeviceByCode(device_code); - ElectricFenceDeviceDriver electricFenceDeviceDriver; - if (device.getDeviceDriver() instanceof ElectricFenceDeviceDriver) { - electricFenceDeviceDriver = (ElectricFenceDeviceDriver) device.getDeviceDriver(); - if (StrUtil.equals(suspended,"0")) { - electricFenceDeviceDriver.setSuspended(true); - } else { - electricFenceDeviceDriver.setSuspended(false); - } - } } @@ -1160,15 +1143,15 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial } @Override - public JSONObject queryDriverConfigByDeviceId(String device_id, String driver_code) { - final JSONObject extraObj = new JSONObject(); + public net.sf.json.JSONObject queryDriverConfigByDeviceId(String device_id, String driver_code) { + final net.sf.json.JSONObject extraObj = new net.sf.json.JSONObject(); DeviceDto dto = this.findById(device_id); if (ObjectUtil.isNull(dto)) { - return new JSONObject(); + return new net.sf.json.JSONObject(); } log.info("判断设备是否配置过驱动!"); //处理设备扩展属性 - JSONObject result = new JSONObject(); + net.sf.json.JSONObject result = new net.sf.json.JSONObject(); //根据设备驱动定义获取OPC读写数据 DeviceDriverDefination deviceDriverDefination = deviceDriverDefinationAppService.getDeviceDriverDefination(driver_code); @@ -1183,13 +1166,24 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial JSONArray arr = WQLObject.getWQLObject("acs_device_extra").query("filed_type ='01' and device_id = '" + device_id + "'").getResultJSONArray(0); +// for (int i = 0; i < arr.size(); i++) { +// final JSONObject json = arr.getJSONObject(i); +// if ("true".equalsIgnoreCase(json.getString("extra_value")) || +// "false".equalsIgnoreCase(json.getString("extra_value"))) { +// extraObj.put(json.getString("extra_code"), json.getBoolean("extra_value")); +// } else { +// extraObj.put(json.getString("extra_code"), json.get("extra_value")); +// } +// } + for (int i = 0; i < arr.size(); i++) { - final JSONObject json = arr.getJSONObject(i); - if ("true".equalsIgnoreCase(json.getString("extra_value")) || - "false".equalsIgnoreCase(json.getString("extra_value"))) { - extraObj.put(json.getString("extra_code"), json.getBoolean("extra_value")); + + final net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(arr.get(i)); + if ("true".equalsIgnoreCase(json.optString("extra_value")) || + "false".equalsIgnoreCase(json.optString("extra_value"))) { + extraObj.put(json.optString("extra_code"), json.optBoolean("extra_value")); } else { - extraObj.put(json.getString("extra_code"), json.get("extra_value")); + extraObj.put(json.optString("extra_code"), json.opt("extra_value")); } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java index 109e9d3..98c30c2 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java @@ -13,6 +13,7 @@ import org.nl.acs.device.service.dto.StorageCellDto; import org.nl.exception.BadRequestException; import org.nl.utils.FileUtil; import org.nl.utils.SecurityUtils; +import org.nl.wql.WQL; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; @@ -22,10 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author wangs @@ -39,9 +37,13 @@ public class StorageCellServiceImpl implements StorageCellService { @Override public Map queryAll(Map whereJson, Pageable page) { - WQLObject wo = WQLObject.getWQLObject("acs_storage_cell"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "", "update_time desc"); - final JSONObject json = rb.pageResult(); + HashMap map = new HashMap<>(16); + map.put("flag","6"); + if (whereJson.get("blurry") != null) { + map.put("blurry", "%" + whereJson.get("blurry") + "%"); + } + + JSONObject json = WQL.getWO("Qdevice_query_002").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page),"update_time desc"); return json; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql index b1fd54f..21f562a 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql @@ -138,4 +138,21 @@ address.methods_id = 输入.methods_id ENDOPTION ENDSELECT - ENDIF \ No newline at end of file + ENDIF + + IF 输入.flag = "6" + PAGEQUERY + SELECT + * + FROM + acs_storage_cell as storage_cell + WHERE + 1=1 + OPTION 输入.blurry <> "" + (storage_cell.storage_code like 输入.blurry + or storage_cell.parent_storage_code like 输入.blurry + or storage_cell.address like 输入.blurry ) + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF \ No newline at end of file diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ElectricFenceDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ElectricFenceDefination.java deleted file mode 100644 index 7370aae..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ElectricFenceDefination.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.nl.acs.device_driver.electric_fence; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device_driver.standard_autodoor.ItemProtocol; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 自动门驱动定义 - */ -@Service -public class ElectricFenceDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "electric_fence"; - } - - @Override - public String getDriverName() { - return "标准版-电子围栏"; - } - - @Override - public String getDriverDescription() { - return "标准版-电子围栏"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new ElectricFenceDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return ElectricFenceDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B4")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ElectricFenceDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ElectricFenceDeviceDriver.java deleted file mode 100644 index ad78b17..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ElectricFenceDeviceDriver.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.nl.acs.device_driver.electric_fence; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.agv.server.AgvService; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.opc.Device; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.HashMap; -import java.util.Map; - -/** - * 电子围栏驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class ElectricFenceDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - - @Autowired - AgvService agvService = SpringContextHolder.getBean("agvServiceImpl"); - - String devicecode; - int mode = 0; - int action = 0; - int error = 0; - Boolean iserror = false; - - int move = 0; - int task = 0; - int last_action = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - //是否暂停 true为暂停 false为恢复 - Boolean suspended = false; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() throws Exception { - - String device_code = this.getDevice().getDevice_code(); - mode = this.itemProtocol.getMode(); - action = this.itemProtocol.getAction(); - error = this.itemProtocol.getError(); - if (mode != last_mode) { - } - if (action != last_action) { - } - if (error != last_error) { - if (this.error == 1) { - agvService.pause(); - } else if (this.error == 0){ - agvService.resume(); - } - } - last_action = action; - last_mode = mode; - last_error = error; - } - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - log.info("下发PLC信号：{},{}", to_command, command); - System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command); - - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ItemProtocol.java deleted file mode 100644 index b91dd96..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ItemProtocol.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.nl.acs.device_driver.electric_fence; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_action = "action"; - public static String item_error = "error"; - public static String item_to_command = "to_command"; - - - private ElectricFenceDeviceDriver driver; - - public ItemProtocol(ElectricFenceDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error("读取错误!"); - } else { - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "DB51.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B4")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/FeedbackAGVStatusSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/FeedbackAGVStatusSiteDefination.java deleted file mode 100644 index 78f357d..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/FeedbackAGVStatusSiteDefination.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.nl.acs.device_driver.feedback_agv_status_site; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * 上报AGV状态站点 - */ -@Service -public class FeedbackAGVStatusSiteDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "feedback_agv_status_site"; - } - - @Override - public String getDriverName() { - return "上报AGV状态站点"; - } - - @Override - public String getDriverDescription() { - return "上报AGV状态站点"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new FeedbackAGVStatusSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return FeedbackAGVStatusSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - - @Override - public List getReadableItemDtos() { - return null; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/FeedbackAGVStatusSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/FeedbackAGVStatusSiteDeviceDriver.java deleted file mode 100644 index fed54d6..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/FeedbackAGVStatusSiteDeviceDriver.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.nl.acs.device_driver.feedback_agv_status_site; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.opc.Device; -import org.openscada.opc.lib.da.Server; - -import java.util.HashMap; -import java.util.Map; - -/** - * 上报AGV状态站点 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class FeedbackAGVStatusSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_status; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/ItemProtocol.java deleted file mode 100644 index fac8dd9..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/ItemProtocol.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.nl.acs.device_driver.feedback_agv_status_site; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - public static String item_to_status = "to_status"; - - private FeedbackAGVStatusSiteDeviceDriver driver; - - public ItemProtocol(FeedbackAGVStatusSiteDeviceDriver driver) { - this.driver = driver; - } - - public int getToStatus() { - return this.getOpcIntegerValue(item_to_status); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - Boolean isonline; - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_status, "agv状态", "DB608.B0", Boolean.valueOf(true))); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDefination.java deleted file mode 100644 index bd12db8..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDefination.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_coating; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 海亮裹膜机 - */ -@Service -public class HaiLiangCoatingDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lamp_three_color"; - } - - @Override - public String getDriverName() { - return "标准版-三色灯"; - } - - @Override - public String getDriverDescription() { - return "标准版-三色灯"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new HaiLiangCoatingDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return HaiLiangCoatingDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B4")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java deleted file mode 100644 index 9faa1d5..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java +++ /dev/null @@ -1,155 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_coating; - -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * 海亮-裹膜机驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class HaiLiangCoatingDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - String devicecode; - int mode = 0; - int action = 0; - int error = 0; - int move = 0; - int task = 0; - int last_action = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - protected boolean hasGoods = false; - boolean isFold = false; - private String assemble_check_tag; - private Boolean sampleMode0; - private Boolean sampleMode3; - private Integer sampleError; - private Boolean sampleOnline; - protected String displayMessage = null; - public int display_message_time_out = 30000; - public Date display_message_time; - protected String current_stage_instruction_message; - protected String last_stage_instruction_message; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - - String device_code = this.getDevice().getDevice_code(); - mode = this.itemProtocol.getMode(); - action = this.itemProtocol.getAction(); - error = this.itemProtocol.getError(); - if (mode != last_mode) { - } - if (action != last_action) { - } - if (error != last_error) { - } - last_action = action; - last_mode = mode; - last_error = error; - //message = StringFormatUtl.format("设备报警:{}", new Object[]{}); - -// String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString(); - - - } - - public synchronized String getStatus() { - JSONObject jo = new JSONObject(); - - if (action == 1) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "OPEN"); - - } else if (action == 2) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "CLOSE"); - - } else { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "ERROR"); - } - return jo.toString(); - } - - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.standard_inspect_site.ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - log.info("下发PLC信号：{},{}", to_command, command); - System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command); - } - - public synchronized void OpenOrClose(String type) { - - writing(Integer.parseInt(type)); - - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/ItemProtocol.java deleted file mode 100644 index cce09b0..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/ItemProtocol.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_coating; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_action = "action"; - public static String item_error = "error"; - public static String item_to_command = "to_command"; - - - private HaiLiangCoatingDeviceDriver driver; - - public ItemProtocol(HaiLiangCoatingDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - //log.error("读取错误!"); - } else { - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "DB51.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B4")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDefination.java deleted file mode 100644 index 971bf41..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDefination.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_labeling; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 海亮贴标机驱动 - */ -@Service -public class HaiLiangLabelingDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "hailiang_labeling"; - } - - @Override - public String getDriverName() { - return "海亮-贴标机"; - } - - @Override - public String getDriverDescription() { - return "海亮-贴标机"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new HaiLiangLabelingDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return HaiLiangLabelingDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "V100.1", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "V100.0")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "VB101")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDeviceDriver.java deleted file mode 100644 index 0df72e8..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDeviceDriver.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_labeling; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.opc.Device; -import org.openscada.opc.lib.da.Server; - -import java.util.HashMap; -import java.util.Map; - -/** - * 海亮贴标机驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class HaiLiangLabelingDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - - String devicecode; - int mode = 0; - int action = 0; - int error = 0; - int move = 0; - int last_action = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int branchProtocol = 0; - - @Override - public Device getDevice() { - return this.device; - } - - @Override - public void execute() { - String message = null; - - String device_code = this.getDevice().getDevice_code(); - mode = this.itemProtocol.getMode(); - action = this.itemProtocol.getAction(); - error = this.itemProtocol.getError(); - if (mode != last_mode) { - } - if (action != last_action) { - } - if (error != last_error) { - } - // 打印就绪 - if (mode == 1 && error == 0) { - - } - - //打印完成 - if (action == 1) { - - } - last_action = action; - last_mode = mode; - last_error = error; - - } - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.standard_inspect_site.ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - log.info("下发PLC信号：{},{}", to_command, command); - System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command); - } - - public synchronized void OpenOrClose(String type) { - writing(Integer.parseInt(type)); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/ItemProtocol.java deleted file mode 100644 index 455eb8a..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/ItemProtocol.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_labeling; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -public class ItemProtocol { - public static String item_mode = "mode"; - public static String item_action = "action"; - public static String item_error = "error"; - public static String item_to_command = "to_command"; - - - private HaiLiangLabelingDeviceDriver driver; - - public ItemProtocol(HaiLiangLabelingDeviceDriver driver) { - this.driver = driver; - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - //log.error("读取错误!"); - } else { - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_mode, "工作状态", "V100.1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "V100.0")); - list.add(new ItemDto(item_error, "报警信号", "VB101")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "V102.0", Boolean.valueOf(true))); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDefination.java deleted file mode 100644 index 6214d2f..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDefination.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_lettering; - -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * 海亮刻字机驱动 - */ -@Service -public class HaiLiangLetteringDefination implements DeviceDriverDefination { - @Override - public String getDriverCode() { - return "hailiang_lettering"; - } - - @Override - public String getDriverName() { - return "海亮-激光刻字机"; - } - - @Override - public String getDriverDescription() { - return "海亮-激光刻字机"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new HaiLiangLetteringDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return HaiLiangLetteringDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDeviceDriver.java deleted file mode 100644 index ce0c6c2..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDeviceDriver.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_lettering; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; - - -/** - * - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class HaiLiangLetteringDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - - Integer hasGoods = 0; - int error = 0; - Boolean iserror = false; - Boolean islock = false; - - int branchProtocol = 0; - int last_branchProtocol = 0; - //是否需要输入物料 - String input_material = "0"; - //备注 - String remark = ""; - //数量 - String qty = ""; - //是否在线 - Boolean is_online = true; - //批次 - String batch = ""; - //物料 - String material = ""; - //目标点位 - String purpose = ""; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - boolean requireSucess = false; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - //申请搬运任务 - private Boolean apply_handling = false; - //申请物料 - private Boolean apply_material = false; - - // 1取货完成 2放货完成 3进入区域 4离开区域 - private int flag; - - //人工确认信号 默认0 agv到达后请求置1 等人工确认后变为2 反馈agv后继续为0 - private int manua_confirm = 0; - - String devicecode; - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - - String message; - - // 1就绪 2下发刻字 3 刻字完成 - int status; - - int mode = 2; - - int move; - - int action; - - int ioaction; - - @Override - public void execute() { - hasGoods = this.getDevice().getHas_goods(); - material = this.getDevice().getMaterial_type(); - batch = this.getDevice().getBatch(); - devicecode = this.getDeviceCode(); - if (branchProtocol != last_branchProtocol) { - requireSucess = false; - } - switch (branchProtocol) { - case 1: - break; - //呼叫请求 - case 2: - - break; - //响应生成任务 - case 3: - - break; - } - } - - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDefination.java deleted file mode 100644 index a48b487..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDefination.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_packing; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 包装机驱动 - */ -@Service -public class HaiLiangPackingDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lamp_three_color"; - } - - @Override - public String getDriverName() { - return "标准版-三色灯"; - } - - @Override - public String getDriverDescription() { - return "标准版-三色灯"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new HaiLiangPackingDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return HaiLiangPackingDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B4")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDeviceDriver.java deleted file mode 100644 index a49414d..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDeviceDriver.java +++ /dev/null @@ -1,155 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_packing; - -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * 海亮-包装机驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class HaiLiangPackingDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - String devicecode; - int mode = 0; - int action = 0; - int error = 0; - int move = 0; - int task = 0; - int last_action = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - protected boolean hasGoods = false; - boolean isFold = false; - private String assemble_check_tag; - private Boolean sampleMode0; - private Boolean sampleMode3; - private Integer sampleError; - private Boolean sampleOnline; - protected String displayMessage = null; - public int display_message_time_out = 30000; - public Date display_message_time; - protected String current_stage_instruction_message; - protected String last_stage_instruction_message; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - - String device_code = this.getDevice().getDevice_code(); - mode = this.itemProtocol.getMode(); - action = this.itemProtocol.getAction(); - error = this.itemProtocol.getError(); - if (mode != last_mode) { - } - if (action != last_action) { - } - if (error != last_error) { - } - last_action = action; - last_mode = mode; - last_error = error; - //message = StringFormatUtl.format("设备报警:{}", new Object[]{}); - -// String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString(); - - - } - - public synchronized String getStatus() { - JSONObject jo = new JSONObject(); - - if (action == 1) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "OPEN"); - - } else if (action == 2) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "CLOSE"); - - } else { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "ERROR"); - } - return jo.toString(); - } - - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.standard_inspect_site.ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - log.info("下发PLC信号：{},{}", to_command, command); - System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command); - } - - public synchronized void OpenOrClose(String type) { - - writing(Integer.parseInt(type)); - - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/ItemProtocol.java deleted file mode 100644 index e904060..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/ItemProtocol.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.nl.acs.device_driver.hailiang.hailiang_packing; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_action = "action"; - public static String item_error = "error"; - public static String item_to_command = "to_command"; - - - private HaiLiangPackingDeviceDriver driver; - - public ItemProtocol(HaiLiangPackingDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - //log.error("读取错误!"); - } else { - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "DB51.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B4")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/ItemProtocol.java index 7734926..c2b1568 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/ItemProtocol.java @@ -45,7 +45,7 @@ public class ItemProtocol { public int getOpcIntegerValue(String protocol) { Integer value = this.driver.getIntegeregerValue(protocol); if (value == null) { - //log.error("读取错误!"); + // } else { return value; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java index c1277c8..7d03c45 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java @@ -3,6 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver; import java.util.ArrayList; import java.util.List; @@ -96,7 +97,7 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (value == null) { - log.error("读取错误!"); + } else { return value; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java index 22e2933..1d82450 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java @@ -3,6 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java deleted file mode 100644 index e41602e..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java +++ /dev/null @@ -1,123 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_status = "status"; - public static String item_open_time = "open_time"; - public static String item_close_time = "close_time"; - public static String item_standby_time = "standby_time "; - public static String item_production_time = "production_time"; - public static String item_error_time = "error_time"; - public static String item_container_qty = "container_qty"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - Boolean isonline; - - private LnshFoldDiscSiteDeviceDriver driver; - - public ItemProtocol(LnshFoldDiscSiteDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getStatus() { - return this.getOpcIntegerValue(item_status); - } - - public int getOpen_time() { - return this.getOpcIntegerValue(item_open_time); - } - - public int getClose_time() { - return this.getOpcIntegerValue(item_close_time); - } - - public int getStandby_time() { - return this.getOpcIntegerValue(item_standby_time); - } - - public int getProduction_time() { - return this.getOpcIntegerValue(item_production_time); - } - - public int getError_time() { - return this.getOpcIntegerValue(item_error_time); - } - - public int getContainer_qty() { - return this.getOpcIntegerValue(item_container_qty); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getToTarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getToTask() { - return this.getOpcIntegerValue(item_to_task); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB49.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB49.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB49.B2")); - list.add(new ItemDto(item_open_time, "开机时间", "DB49.D4")); - list.add(new ItemDto(item_close_time, "关机时间", "DB49.D8")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB49.D12")); - list.add(new ItemDto(item_production_time, "生产时间", "DB49.D16")); - list.add(new ItemDto(item_error_time, "故障时间", "DB49.D20")); - list.add(new ItemDto(item_container_qty, "托盘数", "DB49.D24")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发命令反馈", "DB50.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "下发目标站", "DB50.W2")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB50.D4")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java deleted file mode 100644 index 272ab51..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 晟华叠盘机 - */ -@Service -public class LnshFoldDiscSiteDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lnsh_fold_disc_site"; - } - - @Override - public String getDriverName() { - return "晟华-叠盘机"; - } - - @Override - public String getDriverDescription() { - return "晟华-叠盘机"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new LnshFoldDiscSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - } - - @Override - public Class getDeviceDriverType() { - return LnshFoldDiscSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.station); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB49.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB49.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB49.B2")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB49.D4")); - list.add(new ItemDto(ItemProtocol.item_close_time, "关机时间", "DB49.D8")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB49.D12")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB49.D16")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB49.D20")); - list.add(new ItemDto(ItemProtocol.item_container_qty, "托盘数", "DB49.D24")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java deleted file mode 100644 index 1799246..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java +++ /dev/null @@ -1,222 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 晟华叠盘机 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class LnshFoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - - String device_code; - int mode = 0; - int error = 0; - int move = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - Boolean isonline = true; - int hasGoods = 0; - Boolean iserror = false; - - boolean requireSucess = false; - - int heartbeat; - int last_heartbeat; - private Date checkHeartbeattime = new Date(); - private Date last_checkHeartbeattime = new Date(); - - int branchProtocol = 0; - - String message; - int status = 0; - int last_status = 0; - //开机时间 - int open_time = 0; - int last_open_time = 0; - int close_time = 0; - int last_close_time = 0; - //待机时间 - int standby_time = 0; - int last_standby_time = 0; - //生产时间 - int production_time = 0; - int last_production_time = 0; - //故障时间 - int error_time = 0; - int last_error_time = 0; - int container_qty = 0; - int last_container_qty = 0; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - status = this.itemProtocol.getStatus(); - open_time = this.itemProtocol.getOpen_time(); - close_time = this.itemProtocol.getClose_time(); - standby_time = this.itemProtocol.getStandby_time(); - production_time = this.itemProtocol.getProduction_time(); - error_time = this.itemProtocol.getError_time(); - container_qty = this.itemProtocol.getContainer_qty(); - - if (mode != last_mode) { - this.setRequireSucess(false); - logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); - } - if (status != last_status) { - logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); - } - if (open_time != last_open_time) { - logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); - } - if (close_time != last_close_time) { - logServer.deviceItemValue(this.device_code,"close_time" ,String.valueOf(close_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号close_time：" + last_close_time + "->" + close_time); - } - if (standby_time != last_standby_time) { - logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); - } - if (production_time != last_production_time) { - logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); - } - if (error_time != last_error_time) { - logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); - } - if (container_qty != last_container_qty) { - logServer.deviceItemValue(this.device_code,"container_qty" ,String.valueOf(container_qty)); - logServer.deviceExecuteLog(this.device_code,"","","信号container_qty：" + last_container_qty + "->" + container_qty); - } - - } catch (Exception var17) { - return; - } - - //急停 - if (this.isStop()) { - - //未在线无心跳 - } else if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - break; - case 2: - - break; - case 3: - - break; - case 4: - break; - } - } - - last_mode = mode; - last_status = status; - last_open_time = open_time; - last_close_time = close_time; - last_standby_time = standby_time; - last_production_time = production_time; - last_error_time = error_time; - last_container_qty = container_qty; - } - - public void writing(String param, String value) { - - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + param; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - if (value instanceof String) { - itemMap.put(to_param, value); - } else { - itemMap.put(to_param, Integer.parseInt(value)); - } - ReadUtil.write(itemMap, server); - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/ItemProtocol.java index 55d3503..504a85f 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/ItemProtocol.java @@ -165,7 +165,7 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (StrUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java index 0a8fd1b..e81fabb 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDeviceDriver.java @@ -347,7 +347,7 @@ public class LnshKilnLaneDeviceDriver extends AbstractOpcDeviceDriver implements public void writing(int command) { String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.ItemProtocol.item_to_command; + + "." + ItemProtocol.item_to_command; String opcservcerid = this.getDevice().getOpc_server_id(); Server server = ReadUtil.getServer(opcservcerid); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/ItemProtocol.java deleted file mode 100644 index f65d4e6..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/ItemProtocol.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_kiln_truss; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_status = "status"; - public static String item_open_time = "open_time"; - public static String item_standby_time = "standby_time "; - public static String item_production_time = "production_time"; - public static String item_error_time = "error_time"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - Boolean isonline; - - private LnshKilnTrussDeviceDriver driver; - - public ItemProtocol(LnshKilnTrussDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getStatus() { - return this.getOpcIntegerValue(item_status); - } - - public int getOpen_time() { - return this.getOpcIntegerValue(item_open_time); - } - - public int getStandby_time() { - return this.getOpcIntegerValue(item_standby_time); - } - - public int getProduction_time() { - return this.getOpcIntegerValue(item_production_time); - } - - public int getError_time() { - return this.getOpcIntegerValue(item_error_time); - } - - public int getTo_command() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getTo_target() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getTo_task() { - return this.getOpcIntegerValue(item_to_task); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.D4")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D8")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D12")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D16")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发命令反馈", "DB2.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "下发目标站", "DB2.W2")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB2.D4")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDefination.java deleted file mode 100644 index 99882aa..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDefination.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_kiln_truss; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 晟华入出窑桁架 - */ -@Service -public class LnshKilnTrussDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lnsh_kiln_truss"; - } - - @Override - public String getDriverName() { - return "晟华-入出窑桁架"; - } - - @Override - public String getDriverDescription() { - return "晟华-入出窑桁架"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new LnshKilnTrussDeviceDriver()).setDevice(device).setDriverDefination(this); - } - - @Override - public Class getDeviceDriverType() { - return LnshKilnTrussDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.station); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.D4")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D8")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D12")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D16")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java deleted file mode 100644 index fa99d7f..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDeviceDriver.java +++ /dev/null @@ -1,180 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_kiln_truss; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 晟华入出窑桁架 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class LnshKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - - String device_code; - int mode = 0; - int error = 0; - int move = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - Boolean isonline = true; - int hasGoods = 0; - Boolean iserror = false; - - boolean requireSucess = false; - - private Date checkHeartbeattime = new Date(); - private Date last_checkHeartbeattime = new Date(); - - int branchProtocol = 0; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - String message; - int status = 0; - int last_status = 0; - - int open_time = 0; - int last_open_time = 0; - int standby_time = 0; - int last_standby_time = 0; - int production_time = 0; - int last_production_time = 0; - int error_time = 0; - int last_error_time = 0; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - status = this.itemProtocol.getStatus(); - open_time = this.itemProtocol.getOpen_time(); - standby_time = this.itemProtocol.getStandby_time(); - production_time = this.itemProtocol.getProduction_time(); - error_time = this.itemProtocol.getError_time(); - - if (mode != last_mode) { - this.setRequireSucess(false); - logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); - } - if (status != last_status) { - logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); - } - if (open_time != last_open_time) { - logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); - } - if (standby_time != last_standby_time) { - logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); - } - if (production_time != last_production_time) { - logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); - } - if (error_time != last_error_time) { - logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); - } - - } catch (Exception var17) { - return; - } - - //急停 - if (this.isStop()) { - - //未在线无心跳 - } else if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - break; - case 2: - - break; - case 3: - - break; - case 4: - break; - } - } - - last_mode = mode; - last_status = status; - last_open_time = open_time; - last_standby_time = standby_time; - last_production_time = production_time; - last_error_time = error_time; - } - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java deleted file mode 100644 index 08a5b28..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java +++ /dev/null @@ -1,163 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_mixing_mill; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_status = "status"; - public static String item_error = "error"; - public static String item_open_time = "open_time"; - public static String item_standby_time = "standby_time "; - public static String item_production_time = "production_time"; - public static String item_error_time = "error_time"; - public static String item_weight = "weight"; - public static String item_order_No = "order_No"; - public static String item_mix_num = "mix_num"; - public static String item_material = "material"; - public static String item_to_command = "to_command"; - public static String item_to_error = "to_error"; - public static String item_to_order_No = "to_order_No"; - public static String item_to_weight = "to_weight"; - public static String item_to_material_code = "to_material_code"; - - - private LnshMixingMillDeviceDriver driver; - - public ItemProtocol(LnshMixingMillDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getStatus() { - return this.getOpcIntegerValue(item_status); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getOpen_time() { - return this.getOpcIntegerValue(item_open_time); - } - - public int getWeight() { - return this.getOpcIntegerValue(item_weight); - } - - public int getStandby_time() { - return this.getOpcIntegerValue(item_standby_time); - } - - public int getProduction_time() { - return this.getOpcIntegerValue(item_production_time); - } - - public int getError_time() { - return this.getOpcIntegerValue(item_error_time); - } - - public String getMaterial() { - return this.getOpcStringValue(item_material); - } - - public String getOrder_No() { - return this.getOpcStringValue(item_order_No); - } - - public int getMix_num() { - return this.getOpcIntegerValue(item_mix_num); - } - - public int getTo_error() { - return this.getOpcIntegerValue(item_to_error); - } - - public String getTo_order_No() { - return this.getOpcStringValue(item_to_order_No); - } - - public int getTo_command() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getTo_weight() { - return this.getOpcIntegerValue(item_to_weight); - } - - public String getTo_material_code() { - return this.getOpcStringValue(item_to_material_code); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - Boolean isonline; - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - } - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (value == null) { - log.error("读取错误!"); - } else { - return value; - } - return "0"; - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB4.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB4.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB4.B2")); - list.add(new ItemDto(item_error, "故障代码", "DB4.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB4.D4")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB4.D8")); - list.add(new ItemDto(item_production_time, "生产时间", "DB4.D12")); - list.add(new ItemDto(item_error_time, "故障时间", "DB4.D16")); - list.add(new ItemDto(item_weight, "当前生产重量", "DB4.D20")); - list.add(new ItemDto(item_order_No, "工单号", "DB4.S24")); - list.add(new ItemDto(item_mix_num, "碾次", "DB4.D280")); - list.add(new ItemDto(item_material, "当前生产物料", "DB4.S284")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "反馈", "DB5.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_error, "error", "DB5.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB5.S4")); - list.add(new ItemDto(item_to_weight, "生产重量", "DB5.D260")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB5.S264")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDefination.java deleted file mode 100644 index 224d258..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDefination.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_mixing_mill; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 晟华混碾机 - * - */ -@Service -public class LnshMixingMillDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lnsh_mixing_mill"; - } - - @Override - public String getDriverName() { - return "晟华-混碾机"; - } - - @Override - public String getDriverDescription() { - return "晟华-混碾机"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new LnshMixingMillDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return LnshMixingMillDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.station); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB4.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB4.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB4.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "故障代码", "DB4.B3")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB4.D4")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB4.D8")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB4.D12")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB4.D16")); - list.add(new ItemDto(ItemProtocol.item_weight, "当前生产重量", "DB4.D20")); - list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB4.S24")); - list.add(new ItemDto(ItemProtocol.item_mix_num, "碾次", "DB4.D280")); - list.add(new ItemDto(ItemProtocol.item_material, "当前生产物料", "DB4.S284")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java deleted file mode 100644 index 0a12e84..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java +++ /dev/null @@ -1,424 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_mixing_mill; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; -import org.nl.acs.order.service.ProduceshiftorderService; -import org.nl.acs.order.service.dto.ProduceshiftorderDto; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; -import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.lang.reflect.Field; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 晟华混碾机 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - @Autowired - AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); - @Autowired - ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean("produceshiftorderServiceImpl"); - - int mode = 0; - int error = 0; - int last_mode = 0; - int last_error = 0; - Boolean isonline = true; - int hasGoods = 0; - String message = null; - Boolean iserror = false; - - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 - int flag; - - String device_code; - - int status = 0; - int last_status = 0; - - int open_time = 0; - int last_open_time = 0; - int standby_time = 0; - int last_standby_time = 0; - int production_time = 0; - int last_production_time = 0; - int error_time = 0; - int last_error_time = 0; - int weight = 0; - int last_weight = 0; - String order_No = "0"; - String last_order_No = "0"; - int mix_num = 0; - int last_mix_num = 0; - String material; - String last_material; - - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - error = this.itemProtocol.getError(); - status = this.itemProtocol.getStatus(); - open_time = this.itemProtocol.getOpen_time(); - standby_time = this.itemProtocol.getStandby_time(); - production_time = this.itemProtocol.getProduction_time(); - error_time = this.itemProtocol.getError_time(); - weight = this.itemProtocol.getWeight(); - order_No = this.itemProtocol.getOrder_No(); - material = this.itemProtocol.getMaterial(); - mix_num = this.itemProtocol.getMix_num(); - - if (mode != last_mode) { - this.setRequireSucess(false); - logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); - } - if (error != last_error) { - logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); - } - if (status != last_status) { - logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); - } - if (open_time != last_open_time) { - logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); - } - if (standby_time != last_standby_time) { - logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); - } - if (production_time != last_production_time) { - logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); - } - if (error_time != last_error_time) { - logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); - } - if (weight != last_weight) { - logServer.deviceItemValue(this.device_code,"weight" ,String.valueOf(weight)); - logServer.deviceExecuteLog(this.device_code,"","","信号weight：" + last_weight + "->" + weight); - } - if (!StrUtil.equals(material,last_material)) { - logServer.deviceItemValue(this.device_code,"material" ,String.valueOf(material)); - logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); - } - if (!StrUtil.equals(order_No,last_order_No)) { - logServer.deviceItemValue(this.device_code,"order_No" ,order_No); - logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); - } - if (mix_num != last_mix_num) { - logServer.deviceItemValue(this.device_code,"mix_num" ,String.valueOf(mix_num)); - logServer.deviceExecuteLog(this.device_code,"","","信号mix_num：" + last_mix_num + "->" + mix_num); - } - - } catch (Exception var17) { - return; - } - - if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - return; - case 2: - break; - case 3: - //排产单确认 - if (!requireSucess && !order_No.equals("0")) { - JSONObject json = new JSONObject(); - json.put("producetask_code",order_No); - json.put("device_code",this.device_code); - json.put("material_code",material); - json.put("weight",weight); - json.put("type","1"); - enterProduction(json); - } - break; - case 4: - //工单完成 - if (!requireSucess && !order_No.equals("0")) { - JSONObject json = new JSONObject(); - json.put("producetask_code",order_No); - json.put("device_code",this.device_code); - json.put("material_code",material); - json.put("weight",weight); - json.put("type","2"); - enterProduction(json); - } - break; - } - - switch (flag) { - //取货完成 - case 3: - writing(3); - return; - //放货完成 - case 4: - writing(4); - return; - } - - } - last_mode = mode; - last_status = status; - last_error = error; - last_open_time = open_time; - last_standby_time = standby_time; - last_production_time = production_time; - last_error_time = error_time; - last_material = material; - last_weight = weight; - last_order_No = order_No; - last_mix_num = mix_num; - } - - /** - * 排产单确认 - * - * @param - */ - public synchronized boolean enterProduction(JSONObject json) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - HttpResponse result = acsToWmsService.enterOrder(json); - if (ObjectUtil.isNotEmpty(result)) { - JSONObject jsonObject = JSON.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { - this.writing(this.mode); - ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); - if (this.mode == 4) { - dto.setOrder_status("2"); - } else if (this.mode == 3) { - dto.setOrder_status("0"); - } - produceshiftorderService.update(dto); - } - } - this.setRequireSucess(true); - return true; - } - } - - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - public boolean exe_business() { - return true; - } - - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - - } - - public void writing(int type, int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_order_No = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_order_No; - String to_weight = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_weight; - String to_material_code = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_material_code; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - if (type == 1) { - itemMap.put(to_command, command); - } else if (type == 2) { - itemMap.put(to_material_code, command); - } - ReadUtil.write(itemMap, server); - } - - public void writing(String param, String value) { - - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + param; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - - itemMap.put(to_param, value); -// itemMap.put(to_param, Integer.parseInt(value)); - ReadUtil.write(itemMap, server); - } - - public boolean instruction_require(String container_code) { - return instruction_require(container_code, WcsConfig.task_container_type_default_desc); - } - - /** - * 请求指令 - * - * @param container_code - * @param container_type - */ - public synchronized boolean instruction_require(String container_code, String container_type) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(container_code); - dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_codecode); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - requireSucess = false; - return true; - } - } - - public static Boolean isExistFieldName(String fieldName, Object obj) throws NoSuchFieldException { - if (obj == null || StrUtil.isEmpty(fieldName)) { - return null; - } - //获取这个类的所有属性 - Field[] fields = obj.getClass().getDeclaredFields(); - boolean flag = false; - //循环遍历所有的fields - for (int i = 0; i < fields.length; i++) { - if (fields[i].getName().equals("item_" + fieldName)) { - flag = true; - break; - } - } - return flag; - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/ItemProtocol.java index 541deaa..afbcf08 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/ItemProtocol.java @@ -127,7 +127,7 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (StrUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java deleted file mode 100644 index 33ceef0..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java +++ /dev/null @@ -1,138 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_out_kiln_truss; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_status = "status"; - public static String item_outKiln_move = "outKiln_move"; - public static String item_outKiln_barcode = "outKiln_barcode"; - public static String item_outKiln_device = "outKiln_device"; - public static String item_open_time = "open_time"; - public static String item_standby_time = "standby_time "; - public static String item_production_time = "production_time"; - public static String item_error_time = "error_time"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - Boolean isonline; - - private LnshOutKilnTrussDeviceDriver driver; - - public ItemProtocol(LnshOutKilnTrussDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getStatus() { - return this.getOpcIntegerValue(item_status); - } - - public int getOutKiln_move() { - return this.getOpcIntegerValue(item_outKiln_move); - } - - public String getOutKiln_barcode() { - return this.getOpcStringValue(item_outKiln_barcode); - } - - public int getOutKiln_device() { - return this.getOpcIntegerValue(item_outKiln_device); - } - - public int getOpen_time() { - return this.getOpcIntegerValue(item_open_time); - } - - public int getStandby_time() { - return this.getOpcIntegerValue(item_standby_time); - } - - public int getProduction_time() { - return this.getOpcIntegerValue(item_production_time); - } - - public int getError_time() { - return this.getOpcIntegerValue(item_error_time); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getToTarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getToTask() { - return this.getOpcIntegerValue(item_to_task); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - } - - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (value == null) { - log.error("读取错误!"); - } else { - return value; - } - return "0"; - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_outKiln_move, "出窑光电", "DB1.B3")); - list.add(new ItemDto(item_outKiln_barcode, "出窑条码", "DB1.S4")); - list.add(new ItemDto(item_outKiln_device, "出窑设备", "DB1.D260")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.D264")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D268")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D272")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D276")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发命令反馈", "DB1.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "下发目标站", "DB1.W2")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB1.D4")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java deleted file mode 100644 index 7c5fdc7..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_out_kiln_truss; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 晟华出窑桁架 - */ -@Service -public class LnshOutKilnTrussDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lnsh_out_kiln_truss"; - } - - @Override - public String getDriverName() { - return "晟华-出窑桁架"; - } - - @Override - public String getDriverDescription() { - return "晟华-出窑桁架"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new LnshOutKilnTrussDeviceDriver()).setDevice(device).setDriverDefination(this); - } - - @Override - public Class getDeviceDriverType() { - return LnshOutKilnTrussDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.station); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(ItemProtocol.item_outKiln_move, "出窑光电", "DB1.B3")); - list.add(new ItemDto(ItemProtocol.item_outKiln_barcode, "出窑条码", "DB1.S4")); - list.add(new ItemDto(ItemProtocol.item_outKiln_device, "出窑设备", "DB1.D260")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.D264")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D268")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D272")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D276")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java deleted file mode 100644 index e48af42..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java +++ /dev/null @@ -1,293 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_out_kiln_truss; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 晟华出窑桁架 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - @Autowired - AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); - - String device_code; - int mode = 0; - int error = 0; - int move = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - Boolean isonline = true; - int hasGoods = 0; - Boolean iserror = false; - - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - boolean requireSucess = false; - - - int heartbeat; - int last_heartbeat; - private Date checkHeartbeattime = new Date(); - private Date last_checkHeartbeattime = new Date(); - private int instruction_require_time_out = 3000; - - int branchProtocol = 0; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - String message; - int status = 0; - int last_status = 0; - - int open_time = 0; - int last_open_time = 0; - int standby_time = 0; - int last_standby_time = 0; - int production_time = 0; - int last_production_time = 0; - int error_time = 0; - int last_error_time = 0; - //出窑光电 - int outKiln_move = 0; - int last_outKiln_move = 0; - //出窑条码 - String outKiln_barcode; - String last_outKiln_barcode; - //出窑设备 - int outKiln_device = 0; - int last_outKiln_device = 0; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - status = this.itemProtocol.getStatus(); - open_time = this.itemProtocol.getOpen_time(); - standby_time = this.itemProtocol.getStandby_time(); - production_time = this.itemProtocol.getProduction_time(); - error_time = this.itemProtocol.getError_time(); - outKiln_move = this.itemProtocol.getOutKiln_move(); - outKiln_barcode = this.itemProtocol.getOutKiln_barcode(); - outKiln_device = this.itemProtocol.getOutKiln_device(); - - if (mode != last_mode) { - this.setRequireSucess(false); - logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); - } - if (status != last_status) { - logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); - } - if (open_time != last_open_time) { - logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); - } - if (standby_time != last_standby_time) { - logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); - } - if (production_time != last_production_time) { - logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); - } - if (error_time != last_error_time) { - logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); - } - if (outKiln_move != last_outKiln_move) { - logServer.deviceItemValue(this.device_code,"outKiln_move" ,String.valueOf(outKiln_move)); - logServer.deviceExecuteLog(this.device_code,"","","信号outKiln_move：" + last_outKiln_move + "->" + outKiln_move); - } - if (!StrUtil.equals(outKiln_barcode,last_outKiln_barcode)) { - logServer.deviceItemValue(this.device_code,"outKiln_barcode" ,outKiln_barcode); - logServer.deviceExecuteLog(this.device_code,"","","信号outKiln_barcode：" + last_outKiln_barcode + "->" + outKiln_barcode); - } - if (outKiln_device != last_outKiln_device) { - logServer.deviceItemValue(this.device_code,"outKiln_device" ,String.valueOf(outKiln_device)); - logServer.deviceExecuteLog(this.device_code,"","","信号outKiln_device：" + last_outKiln_device + "->" + outKiln_device); - } - - } catch (Exception var17) { - return; - } - - //急停 - if (this.isStop()) { - - //未在线无心跳 - } else if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - break; - case 2: - - break; - case 3: - - break; - case 5: - if (!requireSucess) { - outKiln(); - } - break; - } - } - - last_mode = mode; - last_status = status; - last_open_time = open_time; - last_standby_time = standby_time; - last_production_time = production_time; - last_error_time = error_time; - last_outKiln_move = outKiln_move; - last_outKiln_barcode = outKiln_barcode; - last_outKiln_device = outKiln_device; - } - - - protected void thingToNothing() throws Exception { - this.setRequireSucess(false); - } - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - /** - * 出窑请求 - * - * @param - */ - public synchronized boolean outKiln() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - - JSONObject json = new JSONObject(); - json.put("device_code",this.device_code); -// json.put("vehicle_code",barcode); - HttpResponse result = acsToWmsService.outKiln(json); - if (ObjectUtil.isNotEmpty(result)) { - JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && StrUtil.equals(jsonObject.get("status").toString(),"200")) { - String code = jsonObject.getString("code"); - this.writing(this.mode); - this.writing("to_target",code); - requireSucess = true; - - } - } - -// JSONObject jo = acsToWmsService.outKiln(this.device_code); -// if (jo.getInteger("status") == 200) { -// String code = jo.getString("code"); -// -// this.writing(this.mode); -// this.writing("to_target",code); -// } - - return true; - } - } - - public void writing(int command) { - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - ReadUtil.write(itemMap, server); - - } - - public void writing(String param, String value) { - - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + param; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_param, value); - - ReadUtil.write(itemMap, server); - } - - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/ItemProtocol.java deleted file mode 100644 index aa1e797..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/ItemProtocol.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_package_line; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_status = "status"; - public static String item_open_time = "open_time"; - public static String item_standby_time = "standby_time "; - public static String item_production_time = "production_time"; - public static String item_error_time = "error_time"; - public static String item_barcode = "barcode"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - public static String item_to_code_message = "to_code_message"; - public static String item_to_isPackage = "to_isPackage"; - Boolean isonline; - - private LnshPackageLineDeviceDriver driver; - - public ItemProtocol(LnshPackageLineDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getStatus() { - return this.getOpcIntegerValue(item_status); - } - - public int getOpen_time() { - return this.getOpcIntegerValue(item_open_time); - } - - public int getStandby_time() { - return this.getOpcIntegerValue(item_standby_time); - } - - public int getProduction_time() { - return this.getOpcIntegerValue(item_production_time); - } - - public int getError_time() { - return this.getOpcIntegerValue(item_error_time); - } - - public String getBarcode() { - return this.getOpcStringValue(item_barcode); - } - - public int getTo_command() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getTo_target() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getTo_task() { - return this.getOpcIntegerValue(item_to_task); - } - - public int getTo_code_message() { - return this.getOpcIntegerValue(item_to_code_message); - } - - public String getTo_isPackage() { - return this.getOpcStringValue(item_to_isPackage); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - } - - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (value == null) { - log.error("读取错误!"); - } else { - return value; - } - return "0"; - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.D4")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D8")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D12")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D16")); - list.add(new ItemDto(item_barcode, "条码", "DB1.S20")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "下发目标站", "DB2.W2")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB2.D4")); - list.add(new ItemDto(item_to_code_message, "打码信息", "DB2.D8")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDefination.java deleted file mode 100644 index 4e43998..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDefination.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_package_line; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 晟华包装机 - */ -@Service -public class LnshPackageLineDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lnsh_package_line"; - } - - @Override - public String getDriverName() { - return "晟华-包装机"; - } - - @Override - public String getDriverDescription() { - return "晟华-包装机"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new LnshPackageLineDeviceDriver()).setDevice(device).setDriverDefination(this); - } - - @Override - public Class getDeviceDriverType() { - return LnshPackageLineDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.station); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.D4")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D8")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D12")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D16")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB1.S20")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java deleted file mode 100644 index a7a30cc..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java +++ /dev/null @@ -1,214 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_package_line; - -import cn.hutool.core.util.StrUtil; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 晟华包装机 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class LnshPackageLineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - - String device_code; - int mode = 0; - int error = 0; - int last_mode = 0; - int last_error = 0; - Boolean isonline = true; - Boolean iserror = false; - - boolean requireSucess = false; - - int heartbeat; - int last_heartbeat; - private Date checkHeartbeattime = new Date(); - private Date last_checkHeartbeattime = new Date(); - - String message; - int status = 0; - int last_status = 0; - //开机时间 - int open_time = 0; - int last_open_time = 0; - //待机时间 - int standby_time = 0; - int last_standby_time = 0; - //生产时间 - int production_time = 0; - int last_production_time = 0; - //故障时间 - int error_time = 0; - int last_error_time = 0; - //条码 - String barcode; - String last_barcode; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - status = this.itemProtocol.getStatus(); - open_time = this.itemProtocol.getOpen_time(); - standby_time = this.itemProtocol.getStandby_time(); - production_time = this.itemProtocol.getProduction_time(); - error_time = this.itemProtocol.getError_time(); - barcode = this.itemProtocol.getBarcode(); - - if (mode != last_mode) { - this.setRequireSucess(false); - logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); - } - if (status != last_status) { - logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); - } - if (open_time != last_open_time) { - logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); - } - if (standby_time != last_standby_time) { - logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); - } - if (production_time != last_production_time) { - logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); - } - if (error_time != last_error_time) { - logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); - } - if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceItemValue(this.device_code,"barcode", barcode); - logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); - } - - } catch (Exception var17) { - return; - } - - //急停 - if (this.isStop()) { - - //未在线无心跳 - } else if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - break; - case 2: - - break; - case 3: - - break; - case 4: - break; - } - } - - last_mode = mode; - last_status = status; - last_open_time = open_time; - last_standby_time = standby_time; - last_production_time = production_time; - last_error_time = error_time; - last_barcode = barcode; - } - - - protected void thingToNothing() throws Exception { - this.setRequireSucess(false); - } - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - public boolean exe_business() { - return true; - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - public void writing(String param, String value) { - - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + param; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - - itemMap.put(to_param, value); - ReadUtil.write(itemMap, server); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java index 81a642b..7d0d71c 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java @@ -25,7 +25,7 @@ public class ItemProtocol { public static String item_batch = "batch"; public static String item_qty = "qty"; public static String item_open_time = "open_time"; - public static String item_standby_time = "standby_time "; + public static String item_standby_time = "standby_time"; public static String item_production_time = "production_time"; public static String item_error_time = "error_time"; public static String item_order_No = "order_No"; @@ -752,7 +752,7 @@ public class ItemProtocol { public Float getOpcFloatValue(String protocol) { Float value = this.driver.getFloatValue(protocol); if (ObjectUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } @@ -762,7 +762,7 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (StrUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index 814c9dd..3f0fd48 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -814,8 +814,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD HttpResponse result = acsToWmsService.enterOrder(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { - this.writing(this.mode); + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); if (this.mode == 4) { dto.setOrder_status("0"); @@ -823,10 +822,11 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD dto.setOrder_status("2"); } produceshiftorderService.update(dto); + this.writing(this.mode); + this.setRequireSucess(true); } } - this.setRequireSucess(true); return true; } } @@ -1064,7 +1064,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); } } @@ -1152,7 +1152,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); } } @@ -1183,7 +1183,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); this.setRequireSucess(true); } @@ -1219,7 +1219,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD public void writing(int command) { String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.ItemProtocol.item_to_command; + + "." + ItemProtocol.item_to_feedback; String opcservcerid = this.getDevice().getOpc_server_id(); Server server = ReadUtil.getServer(opcservcerid); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java deleted file mode 100644 index 7b93baf..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java +++ /dev/null @@ -1,146 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_package_site; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_move = "move"; - public static String item_action = "action"; - public static String item_ioaction = "ioaction"; - public static String item_error = "error"; - public static String item_task = "task"; - public static String item_weight = "weight"; - public static String item_material = "material"; - public static String item_barcode = "barcode"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - public static String item_to_isPackage = "to_isPackage"; - - - Boolean isonline; - - private LnshPackageSiteDeviceDriver driver; - - public ItemProtocol(LnshPackageSiteDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getMove() { - return this.getOpcIntegerValue(item_move); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getIoAction() { - return this.getOpcIntegerValue(item_ioaction); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getWeight() { - return this.getOpcIntegerValue(item_weight); - } - - public String getMaterial() { - return this.getOpcStringValue(item_material); - } - - public String getBarcode() { - return this.getOpcStringValue(item_barcode); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getToTarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getToTask() { - return this.getOpcIntegerValue(item_to_task); - } - - public int getTo_isPackage() { - return this.getOpcIntegerValue(item_to_isPackage); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (value == null) { - log.error("读取错误!"); - } else { - return value; - } - return "0"; - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB4.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB4.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB4.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB4.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB4.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB4.B5")); - list.add(new ItemDto(item_task, "任务号", "DB4.D6")); - list.add(new ItemDto(item_weight, "重量", "DB4.D10")); - list.add(new ItemDto(item_material, "物料", "DB4.S14")); - list.add(new ItemDto(item_barcode, "条码", "DB4.S270")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB35.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB35.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB35.D4")); - list.add(new ItemDto(item_to_isPackage, "是否包装", "DB35.D8")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java deleted file mode 100644 index 58caad0..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_package_site; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 晟华-包装线工位 - * - */ -@Service -public class LnshPackageSiteDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lnsh_package_site"; - } - - @Override - public String getDriverName() { - return "晟华-包装线工位"; - } - - @Override - public String getDriverDescription() { - return "晟华-包装线工位"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new LnshPackageSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return LnshPackageSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.station); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB4.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB4.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB4.B2")); - list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "DB4.B3")); - list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB4.B4")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB4.B5")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB4.D6")); - list.add(new ItemDto(ItemProtocol.item_weight, "重量", "DB4.D10")); - list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB4.S14")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.S270")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java deleted file mode 100644 index af942d2..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java +++ /dev/null @@ -1,522 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_package_site; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; -import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 晟华-包装线工位 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class LnshPackageSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - String device_code; - int mode = 0; - int error = 0; - int move = 0; - int action; - int io_action; - int task = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - int last_action = 0; - int last_ioaction = 0; - Boolean isonline = true; - int hasGoods = 0; - Boolean iserror = false; - - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out = 3000; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int heartbeat; - int last_heartbeat; - private Date checkHeartbeattime = new Date(); - private Date last_checkHeartbeattime = new Date(); - - - int branchProtocol = 0; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 - int flag; - - String message; - int weight = 0; - int last_weight = 0; - String material; - String last_material; - String barcode; - String last_barcode; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - error = this.itemProtocol.getError(); - move = this.itemProtocol.getMove(); - task = this.itemProtocol.getTask(); - hasGoods = this.itemProtocol.getMove(); - io_action = this.itemProtocol.getIoAction(); - action = this.itemProtocol.getAction(); - weight = this.itemProtocol.getWeight(); - material = this.itemProtocol.getMaterial(); - barcode = this.itemProtocol.getBarcode(); - - if (mode != last_mode) { - this.setRequireSucess(false); - logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); - } - if (move != last_move) { - logServer.deviceItemValue(this.device_code,"move" ,String.valueOf(move)); - logServer.deviceExecuteLog(this.device_code,"","","信号move：" + last_move + "->" + move); - } - if (error != last_error) { - logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); - } - if (task != last_task) { - logServer.deviceItemValue(this.device_code,"task",String.valueOf(task)); - logServer.deviceExecuteLog(this.device_code,"","","信号task：" + last_task + "->" + task); - } - if (action != last_action) { - logServer.deviceItemValue(this.device_code,"action",String.valueOf(action)); - logServer.deviceExecuteLog(this.device_code,"","","信号action：" + last_action + "->" + action); - } - if (io_action != last_ioaction) { - logServer.deviceItemValue(this.device_code,"io_action",String.valueOf(io_action)); - logServer.deviceExecuteLog(this.device_code,"","","信号io_action: " + last_ioaction + "->" + io_action); - } - if (weight != last_weight) { - logServer.deviceItemValue(this.device_code,"weight",String.valueOf(weight)); - logServer.deviceExecuteLog(this.device_code,"","","信号weight: " + last_weight + "->" + weight); - } - if (!StrUtil.equals(material,last_material)) { - logServer.deviceItemValue(this.device_code,"material", material); - logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); - } - if (!StrUtil.equals(barcode,last_barcode)) { - logServer.deviceItemValue(this.device_code,"barcode", barcode); - logServer.deviceExecuteLog(this.device_code,"","","信号barcode：" + last_barcode + "->" + barcode); - } - - } catch (Exception var17) { - return; - } - - //急停 - if (this.isStop()) { - - //未在线无心跳 - } else if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - break; - case 2: - break; - case 3: - //申请空盘 - if (!requireSucess && this.move == 0) { - applyEmpty(); - } - break; - case 4: - //申请搬运任务 - if (!requireSucess && this.move != 0) { - autoCreateTask(); - } - break; - case 5: - break; - } - } - - last_mode = mode; - last_error = error; - last_move = move; - last_task = task; - last_action = action; - last_ioaction = io_action; - last_weight = weight; - last_material = material; - last_barcode = barcode; - } - - /** - * 生成搬运任务 - * - * @return - */ - public synchronized boolean autoCreateTask() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setStart_device_code(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - - String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); - JSONArray ja = routelineserver.queryNextLine(this.getDevice().getDevice_code(), plan_uuid); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int i = 0; i < ja.size(); i++) { - JSONObject jo = (JSONObject) ja.get(i); - next_device_code = jo.get("next_device_code").toString(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) nextdevice.getDeviceDriver(); - String maxTaskNum = WQLObject.getWQLObject("sys_param").query("code= 'onePointMaxTask' and is_active='1' ").uniqueResult(0).getString("value"); - - if (taskserver.checkAllowCreate(next_device_code) >= Integer.parseInt(maxTaskNum)) { - next_device_code = ""; - continue; - } - if (standardInspectSiteDeviceDriver.getMode() == 2 && standardInspectSiteDeviceDriver.getMove() == 0) { - break; - } - } - } - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_code); - dto.setNext_device_code(next_device_code); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - try { - taskserver.create(dto); - } catch (Exception e) { - e.printStackTrace(); - } - this.setRequireSucess(true); - return true; - } - - } - - - public synchronized boolean applyEmpty() { - - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String start_device_code = ""; - String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); - - JSONArray ja = routelineserver.querySuperiorLine(this.getDevice().getDevice_code(), plan_uuid); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int i = 0; i < ja.size(); i++) { - JSONObject jo = (JSONObject) ja.get(i); - start_device_code = jo.get("device_code").toString(); - Device start_device = appService.findDeviceByCode(start_device_code); - StandardEmptyPalletSiteDeviceDriver standardEmptyPalletSiteDeviceDriver; - if (start_device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) { - standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) start_device.getDeviceDriver(); - //根据路由 寻找取空盘的设备 -// if(standardEmptyPalletSiteDeviceDriver.getNumber() < Integer.parseInt(standardEmptyPalletSiteDeviceDriver.getDevice().getExtraValue().get("max_emptypalletnum").toString()) ) { -// break; -// } - if (standardEmptyPalletSiteDeviceDriver.getMode() == 2 && standardEmptyPalletSiteDeviceDriver.getNumber() > 0) { - break; - } - } - } - dto.setTask_type("1"); - dto.setEmptypallet_num("1"); - dto.setNext_device_code(this.getDevice().getDevice_code()); - dto.setNext_point_code(this.getDevice().getDevice_code()); - dto.setStart_point_code(start_device_code); - dto.setStart_device_code(start_device_code); - if (StrUtil.isEmpty(start_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - try { - taskserver.create(dto); - } catch (Exception e) { - e.printStackTrace(); - } - this.setRequireSucess(true); - this.setBranchProtocol(0); - return true; - } - } - - public void finish_instruction(Instruction instruction) throws Exception { - instruction_finished(instruction); - } - - /** - * 完成指令 - * - * @param instruction - * @return - */ - public boolean instruction_finished(Instruction instruction) throws Exception { - Date date = new Date(); - if (date.getTime() - this.instruction_finished_time.getTime() < (long) this.instruction_finished_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_finished_time_out); - return false; - } else { - instructionService.finish(instruction.getInstruction_id()); - this.instruction_finished_time = date; - return true; - } - } - - /** - * 完成并创建下一条指令 - * - * @param instruction - * @param needCreateNext - * @return - */ - public boolean instruction_finished(Instruction instruction, boolean needCreateNext) { - Date date = new Date(); - if (date.getTime() - this.instruction_finished_time.getTime() < (long) this.instruction_finished_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_finished_time_out); - return false; - } else { - this.instruction_finished_time = date; - return true; - } - } - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - public boolean exe_business() { - return true; - } - - protected void executing(Instruction instruction) { - this.executing(1, instruction, ""); - } - - public void executing(int command, Instruction instruction, String appendMessage) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - if (appendMessage == null) { - appendMessage = ""; - } - if (instruction != null) { - instruction_num = Integer.parseInt(instruction.getInstruction_code()); - } - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, 1); - itemMap.put(to_task, instruction_num); - ReadUtil.write(itemMap, server); - - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - - public boolean instruction_require(String container_code) { - return instruction_require(container_code, WcsConfig.task_container_type_default_desc); - } - - /** - * 请求指令 - * - * @param container_code - * @param container_type - */ - public synchronized boolean instruction_require(String container_code, String container_type) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(container_code); - dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_codecode); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - requireSucess = false; - return true; - } - } - - public void writing(int type, int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - if (type == 1) { - itemMap.put(to_command, command); - } else if (type == 2) { - itemMap.put(to_target, command); - - } else if (type == 3) { - itemMap.put(to_task, command); - } - ReadUtil.write(itemMap, server); - - } - - public String toString() { - return ""; - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/ItemProtocol.java deleted file mode 100644 index 35caeef..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/ItemProtocol.java +++ /dev/null @@ -1,129 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_pallet_storage; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_status = "status"; - public static String item_open_time = "open_time"; - public static String item_close_time = "close_time"; - public static String item_standby_time = "standby_time "; - public static String item_production_time = "production_time"; - public static String item_error_time = "error_time"; - public static String item_tray_crib_qty = "tray_crib_qty"; - public static String item_total_container = "total_container"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - Boolean isonline; - - private LnshPalletStorageDeviceDriver driver; - - public ItemProtocol(LnshPalletStorageDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getStatus() { - return this.getOpcIntegerValue(item_status); - } - - public int getOpen_time() { - return this.getOpcIntegerValue(item_open_time); - } - - public int getClose_time() { - return this.getOpcIntegerValue(item_close_time); - } - - public int getStandby_time() { - return this.getOpcIntegerValue(item_standby_time); - } - - public int getProduction_time() { - return this.getOpcIntegerValue(item_production_time); - } - - public int getError_time() { - return this.getOpcIntegerValue(item_error_time); - } - - public int getTray_crib_qty() { - return this.getOpcIntegerValue(item_tray_crib_qty); - } - - public int getTotal_container() { - return this.getOpcIntegerValue(item_total_container); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getToTarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getToTask() { - return this.getOpcIntegerValue(item_to_task); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB600.B2", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB600.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB600.D6")); - list.add(new ItemDto(item_close_time, "关机时间", "DB600.D10")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB600.D14")); - list.add(new ItemDto(item_production_time, "生产时间", "DB600.D18")); - list.add(new ItemDto(item_error_time, "故障时间", "DB600.D22")); - list.add(new ItemDto(item_tray_crib_qty, "托盘垛数", "DB600.D26")); - list.add(new ItemDto(item_total_container, "托盘总数量", "DB600.D30")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "下发目标站", "DB601.W4")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB601.D8")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDefination.java deleted file mode 100644 index 0b1ccf7..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDefination.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_pallet_storage; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 晟华托盘存储线 - */ -@Service -public class LnshPalletStorageDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lnsh_pallet_storage"; - } - - @Override - public String getDriverName() { - return "晟华-托盘存储线"; - } - - @Override - public String getDriverDescription() { - return "晟华-托盘存储线"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new LnshPalletStorageDeviceDriver()).setDevice(device).setDriverDefination(this); - } - - @Override - public Class getDeviceDriverType() { - return LnshPalletStorageDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.station); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B2", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB600.B3")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB600.D6")); - list.add(new ItemDto(ItemProtocol.item_close_time, "关机时间", "DB600.D10")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB600.D14")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB600.D18")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB600.D22")); - list.add(new ItemDto(ItemProtocol.item_tray_crib_qty, "托盘垛数", "DB600.D26")); - list.add(new ItemDto(ItemProtocol.item_total_container, "托盘总数量", "DB600.D30")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDeviceDriver.java deleted file mode 100644 index fe464e5..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDeviceDriver.java +++ /dev/null @@ -1,219 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_pallet_storage; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 晟华托盘存储线 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class LnshPalletStorageDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - - String device_code; - int mode = 0; - int error = 0; - int last_mode = 0; - int last_error = 0; - Boolean isonline = true; - Boolean iserror = false; - - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int heartbeat; - int last_heartbeat; - private Date checkHeartbeattime = new Date(); - private Date last_checkHeartbeattime = new Date(); - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - String message; - int status = 0; - int last_status = 0; - //开机时间 - int open_time = 0; - int last_open_time = 0; - int close_time = 0; - int last_close_time = 0; - //待机时间 - int standby_time = 0; - int last_standby_time = 0; - //生产时间 - int production_time = 0; - int last_production_time = 0; - //故障时间 - int error_time = 0; - int last_error_time = 0; - //托盘垛数 - int tray_crib_qty = 0; - int last_tray_crib_qty = 0; - //托盘总数量 - int total_container = 0; - int last_total_container = 0; - - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - status = this.itemProtocol.getStatus(); - open_time = this.itemProtocol.getOpen_time(); - close_time = this.itemProtocol.getClose_time(); - standby_time = this.itemProtocol.getStandby_time(); - production_time = this.itemProtocol.getProduction_time(); - error_time = this.itemProtocol.getError_time(); - tray_crib_qty = this.itemProtocol.getTray_crib_qty(); - total_container = this.itemProtocol.getTotal_container(); - - if (mode != last_mode) { - this.setRequireSucess(false); - logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); - } - if (status != last_status) { - logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); - } - if (open_time != last_open_time) { - logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); - } - if (close_time != last_close_time) { - logServer.deviceItemValue(this.device_code,"close_time" ,String.valueOf(close_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号close_time：" + last_close_time + "->" + close_time); - } - if (standby_time != last_standby_time) { - logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); - } - if (production_time != last_production_time) { - logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); - } - if (error_time != last_error_time) { - logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); - } - if (tray_crib_qty != last_tray_crib_qty) { - logServer.deviceItemValue(this.device_code,"tray_crib_qty" ,String.valueOf(tray_crib_qty)); - logServer.deviceExecuteLog(this.device_code,"","","信号tray_crib_qty：" + last_tray_crib_qty + "->" + tray_crib_qty); - } - if (total_container != last_total_container) { - logServer.deviceItemValue(this.device_code,"total_container" ,String.valueOf(total_container)); - logServer.deviceExecuteLog(this.device_code,"","","信号total_container：" + last_total_container + "->" + total_container); - } - - } catch (Exception var17) { - return; - } - - //急停 - if (this.isStop()) { - - //未在线无心跳 - } else if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - break; - case 2: - - break; - case 3: - - break; - case 4: - break; - } - } - - last_mode = mode; - last_status = status; - last_open_time = open_time; - last_close_time = close_time; - last_standby_time = standby_time; - last_production_time = production_time; - last_error_time = error_time; - last_tray_crib_qty = tray_crib_qty; - last_total_container = total_container; - } - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - public boolean exe_business() { - return true; - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java index c993cdf..25cb11c 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java @@ -139,7 +139,7 @@ public class ItemProtocol { public Float getOpcFloatValue(String protocol) { Float value = this.driver.getFloatValue(protocol); if (ObjectUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } @@ -149,7 +149,7 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (StrUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } @@ -158,31 +158,31 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_action, "动作", "DB1.B3")); - list.add(new ItemDto(item_error, "故障代码", "DB1.B4")); - list.add(new ItemDto(item_put_station, "当前码盘工位", "DB1.B5")); - list.add(new ItemDto(item_material, "码盘工位当前物料", "DB1.S6")); - list.add(new ItemDto(item_specifications, "规格", "DB1.S262")); - list.add(new ItemDto(item_encoder_qty, "码盘位当前码盘数量", "DB1.D518")); - list.add(new ItemDto(item_batch, "批次", "DB1.D522")); - list.add(new ItemDto(item_order_qty, "当前工单数量", "DB1.D526")); - list.add(new ItemDto(item_order_No, "工单号", "DB1.S530")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB11010.B0")); + list.add(new ItemDto(item_mode, "工作状态", "DB11010.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_status, "设备状态", "DB11010.B2")); + list.add(new ItemDto(item_action, "动作", "DB11010.B3")); + list.add(new ItemDto(item_error, "故障代码", "DB11010.B4")); + list.add(new ItemDto(item_put_station, "当前码盘工位", "DB110.B5")); + list.add(new ItemDto(item_material, "码盘工位当前物料", "DB110.S6")); + list.add(new ItemDto(item_specifications, "规格", "DB110.S262")); + list.add(new ItemDto(item_encoder_qty, "码盘位当前码盘数量", "DB110.D518")); + list.add(new ItemDto(item_batch, "批次", "DB110.D522")); + list.add(new ItemDto(item_order_qty, "当前工单数量", "DB110.D526")); + list.add(new ItemDto(item_order_No, "工单号", "DB110.S530")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB2.B0")); - list.add(new ItemDto(item_to_error, "故障代码", "DB2.B1")); - list.add(new ItemDto(item_to_allow_pallet_qty, "允许码垛数量", "DB2.W2")); - list.add(new ItemDto(item_to_material_type, "托盘类型", "DB2.D4")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB2.D8")); - list.add(new ItemDto(item_to_order_qty, "下发工单数量", "DB2.D12")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB2.D16")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB2.S20")); + list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB111.B0")); + list.add(new ItemDto(item_to_error, "故障代码", "DB111.B1")); + list.add(new ItemDto(item_to_allow_pallet_qty, "允许码垛数量", "DB111.W2")); + list.add(new ItemDto(item_to_material_type, "托盘类型", "DB111.D4")); + list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB111.D8")); + list.add(new ItemDto(item_to_order_qty, "下发工单数量", "DB111.D12")); + list.add(new ItemDto(item_to_product_code, "产品编号", "DB111.D16")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB111.S20")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefination.java index c5135b7..be7e536 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefination.java @@ -57,18 +57,18 @@ public class LnshPalletizingManipulatorDefination implements OpcDeviceDriverDefi public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(ItemProtocol.item_action, "动作", "DB1.B3")); - list.add(new ItemDto(ItemProtocol.item_error, "故障代码", "DB1.B4")); - list.add(new ItemDto(ItemProtocol.item_put_station, "当前码盘工位", "DB1.B5")); - list.add(new ItemDto(ItemProtocol.item_material, "码盘工位当前物料", "DB1.S6")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB1.S262")); - list.add(new ItemDto(ItemProtocol.item_encoder_qty, "码盘位当前码盘数量", "DB1.D518")); - list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB1.D522")); - list.add(new ItemDto(ItemProtocol.item_order_qty, "当前工单数量", "DB1.D526")); - list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB1.S530")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB110.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB110.B1", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB110.B2")); + list.add(new ItemDto(ItemProtocol.item_action, "动作", "DB110.B3")); + list.add(new ItemDto(ItemProtocol.item_error, "故障代码", "DB110.B4")); + list.add(new ItemDto(ItemProtocol.item_put_station, "当前码盘工位", "DB110.B5")); + list.add(new ItemDto(ItemProtocol.item_material, "码盘工位当前物料", "DB110.S6")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB110.S262")); + list.add(new ItemDto(ItemProtocol.item_encoder_qty, "码盘位当前码盘数量", "DB110.D518")); + list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB110.D522")); + list.add(new ItemDto(ItemProtocol.item_order_qty, "当前工单数量", "DB110.D526")); + list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB110.S530")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java index a888494..7256716 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java @@ -246,7 +246,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri json.put("device_code",this.device_code); json.put("material_code",material); json.put("qty",encoder_qty); - json.put("type","3"); + json.put("type","2"); enterProduction(json); } break; @@ -324,8 +324,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri HttpResponse result = acsToWmsService.enterOrder(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { - this.writing(this.mode); + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); if (this.mode == 4) { dto.setOrder_status("1"); @@ -333,9 +332,9 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri dto.setOrder_status("2"); } produceshiftorderService.update(dto); + this.writing(this.mode); + this.setRequireSucess(true); } - this.setRequireSucess(true); - } return true; } @@ -367,7 +366,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); this.setRequireSucess(true); } @@ -403,7 +402,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); this.setRequireSucess(true); } @@ -435,7 +434,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); this.setRequireSucess(true); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java index 63279f0..9360938 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java @@ -148,7 +148,7 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (StrUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } @@ -157,32 +157,32 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB4.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB4.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB4.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB4.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB4.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB4.B5")); - list.add(new ItemDto(item_task, "任务号", "DB4.D6")); - list.add(new ItemDto(item_weight, "重量", "DB4.D10")); - list.add(new ItemDto(item_batch, "批次", "DB4.D14")); - list.add(new ItemDto(item_specifications, "规格", "DB4.S18")); - list.add(new ItemDto(item_material, "物料", "DB4.S274")); - list.add(new ItemDto(item_barcode, "条码", "DB4.S530")); - list.add(new ItemDto(item_container_type, "托盘类型", "DB4.B786")); - list.add(new ItemDto(item_AlongSide, "A长边", "DB4.W788")); - list.add(new ItemDto(item_BshortSide, "B短边", "DB4.W790")); - list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB4.W792")); - list.add(new ItemDto(item_Wthickness, "W厚度", "DB4.W794")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDto(item_mode, "工作状态", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电开关信号", "DB112.B2")); + list.add(new ItemDto(item_action, "取放信号", "DB112.B3")); + list.add(new ItemDto(item_ioaction, "进出信号", "DB112.B4")); + list.add(new ItemDto(item_error, "报警信号", "DB112.B5")); + list.add(new ItemDto(item_task, "任务号", "DB112.D6")); + list.add(new ItemDto(item_weight, "重量", "DB112.D10")); + list.add(new ItemDto(item_batch, "批次", "DB112.D14")); + list.add(new ItemDto(item_specifications, "规格", "DB112.S18")); + list.add(new ItemDto(item_material, "物料", "DB112.S274")); + list.add(new ItemDto(item_barcode, "条码", "DB112.S530")); + list.add(new ItemDto(item_container_type, "托盘类型", "DB112.B786")); + list.add(new ItemDto(item_AlongSide, "A长边", "DB112.W788")); + list.add(new ItemDto(item_BshortSide, "B短边", "DB112.W790")); + list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB112.W792")); + list.add(new ItemDto(item_Wthickness, "W厚度", "DB112.W794")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB5.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB5.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB5.D4")); - list.add(new ItemDto(item_to_barcode, "条码", "DB5.S8")); + list.add(new ItemDto(item_to_command, "作业命令", "DB113.W0", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_target, "目标站", "DB113.W2")); + list.add(new ItemDto(item_to_task, "任务号", "DB113.D4")); + list.add(new ItemDto(item_to_barcode, "条码", "DB113.S8")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java index a47680c..e72dc46 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java @@ -57,22 +57,22 @@ public class LnshPalletizingManipulatorSiteDefination implements OpcDeviceDriver public static List getReadableItemDtos2() { List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB4.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB4.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB4.B2")); - list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "DB4.B3")); - list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB4.B4")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB4.B5")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB4.D6")); - list.add(new ItemDto(ItemProtocol.item_weight, "重量", "DB4.D10")); - list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB4.D14")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB4.S18")); - list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB4.S274")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB4.S530")); - list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB4.W786")); - list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB4.W788")); - list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB4.W790")); - list.add(new ItemDto(ItemProtocol.item_Wthickness, "W厚度", "DB4.W792")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB112.B2")); + list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "DB112.B3")); + list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB112.B4")); + list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB112.B5")); + list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB112.D6")); + list.add(new ItemDto(ItemProtocol.item_weight, "重量", "DB112.D10")); + list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB112.D14")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB112.S18")); + list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB112.S274")); + list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB112.S530")); + list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB112.W786")); + list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB112.W788")); + list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB112.W790")); + list.add(new ItemDto(ItemProtocol.item_Wthickness, "W厚度", "DB112.W792")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java index 44e5981..5938cf0 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java @@ -311,7 +311,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(1); this.setRequireSucess(true); } @@ -341,7 +341,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(1); } } @@ -371,7 +371,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(1); } this.setRequireSucess(true); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java deleted file mode 100644 index c0af21e..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java +++ /dev/null @@ -1,176 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_press; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_status = "status"; - public static String item_error = "error"; - public static String item_open_time = "open_time"; - public static String item_standby_time = "standby_time "; - public static String item_production_time = "production_time"; - public static String item_error_time = "error_time"; - public static String item_material = "material"; - public static String item_qty = "qty"; - public static String item_weight = "weight"; - public static String item_qualified = "qualified"; - public static String item_unqualified = "unqualified"; - public static String item_order_No = "order_No"; - public static String item_to_command = "to_command"; - public static String item_to_error = "to_error"; - public static String item_to_order_No = "to_order_No"; - public static String item_to_qty = "to_qty"; - public static String item_to_material_code = "to_material_code"; - - - private LnshPressDeviceDriver driver; - - public ItemProtocol(LnshPressDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getStatus() { - return this.getOpcIntegerValue(item_status); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getOpen_time() { - return this.getOpcIntegerValue(item_open_time); - } - - public int getStandby_time() { - return this.getOpcIntegerValue(item_standby_time); - } - - public int getProduction_time() { - return this.getOpcIntegerValue(item_production_time); - } - - public int getError_time() { - return this.getOpcIntegerValue(item_error_time); - } - - public String getMaterial() { - return this.getOpcStringValue(item_material); - } - - public int getQty() { - return this.getOpcIntegerValue(item_qty); - } - - public int getWeight() { - return this.getOpcIntegerValue(item_weight); - } - - public int getQualified() { - return this.getOpcIntegerValue(item_qualified); - } - - public int getUnqualified() { - return this.getOpcIntegerValue(item_unqualified); - } - - public String getOrder_No() { - return this.getOpcStringValue(item_order_No); - } - - public int getTo_command() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getTo_error() { - return this.getOpcIntegerValue(item_to_error); - } - - public String getTo_order_No() { - return this.getOpcStringValue(item_to_order_No); - } - - public int getTo_qty() { - return this.getOpcIntegerValue(item_to_qty); - } - - public String getTo_material_code() { - return this.getOpcStringValue(item_to_material_code); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - Boolean isonline; - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - } - - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (value == null) { - log.error("读取错误!"); - } else { - return value; - } - return "0"; - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB8.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB8.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB8.B2")); - list.add(new ItemDto(item_error, "故障", "DB8.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB8.D4")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB8.D8")); - list.add(new ItemDto(item_production_time, "生产时间", "DB8.D12")); - list.add(new ItemDto(item_error_time, "故障时间", "DB8.D16")); - list.add(new ItemDto(item_material, "当前生产物料", "DB8.S20")); - list.add(new ItemDto(item_qty, "当前已生产数量", "DB8.D276")); - list.add(new ItemDto(item_weight, "当前已生产重量", "DB8.D280")); - list.add(new ItemDto(item_qualified, "当前已生产合格数", "DB8.D284")); - list.add(new ItemDto(item_unqualified, "当前已生产不合格数", "DB8.D288")); - list.add(new ItemDto(item_order_No, "工单号", "DB8.S292")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "反馈", "DB9.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_error, "error", "DB9.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB9.S4")); - list.add(new ItemDto(item_to_qty, "生产重量", "DB9.D260")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB9.S264")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java deleted file mode 100644 index db1223d..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_press; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 晟华压力机 - * - */ -@Service -public class LnshPressDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lnsh_press"; - } - - @Override - public String getDriverName() { - return "晟华-压力机"; - } - - @Override - public String getDriverDescription() { - return "晟华-压力机"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new LnshPressDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return LnshPressDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.station); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB8.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB8.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB8.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "故障", "DB8.B3")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB8.D4")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB8.D8")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB8.D12")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB8.D16")); - list.add(new ItemDto(ItemProtocol.item_material, "当前生产物料", "DB8.S20")); - list.add(new ItemDto(ItemProtocol.item_qty, "当前已生产数量", "DB8.D276")); - list.add(new ItemDto(ItemProtocol.item_weight, "当前已生产重量", "DB8.D280")); - list.add(new ItemDto(ItemProtocol.item_qualified, "当前已生产合格数", "DB8.D284")); - list.add(new ItemDto(ItemProtocol.item_unqualified, "当前已生产不合格数", "DB8.D288")); - list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB8.S292")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java deleted file mode 100644 index ef76674..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java +++ /dev/null @@ -1,379 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_press; - -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.Device; -import org.nl.acs.order.service.ProduceshiftorderService; -import org.nl.acs.order.service.dto.ProduceshiftorderDto; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.lang.reflect.Field; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 晟华压力机 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - @Autowired - AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); - @Autowired - ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean("produceshiftorderServiceImpl"); - - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - - int mode = 0; - int error = 0; - int last_mode = 0; - int last_error = 0; - Boolean isonline = true; - int hasGoods = 0; - String message = null; - Boolean iserror = false; - - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - - //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 - int flag; - - String device_code; - int status = 0; - int last_status = 0; - - int open_time = 0; - int last_open_time = 0; - int standby_time = 0; - int last_standby_time = 0; - int production_time = 0; - int last_production_time = 0; - int error_time = 0; - int last_error_time = 0; - String material; - String last_material; - int qty = 0; - int last_qty = 0; - int weight = 0; - int last_weight = 0; - int qualified = 0; - int last_qualified = 0; - int unqualified = 0; - int last_unqualified = 0; - String order_No = "0"; - String last_order_No = "0"; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - error = this.itemProtocol.getError(); - status = this.itemProtocol.getStatus(); - open_time = this.itemProtocol.getOpen_time(); - standby_time = this.itemProtocol.getStandby_time(); - production_time = this.itemProtocol.getProduction_time(); - error_time = this.itemProtocol.getError_time(); - weight = this.itemProtocol.getWeight(); - order_No = this.itemProtocol.getOrder_No(); - qualified = this.itemProtocol.getQualified(); - unqualified = this.itemProtocol.getUnqualified(); - qty = this.itemProtocol.getQty(); - material = this.itemProtocol.getMaterial(); - - if (mode != last_mode) { - this.setRequireSucess(false); - logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); - } - if (error != last_error) { - logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); - logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error); - } - if (status != last_status) { - logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); - logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); - } - if (open_time != last_open_time) { - logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + "->" + open_time); - } - if (standby_time != last_standby_time) { - logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + "->" + standby_time); - } - if (production_time != last_production_time) { - logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + "->" + production_time); - } - if (error_time != last_error_time) { - logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + "->" + error_time); - } - if (weight != last_weight) { - logServer.deviceItemValue(this.device_code,"weight" ,String.valueOf(weight)); - logServer.deviceExecuteLog(this.device_code,"","","信号weight：" + last_weight + "->" + weight); - } - if (!StrUtil.equals(material,last_material)) { - logServer.deviceItemValue(this.device_code,"material" ,material); - logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + "->" + material); - } - if (qty != last_qty) { - logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); - logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + "->" + qty); - } - if (qualified != last_qualified) { - logServer.deviceItemValue(this.device_code,"qualified" ,String.valueOf(qualified)); - logServer.deviceExecuteLog(this.device_code,"","","信号qualified：" + last_qualified + "->" + qualified); - } - if (unqualified != last_unqualified) { - logServer.deviceItemValue(this.device_code,"unqualified" ,String.valueOf(unqualified)); - logServer.deviceExecuteLog(this.device_code,"","","信号unqualified：" + last_unqualified + "->" + unqualified); - } - if (!StrUtil.equals(order_No,last_order_No)) { - logServer.deviceItemValue(this.device_code,"order_No" ,order_No); - logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + "->" + order_No); - } - - } catch (Exception var17) { - return; - } - - if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - return; - case 2: - break; - case 3: - //排产单确认 - if (!requireSucess && !order_No.equals("0")) { - JSONObject json = new JSONObject(); - json.put("producetask_code",order_No); - json.put("device_code",this.device_code); - json.put("material_code",material); - json.put("weight",weight); - json.put("qty",qualified); - json.put("type","1"); - enterProduction(json); - } - break; - case 4: - //工单完成反馈 - if (!requireSucess && !order_No.equals("0")) { - JSONObject json = new JSONObject(); - json.put("producetask_code",order_No); - json.put("device_code",this.device_code); - json.put("material_code",material); - json.put("weight",weight); - json.put("qty",qualified); - json.put("type","2"); - enterProduction(json); - } - break; - } - - switch (flag) { - //取货完成 - case 1: - writing(2); - return; - //放货完成 - case 2: - writing(3); - return; - - } - - } - last_mode = mode; - last_status = status; - last_error = error; - last_open_time = open_time; - last_standby_time = standby_time; - last_production_time = production_time; - last_error_time = error_time; - last_material = material; - last_qty = qty; - last_weight = weight; - last_qualified = qualified; - last_unqualified = unqualified; - last_order_No = order_No; - } - - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - /** - * 排产单确认 - * - * @param - */ - public synchronized boolean enterProduction(JSONObject json) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - HttpResponse result = acsToWmsService.enterOrder(json); - if (result.getStatus() == 200) { - this.writing(this.mode); - ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); - if (this.mode == 4) { - dto.setOrder_status("2"); - } else if (this.mode == 3){ - dto.setOrder_status("0"); - } - produceshiftorderService.update(dto); - } - requireSucess = true; - return true; - } - } - - public boolean exe_business() { - return true; - } - - protected void executing(Instruction instruction) { - this.executing(1, instruction, ""); - } - - public void executing(int command, Instruction instruction, String appendMessage) { - String to_material_code = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_material_code; - if (appendMessage == null) { - appendMessage = ""; - } - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - ReadUtil.write(itemMap, server); - - } - - public void writing(String param, String value) { - - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + param; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_param, value); - - ReadUtil.write(itemMap, server); - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - - } - - public static Boolean isExistFieldName(String fieldName, Object obj) throws NoSuchFieldException { - if (obj == null || StrUtil.isEmpty(fieldName)) { - return null; - } - //获取这个类的所有属性 - Field[] fields = obj.getClass().getDeclaredFields(); - boolean flag = false; - //循环遍历所有的fields - for (int i = 0; i < fields.length; i++) { - if (fields[i].getName().equals("item_" + fieldName)) { - flag = true; - break; - } - } - return flag; - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java index 827f407..edcbd57 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java @@ -24,7 +24,7 @@ public class ItemProtocol { public static String item_task1 = "task1"; public static String item_task2 = "task2"; public static String item_open_time = "open_time"; - public static String item_standby_time = "standby_time "; + public static String item_standby_time = "standby_time"; public static String item_production_time = "production_time"; public static String item_error_time = "error_time"; public static String item_task_qty = "task_qty"; @@ -182,7 +182,7 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (StrUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java index f499d6f..1daf8e3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java @@ -20,7 +20,7 @@ public class ItemProtocol { public static String item_barcode = "barcode"; public static String item_qty = "qty"; public static String item_open_time = "open_time"; - public static String item_standby_time = "standby_time "; + public static String item_standby_time = "standby_time"; public static String item_production_time = "production_time"; public static String item_error_time = "error_time"; public static String item_material = "material"; @@ -736,7 +736,7 @@ public class ItemProtocol { public Float getOpcFloatValue(String protocol) { Float value = this.driver.getFloatValue(protocol); if (ObjectUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } @@ -746,7 +746,7 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (StrUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java index 4919aad..b32c0f3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java @@ -828,7 +828,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); this.setRequireSucess(true); } @@ -852,8 +852,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im HttpResponse result = acsToWmsService.enterOrder(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { - this.writing(this.mode); + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); if (this.mode == 4) { dto.setOrder_status("0"); @@ -861,10 +860,10 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im dto.setOrder_status("2"); } produceshiftorderService.update(dto); + this.writing(this.mode); + this.setRequireSucess(true); } } - - this.setRequireSucess(true); return true; } } @@ -892,7 +891,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); this.setRequireSucess(true); } @@ -926,8 +925,8 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im this.writing(this.mode); this.writing("to_material",material_code); + this.setRequireSucess(true); } - requireSucess = true; return true; } } @@ -953,7 +952,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); } } @@ -982,7 +981,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java index 2f9b719..044ad18 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java @@ -128,11 +128,11 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (StrUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } - return "0"; + return ""; } public static List getReadableItemDtos() { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java index fc7cbb3..7d19a9a 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java @@ -560,7 +560,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(1); this.setRequireSucess(true); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/ItemProtocol.java index d981b2f..b7f0557 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/ItemProtocol.java @@ -26,7 +26,7 @@ public class ItemProtocol { public static String item_batch = "batch"; public static String item_specifications = "specifications"; public static String item_open_time = "open_time"; - public static String item_standby_time = "standby_time "; + public static String item_standby_time = "standby_time"; public static String item_production_time = "production_time"; public static String item_error_time = "error_time"; public static String item_order_No = "order_No"; @@ -763,7 +763,7 @@ public class ItemProtocol { public String getOpcStringValue(String protocol) { String value = this.driver.getStringValue(protocol); if (StrUtil.isEmpty(value)) { - log.error("读取错误!"); + } else { return value; } @@ -772,156 +772,156 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_error, "故障代码", "DB1.B3")); - list.add(new ItemDto(item_onoff_status, "开关机状态", "DB1.B4")); - list.add(new ItemDto(item_putStation, "当前码盘工位", "DB1.D6")); - list.add(new ItemDto(item_getStation, "当前抓取工位", "DB1.D10")); - list.add(new ItemDto(item_barcode, "当前码盘工位条码", "DB1.S14")); - list.add(new ItemDto(item_material, "码盘工位当前物料", "DB1.S270")); - list.add(new ItemDto(item_specifications, "规格", "DB1.S526")); - list.add(new ItemDto(item_batch, "批次", "DB1.D782")); - list.add(new ItemDto(item_qty, "数量", "DB1.D786")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.D790")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D794")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D798")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D802")); - list.add(new ItemDto(item_total_split, "累计拆垛数量", "DB1.D806")); - list.add(new ItemDto(item_order_No, "工单号", "DB1.S810")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB13.B0")); + list.add(new ItemDto(item_mode, "工作状态", "DB13.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_status, "设备状态", "DB13.B2")); + list.add(new ItemDto(item_error, "故障代码", "DB13.B3")); + list.add(new ItemDto(item_onoff_status, "开关机状态", "DB13.B4")); + list.add(new ItemDto(item_putStation, "当前码盘工位", "DB13.D6")); + list.add(new ItemDto(item_getStation, "当前抓取工位", "DB13.D10")); + list.add(new ItemDto(item_barcode, "当前码盘工位条码", "DB13.S14")); + list.add(new ItemDto(item_material, "码盘工位当前物料", "DB13.S270")); + list.add(new ItemDto(item_specifications, "规格", "DB13.S526")); + list.add(new ItemDto(item_batch, "批次", "DB13.D782")); + list.add(new ItemDto(item_qty, "数量", "DB13.D786")); + list.add(new ItemDto(item_open_time, "开机时间", "DB13.D790")); + list.add(new ItemDto(item_standby_time, "待机时间", "DB13.D794")); + list.add(new ItemDto(item_production_time, "生产时间", "DB13.D798")); + list.add(new ItemDto(item_error_time, "故障时间", "DB13.D802")); + list.add(new ItemDto(item_total_split, "累计拆垛数量", "DB13.D806")); + list.add(new ItemDto(item_order_No, "工单号", "DB13.S810")); - list.add(new ItemDto(item_product_code, "产品编号", "DB1.W1066")); - list.add(new ItemDto(item_AlongSide, "A长边", "DB1.W1068")); - list.add(new ItemDto(item_BshortSide, "B短边", "DB1.W1070")); - list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB1.W1072")); - list.add(new ItemDto(item_Wthickness, "W厚度", "DB1.W1074")); - list.add(new ItemDto(item_tray_qty, "当前垛盘数", "DB1.W1076")); - list.add(new ItemDto(item_tray_high, "垛盘高度", "DB1.W1078")); - list.add(new ItemDto(item_crib_category, "垛型类别", "DB1.W1080")); - list.add(new ItemDto(item_palletX1_line, "码垛X1行", "DB1.W1082")); - list.add(new ItemDto(item_palletY1_row, "码垛Y1列", "DB1.W1084")); - list.add(new ItemDto(item_palletA1_angle, "码垛A1角度", "DB1.W1086")); - list.add(new ItemDto(item_palletX2_line, "码垛X2行", "DB1.W1088")); - list.add(new ItemDto(item_palletY2_row, "码垛Y2列", "DB1.W1090")); - list.add(new ItemDto(item_palletA2_angle, "码垛A2角度", "DB1.W1092")); - list.add(new ItemDto(item_palletX3_line, "码垛X3行", "DB1.W1094")); - list.add(new ItemDto(item_palletY3_row, "码垛Y3列", "DB1.W1096")); - list.add(new ItemDto(item_palletA3_angle, "码垛A3角度", "DB1.W1098")); - list.add(new ItemDto(item_pressCribX1_line, "压垛X1行", "DB1.W1100")); - list.add(new ItemDto(item_pressCribY1_row, "压垛Y1列", "DB1.W1102")); - list.add(new ItemDto(item_pressCribA1_angle, "压垛A1角度", "DB1.W1104")); - list.add(new ItemDto(item_pressCribX2_line, "压垛X2行", "DB1.W1106")); - list.add(new ItemDto(item_pressCribY2_row, "压垛Y2列", "DB1.W1108")); - list.add(new ItemDto(item_pressCribA2_angle, "压垛A2角度", "DB1.W1110")); - list.add(new ItemDto(item_pressCribX3_line, "压垛X3行", "DB1.W1112")); - list.add(new ItemDto(item_pressCribY3_row, "压垛Y3列", "DB1.W1114")); - list.add(new ItemDto(item_pressCribA3_angle, "压垛A3角度", "DB1.W1116")); - list.add(new ItemDto(item_Zoffset, "Z轴偏移", "DB1.W1118")); - list.add(new ItemDto(item_pallet_layerQty, "码垛层数", "DB1.W1120")); - list.add(new ItemDto(item_pressCrib_layerQty, "压垛层数", "DB1.W1122")); - list.add(new ItemDto(item_codeLayerX1_interval, "码层X1间隔", "DB1.W1124")); - list.add(new ItemDto(item_codeLayerY1_interval, "码层Y1间隔", "DB1.W1126")); - list.add(new ItemDto(item_codeLayerX2_interval, "码层X2间隔", "DB1.W1128")); - list.add(new ItemDto(item_codeLayerY2_interval, "码层Y2间隔", "DB1.W1130")); - list.add(new ItemDto(item_codeLayerX3_interval, "码层X3间隔", "DB1.W1132")); - list.add(new ItemDto(item_codeLayerY3_interval, "码层Y3间隔", "DB1.W1134")); - list.add(new ItemDto(item_codeLayerX1_offset, "码层X1偏移", "DB1.W1136")); - list.add(new ItemDto(item_codeLayerY1_offset, "码层Y1偏移", "DB1.W1138")); - list.add(new ItemDto(item_codeLayerX2_offset, "码层X2偏移", "DB1.W1140")); - list.add(new ItemDto(item_codeLayerY2_offset, "码层Y2偏移", "DB1.W1142")); - list.add(new ItemDto(item_codeLayerX3_offset, "码层X3偏移", "DB1.W1144")); - list.add(new ItemDto(item_codeLayerY3_offset, "码层Y3偏移", "DB1.W1146")); - list.add(new ItemDto(item_pressLayerX1_interval, "压层X1间隔", "DB1.W1148")); - list.add(new ItemDto(item_pressLayerY1_interval, "压层Y1间隔", "DB1.W1150")); - list.add(new ItemDto(item_pressLayerX2_interval, "压层X2间隔", "DB1.W1152")); - list.add(new ItemDto(item_pressLayerY2_interval, "压层Y2间隔", "DB1.W1154")); - list.add(new ItemDto(item_pressLayerX3_interval, "压层X3间隔", "DB1.W1156")); - list.add(new ItemDto(item_pressLayerY3_interval, "压层Y3间隔", "DB1.W1158")); - list.add(new ItemDto(item_pressLayerX1_offset, "压层X1偏移", "DB1.W1160")); - list.add(new ItemDto(item_pressLayerY1_offset, "压层Y1偏移", "DB1.W1162")); - list.add(new ItemDto(item_pressLayerX2_offset, "压层X2偏移", "DB1.W1164")); - list.add(new ItemDto(item_pressLayerY2_offset, "压层Y2偏移", "DB1.W1166")); - list.add(new ItemDto(item_pressLayerX3_offset, "压层X3偏移", "DB1.W1168")); - list.add(new ItemDto(item_pressLayerY3_offset, "压层Y3偏移", "DB1.W1170")); - list.add(new ItemDto(item_one_cribTotal, "1#垛总数", "DB1.W1172")); - list.add(new ItemDto(item_two_cribTotal, "2#垛总数", "DB1.W1174")); - list.add(new ItemDto(item_one_qty, "1#垛当前数", "DB1.W1176")); - list.add(new ItemDto(item_two_qty, "2#垛当前数", "DB1.W1178")); - list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB1.W1180")); - list.add(new ItemDto(item_order_qty, "工单数量", "DB1.D1182")); + list.add(new ItemDto(item_product_code, "产品编号", "DB13.W1066")); + list.add(new ItemDto(item_AlongSide, "A长边", "DB13.W1068")); + list.add(new ItemDto(item_BshortSide, "B短边", "DB13.W1070")); + list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB13.W1072")); + list.add(new ItemDto(item_Wthickness, "W厚度", "DB13.W1074")); + list.add(new ItemDto(item_tray_qty, "当前垛盘数", "DB13.W1076")); + list.add(new ItemDto(item_tray_high, "垛盘高度", "DB13.W1078")); + list.add(new ItemDto(item_crib_category, "垛型类别", "DB13.W1080")); + list.add(new ItemDto(item_palletX1_line, "码垛X1行", "DB13.W1082")); + list.add(new ItemDto(item_palletY1_row, "码垛Y1列", "DB13.W1084")); + list.add(new ItemDto(item_palletA1_angle, "码垛A1角度", "DB13.W1086")); + list.add(new ItemDto(item_palletX2_line, "码垛X2行", "DB13.W1088")); + list.add(new ItemDto(item_palletY2_row, "码垛Y2列", "DB13.W1090")); + list.add(new ItemDto(item_palletA2_angle, "码垛A2角度", "DB13.W1092")); + list.add(new ItemDto(item_palletX3_line, "码垛X3行", "DB13.W1094")); + list.add(new ItemDto(item_palletY3_row, "码垛Y3列", "DB13.W1096")); + list.add(new ItemDto(item_palletA3_angle, "码垛A3角度", "DB13.W1098")); + list.add(new ItemDto(item_pressCribX1_line, "压垛X1行", "DB13.W1100")); + list.add(new ItemDto(item_pressCribY1_row, "压垛Y1列", "DB13.W1102")); + list.add(new ItemDto(item_pressCribA1_angle, "压垛A1角度", "DB13.W1104")); + list.add(new ItemDto(item_pressCribX2_line, "压垛X2行", "DB13.W1106")); + list.add(new ItemDto(item_pressCribY2_row, "压垛Y2列", "DB13.W1108")); + list.add(new ItemDto(item_pressCribA2_angle, "压垛A2角度", "DB13.W1110")); + list.add(new ItemDto(item_pressCribX3_line, "压垛X3行", "DB13.W1112")); + list.add(new ItemDto(item_pressCribY3_row, "压垛Y3列", "DB13.W1114")); + list.add(new ItemDto(item_pressCribA3_angle, "压垛A3角度", "DB13.W1116")); + list.add(new ItemDto(item_Zoffset, "Z轴偏移", "DB13.W1118")); + list.add(new ItemDto(item_pallet_layerQty, "码垛层数", "DB13.W1120")); + list.add(new ItemDto(item_pressCrib_layerQty, "压垛层数", "DB13.W1122")); + list.add(new ItemDto(item_codeLayerX1_interval, "码层X1间隔", "DB13.W1124")); + list.add(new ItemDto(item_codeLayerY1_interval, "码层Y1间隔", "DB13.W1126")); + list.add(new ItemDto(item_codeLayerX2_interval, "码层X2间隔", "DB13.W1128")); + list.add(new ItemDto(item_codeLayerY2_interval, "码层Y2间隔", "DB13.W1130")); + list.add(new ItemDto(item_codeLayerX3_interval, "码层X3间隔", "DB13.W1132")); + list.add(new ItemDto(item_codeLayerY3_interval, "码层Y3间隔", "DB13.W1134")); + list.add(new ItemDto(item_codeLayerX1_offset, "码层X1偏移", "DB13.W1136")); + list.add(new ItemDto(item_codeLayerY1_offset, "码层Y1偏移", "DB13.W1138")); + list.add(new ItemDto(item_codeLayerX2_offset, "码层X2偏移", "DB13.W1140")); + list.add(new ItemDto(item_codeLayerY2_offset, "码层Y2偏移", "DB13.W1142")); + list.add(new ItemDto(item_codeLayerX3_offset, "码层X3偏移", "DB13.W1144")); + list.add(new ItemDto(item_codeLayerY3_offset, "码层Y3偏移", "DB13.W1146")); + list.add(new ItemDto(item_pressLayerX1_interval, "压层X1间隔", "DB13.W1148")); + list.add(new ItemDto(item_pressLayerY1_interval, "压层Y1间隔", "DB13.W1150")); + list.add(new ItemDto(item_pressLayerX2_interval, "压层X2间隔", "DB13.W1152")); + list.add(new ItemDto(item_pressLayerY2_interval, "压层Y2间隔", "DB13.W1154")); + list.add(new ItemDto(item_pressLayerX3_interval, "压层X3间隔", "DB13.W1156")); + list.add(new ItemDto(item_pressLayerY3_interval, "压层Y3间隔", "DB13.W1158")); + list.add(new ItemDto(item_pressLayerX1_offset, "压层X1偏移", "DB13.W1160")); + list.add(new ItemDto(item_pressLayerY1_offset, "压层Y1偏移", "DB13.W1162")); + list.add(new ItemDto(item_pressLayerX2_offset, "压层X2偏移", "DB13.W1164")); + list.add(new ItemDto(item_pressLayerY2_offset, "压层Y2偏移", "DB13.W1166")); + list.add(new ItemDto(item_pressLayerX3_offset, "压层X3偏移", "DB13.W1168")); + list.add(new ItemDto(item_pressLayerY3_offset, "压层Y3偏移", "DB13.W1170")); + list.add(new ItemDto(item_one_cribTotal, "1#垛总数", "DB13.W1172")); + list.add(new ItemDto(item_two_cribTotal, "2#垛总数", "DB13.W1174")); + list.add(new ItemDto(item_one_qty, "1#垛当前数", "DB13.W1176")); + list.add(new ItemDto(item_two_qty, "2#垛当前数", "DB13.W1178")); + list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB13.W1180")); + list.add(new ItemDto(item_order_qty, "工单数量", "DB13.D1182")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB2.B0")); - list.add(new ItemDto(item_to_error, "故障代码", "DB2.W2")); - list.add(new ItemDto(item_to_material_qty, "托盘上数量", "DB2.W4")); - list.add(new ItemDto(item_to_allow_pallet_qty, "允许码垛数量", "DB2.W6")); - list.add(new ItemDto(item_to_material_type, "托盘类型", "DB2.D8")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB2.D12")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB2.S16")); + list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB14.B0")); + list.add(new ItemDto(item_to_error, "故障代码", "DB14.W2")); + list.add(new ItemDto(item_to_material_qty, "托盘上数量", "DB14.W4")); + list.add(new ItemDto(item_to_allow_pallet_qty, "允许码垛数量", "DB14.W6")); + list.add(new ItemDto(item_to_material_type, "托盘类型", "DB14.D8")); + list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB14.D12")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB14.S16")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB2.W272")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB2.W274")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB2.W276")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB2.W278")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB2.W280")); - list.add(new ItemDto(item_to_tray_qty, "当前垛盘数", "DB2.W282")); - list.add(new ItemDto(item_to_tray_high, "垛盘高度", "DB2.W284")); - list.add(new ItemDto(item_to_crib_category, "垛型类别", "DB2.W286")); - list.add(new ItemDto(item_to_palletX1_line, "码垛X1行", "DB2.W288")); - list.add(new ItemDto(item_to_palletY1_row, "码垛Y1列", "DB2.W290")); - list.add(new ItemDto(item_to_palletA1_angle, "码垛A1角度", "DB2.W292")); - list.add(new ItemDto(item_to_palletX2_line, "码垛X2行", "DB2.W294")); - list.add(new ItemDto(item_to_palletY2_row, "码垛Y2列", "DB2.W296")); - list.add(new ItemDto(item_to_palletA2_angle, "码垛A2角度", "DB2.W298")); - list.add(new ItemDto(item_to_palletX3_line, "码垛X3行", "DB2.W300")); - list.add(new ItemDto(item_to_palletY3_row, "码垛Y3列", "DB2.W302")); - list.add(new ItemDto(item_to_palletA3_angle, "码垛A3角度", "DB2.W304")); - list.add(new ItemDto(item_to_pressCribX1_line, "压垛X1行", "DB2.W306")); - list.add(new ItemDto(item_to_pressCribY1_row, "压垛Y1列", "DB2.W308")); - list.add(new ItemDto(item_to_pressCribA1_angle, "压垛A1角度", "DB2.W310")); - list.add(new ItemDto(item_to_pressCribX2_line, "压垛X2行", "DB2.W312")); - list.add(new ItemDto(item_to_pressCribY2_row, "压垛Y2列", "DB2.W314")); - list.add(new ItemDto(item_to_pressCribA2_angle, "压垛A2角度", "DB2.W316")); - list.add(new ItemDto(item_to_pressCribX3_line, "压垛X3行", "DB2.W318")); - list.add(new ItemDto(item_to_pressCribY3_row, "压垛Y3列", "DB2.W320")); - list.add(new ItemDto(item_to_pressCribA3_angle, "压垛A3角度", "DB2.W322")); - list.add(new ItemDto(item_to_Zoffset, "Z轴偏移", "DB2.W324")); - list.add(new ItemDto(item_to_pallet_layerQty, "码垛层数", "DB2.W326")); - list.add(new ItemDto(item_to_pressCrib_layerQty, "压垛层数", "DB2.W328")); - list.add(new ItemDto(item_to_codeLayerX1_interval, "码层X1间隔", "DB2.W330")); - list.add(new ItemDto(item_to_codeLayerY1_interval, "码层Y1间隔", "DB2.W332")); - list.add(new ItemDto(item_to_codeLayerX2_interval, "码层X2间隔", "DB2.W334")); - list.add(new ItemDto(item_to_codeLayerY2_interval, "码层Y2间隔", "DB2.W336")); - list.add(new ItemDto(item_to_codeLayerX3_interval, "码层X3间隔", "DB2.W338")); - list.add(new ItemDto(item_to_codeLayerY3_interval, "码层Y3间隔", "DB2.W340")); - list.add(new ItemDto(item_to_codeLayerX1_offset, "码层X1偏移", "DB2.W342")); - list.add(new ItemDto(item_to_codeLayerY1_offset, "码层Y1偏移", "DB2.W344")); - list.add(new ItemDto(item_to_codeLayerX2_offset, "码层X2偏移", "DB2.W346")); - list.add(new ItemDto(item_to_codeLayerY2_offset, "码层Y2偏移", "DB2.W348")); - list.add(new ItemDto(item_to_codeLayerX3_offset, "码层X3偏移", "DB2.W350")); - list.add(new ItemDto(item_to_codeLayerY3_offset, "码层Y3偏移", "DB2.W352")); - list.add(new ItemDto(item_to_pressLayerX1_interval, "压层X1间隔", "DB2.W354")); - list.add(new ItemDto(item_to_pressLayerY1_interval, "压层Y1间隔", "DB2.W356")); - list.add(new ItemDto(item_to_pressLayerX2_interval, "压层X2间隔", "DB2.W358")); - list.add(new ItemDto(item_to_pressLayerY2_interval, "压层Y2间隔", "DB2.W360")); - list.add(new ItemDto(item_to_pressLayerX3_interval, "压层X3间隔", "DB2.W362")); - list.add(new ItemDto(item_to_pressLayerY3_interval, "压层Y3间隔", "DB2.W364")); - list.add(new ItemDto(item_to_pressLayerX1_offset, "压层X1偏移", "DB2.W366")); - list.add(new ItemDto(item_to_pressLayerY1_offset, "压层Y1偏移", "DB2.W368")); - list.add(new ItemDto(item_to_pressLayerX2_offset, "压层X2偏移", "DB2.W370")); - list.add(new ItemDto(item_to_pressLayerY2_offset, "压层Y2偏移", "DB2.W372")); - list.add(new ItemDto(item_to_pressLayerX3_offset, "压层X3偏移", "DB2.W374")); - list.add(new ItemDto(item_to_pressLayerY3_offset, "压层Y3偏移", "DB2.W376")); - list.add(new ItemDto(item_to_one_cribTotal, "1#垛总数", "DB2.W378")); - list.add(new ItemDto(item_to_two_cribTotal, "2#垛总数", "DB2.W380")); - list.add(new ItemDto(item_to_one_qty, "1#垛当前数", "DB2.W382")); - list.add(new ItemDto(item_to_two_qty, "2#垛当前数", "DB2.W384")); - list.add(new ItemDto(item_to_tool_coordinate, "工具坐标", "DB2.W386")); - list.add(new ItemDto(item_to_order_qty, "工单数量", "DB2.D388")); + list.add(new ItemDto(item_to_product_code, "产品编号", "DB14.W272")); + list.add(new ItemDto(item_to_AlongSide, "A长边", "DB14.W274")); + list.add(new ItemDto(item_to_BshortSide, "B短边", "DB14.W276")); + list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB14.W278")); + list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB14.W280")); + list.add(new ItemDto(item_to_tray_qty, "当前垛盘数", "DB14.W282")); + list.add(new ItemDto(item_to_tray_high, "垛盘高度", "DB14.W284")); + list.add(new ItemDto(item_to_crib_category, "垛型类别", "DB14.W286")); + list.add(new ItemDto(item_to_palletX1_line, "码垛X1行", "DB14.W288")); + list.add(new ItemDto(item_to_palletY1_row, "码垛Y1列", "DB14.W290")); + list.add(new ItemDto(item_to_palletA1_angle, "码垛A1角度", "DB14.W292")); + list.add(new ItemDto(item_to_palletX2_line, "码垛X2行", "DB14.W294")); + list.add(new ItemDto(item_to_palletY2_row, "码垛Y2列", "DB14.W296")); + list.add(new ItemDto(item_to_palletA2_angle, "码垛A2角度", "DB14.W298")); + list.add(new ItemDto(item_to_palletX3_line, "码垛X3行", "DB14.W300")); + list.add(new ItemDto(item_to_palletY3_row, "码垛Y3列", "DB14.W302")); + list.add(new ItemDto(item_to_palletA3_angle, "码垛A3角度", "DB14.W304")); + list.add(new ItemDto(item_to_pressCribX1_line, "压垛X1行", "DB14.W306")); + list.add(new ItemDto(item_to_pressCribY1_row, "压垛Y1列", "DB14.W308")); + list.add(new ItemDto(item_to_pressCribA1_angle, "压垛A1角度", "DB14.W310")); + list.add(new ItemDto(item_to_pressCribX2_line, "压垛X2行", "DB14.W312")); + list.add(new ItemDto(item_to_pressCribY2_row, "压垛Y2列", "DB14.W314")); + list.add(new ItemDto(item_to_pressCribA2_angle, "压垛A2角度", "DB14.W316")); + list.add(new ItemDto(item_to_pressCribX3_line, "压垛X3行", "DB14.W318")); + list.add(new ItemDto(item_to_pressCribY3_row, "压垛Y3列", "DB14.W320")); + list.add(new ItemDto(item_to_pressCribA3_angle, "压垛A3角度", "DB14.W322")); + list.add(new ItemDto(item_to_Zoffset, "Z轴偏移", "DB14.W324")); + list.add(new ItemDto(item_to_pallet_layerQty, "码垛层数", "DB14.W326")); + list.add(new ItemDto(item_to_pressCrib_layerQty, "压垛层数", "DB14.W328")); + list.add(new ItemDto(item_to_codeLayerX1_interval, "码层X1间隔", "DB14.W330")); + list.add(new ItemDto(item_to_codeLayerY1_interval, "码层Y1间隔", "DB14.W332")); + list.add(new ItemDto(item_to_codeLayerX2_interval, "码层X2间隔", "DB14.W334")); + list.add(new ItemDto(item_to_codeLayerY2_interval, "码层Y2间隔", "DB14.W336")); + list.add(new ItemDto(item_to_codeLayerX3_interval, "码层X3间隔", "DB14.W338")); + list.add(new ItemDto(item_to_codeLayerY3_interval, "码层Y3间隔", "DB14.W340")); + list.add(new ItemDto(item_to_codeLayerX1_offset, "码层X1偏移", "DB14.W342")); + list.add(new ItemDto(item_to_codeLayerY1_offset, "码层Y1偏移", "DB14.W344")); + list.add(new ItemDto(item_to_codeLayerX2_offset, "码层X2偏移", "DB14.W346")); + list.add(new ItemDto(item_to_codeLayerY2_offset, "码层Y2偏移", "DB14.W348")); + list.add(new ItemDto(item_to_codeLayerX3_offset, "码层X3偏移", "DB14.W350")); + list.add(new ItemDto(item_to_codeLayerY3_offset, "码层Y3偏移", "DB14.W352")); + list.add(new ItemDto(item_to_pressLayerX1_interval, "压层X1间隔", "DB14.W354")); + list.add(new ItemDto(item_to_pressLayerY1_interval, "压层Y1间隔", "DB14.W356")); + list.add(new ItemDto(item_to_pressLayerX2_interval, "压层X2间隔", "DB14.W358")); + list.add(new ItemDto(item_to_pressLayerY2_interval, "压层Y2间隔", "DB14.W360")); + list.add(new ItemDto(item_to_pressLayerX3_interval, "压层X3间隔", "DB14.W362")); + list.add(new ItemDto(item_to_pressLayerY3_interval, "压层Y3间隔", "DB14.W364")); + list.add(new ItemDto(item_to_pressLayerX1_offset, "压层X1偏移", "DB14.W366")); + list.add(new ItemDto(item_to_pressLayerY1_offset, "压层Y1偏移", "DB14.W368")); + list.add(new ItemDto(item_to_pressLayerX2_offset, "压层X2偏移", "DB14.W370")); + list.add(new ItemDto(item_to_pressLayerY2_offset, "压层Y2偏移", "DB14.W372")); + list.add(new ItemDto(item_to_pressLayerX3_offset, "压层X3偏移", "DB14.W374")); + list.add(new ItemDto(item_to_pressLayerY3_offset, "压层Y3偏移", "DB14.W376")); + list.add(new ItemDto(item_to_one_cribTotal, "1#垛总数", "DB14.W378")); + list.add(new ItemDto(item_to_two_cribTotal, "2#垛总数", "DB14.W380")); + list.add(new ItemDto(item_to_one_qty, "1#垛当前数", "DB14.W382")); + list.add(new ItemDto(item_to_two_qty, "2#垛当前数", "DB14.W384")); + list.add(new ItemDto(item_to_tool_coordinate, "工具坐标", "DB14.W386")); + list.add(new ItemDto(item_to_order_qty, "工单数量", "DB14.D388")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDefination.java index eecd4b4..6e933ab 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDefination.java @@ -19,17 +19,17 @@ import java.util.List; public class RljnPackagePalletSplitManipulatorDefination implements OpcDeviceDriverDefination { @Override public String getDriverCode() { - return "lnsh_package_palletSplit_manipulator"; + return "rljn_package_palletSplit_manipulator"; } @Override public String getDriverName() { - return "荣力嘉耐-包装码拆垛机械手"; + return "嘉耐-包装码拆垛机械手"; } @Override public String getDriverDescription() { - return "荣力嘉耐-包装码拆垛机械手"; + return "嘉耐-包装码拆垛机械手"; } @Override @@ -57,84 +57,84 @@ public class RljnPackagePalletSplitManipulatorDefination implements OpcDeviceDri public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "故障代码", "DB1.B3")); - list.add(new ItemDto(ItemProtocol.item_onoff_status, "开关机状态", "DB1.B4")); - list.add(new ItemDto(ItemProtocol.item_putStation, "当前码盘工位", "DB1.D6")); - list.add(new ItemDto(ItemProtocol.item_getStation, "当前抓取工位", "DB1.D10")); - list.add(new ItemDto(ItemProtocol.item_barcode, "当前码盘工位条码", "DB1.S14")); - list.add(new ItemDto(ItemProtocol.item_material, "码盘工位当前物料", "DB1.S270")); - list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB1.S526")); - list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB1.D782")); - list.add(new ItemDto(ItemProtocol.item_qty, "数量", "DB1.D786")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.D790")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D794")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D798")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D802")); - list.add(new ItemDto(ItemProtocol.item_total_split, "累计拆垛数量", "DB1.D806")); - list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB1.S810")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB13.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB13.B1", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB13.B2")); + list.add(new ItemDto(ItemProtocol.item_error, "故障代码", "DB13.B3")); + list.add(new ItemDto(ItemProtocol.item_onoff_status, "开关机状态", "DB13.B4")); + list.add(new ItemDto(ItemProtocol.item_putStation, "当前码盘工位", "DB13.D6")); + list.add(new ItemDto(ItemProtocol.item_getStation, "当前抓取工位", "DB13.D10")); + list.add(new ItemDto(ItemProtocol.item_barcode, "当前码盘工位条码", "DB13.S14")); + list.add(new ItemDto(ItemProtocol.item_material, "码盘工位当前物料", "DB13.S270")); + list.add(new ItemDto(ItemProtocol.item_specifications, "规格", "DB13.S526")); + list.add(new ItemDto(ItemProtocol.item_batch, "批次", "DB13.D782")); + list.add(new ItemDto(ItemProtocol.item_qty, "数量", "DB13.D786")); + list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB13.D790")); + list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB13.D794")); + list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB13.D798")); + list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB13.D802")); + list.add(new ItemDto(ItemProtocol.item_total_split, "累计拆垛数量", "DB13.D806")); + list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB13.S810")); - list.add(new ItemDto(ItemProtocol.item_product_code, "产品编号", "DB1.W1066")); - list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB1.W1068")); - list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB1.W1070")); - list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB1.W1072")); - list.add(new ItemDto(ItemProtocol.item_Wthickness, "W厚度", "DB1.W1074")); - list.add(new ItemDto(ItemProtocol.item_tray_qty, "当前垛盘数", "DB1.W1076")); - list.add(new ItemDto(ItemProtocol.item_tray_high, "垛盘高度", "DB1.W1078")); - list.add(new ItemDto(ItemProtocol.item_crib_category, "垛型类别", "DB1.W1080")); - list.add(new ItemDto(ItemProtocol.item_palletX1_line, "码垛X1行", "DB1.W1082")); - list.add(new ItemDto(ItemProtocol.item_palletY1_row, "码垛Y1列", "DB1.W1084")); - list.add(new ItemDto(ItemProtocol.item_palletA1_angle, "码垛A1角度", "DB1.W1086")); - list.add(new ItemDto(ItemProtocol.item_palletX2_line, "码垛X2行", "DB1.W1088")); - list.add(new ItemDto(ItemProtocol.item_palletY2_row, "码垛Y2列", "DB1.W1090")); - list.add(new ItemDto(ItemProtocol.item_palletA2_angle, "码垛A2角度", "DB1.W1092")); - list.add(new ItemDto(ItemProtocol.item_palletX3_line, "码垛X3行", "DB1.W1094")); - list.add(new ItemDto(ItemProtocol.item_palletY3_row, "码垛Y3列", "DB1.W1096")); - list.add(new ItemDto(ItemProtocol.item_palletA3_angle, "码垛A3角度", "DB1.W1098")); - list.add(new ItemDto(ItemProtocol.item_pressCribX1_line, "压垛X1行", "DB1.W1100")); - list.add(new ItemDto(ItemProtocol.item_pressCribY1_row, "压垛Y1列", "DB1.W1102")); - list.add(new ItemDto(ItemProtocol.item_pressCribA1_angle, "压垛A1角度", "DB1.W1104")); - list.add(new ItemDto(ItemProtocol.item_pressCribX2_line, "压垛X2行", "DB1.W1106")); - list.add(new ItemDto(ItemProtocol.item_pressCribY2_row, "压垛Y2列", "DB1.W1108")); - list.add(new ItemDto(ItemProtocol.item_pressCribA2_angle, "压垛A2角度", "DB1.W1110")); - list.add(new ItemDto(ItemProtocol.item_pressCribX3_line, "压垛X3行", "DB1.W1112")); - list.add(new ItemDto(ItemProtocol.item_pressCribY3_row, "压垛Y3列", "DB1.W1114")); - list.add(new ItemDto(ItemProtocol.item_pressCribA3_angle, "压垛A3角度", "DB1.W1116")); - list.add(new ItemDto(ItemProtocol.item_Zoffset, "Z轴偏移", "DB1.W1118")); - list.add(new ItemDto(ItemProtocol.item_pallet_layerQty, "码垛层数", "DB1.W1120")); - list.add(new ItemDto(ItemProtocol.item_pressCrib_layerQty, "压垛层数", "DB1.W1122")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX1_interval, "码层X1间隔", "DB1.W1124")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY1_interval, "码层Y1间隔", "DB1.W1126")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX2_interval, "码层X2间隔", "DB1.W1128")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY2_interval, "码层Y2间隔", "DB1.W1130")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX3_interval, "码层X3间隔", "DB1.W1132")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY3_interval, "码层Y3间隔", "DB1.W1134")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX1_offset, "码层X1偏移", "DB1.W1136")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY1_offset, "码层Y1偏移", "DB1.W1138")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX2_offset, "码层X2偏移", "DB1.W1140")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY2_offset, "码层Y2偏移", "DB1.W1142")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX3_offset, "码层X3偏移", "DB1.W1144")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY3_offset, "码层Y3偏移", "DB1.W1146")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX1_interval, "压层X1间隔", "DB1.W1148")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY1_interval, "压层Y1间隔", "DB1.W1150")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX2_interval, "压层X2间隔", "DB1.W1152")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY2_interval, "压层Y2间隔", "DB1.W1154")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX3_interval, "压层X3间隔", "DB1.W1156")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY3_interval, "压层Y3间隔", "DB1.W1158")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX1_offset, "压层X1偏移", "DB1.W1160")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY1_offset, "压层Y1偏移", "DB1.W1162")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX2_offset, "压层X2偏移", "DB1.W1164")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY2_offset, "压层Y2偏移", "DB1.W1166")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX3_offset, "压层X3偏移", "DB1.W1168")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY3_offset, "压层Y3偏移", "DB1.W1170")); - list.add(new ItemDto(ItemProtocol.item_one_cribTotal, "1#垛总数", "DB1.W1172")); - list.add(new ItemDto(ItemProtocol.item_two_cribTotal, "2#垛总数", "DB1.W1174")); - list.add(new ItemDto(ItemProtocol.item_one_qty, "1#垛当前数", "DB1.W1176")); - list.add(new ItemDto(ItemProtocol.item_two_qty, "2#垛当前数", "DB1.W1178")); - list.add(new ItemDto(ItemProtocol.item_tool_coordinate, "工具坐标", "DB1.W1180")); - list.add(new ItemDto(ItemProtocol.item_order_qty, "工单数量", "DB1.D1182")); + list.add(new ItemDto(ItemProtocol.item_product_code, "产品编号", "DB13.W1066")); + list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB13.W1068")); + list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB13.W1070")); + list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB13.W1072")); + list.add(new ItemDto(ItemProtocol.item_Wthickness, "W厚度", "DB13.W1074")); + list.add(new ItemDto(ItemProtocol.item_tray_qty, "当前垛盘数", "DB13.W1076")); + list.add(new ItemDto(ItemProtocol.item_tray_high, "垛盘高度", "DB13.W1078")); + list.add(new ItemDto(ItemProtocol.item_crib_category, "垛型类别", "DB13.W1080")); + list.add(new ItemDto(ItemProtocol.item_palletX1_line, "码垛X1行", "DB13.W1082")); + list.add(new ItemDto(ItemProtocol.item_palletY1_row, "码垛Y1列", "DB13.W1084")); + list.add(new ItemDto(ItemProtocol.item_palletA1_angle, "码垛A1角度", "DB13.W1086")); + list.add(new ItemDto(ItemProtocol.item_palletX2_line, "码垛X2行", "DB13.W1088")); + list.add(new ItemDto(ItemProtocol.item_palletY2_row, "码垛Y2列", "DB13.W1090")); + list.add(new ItemDto(ItemProtocol.item_palletA2_angle, "码垛A2角度", "DB13.W1092")); + list.add(new ItemDto(ItemProtocol.item_palletX3_line, "码垛X3行", "DB13.W1094")); + list.add(new ItemDto(ItemProtocol.item_palletY3_row, "码垛Y3列", "DB13.W1096")); + list.add(new ItemDto(ItemProtocol.item_palletA3_angle, "码垛A3角度", "DB13.W1098")); + list.add(new ItemDto(ItemProtocol.item_pressCribX1_line, "压垛X1行", "DB13.W1100")); + list.add(new ItemDto(ItemProtocol.item_pressCribY1_row, "压垛Y1列", "DB13.W1102")); + list.add(new ItemDto(ItemProtocol.item_pressCribA1_angle, "压垛A1角度", "DB13.W1104")); + list.add(new ItemDto(ItemProtocol.item_pressCribX2_line, "压垛X2行", "DB13.W1106")); + list.add(new ItemDto(ItemProtocol.item_pressCribY2_row, "压垛Y2列", "DB13.W1108")); + list.add(new ItemDto(ItemProtocol.item_pressCribA2_angle, "压垛A2角度", "DB13.W1110")); + list.add(new ItemDto(ItemProtocol.item_pressCribX3_line, "压垛X3行", "DB13.W1112")); + list.add(new ItemDto(ItemProtocol.item_pressCribY3_row, "压垛Y3列", "DB13.W1114")); + list.add(new ItemDto(ItemProtocol.item_pressCribA3_angle, "压垛A3角度", "DB13.W1116")); + list.add(new ItemDto(ItemProtocol.item_Zoffset, "Z轴偏移", "DB13.W1118")); + list.add(new ItemDto(ItemProtocol.item_pallet_layerQty, "码垛层数", "DB13.W1120")); + list.add(new ItemDto(ItemProtocol.item_pressCrib_layerQty, "压垛层数", "DB13.W1122")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX1_interval, "码层X1间隔", "DB13.W1124")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY1_interval, "码层Y1间隔", "DB13.W1126")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX2_interval, "码层X2间隔", "DB13.W1128")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY2_interval, "码层Y2间隔", "DB13.W1130")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX3_interval, "码层X3间隔", "DB13.W1132")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY3_interval, "码层Y3间隔", "DB13.W1134")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX1_offset, "码层X1偏移", "DB13.W1136")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY1_offset, "码层Y1偏移", "DB13.W1138")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX2_offset, "码层X2偏移", "DB13.W1140")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY2_offset, "码层Y2偏移", "DB13.W1142")); + list.add(new ItemDto(ItemProtocol.item_codeLayerX3_offset, "码层X3偏移", "DB13.W1144")); + list.add(new ItemDto(ItemProtocol.item_codeLayerY3_offset, "码层Y3偏移", "DB13.W1146")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX1_interval, "压层X1间隔", "DB13.W1148")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY1_interval, "压层Y1间隔", "DB13.W1150")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX2_interval, "压层X2间隔", "DB13.W1152")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY2_interval, "压层Y2间隔", "DB13.W1154")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX3_interval, "压层X3间隔", "DB13.W1156")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY3_interval, "压层Y3间隔", "DB13.W1158")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX1_offset, "压层X1偏移", "DB13.W1160")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY1_offset, "压层Y1偏移", "DB13.W1162")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX2_offset, "压层X2偏移", "DB13.W1164")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY2_offset, "压层Y2偏移", "DB13.W1166")); + list.add(new ItemDto(ItemProtocol.item_pressLayerX3_offset, "压层X3偏移", "DB13.W1168")); + list.add(new ItemDto(ItemProtocol.item_pressLayerY3_offset, "压层Y3偏移", "DB13.W1170")); + list.add(new ItemDto(ItemProtocol.item_one_cribTotal, "1#垛总数", "DB13.W1172")); + list.add(new ItemDto(ItemProtocol.item_two_cribTotal, "2#垛总数", "DB13.W1174")); + list.add(new ItemDto(ItemProtocol.item_one_qty, "1#垛当前数", "DB13.W1176")); + list.add(new ItemDto(ItemProtocol.item_two_qty, "2#垛当前数", "DB13.W1178")); + list.add(new ItemDto(ItemProtocol.item_tool_coordinate, "工具坐标", "DB13.W1180")); + list.add(new ItemDto(ItemProtocol.item_order_qty, "工单数量", "DB13.D1182")); return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java index 4b0b8d5..75adc0a 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java @@ -836,7 +836,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe HttpResponse result = acsToWmsService.enterOrder(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); if (this.mode == 4) { @@ -1081,7 +1081,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); } } @@ -1169,7 +1169,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); } } @@ -1198,7 +1198,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && jsonObject.get("status").equals("200")) { + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { this.writing(this.mode); } } @@ -1234,7 +1234,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe public void writing(int command) { String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.ItemProtocol.item_to_command; + + "." + ItemProtocol.item_to_feedback; String opcservcerid = this.getDevice().getOpc_server_id(); Server server = ReadUtil.getServer(opcservcerid); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/ItemProtocol.java deleted file mode 100644 index e92763f..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/ItemProtocol.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.nl.acs.device_driver.machines_site; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_ioaction = "ioaction"; - public static String item_error = "error"; - public static String item_task = "task"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - public static String item_weight = "weight"; - - private MachinesSiteDeviceDriver driver; - - public ItemProtocol(MachinesSiteDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getIoaction() { - return this.getOpcIntegerValue(item_ioaction); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getToTarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getToTask() { - return this.getOpcIntegerValue(item_to_task); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - Boolean isonline; - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_ioaction, "取放信号", "DB600.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(item_task, "任务号", "DB600.D8")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB601.W4")); - list.add(new ItemDto(item_to_task, "任务号", "DB601.D8")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/MachinesSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/MachinesSiteDefination.java deleted file mode 100644 index 187d9ca..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/MachinesSiteDefination.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.nl.acs.device_driver.machines_site; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device_driver.standard_inspect_site.ItemProtocol; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 检测站点驱动定义 - * 说明：该站点为普通带光电检测站点 - */ -@Service -public class MachinesSiteDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "machines_site"; - } - - @Override - public String getDriverName() { - return "标准版-机台设备"; - } - - @Override - public String getDriverDescription() { - return "标准版-机台设备"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new MachinesSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return MachinesSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_ioaction, "取放信号", "DB600.B3")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB600.D8")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/MachinesSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/MachinesSiteDeviceDriver.java deleted file mode 100644 index 57c93cc..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/MachinesSiteDeviceDriver.java +++ /dev/null @@ -1,346 +0,0 @@ -package org.nl.acs.device_driver.machines_site; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 机台设备驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class MachinesSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - - int mode = 0; - int error = 0; - int move = 0; - int task = 0; - int ioaction = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - Boolean isonline = true; - int hasGoods = 0; - String message = null; - Boolean iserror = false; - - - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - boolean isFold = false; - private String assemble_check_tag; - - protected String current_stage_instruction_message; - protected String last_stage_instruction_message; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - //备注 - String remark; - //数量 - String qty; - //物料 - String material; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - //申请搬运任务 - private Boolean apply_handling = false; - //申请物料 - private Boolean apply_material = false; - - //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 - int flag; - - String device_code; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - error = this.itemProtocol.getError(); - task = this.itemProtocol.getTask(); - ioaction = this.itemProtocol.getIoaction(); - if (mode != last_mode) { - this.setRequireSucess(false); - } - if (move != last_move) { - } - if (error != last_error) { - } - - - } catch (Exception var17) { - return; - } - - if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - return; - case 2: - //申请任务 -// if (this.getApply_handling()) { -// String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString(); -// DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); -// Device link_device = appService.findDeviceByCode(link_device_code); -// StandardInspectSiteDeviceDriver standardInspectSiteDevicedriver; -// if(link_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { -// standardInspectSiteDevicedriver = (StandardInspectSiteDeviceDriver) link_device.getDeviceDriver(); -// if(standardInspectSiteDevicedriver.getMode() != 2){ -// log.debug("设备未待机"); -// return; -// } -// if(standardInspectSiteDevicedriver.getMove() != 0){ -// log.debug("设备不满足放货条件"); -// return; -// } -// -// //如果目标设备申请叫料 则允许生成任务 -// if(standardInspectSiteDevicedriver.getApply_material()){ -// TaskDto dto = new TaskDto(); -// String now = DateUtil.now(); -// dto.setTask_id(IdUtil.simpleUUID()); -// dto.setCreate_by(this.getDevice().getDevice_code()); -// dto.setUpdate_by(this.getDevice().getDevice_code()); -// dto.setStart_point_code(this.getDevice().getDevice_code()); -// -// String taskcode = CodeGenerateUtil.getNewCode("TASK_NO"); -// dto.setTask_code("-"+taskcode); -// dto.setTask_status("0"); -// dto.setPriority("101"); -// RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); -// String next_device_codecode = jo.getNext_device_code(); -// if(StrUtil.isEmpty(next_device_codecode)){ -// throw new RuntimeException("该设备未找到对应路由"); -// } -// dto.setNext_point_code(next_device_codecode); -// dto.setUpdate_time(now); -// dto.setCreate_time(now); -// -// WQLObject wo = WQLObject.getWQLObject("acs_task"); -// JSONObject json = (JSONObject) JSONObject.toJSON(dto); - -// wo.insert(json); -// standardInspectSiteDevicedriver.setApply_material(false); -// } -// } -// this.setApply_handling(false); -// } - - if (material.length() > 0 && qty.length() > 0 && !requireSucess) { - this.instruction_require(container); - } - } - - switch (flag) { - //取货完成 - case 1: - writing(2); - return; - //放货完成 - case 2: - writing(3); - return; - - } - last_mode = mode; - last_error = error; - last_move = move; - last_task = task; - } - - } - - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - protected void thingToNothing() { - log.debug("从有货到无货 清理数据"); - this.set_last_container(container, container_type_desc); - } - - public void set_last_container(String barcode, String type_desc) { - this.set_last_container(barcode); - this.set_last_container_type_desc(type_desc); - } - - public void set_last_container(String barcode) { - } - - public void set_last_container_type_desc(String type) { - } - - public boolean exe_business() { - return true; - } - - protected void executing(Instruction instruction) { - this.executing(1, instruction, ""); - } - - public void executing(int command, Instruction instruction, String appendMessage) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - if (appendMessage == null) { - appendMessage = ""; - } - if (instruction != null) { - instruction_num = Integer.parseInt(instruction.getInstruction_code()); - } - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, 1); - itemMap.put(to_task, instruction_num); - ReadUtil.write(itemMap, server); - - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - log.info("下发PLC信号：{},{}", to_command, command); - } - - public void writing(int type, int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - if (type == 1) { - itemMap.put(to_command, command); - } else if (type == 2) { - itemMap.put(to_target, command); - - } else if (type == 3) { - itemMap.put(to_task, command); - } - ReadUtil.write(itemMap, server); - - } - - public boolean instruction_require(String container_code) { - return instruction_require(container_code, WcsConfig.task_container_type_default_desc); - } - - /** - * 请求指令 - * - * @param container_code - * @param container_type - */ - public synchronized boolean instruction_require(String container_code, String container_type) { - return true; - } - - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/magic_agv/MagicAgvDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/magic_agv/MagicAgvDefination.java deleted file mode 100644 index afaba90..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/magic_agv/MagicAgvDefination.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.nl.acs.device_driver.magic_agv; - -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * 普通站点定义 - */ -@Service -public class MagicAgvDefination implements DeviceDriverDefination { - @Override - public String getDriverCode() { - return "magic_agv"; - } - - @Override - public String getDriverName() { - return "标准版-MagicAgv"; - } - - @Override - public String getDriverDescription() { - return "标准版-MagicAgv"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new MagicAgvDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return MagicAgvDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/magic_agv/MagicAgvDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/magic_agv/MagicAgvDeviceDriver.java deleted file mode 100644 index d712f20..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/magic_agv/MagicAgvDeviceDriver.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.nl.acs.device_driver.magic_agv; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.opc.Device; -import org.springframework.stereotype.Service; - -/** - * 普通站点 - */ -@Slf4j -@Service -public class MagicAgvDeviceDriver extends AbstractDeviceDriver implements DeviceDriver { - @Override - public Device getDevice() { - return null; - } - - @Override - public DeviceDriverDefination getDriverDefination() { - return null; - } - - @Override - public DeviceDriver setDriverDefination(DeviceDriverDefination var1) { - return null; - } - - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/manipulator_inspect_site_NDC/ManipulatorInspectSiteNDCDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/manipulator_inspect_site_NDC/ManipulatorInspectSiteNDCDefination.java deleted file mode 100644 index 9af54e7..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/manipulator_inspect_site_NDC/ManipulatorInspectSiteNDCDefination.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.nl.acs.device_driver.manipulator_inspect_site_NDC; - -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * 区域管制设备交互站点-NDC - */ -@Service -public class ManipulatorInspectSiteNDCDefination implements DeviceDriverDefination { - @Override - public String getDriverCode() { - return "manipulator_inspect_site_NDC"; - } - - @Override - public String getDriverName() { - return "区域管制站点-NDC"; - } - - @Override - public String getDriverDescription() { - return "区域管制站点-NDC"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new ManipulatorInspectSiteNDCDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return ManipulatorInspectSiteNDCDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/manipulator_inspect_site_NDC/ManipulatorInspectSiteNDCDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/manipulator_inspect_site_NDC/ManipulatorInspectSiteNDCDeviceDriver.java deleted file mode 100644 index 97e5b61..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/manipulator_inspect_site_NDC/ManipulatorInspectSiteNDCDeviceDriver.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.nl.acs.device_driver.manipulator_inspect_site_NDC; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; - - -/** - * 区域管制设备交互站点-NDC - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class ManipulatorInspectSiteNDCDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - String relevance_device_code; - - @Override - public void execute() { - } -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_inspect_site/NonLineInspectSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_inspect_site/NonLineInspectSiteDefination.java deleted file mode 100644 index b489f47..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_inspect_site/NonLineInspectSiteDefination.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.nl.acs.device_driver.non_line_inspect_site; - -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * 普通站点定义 - */ -@Service -public class NonLineInspectSiteDefination implements DeviceDriverDefination { - @Override - public String getDriverCode() { - return "non_line_inspect_site"; - } - - @Override - public String getDriverName() { - return "检测站点-无PLC"; - } - - @Override - public String getDriverDescription() { - return "检测站点-无PLC"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new NonLineInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return NonLineInspectSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_inspect_site/NonLineInspectSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_inspect_site/NonLineInspectSiteDeviceDriver.java deleted file mode 100644 index a1b6de7..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_inspect_site/NonLineInspectSiteDeviceDriver.java +++ /dev/null @@ -1,393 +0,0 @@ -package org.nl.acs.device_driver.non_line_inspect_site; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; -import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.springframework.beans.factory.annotation.Autowired; - -import java.math.BigDecimal; -import java.util.Date; - - -/** - * 检测站点-无PLC - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class NonLineInspectSiteDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - - Integer hasGoods = 0; - int error = 0; - Boolean iserror = false; - Boolean islock = false; - - int branchProtocol = 0; - int last_branchProtocol = 0; - //是否需要输入物料 - String input_material = "0"; - //备注 - String remark = ""; - //数量 - String qty = ""; - //批次 - String batch = ""; - //物料 - String material = ""; - //是否在线 - Boolean is_online = true; - //目标点位 - String purpose = ""; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - boolean requireSucess = false; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - //申请搬运任务 - private Boolean apply_handling = false; - //申请物料 - private Boolean apply_material = false; - - // 1取货完成 2放货完成 3进入区域 4离开区域 - private int flag; - - //人工确认信号 默认0 agv到达后请求置1 等人工确认后变为2 反馈agv后继续为0 - private int manua_confirm = 0; - - String devicecode; - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - - String message; - - int mode = 2; - - int move; - - int action; - - int ioaction; - - @Override - public void execute() { - hasGoods = this.getDevice().getHas_goods(); - material = this.getDevice().getMaterial_type(); - batch = this.getDevice().getBatch(); - devicecode = this.getDeviceCode(); - if (branchProtocol != last_branchProtocol) { - requireSucess = false; - } - switch (branchProtocol) { - case 1: - break; - //呼叫请求 - case 2: - if (material.length() > 0 && Integer.parseInt(this.getQty()) > 0 && !requireSucess) { - } - break; - //响应生成任务 - case 3: - if (material.length() > 0 && qty.length() > 0 && purpose.length() > 0 && !requireSucess) { - this.instruction_require(material, qty, this.getRemark(), purpose); - } - break; - //自动创建任务 叫料 - case 4: - if (!requireSucess) { - autoCreateTask(); - } - break; - //搬运空车、空托 - case 5: - if (!requireSucess) { - autoCreateEmptyPallet(); - } - break; - } - } - - public boolean instruction_require(String container_code) { - return instruction_require(container_code, WcsConfig.task_container_type_default_desc); - } - - - /** - * 自动创建任务 - * - * @return - */ - public synchronized boolean autoCreateTask() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); -// dto.setVehicle_code(container_code); -// dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - - String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); - JSONArray ja = routelineserver.queryNextLine(this.getDevice().getDevice_code(), plan_uuid); - - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int i = 0; i < ja.size(); i++) { - JSONObject jo = (JSONObject) ja.get(i); - next_device_code = jo.get("next_device_code").toString(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - NonLineInspectSiteDeviceDriver standardOrdinarySiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (NonLineInspectSiteDeviceDriver) nextdevice.getDeviceDriver(); - String maxTaskNum = WQLObject.getWQLObject("sys_param").query("code= 'onePointMaxTask' and is_active='1' ").uniqueResult(0).getString("value"); - - if (taskserver.checkAllowCreate(next_device_code) >= Integer.parseInt(maxTaskNum)) { - continue; - } - if (standardOrdinarySiteDeviceDriver.getHasGoods() == 0) { - break; - } - } - } - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - - - dto.setNext_point_code(next_device_code); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setIslock(true); - requireSucess = false; - branchProtocol = 0; - return true; - } - - } - - /** - * 自动创建搬运空车任务 - * - * @return - */ - public synchronized boolean autoCreateEmptyPallet() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - //存在空位才能执行 - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - dto.setRoute_plan_code("one"); - String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); - - JSONArray ja = routelineserver.queryNextLine(this.getDevice().getDevice_code(), plan_uuid); - - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int j = 0; j < ja.size(); j++) { - JSONObject jo = (JSONObject) ja.get(j); - next_device_code = jo.get("next_device_code").toString(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof SpecialOrdinarySiteDeviceDriver) { - specialOrdinarySiteDeviceDriver = (SpecialOrdinarySiteDeviceDriver) nextdevice.getDeviceDriver(); - String maxTaskNum = WQLObject.getWQLObject("sys_param").query("code= 'onePointMaxTask' and is_active='1' ").uniqueResult(0).getString("value"); - specialOrdinarySiteDeviceDriver.setIslock(true); - if (taskserver.checkAllowCreate(next_device_code) >= Integer.parseInt(maxTaskNum)) { - continue; - } - if (specialOrdinarySiteDeviceDriver.getMode() == 2 && specialOrdinarySiteDeviceDriver.getMove() == 0) { - break; - } - } - } - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - - dto.setNext_point_code(next_device_code); - dto.setUpdate_time(now); - dto.setCreate_time(now); - dto.setMaterial(material); - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setIslock(true); - requireSucess = false; - branchProtocol = 0; - return true; - } - } - - /** - * 请求任务 - * - * @param container_code - * @param container_type - */ - public synchronized boolean instruction_require(String container_code, String container_type) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(container_code); - dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_codecode); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - requireSucess = false; - branchProtocol = 0; - return true; - } - } - - /** - * 请求任务 - * - * @param - * @param - */ - public synchronized boolean instruction_require(String material, String qty, String remark, String purpose) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(""); - dto.setVehicle_type(""); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - dto.setMaterial(this.getMaterial()); - dto.setQuantity(new BigDecimal(this.getQty())); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - Device purposedevice = appService.findDeviceByCode(purpose); - NonLineInspectSiteDeviceDriver standardOrdinarySiteDeviceDriver = null; - if (purposedevice.getDeviceDriver() instanceof NonLineInspectSiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (NonLineInspectSiteDeviceDriver) purposedevice.getDeviceDriver(); - standardOrdinarySiteDeviceDriver.setBranchProtocol(0); - standardOrdinarySiteDeviceDriver.setPurpose(null); - standardOrdinarySiteDeviceDriver.setRemark(null); - } - dto.setNext_point_code(purpose); - dto.setUpdate_time(now); - dto.setCreate_time(now); - dto.setRemark(getRemark()); - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - last_branchProtocol = 2; - this.setBranchProtocol(0); - this.setRemark(null); - this.setPurpose(null); - this.setRequireSucess(true); - return true; - } - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_manipulator_inspect_site/NonLineManipulatorInspectSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_manipulator_inspect_site/NonLineManipulatorInspectSiteDefination.java deleted file mode 100644 index 1d42401..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_manipulator_inspect_site/NonLineManipulatorInspectSiteDefination.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.nl.acs.device_driver.non_line_manipulator_inspect_site; - -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * 普通站点定义 - */ -@Service -public class NonLineManipulatorInspectSiteDefination implements DeviceDriverDefination { - @Override - public String getDriverCode() { - return "non_line_manipulator_inspect_site"; - } - - @Override - public String getDriverName() { - return "区域管制设备交互站点-无PLC"; - } - - @Override - public String getDriverDescription() { - return "区域管制设备交互站点-无PLC"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new NonLineManipulatorInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return NonLineManipulatorInspectSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_manipulator_inspect_site/NonLineManipulatorInspectSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_manipulator_inspect_site/NonLineManipulatorInspectSiteDeviceDriver.java deleted file mode 100644 index 32c68b4..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/non_line_manipulator_inspect_site/NonLineManipulatorInspectSiteDeviceDriver.java +++ /dev/null @@ -1,393 +0,0 @@ -package org.nl.acs.device_driver.non_line_manipulator_inspect_site; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; -import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.springframework.beans.factory.annotation.Autowired; - -import java.math.BigDecimal; -import java.util.Date; - - -/** - * 区域管制站点-无PLC - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class NonLineManipulatorInspectSiteDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - - Integer hasGoods = 0; - int error = 0; - Boolean iserror = false; - Boolean islock = false; - - int branchProtocol = 0; - int last_branchProtocol = 0; - //是否需要输入物料 - String input_material = "0"; - //备注 - String remark = ""; - //数量 - String qty = ""; - //是否在线 - Boolean is_online = true; - //批次 - String batch = ""; - //物料 - String material = ""; - //目标点位 - String purpose = ""; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - boolean requireSucess = false; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - //申请搬运任务 - private Boolean apply_handling = false; - //申请物料 - private Boolean apply_material = false; - - // 1取货完成 2放货完成 3进入区域 4离开区域 - private int flag; - - //人工确认信号 默认0 agv到达后请求置1 等人工确认后变为2 反馈agv后继续为0 - private int manua_confirm = 0; - - String devicecode; - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - - String message; - - int mode = 2; - - int move; - - int action; - - int ioaction; - - @Override - public void execute() { - hasGoods = this.getDevice().getHas_goods(); - material = this.getDevice().getMaterial_type(); - batch = this.getDevice().getBatch(); - devicecode = this.getDeviceCode(); - if (branchProtocol != last_branchProtocol) { - requireSucess = false; - } - switch (branchProtocol) { - case 1: - break; - //呼叫请求 - case 2: - if (material.length() > 0 && Integer.parseInt(this.getQty()) > 0 && !requireSucess) { - } - break; - //响应生成任务 - case 3: - if (material.length() > 0 && qty.length() > 0 && purpose.length() > 0 && !requireSucess) { - this.instruction_require(material, qty, this.getRemark(), purpose); - } - break; - //自动创建任务 叫料 - case 4: - if (!requireSucess) { - autoCreateTask(); - } - break; - //搬运空车、空托 - case 5: - if (!requireSucess) { - autoCreateEmptyPallet(); - } - break; - } - } - - public boolean instruction_require(String container_code) { - return instruction_require(container_code, WcsConfig.task_container_type_default_desc); - } - - - /** - * 自动创建任务 - * - * @return - */ - public synchronized boolean autoCreateTask() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); -// dto.setVehicle_code(container_code); -// dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - - String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); - JSONArray ja = routelineserver.queryNextLine(this.getDevice().getDevice_code(), plan_uuid); - - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int i = 0; i < ja.size(); i++) { - JSONObject jo = (JSONObject) ja.get(i); - next_device_code = jo.get("next_device_code").toString(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - NonLineManipulatorInspectSiteDeviceDriver standardOrdinarySiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (NonLineManipulatorInspectSiteDeviceDriver) nextdevice.getDeviceDriver(); - String maxTaskNum = WQLObject.getWQLObject("sys_param").query("code= 'onePointMaxTask' and is_active='1' ").uniqueResult(0).getString("value"); - - if (taskserver.checkAllowCreate(next_device_code) >= Integer.parseInt(maxTaskNum)) { - continue; - } - if (standardOrdinarySiteDeviceDriver.getHasGoods() == 0) { - break; - } - } - } - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - - - dto.setNext_point_code(next_device_code); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setIslock(true); - requireSucess = false; - branchProtocol = 0; - return true; - } - - } - - /** - * 自动创建搬运空车任务 - * - * @return - */ - public synchronized boolean autoCreateEmptyPallet() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - //存在空位才能执行 - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - dto.setRoute_plan_code("one"); - String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); - - JSONArray ja = routelineserver.queryNextLine(this.getDevice().getDevice_code(), plan_uuid); - - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int j = 0; j < ja.size(); j++) { - JSONObject jo = (JSONObject) ja.get(j); - next_device_code = jo.get("next_device_code").toString(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof SpecialOrdinarySiteDeviceDriver) { - specialOrdinarySiteDeviceDriver = (SpecialOrdinarySiteDeviceDriver) nextdevice.getDeviceDriver(); - String maxTaskNum = WQLObject.getWQLObject("sys_param").query("code= 'onePointMaxTask' and is_active='1' ").uniqueResult(0).getString("value"); - specialOrdinarySiteDeviceDriver.setIslock(true); - if (taskserver.checkAllowCreate(next_device_code) >= Integer.parseInt(maxTaskNum)) { - continue; - } - if (specialOrdinarySiteDeviceDriver.getMode() == 2 && specialOrdinarySiteDeviceDriver.getMove() == 0) { - break; - } - } - } - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - - dto.setNext_point_code(next_device_code); - dto.setUpdate_time(now); - dto.setCreate_time(now); - dto.setMaterial(material); - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setIslock(true); - requireSucess = false; - branchProtocol = 0; - return true; - } - } - - /** - * 请求任务 - * - * @param container_code - * @param container_type - */ - public synchronized boolean instruction_require(String container_code, String container_type) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(container_code); - dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_codecode); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - requireSucess = false; - branchProtocol = 0; - return true; - } - } - - /** - * 请求任务 - * - * @param - * @param - */ - public synchronized boolean instruction_require(String material, String qty, String remark, String purpose) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(""); - dto.setVehicle_type(""); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - dto.setMaterial(this.getMaterial()); - dto.setQuantity(new BigDecimal(this.getQty())); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - Device purposedevice = appService.findDeviceByCode(purpose); - NonLineManipulatorInspectSiteDeviceDriver standardOrdinarySiteDeviceDriver = null; - if (purposedevice.getDeviceDriver() instanceof NonLineManipulatorInspectSiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (NonLineManipulatorInspectSiteDeviceDriver) purposedevice.getDeviceDriver(); - standardOrdinarySiteDeviceDriver.setBranchProtocol(0); - standardOrdinarySiteDeviceDriver.setPurpose(null); - standardOrdinarySiteDeviceDriver.setRemark(null); - } - dto.setNext_point_code(purpose); - dto.setUpdate_time(now); - dto.setCreate_time(now); - dto.setRemark(getRemark()); - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - last_branchProtocol = 2; - this.setBranchProtocol(0); - this.setRemark(null); - this.setPurpose(null); - this.setRequireSucess(true); - return true; - } - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/oumulong_plc/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/oumulong_plc/ItemProtocol.java deleted file mode 100644 index ece85be..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/oumulong_plc/ItemProtocol.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.nl.acs.device_driver.oumulong_plc; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_action = "action"; - public static String item_error = "error"; - public static String item_to_command = "to_command"; - - - private OumulongPlcDeviceDriver driver; - - public ItemProtocol(OumulongPlcDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error("读取错误!"); - } else { - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "D00000")); - list.add(new ItemDto(item_mode, "工作状态", "D00002", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "D00004")); - list.add(new ItemDto(item_error, "报警信号", "D00006")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "D00008", Boolean.valueOf(true))); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/oumulong_plc/OumulongPlcDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/oumulong_plc/OumulongPlcDefination.java deleted file mode 100644 index 84b3ecf..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/oumulong_plc/OumulongPlcDefination.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.nl.acs.device_driver.oumulong_plc; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 自动门驱动定义 - */ -@Service -public class OumulongPlcDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "oumulong_plc"; - } - - @Override - public String getDriverName() { - return "标准版-自动门-欧姆龙plc"; - } - - @Override - public String getDriverDescription() { - return "标准版-自动门-欧姆龙plc"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new OumulongPlcDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return OumulongPlcDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "D00000")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "D00002", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "D00004")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "D00006")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/oumulong_plc/OumulongPlcDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/oumulong_plc/OumulongPlcDeviceDriver.java deleted file mode 100644 index 56536b2..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/oumulong_plc/OumulongPlcDeviceDriver.java +++ /dev/null @@ -1,162 +0,0 @@ -package org.nl.acs.device_driver.oumulong_plc; - -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * 自动门驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class OumulongPlcDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - String devicecode; - int mode = 0; - int action = 0; - int error = 0; - Boolean iserror = false; - - int move = 0; - int task = 0; - int last_action = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - protected boolean hasGoods = false; - boolean isFold = false; - private String assemble_check_tag; - private Boolean sampleMode0; - private Boolean sampleMode3; - private Integer sampleError; - private Boolean sampleOnline; - protected String displayMessage = null; - public int display_message_time_out = 30000; - public Date display_message_time; - protected String current_stage_instruction_message; - protected String last_stage_instruction_message; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - - String device_code = this.getDevice().getDevice_code(); - mode = this.itemProtocol.getMode(); - action = this.itemProtocol.getAction(); - error = this.itemProtocol.getError(); - if (mode != last_mode) { - } - if (action != last_action) { - } - if (error != last_error) { - } - last_action = action; - last_mode = mode; - last_error = error; - //message = StringFormatUtl.format("设备报警:{}", new Object[]{}); - -// String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString(); - - } - - public synchronized String getStatus() { - JSONObject jo = new JSONObject(); - - if (action == 1) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "OPEN"); - - } else if (action == 2) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "CLOSE"); - - } else { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "ERROR"); - } - return jo.toString(); - } - - - public void writeing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - log.info("下发PLC信号：{},{}", to_command, command); - System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command); - - } - - public synchronized void OpenOrClose(String type) { - - //开门 - if ("1".equals(type)) { - writeing(1); - } else { - writeing(2); - } - - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java index bd81d1b..c1317a0 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java @@ -45,7 +45,7 @@ public class ItemProtocol { public int getOpcIntegerValue(String protocol) { Integer value = this.driver.getIntegeregerValue(protocol); if (value == null) { - log.error("读取错误!"); + } else { return value; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/ItemProtocol.java deleted file mode 100644 index 0ba497e..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/ItemProtocol.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.nl.acs.device_driver.standard_manipulator_inspect_site; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_move = "move"; - public static String item_action = "action"; - public static String item_ioaction = "ioaction"; - public static String item_error = "error"; - public static String item_task = "task"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - - - Boolean isonline; - - private StandardManipulatorInspectSiteDeviceDriver driver; - - public ItemProtocol(StandardManipulatorInspectSiteDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getMove() { - return this.getOpcIntegerValue(item_move); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getIoAction() { - return this.getOpcIntegerValue(item_ioaction); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getToTarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getToTask() { - return this.getOpcIntegerValue(item_to_task); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB600.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB600.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(item_task, "任务号", "DB600.D8")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB601.W4")); - list.add(new ItemDto(item_to_task, "任务号", "DB601.D8")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/StandardManipulatorInspectSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/StandardManipulatorInspectSiteDefination.java deleted file mode 100644 index e58de97..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/StandardManipulatorInspectSiteDefination.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.nl.acs.device_driver.standard_manipulator_inspect_site; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 机械手站点驱动定义 - * 说明：该站点为需要进行区域管制交互时使用 - */ -@Service -public class StandardManipulatorInspectSiteDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "standard_manipulator_inspect_site"; - } - - @Override - public String getDriverName() { - return "标准版-区域管制设备-检测站点"; - } - - @Override - public String getDriverDescription() { - return "标准版-区域管制设备-检测站点"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new StandardManipulatorInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return StandardManipulatorInspectSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "DB600.B3")); - list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB600.B4")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB600.D8")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/StandardManipulatorInspectSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/StandardManipulatorInspectSiteDeviceDriver.java deleted file mode 100644 index 96c2835..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/StandardManipulatorInspectSiteDeviceDriver.java +++ /dev/null @@ -1,538 +0,0 @@ -package org.nl.acs.device_driver.standard_manipulator_inspect_site; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; -import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 区域管制设备交互站点驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class StandardManipulatorInspectSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - String devicecode; - int mode = 0; - int error = 0; - int move = 0; - int actoin; - int io_action; - int task = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - Boolean isonline = true; - int hasGoods = 0; - Boolean iserror = false; - - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - boolean isFold = false; - private String assemble_check_tag; - private Boolean sampleMode0; - private Boolean sampleMode3; - private Integer sampleError; - private Boolean sampleOnline; - protected String displayMessage = null; - public int display_message_time_out = 30000; - public Date display_message_time; - protected String current_stage_instruction_message; - protected String last_stage_instruction_message; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out = 3000; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int heartbeat; - int last_heartbeat; - private Date checkHeartbeattime = new Date(); - private Date last_checkHeartbeattime = new Date(); - - - int branchProtocol = 0; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - String message; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - String device_code = this.getDeviceCode(); - - mode = this.itemProtocol.getMode(); - error = this.itemProtocol.getError(); - move = this.itemProtocol.getMove(); - task = this.itemProtocol.getTask(); - hasGoods = this.itemProtocol.getMove(); - io_action = this.itemProtocol.getIoAction(); - actoin = this.itemProtocol.getAction(); - - if (mode != last_mode) { - this.setRequireSucess(false); - } - if (move != last_move) { - if (move == 0) { - thingToNothing(); - } - } - if (error != last_error) { - } - - } catch (Exception var17) { - return; - } - - //急停 - if (this.isStop()) { - - //未在线无心跳 - } else if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - break; - case 2: - break; - case 3: - //申请空盘 - if (!requireSucess && this.move == 0) { - applyEmpty(); - } - break; - case 4: - //申请搬运任务 - if (!requireSucess && this.move != 0) { - autoCreateTask(); - } - break; - case 5: - break; - } - } - - last_mode = mode; - last_error = error; - last_move = move; - last_task = task; - } - - /** - * 生成搬运任务 - * - * @return - */ - public synchronized boolean autoCreateTask() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setStart_device_code(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - - String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); - JSONArray ja = routelineserver.queryNextLine(this.getDevice().getDevice_code(), plan_uuid); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int i = 0; i < ja.size(); i++) { - JSONObject jo = (JSONObject) ja.get(i); - next_device_code = jo.get("next_device_code").toString(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) nextdevice.getDeviceDriver(); - String maxTaskNum = WQLObject.getWQLObject("sys_param").query("code= 'onePointMaxTask' and is_active='1' ").uniqueResult(0).getString("value"); - - if (taskserver.checkAllowCreate(next_device_code) >= Integer.parseInt(maxTaskNum)) { - next_device_code = ""; - continue; - } - if (standardInspectSiteDeviceDriver.getMode() == 2 && standardInspectSiteDeviceDriver.getMove() == 0) { - break; - } - } - } - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_code); - dto.setNext_device_code(next_device_code); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - try { - taskserver.create(dto); - } catch (Exception e) { - e.printStackTrace(); - } - this.setRequireSucess(true); - return true; - } - - } - - - public synchronized boolean applyEmpty() { - - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String start_device_code = ""; - String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); - - JSONArray ja = routelineserver.querySuperiorLine(this.getDevice().getDevice_code(), plan_uuid); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int i = 0; i < ja.size(); i++) { - JSONObject jo = (JSONObject) ja.get(i); - start_device_code = jo.get("device_code").toString(); - Device start_device = appService.findDeviceByCode(start_device_code); - StandardEmptyPalletSiteDeviceDriver standardEmptyPalletSiteDeviceDriver; - if (start_device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) { - standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) start_device.getDeviceDriver(); - //根据路由 寻找取空盘的设备 -// if(standardEmptyPalletSiteDeviceDriver.getNumber() < Integer.parseInt(standardEmptyPalletSiteDeviceDriver.getDevice().getExtraValue().get("max_emptypalletnum").toString()) ) { -// break; -// } - if (standardEmptyPalletSiteDeviceDriver.getMode() == 2 && standardEmptyPalletSiteDeviceDriver.getNumber() > 0) { - break; - } - } - } - dto.setTask_type("1"); - dto.setEmptypallet_num("1"); - dto.setNext_device_code(this.getDevice().getDevice_code()); - dto.setNext_point_code(this.getDevice().getDevice_code()); - dto.setStart_point_code(start_device_code); - dto.setStart_device_code(start_device_code); - if (StrUtil.isEmpty(start_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - try { - taskserver.create(dto); - } catch (Exception e) { - e.printStackTrace(); - } - this.setRequireSucess(true); - this.setBranchProtocol(0); - return true; - } - } - - public void finish_instruction(Instruction instruction) throws Exception { - instruction_finished(instruction); - } - - /** - * 完成指令 - * - * @param instruction - * @return - */ - public boolean instruction_finished(Instruction instruction) throws Exception { - Date date = new Date(); - if (date.getTime() - this.instruction_finished_time.getTime() < (long) this.instruction_finished_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_finished_time_out); - return false; - } else { - instructionService.finish(instruction.getInstruction_id()); - this.instruction_finished_time = date; - return true; - } - } - - /** - * 完成并创建下一条指令 - * - * @param instruction - * @param needCreateNext - * @return - */ - public boolean instruction_finished(Instruction instruction, boolean needCreateNext) { - Date date = new Date(); - if (date.getTime() - this.instruction_finished_time.getTime() < (long) this.instruction_finished_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_finished_time_out); - return false; - } else { - this.instruction_finished_time = date; - return true; - } - } - - - private Instruction findInstruction() { - Instruction instruction = null; - if (this.instruction_num != 0) { - instruction = (Instruction) instructionService.findByCodeFromCache(String.valueOf(instruction_num)); - } - if (instruction != null) { - //可进行校验 - - - } else { - List container_instructions = new ArrayList(); - String barcode = this.getLast_container(); - - if (!StrUtil.isEmpty(barcode)) { - Map map = new HashMap(); - map.put("vehicle_code", barcode); - container_instructions = instructionService.queryAll(map); - } - - if (((List) container_instructions).size() > 1) { - log.debug("容器存在多个指令"); - } else { - if (((List) container_instructions).size() > 0) { - instruction = (Instruction) ((List) container_instructions).get(0); - } - } - } - return instruction; - } - - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - protected void thingToNothing() { - log.debug("从有货到无货 清理数据"); - this.set_last_container(container, container_type_desc); - this.setRequireSucess(false); - } - - public void set_last_container(String barcode, String type_desc) { - this.set_last_container(barcode); - this.set_last_container_type_desc(type_desc); - } - - public void set_last_container(String barcode) { - } - - public void set_last_container_type_desc(String type) { - } - - public boolean exe_business() { - return true; - } - - protected void executing(Instruction instruction) { - this.executing(1, instruction, ""); - } - - public void executing(int command, Instruction instruction, String appendMessage) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - if (appendMessage == null) { - appendMessage = ""; - } - if (instruction != null) { - instruction_num = Integer.parseInt(instruction.getInstruction_code()); - } - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, 1); - itemMap.put(to_task, instruction_num); - ReadUtil.write(itemMap, server); - - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - - public boolean instruction_require(String container_code) { - return instruction_require(container_code, WcsConfig.task_container_type_default_desc); - } - - /** - * 请求指令 - * - * @param container_code - * @param container_type - */ - public synchronized boolean instruction_require(String container_code, String container_type) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(container_code); - dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_codecode); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - requireSucess = false; - return true; - } - } - - public void writing(int type, int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - if (type == 1) { - itemMap.put(to_command, command); - } else if (type == 2) { - itemMap.put(to_target, command); - - } else if (type == 3) { - itemMap.put(to_task, command); - } - ReadUtil.write(itemMap, server); - - } - - public String toString() { - return ""; - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/ItemProtocol.java deleted file mode 100644 index 08e9cbe..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/ItemProtocol.java +++ /dev/null @@ -1,123 +0,0 @@ -package org.nl.acs.device_driver.standard_manipulator_stacking_site; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_move = "move"; - public static String item_action = "action"; - public static String item_ioaction = "ioaction"; - public static String item_container_type = "container_type"; - public static String item_error = "error"; - public static String item_task = "task"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - public static String item_to_container_type = "to_container_type"; - Boolean isonline; - - private StandardManipulatorStackingSiteDeviceDriver driver; - - public ItemProtocol(StandardManipulatorStackingSiteDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getMove() { - return this.getOpcIntegerValue(item_move); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getIoAction() { - return this.getOpcIntegerValue(item_ioaction); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getToTarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getToTask() { - return this.getOpcIntegerValue(item_to_task); - } - - public int getToContainerType() { - return this.getOpcIntegerValue(item_to_container_type); - } - - public int getContainerType() { - return this.getOpcIntegerValue(item_container_type); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB600.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB600.B4")); - list.add(new ItemDto(item_container_type, "托盘类型", "DB600.B5")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(item_task, "任务号", "DB600.D8")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB601.W4")); - list.add(new ItemDto(item_to_container_type, "下发托盘类型", "DB601.W6")); - list.add(new ItemDto(item_to_task, "任务号", "DB601.D8")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDefination.java deleted file mode 100644 index e522ef8..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDefination.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.nl.acs.device_driver.standard_manipulator_stacking_site; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 机械手码垛驱动（区分托盘类型） - */ -@Service -public class StandardManipulatorStackingSiteDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "standard_manipulator_stacking_site"; - } - - @Override - public String getDriverName() { - return "机械手码垛驱动（区分托盘类型）"; - } - - @Override - public String getDriverDescription() { - return "机械手码垛驱动（区分托盘类型）"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new StandardManipulatorStackingSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - } - - @Override - public Class getDeviceDriverType() { - return StandardManipulatorStackingSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "DB600.B3")); - list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB600.B4")); - list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB600.B5")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB600.D8")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java deleted file mode 100644 index ed2f339..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java +++ /dev/null @@ -1,977 +0,0 @@ -package org.nl.acs.device_driver.standard_manipulator_stacking_site; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.standard_photoelectric_inspect_site.StandardPhotoelectricInspectSiteDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; -import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 机械手码垛驱动（区分托盘类型） - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - - - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - - - String device_code; - int mode = 0; - int error = 0; - int move = 0; - int action; - int io_action; - int task = 0; - int container_type = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - int last_container_type; - Boolean isonline = true; - int hasGoods = 0; - Boolean iserror = false; - - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - boolean isFold = false; - private String assemble_check_tag; - private Boolean sampleMode0; - private Boolean sampleMode3; - private Integer sampleError; - private Boolean sampleOnline; - protected String displayMessage = null; - public int display_message_time_out = 30000; - public Date display_message_time; - protected String current_stage_instruction_message; - protected String last_stage_instruction_message; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out = 3000; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int heartbeat; - int last_heartbeat; - private Date checkHeartbeattime = new Date(); - private Date last_checkHeartbeattime = new Date(); - - int branchProtocol = 0; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - String message; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - device_code = this.getDeviceCode(); - - mode = this.itemProtocol.getMode(); - error = this.itemProtocol.getError(); - move = this.itemProtocol.getMove(); - task = this.itemProtocol.getTask(); - container_type = this.itemProtocol.getContainerType(); - hasGoods = this.itemProtocol.getMove(); - action = this.itemProtocol.getAction(); - io_action = this.itemProtocol.getIoAction(); - - if (mode != last_mode) { - this.setRequireSucess(false); - } - if (move != last_move) { - thingToNothing(); - } - if (error != last_error) { - } - if (container_type != last_container_type) { - } - - } catch (Exception var17) { - return; - } - - //急停 - if (this.isStop()) { - - //未在线无心跳 - } else if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - break; - case 2: - - break; - case 3: - - break; - case 4: - //待机 - if (!requireSucess && this.move == 0 && this.container_type != 0) { - standby(); - } - break; - case 5: - //申请空盘 - if (!requireSucess && this.move == 0 && this.container_type != 0) { - applyEmpty(); - } - break; - case 6: - //申请入库（满托入窑） - if (!requireSucess && this.move != 0 && this.container_type != 0) { - applyEnter(); - } - break; - case 7: - //换盘去应急位 - if (!requireSucess && this.move != 0 && this.container_type != 0) { - emergency(); - } - break; - case 8: - //换盘去托盘库 - if (!requireSucess && this.move != 0 && this.container_type != 0) { - trayLibrary(); - } - break; - case 9: - //入托盘 - if (!requireSucess && this.move != 0 && this.container_type != 0) { - intoTray(); - } - break; - } - } - - last_mode = mode; - last_error = error; - last_move = move; - last_task = task; - last_container_type = container_type; - } - - - protected void thingToNothing() throws Exception { - this.setRequireSucess(false); - } - - /** - * 待机 - * - * @return - */ - public synchronized boolean standby() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - - dto.setTask_status("0"); - dto.setPriority("101"); - String device_code = ""; - StandardPhotoelectricInspectSiteDeviceDriver standardPhotoelectricInspectSiteDeviceDriver; - List list = routelineserver.getPathLinesByCode(this.device_code, "normal"); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - - for (int i = 0; i < list.size(); i++) { - RouteLineDto routeLineDto = list.get(i); - device_code = routeLineDto.getDevice_code(); - Device device = appService.findDeviceByCode(device_code); - if (device.getDeviceDriver() instanceof StandardPhotoelectricInspectSiteDeviceDriver) { - standardPhotoelectricInspectSiteDeviceDriver = (StandardPhotoelectricInspectSiteDeviceDriver) device.getDeviceDriver(); - if (this.container_type == standardPhotoelectricInspectSiteDeviceDriver.getContainer_type() - && standardPhotoelectricInspectSiteDeviceDriver.getMove() != 0 - && standardPhotoelectricInspectSiteDeviceDriver.getPriority() == 1 - && ObjectUtil.isEmpty(taskserver.findByNextCode(this.device_code)) - && ObjectUtil.isEmpty(taskserver.findByStartCode(device_code)) - && standardPhotoelectricInspectSiteDeviceDriver.getMode() != 0) { - break; - } else { - device_code = ""; - } - } else { - device_code = ""; - } - } - if (StrUtil.isEmpty(device_code)) { - for (int i = 0; i < list.size(); i++) { - RouteLineDto routeLineDto = list.get(i); - device_code = routeLineDto.getDevice_code(); - Device device = appService.findDeviceByCode(device_code); - if (device.getDeviceDriver() instanceof StandardPhotoelectricInspectSiteDeviceDriver) { - standardPhotoelectricInspectSiteDeviceDriver = (StandardPhotoelectricInspectSiteDeviceDriver) device.getDeviceDriver(); - if (standardPhotoelectricInspectSiteDeviceDriver.getMove() != 0 - && this.container_type == standardPhotoelectricInspectSiteDeviceDriver.getContainer_type() - && ObjectUtil.isEmpty(taskserver.findByNextCode(this.device_code)) - && ObjectUtil.isEmpty(taskserver.findByStartCode(device_code)) - && standardPhotoelectricInspectSiteDeviceDriver.getMode() != 0) { - break; - } else { - device_code = ""; - } - } else { - device_code = ""; - } - } - } - if (StrUtil.isEmpty(device_code)) { - for (int i = 0; i < list.size(); i++) { - RouteLineDto routeLineDto = list.get(i); - device_code = routeLineDto.getDevice_code(); - Device device = appService.findDeviceByCode(device_code); - StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver; - if (device.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { - standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) device.getDeviceDriver(); - if (standardManipulatorStackingSiteDeviceDriver.getMove() != 0 - && this.container_type == 4 - && standardManipulatorStackingSiteDeviceDriver.getContainer_type() == 4 - && ObjectUtil.isEmpty(taskserver.findByNextCode(this.device_code)) - && ObjectUtil.isEmpty(taskserver.findByStartCode(device_code)) - && standardManipulatorStackingSiteDeviceDriver.getMode() != 0) { - break; - } else { - device_code = ""; - } - } else { - device_code = ""; - } - } - } - - if (StrUtil.isEmpty(device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - - dto.setStart_point_code(device_code); - dto.setStart_device_code(device_code); - dto.setNext_point_code(this.device_code); - dto.setNext_device_code(this.device_code); - dto.setVehicle_type(String.valueOf(this.container_type)); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setRequireSucess(true); - return true; - } - } - - /** - * 生成搬运任务 - * - * @return - */ - public synchronized boolean autoCreateTask() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - String plan_uuid = WQLObject.getWQLObject("acs_route_plan").query("plan_code= '" + dto.getRoute_plan_code() + "'").uniqueResult(0).getString("plan_uuid"); - JSONArray ja = routelineserver.queryNextLine(this.getDevice().getDevice_code(), plan_uuid); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int i = 0; i < ja.size(); i++) { - JSONObject jo = (JSONObject) ja.get(i); - next_device_code = jo.get("next_device_code").toString(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { - standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) nextdevice.getDeviceDriver(); - String maxTaskNum = WQLObject.getWQLObject("sys_param").query("code= 'onePointMaxTask' and is_active='1' ").uniqueResult(0).getString("value"); - - if (taskserver.checkAllowCreate(next_device_code) >= Integer.parseInt(maxTaskNum)) { - next_device_code = ""; - continue; - } - if (standardManipulatorStackingSiteDeviceDriver.getMode() == 2 - && standardManipulatorStackingSiteDeviceDriver.getMove() == 0) { - break; - } - } - } - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setStart_point_code(this.device_code); - dto.setStart_device_code(this.device_code); - dto.setNext_point_code(next_device_code); - dto.setNext_device_code(next_device_code); - dto.setVehicle_type(String.valueOf(this.container_type)); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setRequireSucess(true); - return true; - } - - } - - /** - * 生成空盘 - * - * @return - */ - public synchronized boolean applyEmpty() { - //device_code - - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String start_device_code = ""; - List list = routelineserver.getPathLinesByCode(this.device_code, "normal"); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - for (int i = 0; i < list.size(); i++) { - RouteLineDto routeLineDto = list.get(i); - start_device_code = routeLineDto.getDevice_code(); - Device startdevice = appService.findDeviceByCode(start_device_code); - StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver; - if (startdevice.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { - standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) startdevice.getDeviceDriver(); - if (this.container_type == standardManipulatorStackingSiteDeviceDriver.getContainer_type() - && standardManipulatorStackingSiteDeviceDriver.getMode() != 0 - && standardManipulatorStackingSiteDeviceDriver.move != 0 - && ObjectUtil.isEmpty(taskserver.findByNextCode(start_device_code)) - && ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code))) { - break; - } else { - start_device_code = ""; - } - } else { - start_device_code = ""; - } - - } - if (StrUtil.isEmpty(start_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setStart_point_code(start_device_code); - dto.setStart_device_code(start_device_code); - dto.setNext_point_code(this.getDevice().getDevice_code()); - dto.setNext_device_code(this.getDevice().getDevice_code()); - dto.setVehicle_type(String.valueOf(this.container_type)); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setRequireSucess(true); - return true; - } - } - - /** - * 申请入库 - * - * @return - */ - public synchronized boolean applyEnter() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - List list = routelineserver.getShortPathLinesByCode(this.device_code, "normal"); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - - for (int i = 0; i < list.size(); i++) { - RouteLineDto routeLineDto = list.get(i); - next_device_code = routeLineDto.getNext_device_code(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { - standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) nextdevice.getDeviceDriver(); - if (this.container_type == standardManipulatorStackingSiteDeviceDriver.getContainer_type() - && StrUtil.equals(standardManipulatorStackingSiteDeviceDriver.getDevice().getExtraValue().get("priority_storage").toString(), "true") - && standardManipulatorStackingSiteDeviceDriver.move == 0 - && ObjectUtil.isEmpty(taskserver.findByNextCode(next_device_code)) - && ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code)) - && standardManipulatorStackingSiteDeviceDriver.getMode() != 0) { - break; - } else { - next_device_code = ""; - } - } else { - next_device_code = ""; - } - } - if (StrUtil.isEmpty(next_device_code)) { - for (int i = 0; i < list.size(); i++) { - RouteLineDto routeLineDto = list.get(i); - next_device_code = routeLineDto.getNext_device_code(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - StandardPhotoelectricInspectSiteDeviceDriver standardPhotoelectricInspectSiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardPhotoelectricInspectSiteDeviceDriver) { - standardPhotoelectricInspectSiteDeviceDriver = (StandardPhotoelectricInspectSiteDeviceDriver) nextdevice.getDeviceDriver(); - if (standardPhotoelectricInspectSiteDeviceDriver.getMode() == 2 - && standardPhotoelectricInspectSiteDeviceDriver.getMove() == 0 - && ObjectUtil.isEmpty(taskserver.findByNextCode(next_device_code)) - && ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code)) - && standardPhotoelectricInspectSiteDeviceDriver.getMode() != 0) { - break; - } else { - next_device_code = ""; - } - } else { - next_device_code = ""; - } - } - } - - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setStart_point_code(this.device_code); - dto.setStart_device_code(this.device_code); - dto.setNext_point_code(next_device_code); - dto.setNext_device_code(next_device_code); - dto.setVehicle_type(String.valueOf(this.container_type)); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setRequireSucess(true); - return true; - } - } - - /** - * 换盘去应急位 - */ - public synchronized Boolean emergency() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - List list = routelineserver.getShortPathLinesByCode(this.device_code, "normal"); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - - for (int i = 0; i < list.size(); i++) { - RouteLineDto routeLineDto = list.get(i); - next_device_code = routeLineDto.getNext_device_code(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { - standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) nextdevice.getDeviceDriver(); - if (this.container_type == standardManipulatorStackingSiteDeviceDriver.getContainer_type() - && StrUtil.equals(standardManipulatorStackingSiteDeviceDriver.getDevice().getExtraValue().get("emergency").toString(), "true") - && standardManipulatorStackingSiteDeviceDriver.move == 0 - && standardManipulatorStackingSiteDeviceDriver.getMode() != 0) { - if (ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code)) - && ObjectUtil.isEmpty(taskserver.findByNextCode(next_device_code))) { - break; - } else { - throw new RuntimeException("货位已满"); - } - }else { - next_device_code = ""; - } - } - } - - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setStart_point_code(this.device_code); - dto.setStart_device_code(this.device_code); - dto.setNext_point_code(next_device_code); - dto.setNext_device_code(next_device_code); - dto.setVehicle_type(String.valueOf(this.container_type)); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setRequireSucess(true); - return true; - } - } - - /** - * 换盘去托盘库 - * - * @return - */ - public synchronized Boolean trayLibrary() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - List list = routelineserver.getShortPathLinesByCode(this.device_code, "normal"); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - - for (int i = 0; i < list.size(); i++) { - RouteLineDto routeLineDto = list.get(i); - next_device_code = routeLineDto.getNext_device_code(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { - standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) nextdevice.getDeviceDriver(); - if (this.container_type == standardManipulatorStackingSiteDeviceDriver.getContainer_type() - && StrUtil.equals(standardManipulatorStackingSiteDeviceDriver.getDevice().getExtraValue().get("tray_library").toString(), "true") - && standardManipulatorStackingSiteDeviceDriver.move == 0 - && ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code)) - && ObjectUtil.isEmpty(taskserver.findByNextCode(next_device_code)) - && standardManipulatorStackingSiteDeviceDriver.getMode() != 0) { - break; - } else { - next_device_code = ""; - } - } else { - next_device_code = ""; - } - } - - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setStart_point_code(this.device_code); - dto.setStart_device_code(this.device_code); - dto.setNext_point_code(next_device_code); - dto.setNext_device_code(next_device_code); - dto.setVehicle_type(String.valueOf(this.container_type)); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setRequireSucess(true); - return true; - } - } - - /** - * 入托盘库 - * - * @return - */ - public synchronized boolean intoTray() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setTask_status("0"); - dto.setPriority("101"); - String next_device_code = ""; - List list = routelineserver.getShortPathLinesByCode(this.device_code, "normal"); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - - for (int i = 0; i < list.size(); i++) { - RouteLineDto routeLineDto = list.get(i); - next_device_code = routeLineDto.getNext_device_code(); - Device nextdevice = appService.findDeviceByCode(next_device_code); - StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver; - if (nextdevice.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { - standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) nextdevice.getDeviceDriver(); - if (this.container_type == standardManipulatorStackingSiteDeviceDriver.getContainer_type() - && standardManipulatorStackingSiteDeviceDriver.getMove() == 0 - && ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code)) - && ObjectUtil.isEmpty(taskserver.findByNextCode(next_device_code)) - && standardManipulatorStackingSiteDeviceDriver.getMode() != 0) { - break; - } else { - next_device_code = ""; - } - } else { - next_device_code = ""; - } - } - - if (StrUtil.isEmpty(next_device_code)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setStart_point_code(this.device_code); - dto.setStart_device_code(this.device_code); - dto.setNext_point_code(next_device_code); - dto.setNext_device_code(next_device_code); - dto.setVehicle_type(String.valueOf(this.container_type)); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - this.setRequireSucess(true); - return true; - } - } - - public void finish_instruction(Instruction instruction) throws Exception { - instruction_finished(instruction); - } - - /** - * 完成指令 - * - * @param instruction - * @return - */ - public boolean instruction_finished(Instruction instruction) throws Exception { - Date date = new Date(); - if (date.getTime() - this.instruction_finished_time.getTime() < (long) this.instruction_finished_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_finished_time_out); - return false; - } else { - instructionService.finish(instruction.getInstruction_id()); - this.instruction_finished_time = date; - return true; - } - } - - /** - * 完成并创建下一条指令 - * - * @param instruction - * @param needCreateNext - * @return - */ - public boolean instruction_finished(Instruction instruction, boolean needCreateNext) { - Date date = new Date(); - if (date.getTime() - this.instruction_finished_time.getTime() < (long) this.instruction_finished_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_finished_time_out); - return false; - } else { - this.instruction_finished_time = date; - return true; - } - } - - - private Instruction findInstruction() { - Instruction instruction = null; - if (this.instruction_num != 0) { - instruction = (Instruction) instructionService.findByCodeFromCache(String.valueOf(instruction_num)); - } - if (instruction != null) { - //可进行校验 - - - } else { - List container_instructions = new ArrayList(); - String barcode = this.getLast_container(); - - if (!StrUtil.isEmpty(barcode)) { - Map map = new HashMap(); - map.put("vehicle_code", barcode); - container_instructions = instructionService.queryAll(map); - } - - if (((List) container_instructions).size() > 1) { - log.debug("容器存在多个指令"); - } else { - if (((List) container_instructions).size() > 0) { - instruction = (Instruction) ((List) container_instructions).get(0); - } - } - } - return instruction; - } - - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - public void set_last_container(String barcode, String type_desc) { - this.set_last_container(barcode); - this.set_last_container_type_desc(type_desc); - } - - public void set_last_container(String barcode) { - } - - public void set_last_container_type_desc(String type) { - } - - public boolean exe_business() { - return true; - } - - protected void executing(Instruction instruction) { - this.executing(1, instruction, ""); - } - - public void executing(int command, Instruction instruction, String appendMessage) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - if (appendMessage == null) { - appendMessage = ""; - } - if (instruction != null) { - instruction_num = Integer.parseInt(instruction.getInstruction_code()); - } - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, 1); - itemMap.put(to_task, instruction_num); - ReadUtil.write(itemMap, server); - - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - - public boolean instruction_require(String container_code) { - return instruction_require(container_code, WcsConfig.task_container_type_default_desc); - } - - /** - * 请求指令 - * - * @param container_code - * @param container_type - */ - public synchronized boolean instruction_require(String container_code, String container_type) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(container_code); - dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_codecode); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - requireSucess = false; - return true; - } - } - - public void writing(int type, int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - String to_container_type = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_container_type; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - if (type == 1) { - itemMap.put(to_command, command); - } else if (type == 2) { - itemMap.put(to_target, command); - } else if (type == 3) { - itemMap.put(to_task, command); - } else if (type == 4) { - itemMap.put(to_container_type, command); - } - ReadUtil.write(itemMap, server); - - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/ItemProtocol.java deleted file mode 100644 index 39fdd21..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/ItemProtocol.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.nl.acs.device_driver.standard_photoelectric_inspect_site; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_move = "move"; - public static String item_action = "action"; - public static String item_error = "error"; - public static String item_task = "task"; - public static String item_ioaction = "ioaction"; - public static String item_container_type = "container_type"; - public static String item_priority = "priority"; - - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_container_type = "to_container_type"; - - public static String item_to_task = "to_task"; - private StandardPhotoelectricInspectSiteDeviceDriver driver; - - public ItemProtocol(StandardPhotoelectricInspectSiteDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getMove() { - return this.getOpcIntegerValue(item_move); - } - - public int getIoAction() { - return this.getOpcIntegerValue(item_ioaction); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getToTarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getToTask() { - return this.getOpcIntegerValue(item_to_task); - } - - public int getToContainerType() { - return this.getOpcIntegerValue(item_to_container_type); - } - - public int getContainerType() { - return this.getOpcIntegerValue(item_container_type); - } - - public int getPriority() { - return this.getOpcIntegerValue(item_priority); - } - - //是否有货 - public int hasGoods(int move) { - return move; - } - - - Boolean isonline; - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB600.B4")); - list.add(new ItemDto(item_container_type, "托盘类型", "DB600.B5")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(item_priority, "优先出库", "DB600.B7")); - list.add(new ItemDto(item_task, "任务号", "DB600.D8")); - - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB601.W4")); - list.add(new ItemDto(item_to_container_type, "下发托盘类型", "DB601.W6")); - list.add(new ItemDto(item_to_task, "任务号", "DB601.D8")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/StandardPhotoelectricInspectSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/StandardPhotoelectricInspectSiteDefination.java deleted file mode 100644 index 1f48add..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/StandardPhotoelectricInspectSiteDefination.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.nl.acs.device_driver.standard_photoelectric_inspect_site; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 光电检测站点（优先出库） - */ -@Service -public class StandardPhotoelectricInspectSiteDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "standard_photoelectric_inspect_site"; - } - - @Override - public String getDriverName() { - return "光电检测站点（优先出库）"; - } - - @Override - public String getDriverDescription() { - return "光电检测站点（优先出库）"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new StandardPhotoelectricInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return StandardPhotoelectricInspectSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB600.B4")); - list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB600.B5")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(ItemProtocol.item_priority, "优先出库", "DB600.B7")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB600.D8")); - - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/StandardPhotoelectricInspectSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/StandardPhotoelectricInspectSiteDeviceDriver.java deleted file mode 100644 index 5b430ea..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/StandardPhotoelectricInspectSiteDeviceDriver.java +++ /dev/null @@ -1,444 +0,0 @@ -package org.nl.acs.device_driver.standard_photoelectric_inspect_site; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.WcsConfig; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; -import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 光电检测站点（优先出库） - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class StandardPhotoelectricInspectSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - - int mode = 0; - int error = 0; - int move = 0; - int task = 0; - int io_action = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - int container_type = 0; - int priority = 0; - Boolean isonline = true; - int hasGoods = 0; - String message = null; - Boolean iserror = false; - - - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - boolean isFold = false; - private String assemble_check_tag; - - protected String current_stage_instruction_message; - protected String last_stage_instruction_message; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - //备注 - String remark; - //数量 - String qty; - //物料 - String material; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - //申请搬运任务 - private Boolean apply_handling = false; - //申请物料 - private Boolean apply_material = false; - - //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 - int flag; - - String devicecode; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - try { - String device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - error = this.itemProtocol.getError(); - move = this.itemProtocol.getMove(); - task = this.itemProtocol.getTask(); - hasGoods = this.itemProtocol.getMove(); - container_type = this.itemProtocol.getContainerType(); - priority = this.itemProtocol.getPriority(); - io_action = this.itemProtocol.getIoAction(); - if (mode != last_mode) { - this.setRequireSucess(false); - } - if (move != last_move) { - } - if (error != last_error) { - } - - if (this.getApply_handling()) { - String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString(); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - Device link_device = appService.findDeviceByCode(link_device_code); - StandardPhotoelectricInspectSiteDeviceDriver standardPhotoelectricInspectSiteDeviceDriver; - if (link_device.getDeviceDriver() instanceof StandardPhotoelectricInspectSiteDeviceDriver) { - standardPhotoelectricInspectSiteDeviceDriver = (StandardPhotoelectricInspectSiteDeviceDriver) link_device.getDeviceDriver(); -// if(standardInspectSiteDevicedriver.getMode() != 2){ -// log.debug("设备未待机"); -// return; -// } -// if(standardInspectSiteDevicedriver.getMove() != 0){ -// log.debug("设备不满足放货条件"); -// return; -// } - - //如果目标设备申请叫料 则允许生成任务 - if (standardPhotoelectricInspectSiteDeviceDriver.getApply_material()) { - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); -// RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); -// String next_device_codecode = jo.getNext_device_code(); -// if(StrUtil.isEmpty(next_device_codecode)){ -// throw new RuntimeException("该设备未找到对应路由"); -// } - dto.setNext_point_code(standardPhotoelectricInspectSiteDeviceDriver.getDevicecode()); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - standardPhotoelectricInspectSiteDeviceDriver.setApply_material(false); - } - } - this.setApply_handling(false); - } - - } catch (Exception var17) { - return; - } - - if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); - message = "未联机"; - //有报警 - } else if (error != 0) { - this.setIsonline(false); - this.setIserror(true); - message = "有报警"; - //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - return; - case 2: - //申请任务 -// if (this.getApply_handling()) { -// String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString(); -// DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); -// Device link_device = appService.findDeviceByCode(link_device_code); -// StandardInspectSiteDeviceDriver standardInspectSiteDevicedriver; -// if(link_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { -// standardInspectSiteDevicedriver = (StandardInspectSiteDeviceDriver) link_device.getDeviceDriver(); -// if(standardInspectSiteDevicedriver.getMode() != 2){ -// log.debug("设备未待机"); -// return; -// } -// if(standardInspectSiteDevicedriver.getMove() != 0){ -// log.debug("设备不满足放货条件"); -// return; -// } -// -// //如果目标设备申请叫料 则允许生成任务 -// if(standardInspectSiteDevicedriver.getApply_material()){ -// TaskDto dto = new TaskDto(); -// String now = DateUtil.now(); -// dto.setTask_id(IdUtil.simpleUUID()); -// dto.setCreate_by(this.getDevice().getDevice_code()); -// dto.setUpdate_by(this.getDevice().getDevice_code()); -// dto.setStart_point_code(this.getDevice().getDevice_code()); -// -// String taskcode = CodeGenerateUtil.getNewCode("TASK_NO"); -// dto.setTask_code("-"+taskcode); -// dto.setTask_status("0"); -// dto.setPriority("101"); -// RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); -// String next_device_codecode = jo.getNext_device_code(); -// if(StrUtil.isEmpty(next_device_codecode)){ -// throw new RuntimeException("该设备未找到对应路由"); -// } -// dto.setNext_point_code(next_device_codecode); -// dto.setUpdate_time(now); -// dto.setCreate_time(now); -// -// WQLObject wo = WQLObject.getWQLObject("acs_task"); -// JSONObject json = (JSONObject) JSONObject.toJSON(dto); - -// wo.insert(json); -// standardInspectSiteDevicedriver.setApply_material(false); -// } -// } -// this.setApply_handling(false); -// } - - } - - switch (flag) { - //取货完成 - case 1: - writing(2); - return; - //放货完成 - case 2: - writing(3); - return; - - } - last_mode = mode; - last_error = error; - last_move = move; - last_task = task; - } - - } - - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - protected void thingToNothing() { - log.debug("从有货到无货 清理数据"); - this.set_last_container(container, container_type_desc); - } - - public void set_last_container(String barcode, String type_desc) { - this.set_last_container(barcode); - this.set_last_container_type_desc(type_desc); - } - - public void set_last_container(String barcode) { - } - - public void set_last_container_type_desc(String type) { - } - - public boolean exe_business() { - return true; - } - - protected void executing(Instruction instruction) { - this.executing(1, instruction, ""); - } - - public void executing(int command, Instruction instruction, String appendMessage) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.standard_inspect_site.ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.standard_inspect_site.ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.standard_inspect_site.ItemProtocol.item_to_task; - if (appendMessage == null) { - appendMessage = ""; - } - if (instruction != null) { - instruction_num = Integer.parseInt(instruction.getInstruction_code()); - } - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, 1); - itemMap.put(to_task, instruction_num); - ReadUtil.write(itemMap, server); - - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.standard_inspect_site.ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - - } - - public void writing(int type, int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - String to_container_type = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_container_type; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - if (type == 1) { - itemMap.put(to_command, command); - } else if (type == 2) { - itemMap.put(to_target, command); - - } else if (type == 3) { - itemMap.put(to_task, command); - } else if (type == 4) { - itemMap.put(to_container_type, command); - } - ReadUtil.write(itemMap, server); - - } - - public boolean instruction_require(String container_code) { - return instruction_require(container_code, WcsConfig.task_container_type_default_desc); - } - - /** - * 请求指令 - * - * @param container_code - * @param container_type - */ - public synchronized boolean instruction_require(String container_code, String container_type) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(container_code); - dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_codecode); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - requireSucess = false; - return true; - } - } - - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/ItemProtocol.java deleted file mode 100644 index 01ada8c..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/ItemProtocol.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.nl.acs.device_driver.standard_special_inspect_site; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_move = "move"; - public static String item_action = "action"; - public static String item_error = "error"; - public static String item_task = "task"; - public static String item_to_command = "to_command"; - public static String item_to_target = "to_target"; - public static String item_to_task = "to_task"; - Boolean isonline; - - private StandardSpecialInspectSiteDeviceDriver driver; - - public ItemProtocol(StandardSpecialInspectSiteDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getMove() { - return this.getOpcIntegerValue(item_move); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getToTarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getToTask() { - return this.getOpcIntegerValue(item_to_task); - } - - - //是否有货 - public int hasGoods(int move) { - return move; - } - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB600.B3")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(item_task, "任务号", "DB600.D7")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB601.W4")); - list.add(new ItemDto(item_to_task, "任务号", "DB601.D8")); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/StandardSpecialInspectSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/StandardSpecialInspectSiteDefination.java deleted file mode 100644 index a5312f9..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/StandardSpecialInspectSiteDefination.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.nl.acs.device_driver.standard_special_inspect_site; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 专机设备交互站点驱动定义 - * 说明：该站点为专机设备交互站点 - */ -@Service -public class StandardSpecialInspectSiteDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "standard_special_inspect_site"; - } - - @Override - public String getDriverName() { - return "标准版-专机设备-检测站点"; - } - - @Override - public String getDriverDescription() { - return "标准版-专机设备-检测站点"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new StandardSpecialInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return StandardSpecialInspectSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB51.B1", true)); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB51.B2")); - list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "DB51.B3")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB51.B6")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB51.D8")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/StandardSpecialInspectSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/StandardSpecialInspectSiteDeviceDriver.java deleted file mode 100644 index cc30200..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/StandardSpecialInspectSiteDeviceDriver.java +++ /dev/null @@ -1,472 +0,0 @@ -package org.nl.acs.device_driver.standard_special_inspect_site; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.WcsConfig; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.modules.system.util.CodeUtil; -import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 专机设备交互站点 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class StandardSpecialInspectSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - String devicecode; - int mode = 0; - int error = 0; - int move = 0; - int task = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - Boolean isonline = true; - int hasGoods = 0; - Boolean iserror = false; - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - boolean isFold = false; - private String assemble_check_tag; - private Boolean sampleMode0; - private Boolean sampleMode3; - private Integer sampleError; - private Boolean sampleOnline; - protected String displayMessage = null; - public int display_message_time_out = 30000; - public Date display_message_time; - protected String current_stage_instruction_message; - protected String last_stage_instruction_message; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - //备注 - String remark; - //数量 - String qty; - //物料 - String material; - //当前指令 - Instruction inst = null; - //上次指令 - Instruction last_inst = null; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - - String message = null; - String device_code; - try { - device_code = this.getDeviceCode().toString(); - - mode = this.itemProtocol.getMode(); - error = this.itemProtocol.getError(); - move = this.itemProtocol.getMove(); - task = this.itemProtocol.getTask(); - hasGoods = this.itemProtocol.hasGoods(move); - - } catch (Exception var17) { - return; - } - - //急停 - if (this.isStop()) { - - //未在线无心跳 - } else if (!this.itemProtocol.getIsonline()) { - this.setIsonline(false); - message = "信号量同步异常"; - - //未联机 - } else if (mode == 0) { - this.setIserror(true); - message = "信号量同步异常"; - //有报警 - } else if (error != 0) { - this.setIserror(true); - message = "报警"; - //无报警 - } else { - - Instruction instruction = null; - List toInstructions; - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - return; - case 2: - - if (task > 0 && task != last_task) { - Instruction inst = (Instruction) instructionService.findByCodeFromCache(String.valueOf(task)); - //指令号起点与当前设备相同 则指令执行中 - if (StrUtil.equals(inst.getStart_point_code(), this.getDeviceCode()) && - task != 0 && task != last_task & move > 0) { - branchProtocol = 3; - } - //指令号终点与当前设备相同、有货、指令号与当前设备指令号相同则指令完成 - if (StrUtil.equals(inst.getNext_point_code(), this.getDeviceCode()) && - task != 0 && task != last_task & move > 0) { - branchProtocol = 4; - } - } - break; - - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - if (move != last_move) { - requireSucess = true; - } - if (move > 0 && requireSucess) { - String barcode = this.getLast_container(); - barcode = "T123456"; - if (StrUtil.isEmpty(barcode)) { - message = "无托盘编号，请补码"; - return; - } - - if (StrUtil.isEmpty(this.getLast_container_type_desc())) { - this.instruction_require(barcode); - } else { - this.instruction_require(barcode, this.getLast_container_type_desc()); - } - } - break; - default: - - } - - - switch (branchProtocol) { - case 1: - if (this.getDevice().getIs_exist()) { - message = "出口:有货等待作业"; - - } else if (mode == 2) { - try { -// if (StrUtil.isEmpty(container)) { -// //判断条码是否为空，否则申请任务 -// return; -// } - - - } catch (Exception var21) { - message = "申请指令异常"; - log.debug("申请指令异常"); - } - } else { - message = "设备运转中, 待申请指令"; - log.debug("设备运转中, 待申请指令"); - } - break; - case 2: - if (mode == 2) { - try { - - this.executing(instruction); - - } catch (Exception var20) { - message = "指令下发异常"; - - } - } else { - message = "设备运转中,待下发指令"; - - } - break; - case 3: - if (mode == 2) { - try { - //执行中 - Instruction inst = instructionService.findByCodeFromCache(String.valueOf(instruction_num)); - if (StrUtil.equals(inst.getInstruction_status(), "1")) { - inst.setInstruction_status("1"); - instructionService.update(inst); - last_task = task; - } - - } catch (Exception var20) { - message = "指令异常"; - - } - } else { - message = "设备运转中"; - - } - break; - case 4: - if (mode == 2) { - try { - Instruction inst = instructionService.findByCodeFromCache(String.valueOf(task)); - this.finish_instruction(inst); - } catch (Exception var19) { - message = "指令完成异常"; - - } - } else { - message = "设备运转中,待完成指令"; - - } - break; - default: - - } - } - - last_mode = mode; - last_error = error; - last_move = move; - last_task = task; - } - - - public void finish_instruction(Instruction instruction) throws Exception { - instruction_finished(instruction); - } - - /** - * 完成指令 - * - * @param instruction - * @return - */ - public boolean instruction_finished(Instruction instruction) throws Exception { - Date date = new Date(); - if (date.getTime() - this.instruction_finished_time.getTime() < (long) this.instruction_finished_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_finished_time_out); - return false; - } else { - instructionService.finish(instruction.getInstruction_id()); - this.instruction_finished_time = date; - return true; - } - } - - /** - * 完成并创建下一条指令 - * - * @param instruction - * @param needCreateNext - * @return - */ - public boolean instruction_finished(Instruction instruction, boolean needCreateNext) { - Date date = new Date(); - if (date.getTime() - this.instruction_finished_time.getTime() < (long) this.instruction_finished_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_finished_time_out); - return false; - } else { - this.instruction_finished_time = date; - return true; - } - } - - - private Instruction findInstruction() { - Instruction instruction = null; - if (this.instruction_num != 0) { - instruction = (Instruction) instructionService.findByCodeFromCache(String.valueOf(instruction_num)); - } - if (instruction != null) { - //可进行校验 - - - } else { - List container_instructions = new ArrayList(); - String barcode = this.getLast_container(); - - if (!StrUtil.isEmpty(barcode)) { - Map map = new HashMap(); - map.put("vehicle_code", barcode); - container_instructions = instructionService.queryAll(map); - } - - if (((List) container_instructions).size() > 1) { - log.debug("容器存在多个指令"); - } else { - if (((List) container_instructions).size() > 0) { - instruction = (Instruction) ((List) container_instructions).get(0); - } - } - } - return instruction; - } - - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - protected void thingToNothing() { - log.debug("从有货到无货 清理数据"); - this.set_last_container(container, container_type_desc); - } - - public void set_last_container(String barcode, String type_desc) { - this.set_last_container(barcode); - this.set_last_container_type_desc(type_desc); - } - - public void set_last_container(String barcode) { - } - - public void set_last_container_type_desc(String type) { - } - - public boolean exe_business() { - return true; - } - - protected void executing(Instruction instruction) { - this.executing(1, instruction, ""); - } - - public void executing(int command, Instruction instruction, String appendMessage) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_target; - String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_task; - if (appendMessage == null) { - appendMessage = ""; - } - if (instruction != null) { - instruction_num = Integer.parseInt(instruction.getInstruction_code()); - } - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, 1); - itemMap.put(to_task, instruction_num); - ReadUtil.write(itemMap, server); - - } - - public void executing(Server server, Map itemMap) { - ReadUtil.write(itemMap, server); - } - - - public boolean instruction_require(String container_code) { - return instruction_require(container_code, WcsConfig.task_container_type_default_desc); - } - - /** - * 请求指令 - * - * @param container_code - * @param container_type - */ - public synchronized boolean instruction_require(String container_code, String container_type) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - TaskDto dto = new TaskDto(); - String now = DateUtil.now(); - dto.setTask_id(IdUtil.simpleUUID()); - dto.setCreate_by(this.getDevice().getDevice_code()); - dto.setUpdate_by(this.getDevice().getDevice_code()); - dto.setStart_point_code(this.getDevice().getDevice_code()); - dto.setVehicle_code(container_code); - dto.setVehicle_type(container_type); - - String taskcode = CodeUtil.getNewCode("TASK_NO"); - dto.setTask_code("-" + taskcode); - dto.setTask_status("0"); - dto.setPriority("101"); - RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); - String next_device_codecode = jo.getNext_device_code(); - if (StrUtil.isEmpty(next_device_codecode)) { - throw new RuntimeException("该设备未找到对应路由"); - } - dto.setNext_point_code(next_device_codecode); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("acs_task"); - JSONObject json = (JSONObject) JSONObject.toJSON(dto); - - wo.insert(json); - requireSucess = false; - return true; - } - } - - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/ItemProtocol.java deleted file mode 100644 index 5f49e02..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/ItemProtocol.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.nl.acs.device_driver.traffic_light; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -public class ItemProtocol { - public static String item_heartbeat = "heartbeat"; - public static String item_mode = "mode"; - public static String item_action = "action"; - public static String item_error = "error"; - public static String item_to_command = "to_command"; - - - private TrafficLightDeviceDriver driver; - - public ItemProtocol(TrafficLightDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getToCommand() { - return this.getOpcIntegerValue(item_to_command); - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - //log.error("读取错误!"); - } else { - return value; - } - return 0; - - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "D00000")); - list.add(new ItemDto(item_mode, "工作状态", "D00010", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "D00012")); - list.add(new ItemDto(item_error, "报警信号", "D00014")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "D00016", Boolean.valueOf(true))); - return list; - } - -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/TrafficLightDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/TrafficLightDefination.java deleted file mode 100644 index e863afe..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/TrafficLightDefination.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.nl.acs.device_driver.traffic_light; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 标准版-交通灯-欧姆龙plc - */ -@Service -public class TrafficLightDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "traffic_light"; - } - - @Override - public String getDriverName() { - return "标准版-交通灯-欧姆龙plc"; - } - - @Override - public String getDriverDescription() { - return "标准版-交通灯-欧姆龙plc"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new TrafficLightDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return TrafficLightDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "D00000")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "D00010", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "D00012")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "D00014")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/TrafficLightDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/TrafficLightDeviceDriver.java deleted file mode 100644 index b7c6f88..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/TrafficLightDeviceDriver.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.nl.acs.device_driver.traffic_light; - -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * 标准版-交通灯-欧姆龙plc - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class TrafficLightDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - //放货准备锁 - String putReadyLock = null; - //有货标记 - protected boolean has_goods_tag = false; - String devicecode; - int mode = 0; - int action = 0; - int error = 0; - int move = 0; - int task = 0; - int last_action = 0; - int last_mode = 0; - int last_error = 0; - int last_move = 0; - int last_task = 0; - - boolean hasVehicle = false; - boolean isReady = false; - protected int instruction_num = 0; - protected int instruction_num_truth = 0; - protected boolean hasGoods = false; - boolean isFold = false; - private String assemble_check_tag; - private Boolean sampleMode0; - private Boolean sampleMode3; - private Integer sampleError; - private Boolean sampleOnline; - protected String displayMessage = null; - public int display_message_time_out = 30000; - public Date display_message_time; - protected String current_stage_instruction_message; - protected String last_stage_instruction_message; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - String message = null; - - String device_code = this.getDevice().getDevice_code(); - mode = this.itemProtocol.getMode(); - action = this.itemProtocol.getAction(); - error = this.itemProtocol.getError(); - if (mode != last_mode) { - } - if (action != last_action) { - } - if (error != last_error) { - } - last_action = action; - last_mode = mode; - last_error = error; - - - } - - public synchronized String getStatus() { - JSONObject jo = new JSONObject(); - - if (action == 1) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "OPEN"); - - } else if (action == 2) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "CLOSE"); - - } else { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "ERROR"); - } - return jo.toString(); - } - - - public void writing(int command) { - String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command; - - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - log.info("下发PLC信号：{},{}", to_command, command); - System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command); - } - - public synchronized void OpenOrClose(String type) { - - writing(Integer.parseInt(type)); - - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/weighing_site/WeighingSiteDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/weighing_site/WeighingSiteDefination.java deleted file mode 100644 index 6a09715..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/weighing_site/WeighingSiteDefination.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.nl.acs.device_driver.weighing_site; - -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * 货架 - */ -@Service -public class WeighingSiteDefination implements DeviceDriverDefination { - @Override - public String getDriverCode() { - return "weighing_site"; - } - - @Override - public String getDriverName() { - return "标准版-称重设备-无PLC"; - } - - @Override - public String getDriverDescription() { - return "标准版-称重设备-无PLC"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new WeighingSiteDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return WeighingSiteDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/weighing_site/WeighingSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/weighing_site/WeighingSiteDeviceDriver.java deleted file mode 100644 index 7955aa6..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/weighing_site/WeighingSiteDeviceDriver.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.nl.acs.device_driver.weighing_site; - -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; - - -/** - * 称重站点 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class WeighingSiteDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver { - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - - Integer hasGoods = 0; - int error = 0; - Boolean iserror = false; - Boolean islock = false; - - int branchProtocol = 0; - int last_branchProtocol = 0; - //是否需要输入物料 - String input_material = "0"; - //备注 - String remark = ""; - //数量 - String qty = ""; - //批次 - String batch = ""; - //物料 - String material = ""; - //目标点位 - String purpose = ""; - //当前指令 - Instruction inst = null; - String inst_message; - //上次指令 - Instruction last_inst = null; - - boolean requireSucess = false; - - //触摸屏手动触发任务 - private Boolean is_has_task = false; - - //申请搬运任务 - private Boolean apply_handling = false; - //申请物料 - private Boolean apply_material = false; - - // 1取货完成 2放货完成 3进入区域 4离开区域 - private int flag; - - String devicecode; - String container; - String container_type_desc; - String last_container_type_desc; - String last_container; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - - private int instruction_require_time_out; - - String message; - - int mode = 2; - - int move; - - @Override - public void execute() { - if (!ObjectUtils.isEmpty(inst)) { - inst_message = "任务号:" + inst.getTask_code() + ",指令号:" + inst.getInstruction_code() + " " + inst.getStart_point_code() + "->" + inst.getNext_point_code() + " 载具号：" + inst.getVehicle_code(); - } - } -} - diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index dfa8ae1..6b2237f 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -55,276 +55,331 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public String applyTaskToWms(String device_code, String container_code, int height, int weight) { - - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("applyTaskToWms"); - String url = wmsurl + addressDto.getMethods_url(); - - JSONObject param = new JSONObject(); - param.put("height", height); - param.put("weight", weight); - String parent_device_code = ""; - JSONObject jo = new JSONObject(); - JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("storage_code ='" + device_code + "'").uniqueResult(0); - if (!device_json.isEmpty()) { - parent_device_code = (String) device_json.get("parent_storage_cell") == null ? device_code : (String) device_json.get("parent_storage_cell"); - } - jo.put("device_code", parent_device_code); - jo.put("container_code", container_code); - jo.put("param", param); - log.info("applyTaskToWms-----请求参数{}", jo.toString()); - HttpResponse result2 = null; try { - //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(jo)) - .execute(); - System.out.println(result2); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); - } - String type = ""; - if (result2.getStatus() == 200) { - type = "info"; - } else { - type = "error"; - } + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("applyTaskToWms"); + String url = wmsurl + addressDto.getMethods_url(); + + JSONObject param = new JSONObject(); + param.put("height", height); + param.put("weight", weight); + String parent_device_code = ""; + JSONObject jo = new JSONObject(); + JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("storage_code ='" + device_code + "'").uniqueResult(0); + if (!device_json.isEmpty()) { + parent_device_code = (String) device_json.get("parent_storage_cell") == null ? device_code : (String) device_json.get("parent_storage_cell"); + } + jo.put("device_code", parent_device_code); + jo.put("container_code", container_code); + jo.put("param", param); + log.info("applyTaskToWms-----请求参数{}", jo.toString()); + HttpResponse result2 = null; + try { + //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} + result2 = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(jo)) + .execute(); + System.out.println(result2); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + String type = ""; + if (result2.getStatus() == 200) { + type = "info"; + } else { + type = "error"; + } // logServer.log("", "applyTaskToWms", type, jo.toString(), result2.body(), String.valueOf(result2.getStatus()), url, container_code); - log.info("applyTaskToWms-----输出参数{}", result2.body()); - return result2.body(); + log.info("applyTaskToWms-----输出参数{}", result2.body()); + return result2.body(); + } finally { + MDC.remove(log_file_type); + } + } @Override public HttpResponse applyTaskManipulatorToWms(JSONObject json) { + try { + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("applyTaskManipulatorToWms"); + String url = wmsurl + addressDto.getMethods_url(); - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("applyTaskManipulatorToWms"); - String url = wmsurl + addressDto.getMethods_url(); + String device_code = json.getString("device_code"); - String device_code = json.getString("device_code"); - - String parent_device_code = ""; - JSONObject jo = new JSONObject(); + String parent_device_code = ""; + JSONObject jo = new JSONObject(); // JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("storage_code ='" + device_code + "'").uniqueResult(0); // if (!device_json.isEmpty()) { // parent_device_code = (String) device_json.get("parent_storage_cell") == null ? device_code : (String) device_json.get("parent_storage_cell"); // } // jo.put("device_code", parent_device_code); - log.info("applyTaskManipulatorToWms-----请求参数{}", json.toString()); - HttpResponse result2 = null; - try { - //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(json)) - .execute(); - System.out.println(result2); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + log.info("applyTaskManipulatorToWms-----请求参数{}", json.toString()); + HttpResponse result2 = null; + try { + //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} + result2 = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(json)) + .execute(); + System.out.println(result2); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + log.info("applyTaskManipulatorToWms-----输出参数{}", result2.body()); + return result2; + } finally { + MDC.remove(log_file_type); } - log.info("applyTaskManipulatorToWms-----输出参数{}", result2.body()); - return result2; + } @Override public HttpResponse applyIntoKiln(JSONObject json) { - - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("applyIntoKiln"); - String url = wmsurl + addressDto.getMethods_url(); - - String device_code = json.getString("device_code"); - - String parent_device_code = ""; - JSONObject jo = new JSONObject(); - JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("storage_code ='" + device_code + "'").uniqueResult(0); - if (!device_json.isEmpty()) { - parent_device_code = (String) device_json.get("parent_storage_cell") == null ? device_code : (String) device_json.get("parent_storage_cell"); - } - jo.put("device_code", parent_device_code); - jo.putAll(json); - - log.info("lnshApplyTaskToWms-----请求参数{}", jo.toString()); - HttpResponse result2 = null; try { - //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(jo)) - .execute(); - System.out.println(result2); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("applyIntoKiln"); + String url = wmsurl + addressDto.getMethods_url(); + + String device_code = json.getString("device_code"); + + String parent_device_code = ""; + JSONObject jo = new JSONObject(); + JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("storage_code ='" + device_code + "'").uniqueResult(0); + if (!device_json.isEmpty()) { + parent_device_code = (String) device_json.get("parent_storage_cell") == null ? device_code : (String) device_json.get("parent_storage_cell"); + } + jo.put("device_code", parent_device_code); + jo.putAll(json); + + log.info("lnshApplyTaskToWms-----请求参数{}", jo.toString()); + HttpResponse result2 = null; + try { + //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} + result2 = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(jo)) + .execute(); + System.out.println(result2); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + log.info("lnshApplyTaskToWms-----输出参数{}", result2.body()); + return result2; + } finally { + MDC.remove(log_file_type); } - log.info("lnshApplyTaskToWms-----输出参数{}", result2.body()); - return result2; + } @Override public HttpResponse lnshApplyTaskToWms(JSONObject json) { - - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("lnshApplyTaskToWms"); - String url = wmsurl + addressDto.getMethods_url(); - - String device_code = json.getString("device_code"); - - String parent_device_code = ""; - JSONObject jo = new JSONObject(); - JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("storage_code ='" + device_code + "'").uniqueResult(0); - if (!device_json.isEmpty()) { - parent_device_code = (String) device_json.get("parent_storage_cell") == null ? device_code : (String) device_json.get("parent_storage_cell"); - } - jo.put("device_code", parent_device_code); - jo.putAll(json); - - log.info("lnshApplyTaskToWms-----请求参数{}", jo.toString()); - HttpResponse result2 = null; try { - //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(jo)) - .execute(); - System.out.println(result2); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("lnshApplyTaskToWms"); + String url = wmsurl + addressDto.getMethods_url(); + + String device_code = json.getString("device_code"); + + String parent_device_code = ""; + JSONObject jo = new JSONObject(); + JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("storage_code ='" + device_code + "'").uniqueResult(0); + if (!device_json.isEmpty()) { + parent_device_code = (String) device_json.get("parent_storage_cell") == null ? device_code : (String) device_json.get("parent_storage_cell"); + } + jo.put("device_code", parent_device_code); + jo.putAll(json); + + log.info("lnshApplyTaskToWms-----请求参数{}", jo.toString()); + HttpResponse result2 = null; + try { + //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} + result2 = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(jo)) + .execute(); + System.out.println(result2); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + log.info("lnshApplyTaskToWms-----输出参数{}", result2.body()); + return result2; + } finally { + MDC.remove(log_file_type); } - log.info("lnshApplyTaskToWms-----输出参数{}", result2.body()); - return result2; + } @Override public JSONObject getVehicle(JSONObject json) { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("getVehicle"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - - log.info("getVehicle----请求参数{}", json.toString()); - HttpResponse result = null; try { - result = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(json)) - .execute(); - System.out.println(result); - } catch (Exception e) { - System.out.println(e.getMessage()); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("getVehicle"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + + log.info("getVehicle----请求参数{}", json.toString()); + HttpResponse result = null; + try { + result = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(json)) + .execute(); + System.out.println(result); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + log.info("getVehicle----返回参数{}", result.body()); + JSONObject jo = JSONObject.parseObject(result.body()); + return jo; + + } finally { + MDC.remove(log_file_type); } - log.info("getVehicle----返回参数{}", result.body()); - JSONObject jo = JSONObject.parseObject(result.body()); - return jo; } @Override public JSONObject getVehicleTokiln(JSONObject json) { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("getVehicleTokiln"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - - log.info("getVehicleTokiln----请求参数{}", json.toString()); - HttpResponse result = null; try { - result = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(json)) - .execute(); - System.out.println(result); - } catch (Exception e) { - System.out.println(e.getMessage()); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("getVehicleTokiln"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + + log.info("getVehicleTokiln----请求参数{}", json.toString()); + HttpResponse result = null; + try { + result = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(json)) + .execute(); + System.out.println(result); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + log.info("getVehicleTokiln----返回参数{}", result.body()); + JSONObject jo = JSONObject.parseObject(result.body()); + return jo; + } finally { + MDC.remove(log_file_type); } - log.info("getVehicleTokiln----返回参数{}", result.body()); - JSONObject jo = JSONObject.parseObject(result.body()); - return jo; } @Override public HttpResponse inKiln(JSONObject json) { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("inKiln"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - - log.info("getVehicleTokiln----请求参数{}", json.toString()); - HttpResponse result = null; try { - result = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(json)) - .execute(); - System.out.println(result); - } catch (Exception e) { - System.out.println(e.getMessage()); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("inKiln"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + + log.info("getVehicleTokiln----请求参数{}", json.toString()); + HttpResponse result = null; + try { + result = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(json)) + .execute(); + System.out.println(result); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + log.info("getVehicleTokiln----返回参数{}", result.body()); + return result; + + } finally { + MDC.remove(log_file_type); } - log.info("getVehicleTokiln----返回参数{}", result.body()); - return result; } @Override public HttpResponse outKiln(JSONObject json) { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("outKiln"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - - - log.info("outKiln----请求参数{}", json.toString()); - HttpResponse result = null; try { - result = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(json)) - .execute(); - System.out.println(result); - } catch (Exception e) { - System.out.println(e.getMessage()); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("outKiln"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + + + log.info("outKiln----请求参数{}", json.toString()); + HttpResponse result = null; + try { + result = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(json)) + .execute(); + System.out.println(result); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + log.info("outKiln----返回参数{}", result.body()); + return result; + } finally { + MDC.remove(log_file_type); } - log.info("outKiln----返回参数{}", result.body()); - return result; + } @Override public HttpResponse enterOrder(JSONObject json) { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - AddressDto addressDto = addressService.findByCode("enterOrder"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - - log.info("enterOrder----请求参数{}", json.toString()); - HttpResponse result = null; try { - result = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(json)) - .execute(); - System.out.println(result); - } catch (Exception e) { - System.out.println(e.getMessage()); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("enterOrder"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + + log.info("enterOrder----请求参数{}", json.toString()); + HttpResponse result = null; + try { + result = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(json)) + .execute(); + System.out.println(result); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + log.info("enterOrder----返回参数{}", result.body()); + return result; + + } finally { + MDC.remove(log_file_type); } - log.info("enterOrder----返回参数{}", result.body()); - return result; } @Override public JSONObject getVehicleCode(String device_code) { + try { + MDC.put(log_file_type, log_type); + + } finally { + MDC.remove(log_file_type); + } String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); AddressDto addressDto = addressService.findByCode("getVehicleCode"); String methods_url = addressDto.getMethods_url(); @@ -350,6 +405,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public JSONObject getVehiclePoint(String vehicle_code) { + try { + MDC.put(log_file_type, log_type); + + } finally { + MDC.remove(log_file_type); + } String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); AddressDto addressDto = addressService.findByCode("getVehiclePoint"); String methods_url = addressDto.getMethods_url(); @@ -376,6 +437,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public HttpResponse feedbackTaskStatusToWms(JSONArray data) { + try { + MDC.put(log_file_type, log_type); + + } finally { + MDC.remove(log_file_type); + } String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); String task_code = ""; @@ -417,36 +484,41 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public Map feedbackPointStatusToWms(Map jsonObject) { - - AddressDto addressDto = addressService.findByCode("feedbackPointStatusToWms"); - String methods_url = addressDto.getMethods_url(); - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - String url = wmsurl + methods_url; - - JSONObject json = new JSONObject(); - json.put("task_uuid", jsonObject.get("device_code")); - json.put("task_code", jsonObject.get("point_status")); - json.put("task_status", jsonObject.get("point_mode")); - json.put("point_error", jsonObject.get("point_error")); - log.info("feedbackPointStatusToWms----请求参数{}", json.toString()); try { - String result2 = HttpRequest.post(url) - .body(String.valueOf(json)) - .execute().body(); - System.out.println(result2); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + AddressDto addressDto = addressService.findByCode("feedbackPointStatusToWms"); + String methods_url = addressDto.getMethods_url(); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + String url = wmsurl + methods_url; + JSONObject json = new JSONObject(); + json.put("task_uuid", jsonObject.get("device_code")); + json.put("task_code", jsonObject.get("point_status")); + json.put("task_status", jsonObject.get("point_mode")); + json.put("point_error", jsonObject.get("point_error")); + log.info("feedbackPointStatusToWms----请求参数{}", json.toString()); + try { + String result2 = HttpRequest.post(url) + .body(String.valueOf(json)) + .execute().body(); + System.out.println(result2); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + + } + + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONArray()); + log.info("feedbackPointStatusToWms----输出参数{}", resultJson.toString()); + return resultJson; + } finally { + MDC.remove(log_file_type); } - JSONObject resultJson = new JSONObject(); - resultJson.put("status", HttpStatus.OK); - resultJson.put("message", "操作成功"); - resultJson.put("data", new JSONArray()); - log.info("feedbackPointStatusToWms----输出参数{}", resultJson.toString()); - return resultJson; } @Override @@ -469,261 +541,314 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONArray jsonArray = JSONArray.parseArray(result); return jsonArray; }finally { - MDC.remove(log_type); + MDC.remove(log_file_type); } } @Override public HttpResponse requestSignalInteraction(String device_code, String vehicle_code, String action) { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - JSONObject json = new JSONObject(); - json.put("device_code", device_code); - json.put("vehicle_code", vehicle_code); - json.put("action", action); - - AddressDto addressDto = addressService.findByCode("requestSignalInteraction"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - HttpResponse result = null; - log.info("requestSignalInteraction----请求参数{}", json.toString()); try { - result = HttpRequest.post(url) - .body(String.valueOf(json)) - .execute(); - System.out.println(result); - log.info("requestSignalInteraction----返回参数{}", result); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + JSONObject json = new JSONObject(); + json.put("device_code", device_code); + json.put("vehicle_code", vehicle_code); + json.put("action", action); + AddressDto addressDto = addressService.findByCode("requestSignalInteraction"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + HttpResponse result = null; + log.info("requestSignalInteraction----请求参数{}", json.toString()); + try { + result = HttpRequest.post(url) + .body(String.valueOf(json)) + .execute(); + System.out.println(result); + log.info("requestSignalInteraction----返回参数{}", result); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + + } + return result; + } finally { + MDC.remove(log_file_type); } - return result; + } @Override public String requestTaskAgain(String address, String task_id, String vehicle_code) { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - String device_code = deviceService.queryDeviceCodeByAddress(Integer.parseInt(address)); - JSONObject jo = new JSONObject(); - jo.put("device_code", device_code); - jo.put("task_id", task_id); - jo.put("vehicle_code", vehicle_code); - String result2 = null; - - AddressDto addressDto = addressService.findByCode("requestTaskAgain"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - log.info("requestTaskAgain----请求参数{}", jo); - try { - result2 = HttpRequest.post(url) - .body(String.valueOf(jo)) - .execute().body(); - System.out.println(result2); - log.info("requestTaskAgain----返回参数{}", result2); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + String device_code = deviceService.queryDeviceCodeByAddress(Integer.parseInt(address)); + JSONObject jo = new JSONObject(); + jo.put("device_code", device_code); + jo.put("task_id", task_id); + jo.put("vehicle_code", vehicle_code); + String result2 = null; + + AddressDto addressDto = addressService.findByCode("requestTaskAgain"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + log.info("requestTaskAgain----请求参数{}", jo); + + try { + result2 = HttpRequest.post(url) + .body(String.valueOf(jo)) + .execute().body(); + System.out.println(result2); + log.info("requestTaskAgain----返回参数{}", result2); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + return result2; + } finally { + MDC.remove(log_file_type); } - return result2; + } @Override public String apply_InEmpty(String device_code, String type, String quantity, String container_code) { - if (StrUtil.isEmpty(container_code)) { - log.info("apply_InEmpty----空盘入库申请校验失败,{}{}", device_code, "设备条码为空"); - throw new BadRequestException("地址对应设备未找到"); - } - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - JSONObject jo = new JSONObject(); - jo.put("device_code", device_code); - jo.put("type", type); - jo.put("quantity", quantity); - jo.put("container_code", container_code); - - String result2 = ""; - - AddressDto addressDto = addressService.findByCode("apply_InEmpty"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - log.info("requestTaskAgain----请求参数{}", jo); - try { - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(jo)) - .execute().body(); - System.out.println(result2); - log.info("requestTaskAgain----返回参数{}", result2); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + if (StrUtil.isEmpty(container_code)) { + log.info("apply_InEmpty----空盘入库申请校验失败,{}{}", device_code, "设备条码为空"); + throw new BadRequestException("地址对应设备未找到"); + } + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + JSONObject jo = new JSONObject(); + jo.put("device_code", device_code); + jo.put("type", type); + jo.put("quantity", quantity); + jo.put("container_code", container_code); + + String result2 = ""; + + AddressDto addressDto = addressService.findByCode("apply_InEmpty"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + log.info("requestTaskAgain----请求参数{}", jo); + + try { + result2 = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(jo)) + .execute().body(); + System.out.println(result2); + log.info("requestTaskAgain----返回参数{}", result2); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + return result2; + } finally { + MDC.remove(log_file_type); } - return result2; + } @Override public String apply_OutEmpty(String device_code) { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - JSONObject jo = new JSONObject(); - jo.put("device_code", device_code); - String result2 = ""; - - AddressDto addressDto = addressService.findByCode("apply_OutEmpty"); - String methods_url = addressDto.getMethods_url(); - String url = wmsurl + methods_url; - log.info("apply_OutEmpty----请求参数{}", jo); try { - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(jo)) - .execute().body(); - System.out.println(result2); - log.info("apply_OutEmpty----返回参数{}", result2); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + JSONObject jo = new JSONObject(); + jo.put("device_code", device_code); + String result2 = ""; + + AddressDto addressDto = addressService.findByCode("apply_OutEmpty"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + log.info("apply_OutEmpty----请求参数{}", jo); + try { + result2 = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(jo)) + .execute().body(); + System.out.println(result2); + log.info("apply_OutEmpty----返回参数{}", result2); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + return result2; + } finally { + MDC.remove(log_file_type); } - return result2; + } @Override public HttpResponse feedbackAgvStatus(String device_code, String error, String error_message) { - String wmsUrl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - - JSONObject json = new JSONObject(); - json.put("device_code", device_code); - json.put("error", error); - json.put("error_message", error_message); - - AddressDto addressDto = addressService.findByCode("feedbackAgvStatus"); - String methods_url = addressDto.getMethods_url(); - String url = wmsUrl + methods_url; - HttpResponse result = null; - log.info("feedbackAgvStatus----请求参数{}", json); - try { - result = HttpRequest.post(url) - .body(String.valueOf(json)) - .execute(); - System.out.println(result); - log.info("feedbackAgvStatus----返回参数{}", result); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsUrl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + + JSONObject json = new JSONObject(); + json.put("device_code", device_code); + json.put("error", error); + json.put("error_message", error_message); + + AddressDto addressDto = addressService.findByCode("feedbackAgvStatus"); + String methods_url = addressDto.getMethods_url(); + String url = wmsUrl + methods_url; + HttpResponse result = null; + log.info("feedbackAgvStatus----请求参数{}", json); + + try { + result = HttpRequest.post(url) + .body(String.valueOf(json)) + .execute(); + System.out.println(result); + log.info("feedbackAgvStatus----返回参数{}", result); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + return result; + } finally { + MDC.remove(log_file_type); } - return result; + } @Override public HttpResponse feedbackDeviceStatus(String device_code, String code, String value) { - String wmsUrl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - - JSONObject json = new JSONObject(); - json.put("device_code", device_code); - json.put("back_time", DateUtil.getStringAllDate()); - JSONArray ja = new JSONArray(); - JSONObject jo = new JSONObject(); - jo.put("code", code); - jo.put("value", value); - ja.add(jo); - json.put("data", ja); - AddressDto addressDto = addressService.findByCode("feedbackDeviceStatus"); - String methods_url = addressDto.getMethods_url(); - String url = wmsUrl + methods_url; - HttpResponse result = null; - log.info("feedbackDeviceStatus----请求参数{}", json); - try { - result = HttpRequest.post(url) - .body(String.valueOf(json)) - .execute(); - System.out.println(result); - log.info("feedbackDeviceStatus----返回参数{}", result); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsUrl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + + JSONObject json = new JSONObject(); + json.put("device_code", device_code); + json.put("back_time", DateUtil.getStringAllDate()); + JSONArray ja = new JSONArray(); + JSONObject jo = new JSONObject(); + jo.put("code", code); + jo.put("value", value); + ja.add(jo); + json.put("data", ja); + AddressDto addressDto = addressService.findByCode("feedbackDeviceStatus"); + String methods_url = addressDto.getMethods_url(); + String url = wmsUrl + methods_url; + HttpResponse result = null; + log.info("feedbackDeviceStatus----请求参数{}", json); + + try { + result = HttpRequest.post(url) + .body(String.valueOf(json)) + .execute(); + System.out.println(result); + log.info("feedbackDeviceStatus----返回参数{}", result); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + return result; + } finally { + MDC.remove(log_file_type); } - return result; + } @Override public HttpResponse feedbackAgv(JSONArray from) { - String wmsUrl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - - AddressDto addressDto = addressService.findByCode("feedbackAgv"); - String methods_url = addressDto.getMethods_url(); - String url = wmsUrl + methods_url; - HttpResponse result = null; - log.info("feedbackAgv----请求参数{}", from); - try { - result = HttpRequest.post(url) - .body(String.valueOf(from)) - .execute(); - System.out.println(result); - log.info("feedbackAgv----返回参数{}", result); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsUrl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("feedbackAgv"); + String methods_url = addressDto.getMethods_url(); + String url = wmsUrl + methods_url; + HttpResponse result = null; + log.info("feedbackAgv----请求参数{}", from); + + try { + result = HttpRequest.post(url) + .body(String.valueOf(from)) + .execute(); + System.out.println(result); + log.info("feedbackAgv----返回参数{}", result); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + return result; + } finally { + MDC.remove(log_file_type); } - return result; + } @Override public HttpResponse applyOpenOrCloseDoor(String device_code, String status) { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - JSONObject jo = new JSONObject(); - jo.put("device_code", device_code); - jo.put("status", status); - HttpResponse result = null; - log.info("applyOpenOrCloseDoor-----请求参数{}", jo.toString()); - - AddressDto addressDto = addressService.findByCode("applyOpenOrCloseDoor"); - String methods_url = addressDto.getMethods_url(); try { - result = HttpRequest.post(wmsurl + methods_url) - .body(String.valueOf(jo)) - .execute(); - System.out.println(result); - log.info("applyOpenOrCloseDoor-----返回参数{}", result); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + JSONObject jo = new JSONObject(); + jo.put("device_code", device_code); + jo.put("status", status); + HttpResponse result = null; + log.info("applyOpenOrCloseDoor-----请求参数{}", jo.toString()); + + AddressDto addressDto = addressService.findByCode("applyOpenOrCloseDoor"); + String methods_url = addressDto.getMethods_url(); + try { + result = HttpRequest.post(wmsurl + methods_url) + .body(String.valueOf(jo)) + .execute(); + System.out.println(result); + log.info("applyOpenOrCloseDoor-----返回参数{}", result); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + } + return result; + } finally { + MDC.remove(log_file_type); } - return result; + } @Override public HttpResponse queryDoorsStatus() { - String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); - - HttpResponse result = null; - log.info("queryDoorStatus-----请求"); - AddressDto addressDto = addressService.findByCode("queryDoorsStatus"); - String methods_url = addressDto.getMethods_url(); try { - result = HttpRequest.get(wmsurl + methods_url) - .body("") - .execute(); - log.info("queryDoorStatus-----输出参数{}", result.body().toString()); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); + MDC.put(log_file_type, log_type); + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + HttpResponse result = null; + log.info("queryDoorStatus-----请求"); + AddressDto addressDto = addressService.findByCode("queryDoorsStatus"); + String methods_url = addressDto.getMethods_url(); + try { + result = HttpRequest.get(wmsurl + methods_url) + .body("") + .execute(); + log.info("queryDoorStatus-----输出参数{}", result.body().toString()); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + + } + return result; + } finally { + MDC.remove(log_file_type); } - return result; + } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 426d040..fafdef9 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -9,42 +9,20 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.LnshFoldDiscSiteDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_kiln_lane.LnshKilnLaneDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_kiln_truss.LnshKilnTrussDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_labeling_machine.LnshLabelingMachineDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_mixing_mill.LnshMixingMillDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_out_kiln_truss.LnshOutKilnTrussDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_package_line.LnshPackageLineDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_package_pallet_manipulator.LnshPackagePalletManipulatorDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_package_site.LnshPackageSiteDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_pallet_storage.LnshPalletStorageDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator.LnshPalletizingManipulatorDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site.LnshPalletizingManipulatorSiteDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_press.LnshPressDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_rgv.LnshRGVDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_split_manipulator.LnshSplitManipulatorDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; import org.nl.acs.device_driver.lnsh.rljn_package_palletSplit_manipulator.RljnPackagePalletSplitManipulatorDeviceDriver; -import org.nl.acs.device_driver.machines_site.MachinesSiteDeviceDriver; -import org.nl.acs.device_driver.non_line_inspect_site.NonLineInspectSiteDeviceDriver; -import org.nl.acs.device_driver.non_line_manipulator_inspect_site.NonLineManipulatorInspectSiteDeviceDriver; -import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; -import org.nl.acs.device_driver.standard_conveyor_control.StandardCoveyorControlDeviceDriver; -import org.nl.acs.device_driver.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver; -import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_monitor.StandardCoveyorMonitorDeviceDriver; -import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; -import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.device_driver.standard_manipulator_inspect_site.StandardManipulatorInspectSiteDeviceDriver; -import org.nl.acs.device_driver.standard_manipulator_stacking_site.StandardManipulatorStackingSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; -import org.nl.acs.device_driver.standard_photoelectric_inspect_site.StandardPhotoelectricInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver; -import org.nl.acs.device_driver.weighing_site.WeighingSiteDeviceDriver; import org.nl.acs.ext.wms.service.WmsToAcsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; @@ -79,186 +57,195 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { private final ProduceshiftorderService produceshiftorderService; private String log_file_type = "log_file_type"; - private String log_type = "WMSToACS"; + private String log_type = "WMS下发ACS"; @Override public Map createFromWms(String param) { - JSONArray tasks = JSONArray.parseArray(param); - JSONObject resultJson = new JSONObject(); - log.info("createFromWms--------------:输入参数：" + tasks.toString()); try { - JSONArray errArr = new JSONArray(); - for (int i = 0; i < tasks.size(); i++) { - JSONObject task = tasks.getJSONObject(i); - String ext_task_uuid = task.getString("ext_task_uuid"); - String task_code = task.getString("task_code"); - String start_point_code = task.getString("start_device_code"); - String next_point_code = task.getString("next_device_code"); - String start_device_code = ""; - String next_device_code = ""; - if (StrUtil.isEmpty(task_code)) { - throw new WDKException("任务号不能为空"); - } - if (StrUtil.isEmpty(start_point_code)) { - throw new WDKException("起点不能为空"); - } - if (StrUtil.isEmpty(next_point_code)) { - throw new WDKException("终点不能为空"); - } + MDC.put(log_file_type, log_type); + JSONArray tasks = JSONArray.parseArray(param); + JSONObject resultJson = new JSONObject(); + log.info("createFromWms--------------:输入参数：" + tasks.toString()); + try { + JSONArray errArr = new JSONArray(); + for (int i = 0; i < tasks.size(); i++) { + JSONObject task = tasks.getJSONObject(i); + String ext_task_uuid = task.getString("ext_task_uuid"); + String task_code = task.getString("task_code"); + String start_point_code = task.getString("start_device_code"); + String next_point_code = task.getString("next_device_code"); + String start_device_code = ""; + String next_device_code = ""; + if (StrUtil.isEmpty(task_code)) { + throw new WDKException("任务号不能为空"); + } + if (StrUtil.isEmpty(start_point_code)) { + throw new WDKException("起点不能为空"); + } + if (StrUtil.isEmpty(next_point_code)) { + throw new WDKException("终点不能为空"); + } - JSONObject start_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + start_point_code + "'").uniqueResult(0); - if (!ObjectUtil.isEmpty(start_device_json)) { - start_point_code = (String) start_device_json.get("parent_storage_code") == null ? start_point_code : (String) start_device_json.get("storage_code"); - } - JSONObject next_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + next_point_code + "'").uniqueResult(0); - if (!ObjectUtil.isEmpty(next_device_json)) { - next_point_code = (String) next_device_json.get("parent_storage_code") == null ? next_point_code : (String) next_device_json.get("storage_code"); - } - String priority = task.getString("priority"); - String vehicle_code = task.getString("vehicle_code"); - String vehicle_type = task.getString("vehicle_type"); - String route_plan_code = task.getString("route_plan_code"); - String task_type = task.getString("task_type"); - String remark = task.getString("remark"); - String params = task.getString("params"); + JSONObject start_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + start_point_code + "'").uniqueResult(0); + if (!ObjectUtil.isEmpty(start_device_json)) { + start_point_code = (String) start_device_json.get("parent_storage_code") == null ? start_point_code : (String) start_device_json.get("storage_code"); + } + JSONObject next_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + next_point_code + "'").uniqueResult(0); + if (!ObjectUtil.isEmpty(next_device_json)) { + next_point_code = (String) next_device_json.get("parent_storage_code") == null ? next_point_code : (String) next_device_json.get("storage_code"); + } + String priority = task.getString("priority"); + String vehicle_code = task.getString("vehicle_code"); + String vehicle_type = task.getString("vehicle_type"); + String route_plan_code = task.getString("route_plan_code"); + String task_type = task.getString("task_type"); + String remark = task.getString("remark"); + String params = task.getString("params"); - if (start_point_code.indexOf("-") > 0) { - String str[] = start_point_code.split("-"); - start_device_code = str[0]; - } else { - start_device_code = start_point_code; - } + if (start_point_code.indexOf("-") > 0) { + String str[] = start_point_code.split("-"); + start_device_code = str[0]; + } else { + start_device_code = start_point_code; + } - if (next_point_code.indexOf("-") > 0) { - String str[] = next_point_code.split("-"); - next_device_code = str[0]; - } else { - next_device_code = next_point_code; - } + if (next_point_code.indexOf("-") > 0) { + String str[] = next_point_code.split("-"); + next_device_code = str[0]; + } else { + next_device_code = next_point_code; + } - if (StrUtil.isEmpty(route_plan_code)) { - route_plan_code = "normal"; - } - List list = RouteLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code); + if (StrUtil.isEmpty(route_plan_code)) { + route_plan_code = "normal"; + } + List list = RouteLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code); - if (ObjectUtil.isEmpty(list)) { - throw new WDKException("路由不通!"); - } - TaskDto taskDto = TaskService.findByCodeFromCache(task_code); - if (taskDto != null) { - throw new WDKException("不能存在相同的任务号!"); - } - if (!StrUtil.isEmpty(vehicle_code)) { - TaskDto vehicle_dto = TaskService.findByContainer(vehicle_code); - if (vehicle_dto != null) { - throw new WDKException("已存在该载具号的任务!"); + if (ObjectUtil.isEmpty(list)) { + throw new WDKException("路由不通!"); + } + TaskDto taskDto = TaskService.findByCodeFromCache(task_code); + if (taskDto != null) { + throw new WDKException("不能存在相同的任务号!"); + } + if (!StrUtil.isEmpty(vehicle_code)) { + TaskDto vehicle_dto = TaskService.findByContainer(vehicle_code); + if (vehicle_dto != null) { + throw new WDKException("已存在该载具号的任务!"); + } + } + JSONObject jo = new JSONObject(); + jo.put("task_code", task_code); + jo.put("ext_task_uuid", ext_task_uuid); + jo.put("start_point_code", start_point_code); + jo.put("next_point_code", next_point_code); + jo.put("start_parent_code", start_point_code); + jo.put("next_parent_code", next_point_code); + jo.put("start_device_code", start_device_code); + jo.put("next_device_code", next_device_code); + jo.put("priority", priority); + jo.put("vehicle_code", vehicle_code); + jo.put("vehicle_type", vehicle_type); + jo.put("remark", remark); + jo.put("params", params); + jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type)); + // 如果是无光电的设备 指令完成变更起点、终点状态 + JSONObject startjo = new JSONObject(); + startjo.put("device_code", start_device_code); + startjo.put("hasGoodStatus", "2"); + startjo.put("material_type", ""); + startjo.put("batch", ""); + startjo.put("islock", "false"); + DeviceService.changeDeviceStatus(startjo); + + JSONObject nextjo = new JSONObject(); + nextjo.put("device_code", next_device_code); + nextjo.put("hasGoodStatus", "0"); + nextjo.put("material_type", ""); + nextjo.put("batch", ""); + nextjo.put("islock", "false"); + DeviceService.changeDeviceStatus(nextjo); + TaskDto task_dto = jo.toJavaObject(TaskDto.class); + try { + TaskService.create(task_dto); + } catch (Exception e) { + e.printStackTrace(); + JSONObject json = new JSONObject(); + json.put("task_code", task_code); + json.put("ext_task_uuid", ext_task_uuid); + json.put("message", e.getMessage()); + errArr.add(json); } } - JSONObject jo = new JSONObject(); - jo.put("task_code", task_code); - jo.put("ext_task_uuid", ext_task_uuid); - jo.put("start_point_code", start_point_code); - jo.put("next_point_code", next_point_code); - jo.put("start_parent_code", start_point_code); - jo.put("next_parent_code", next_point_code); - jo.put("start_device_code", start_device_code); - jo.put("next_device_code", next_device_code); - jo.put("priority", priority); - jo.put("vehicle_code", vehicle_code); - jo.put("vehicle_type", vehicle_type); - jo.put("remark", remark); - jo.put("params", params); - jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type)); - // 如果是无光电的设备 指令完成变更起点、终点状态 - JSONObject startjo = new JSONObject(); - startjo.put("device_code", start_device_code); - startjo.put("hasGoodStatus", "2"); - startjo.put("material_type", ""); - startjo.put("batch", ""); - startjo.put("islock", "false"); - DeviceService.changeDeviceStatus(startjo); - - JSONObject nextjo = new JSONObject(); - nextjo.put("device_code", next_device_code); - nextjo.put("hasGoodStatus", "0"); - nextjo.put("material_type", ""); - nextjo.put("batch", ""); - nextjo.put("islock", "false"); - DeviceService.changeDeviceStatus(nextjo); - TaskDto task_dto = jo.toJavaObject(TaskDto.class); - try { - TaskService.create(task_dto); - } catch (Exception e) { - e.printStackTrace(); - JSONObject json = new JSONObject(); - json.put("task_code", task_code); - json.put("ext_task_uuid", ext_task_uuid); - json.put("message", e.getMessage()); - errArr.add(json); + if (ObjectUtil.isEmpty(errArr)) { + resultJson.put("status", 200); + } else { + resultJson.put("status", 400); } - } - if (ObjectUtil.isEmpty(errArr)) { - resultJson.put("status", 200); - } else { - resultJson.put("status", 400); - } - resultJson.put("errArr", errArr); - resultJson.put("message", "操作成功"); - resultJson.put("data", new JSONObject()); - log.info("createFromWms--------------:输出参数：" + resultJson.toString()); + resultJson.put("errArr", errArr); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONObject()); + log.info("createFromWms--------------:输出参数：" + resultJson.toString()); - } catch (Exception e) { - resultJson.put("status", 400); - resultJson.put("errArr", e.getMessage()); - resultJson.put("message", e.getMessage()); - resultJson.put("data", new JSONObject()); - log.info("createFromWms--------------:输出参数：" + resultJson.toString()); + } catch (Exception e) { + resultJson.put("status", 400); + resultJson.put("errArr", e.getMessage()); + resultJson.put("message", e.getMessage()); + resultJson.put("data", new JSONObject()); + log.info("createFromWms--------------:输出参数：" + resultJson.toString()); + } + return resultJson; + } finally { + MDC.remove(log_file_type); } - - return resultJson; } @Override public Map cancelFromWms(String param) throws Exception { - JSONArray tasks = JSONArray.parseArray(param); - AcsConfigService acsConfigService = SpringContextHolder.getBean(AcsConfigService.class); - InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); - log.debug(tasks.toString()); - log.info("cancelFromWms--------------:输入参数" + tasks.toString()); - for (int i = 0; i < tasks.size(); i++) { - JSONObject task = tasks.getJSONObject(i); - String task_uuid = task.getString("task_id"); - String task_code = task.getString("task_code"); - String vehicle_code = task.getString("vehicle_code"); - String params = task.getString("params"); + try { + MDC.put(log_file_type, log_type); + JSONArray tasks = JSONArray.parseArray(param); + AcsConfigService acsConfigService = SpringContextHolder.getBean(AcsConfigService.class); + InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); + log.debug(tasks.toString()); + log.info("cancelFromWms--------------:输入参数" + tasks.toString()); + for (int i = 0; i < tasks.size(); i++) { + JSONObject task = tasks.getJSONObject(i); + String task_uuid = task.getString("task_id"); + String task_code = task.getString("task_code"); + String vehicle_code = task.getString("vehicle_code"); + String params = task.getString("params"); - if (StrUtil.isEmpty(task_uuid)) { - throw new WDKException("任务标识不能为空"); - } - if (StrUtil.isEmpty(task_code)) { - throw new WDKException("任务号不能为空"); - } - String cancelTaskCheck = acsConfigService.findConfigFromCache().get(AcsConfig.CANCELTASKCHECK); - if (StrUtil.equals(cancelTaskCheck, "1")) { - TaskService.cancel(task_uuid); - } else if (StrUtil.equals(cancelTaskCheck, "0")) { - Instruction inst = instructionService.findByTaskcode(task_code); - if (inst == null) { - TaskService.cancel(task_uuid); - } else { - throw new RuntimeException("指令正在执行中,操作失败!"); + if (StrUtil.isEmpty(task_uuid)) { + throw new WDKException("任务标识不能为空"); + } + if (StrUtil.isEmpty(task_code)) { + throw new WDKException("任务号不能为空"); + } + String cancelTaskCheck = acsConfigService.findConfigFromCache().get(AcsConfig.CANCELTASKCHECK); + if (StrUtil.equals(cancelTaskCheck, "1")) { + TaskService.cancel(task_uuid); + } else if (StrUtil.equals(cancelTaskCheck, "0")) { + Instruction inst = instructionService.findByTaskcode(task_code); + if (inst == null) { + TaskService.cancel(task_uuid); + } else { + throw new RuntimeException("指令正在执行中,操作失败!"); + } } - } + } + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONObject()); + log.info("cancelFromWms--------------:输出参数" + resultJson.toString()); + return resultJson; + } finally { + MDC.remove(log_file_type); } - JSONObject resultJson = new JSONObject(); - resultJson.put("status", HttpStatus.OK); - resultJson.put("message", "操作成功"); - resultJson.put("data", new JSONObject()); - log.info("cancelFromWms--------------:输出参数" + resultJson.toString()); - return resultJson; } @Override @@ -266,7 +253,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { try { MDC.put(log_file_type, log_type); JSONArray orders = JSONArray.parseArray(param); - log.info("createOrder--------------:输入参数："); + log.info("createOrder--------------:输入参数：" + orders.toString()); for (int i = 0; i < orders.size(); i++) { Boolean is_flag = false; @@ -293,36 +280,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { throw new Exception("未找到对应设备:" + device_code); } - LnshMixingMillDeviceDriver lnshMixingMillDeviceDriver; - LnshPressDeviceDriver lnshPressDeviceDriver; LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver; LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver; - if (device.getDeviceDriver() instanceof LnshMixingMillDeviceDriver) { - lnshMixingMillDeviceDriver = (LnshMixingMillDeviceDriver) device.getDeviceDriver(); - if (StrUtil.isEmpty(qty)) { - throw new WDKException("重量不能为空"); - } - if (StrUtil.isEmpty(material_code)) { - throw new WDKException("物料编号不能为空！"); - } - lnshMixingMillDeviceDriver.writing("to_order_No", producetask_code); - lnshMixingMillDeviceDriver.writing("to_weight", qty); - lnshMixingMillDeviceDriver.writing("to_material_code", material_code); - is_flag = true; - } - if (device.getDeviceDriver() instanceof LnshPressDeviceDriver) { - lnshPressDeviceDriver = (LnshPressDeviceDriver) device.getDeviceDriver(); - if (StrUtil.isEmpty(qty)) { - throw new WDKException("数量不能为空"); - } - if (StrUtil.isEmpty(material_code)) { - throw new WDKException("物料编号不能为空！"); - } - lnshPressDeviceDriver.writing("to_order_No", producetask_code); - lnshPressDeviceDriver.writing("to_qty", qty); - lnshPressDeviceDriver.writing("to_material_code", material_code); - is_flag = true; - } if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); if (StrUtil.isEmpty(qty)) { @@ -372,7 +331,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { resultJson.put("status", HttpStatus.OK); resultJson.put("message", "操作成功"); resultJson.put("data", new JSONObject()); - log.info("createOrder--------------:输出参数{}", param); + log.info("createOrder--------------:输出参数" + resultJson.toString()); return resultJson; } finally { @@ -383,881 +342,586 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { @Override public Map updateDeviceGoodsFromWms(String param) { - JSONArray datas = JSONArray.parseArray(param); - log.info("updateDeviceGoodsFromWms--------------:输入参数" + datas.toString()); - for (int i = 0; i < datas.size(); i++) { - JSONObject data = datas.getJSONObject(i); - String device_code = data.getString("point_code"); - String has_goods = data.getString("has_goods"); + try { + MDC.put(log_file_type, log_type); + JSONArray datas = JSONArray.parseArray(param); + log.info("updateDeviceGoodsFromWms--------------:输入参数" + datas.toString()); + for (int i = 0; i < datas.size(); i++) { + JSONObject data = datas.getJSONObject(i); + String device_code = data.getString("point_code"); + String has_goods = data.getString("has_goods"); - JSONObject jo = new JSONObject(); - jo.put("device_code", device_code); - jo.put("hasGoodStatus", has_goods); - DeviceService.changeDeviceStatus(jo); + JSONObject jo = new JSONObject(); + jo.put("device_code", device_code); + jo.put("hasGoodStatus", has_goods); + DeviceService.changeDeviceStatus(jo); + } + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONObject()); + log.info("updateDeviceGoodsFromWms--------------:输出参数" + resultJson.toString()); + return resultJson; + } finally { + MDC.remove(log_file_type); } - JSONObject resultJson = new JSONObject(); - resultJson.put("status", HttpStatus.OK); - resultJson.put("message", "操作成功"); - resultJson.put("data", new JSONObject()); - log.info("updateDeviceGoodsFromWms--------------:输出参数" + resultJson.toString()); - return resultJson; } @Override public Map areaControl(JSONObject form) { - String device_code = form.getString("device_code"); - String type = form.getString("type"); + try { + MDC.put(log_file_type, log_type); + String device_code = form.getString("device_code"); + String type = form.getString("type"); - Device device = DeviceAppService.findDeviceByCode(device_code); - ElectricFenceDeviceDriver electricFenceDeviceDriver; - if (device.getDeviceDriver() instanceof ElectricFenceDeviceDriver) { - electricFenceDeviceDriver = (ElectricFenceDeviceDriver) device.getDeviceDriver(); - if (electricFenceDeviceDriver.getSuspended()) { - throw new RuntimeException("交通管制无法进入"); - } else if (StrUtil.equals(type, "1")) { - electricFenceDeviceDriver.setSuspended(true); - } else if (StrUtil.equals(type, "2")) { - electricFenceDeviceDriver.setSuspended(false); - } + Device device = DeviceAppService.findDeviceByCode(device_code); + + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONObject()); + log.info("updateDeviceGoodsFromWms--------------:输出参数" + resultJson.toString()); + return resultJson; + } finally { + MDC.remove(log_file_type); } - - JSONObject resultJson = new JSONObject(); - resultJson.put("status", HttpStatus.OK); - resultJson.put("message", "操作成功"); - resultJson.put("data", new JSONObject()); - log.info("updateDeviceGoodsFromWms--------------:输出参数" + resultJson.toString()); - return resultJson; } @Override public Map putAction(String jsonObject) throws Exception { - JSONArray datas = JSONArray.parseArray(jsonObject); - log.info("putAction--------------:输入参数" + datas.toString()); - for (int i = 0; i < datas.size(); i++) { - JSONObject data = datas.getJSONObject(i); - String device_code = data.getString("device_code"); - String code = data.getString("code"); - String value = data.getString("value"); - Device device = DeviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device)) { - throw new Exception("未找到对应设备:" + device_code); - } - LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver; - //晟华覆膜机 - if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { - lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.ItemProtocol itemProtocol = new org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.ItemProtocol(lnshLaminatingMachineDeviceDriver); - if (!lnshLaminatingMachineDeviceDriver.isExistFieldName(code, itemProtocol)) { - throw new Exception("设备:" + device_code + "未找到对应信号:" + code); - } - lnshLaminatingMachineDeviceDriver.writing(code, value); - } - } - JSONObject resultJson = new JSONObject(); - resultJson.put("status", HttpStatus.OK); - resultJson.put("message", "操作成功"); - resultJson.put("data", new JSONObject()); - log.info("putAction--------------:输出参数" + resultJson.toString()); - return resultJson; - } - - @Override - public Map queryDevice(String jsonObject) throws Exception { - log.info("queryDevice--------------:输入参数" + jsonObject.toString()); - JSONArray backja = new JSONArray(); - JSONArray datas = JSONArray.parseArray(jsonObject); - - //无光电普通站点 - StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - //监控点 - StandardCoveyorMonitorDeviceDriver standardCoveyorMonitorDeviceDriver; - //扫码器 - StandardScannerDeviceDriver standardScannerDeviceDriver; - //机台设备 - MachinesSiteDeviceDriver machinesSiteDeviceDriver; - //自动门 - StandardAutodoorDeviceDriver standardAutodoorDeviceDriver; - //机械手码垛驱动（区分托盘类型） - StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver; - //光电检测站点（优先入库） - StandardPhotoelectricInspectSiteDeviceDriver standardPhotoelectricInspectSiteDeviceDriver; - //晟华-混碾机 - LnshMixingMillDeviceDriver lnshMixingMillDeviceDriver; - //晟华-压力机 - LnshPressDeviceDriver lnshPressDeviceDriver; - //嘉耐-码垛机械手 - LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver; - //嘉耐-窑车道 - LnshKilnLaneDeviceDriver lnshKilnLaneDeviceDriver; - //晟华-入出窑桁架 - LnshKilnTrussDeviceDriver lnshKilnTrussDeviceDriver; - //晟华-出窑桁架 - LnshOutKilnTrussDeviceDriver lnshOutKilnTrussDeviceDriver; - //晟华-叠盘工位 - LnshFoldDiscSiteDeviceDriver lnshFoldDiscSiteDeviceDriver; - //晟华-托盘存储线 - LnshPalletStorageDeviceDriver lnshPalletStorageDeviceDriver; - //嘉耐-包装码垛机械手 - LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver; - //晟华-贴标机 - LnshLabelingMachineDeviceDriver lnshLabelingMachineDeviceDriver; - //嘉耐-拆垛机械手 - LnshSplitManipulatorDeviceDriver lnshSplitManipulatorDeviceDriver; - //嘉耐-RGV - LnshRGVDeviceDriver lnshRGVDeviceDriver; - //晟华-包装线 - LnshPackageLineDeviceDriver lnshPackageLineDeviceDriver; - //嘉耐-工位(交互模板) - LnshStationDeviceDriver lnshStationDeviceDriver; - //嘉耐-缓存货架 - LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver; - //嘉耐-包装线工位 - LnshPackageSiteDeviceDriver lnshPackageSiteDeviceDriver; - //嘉耐-包装码拆垛机械手 - RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver; - //嘉耐-码垛机械手工位 - LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; - - if (datas.size() == 0) { - List list = DeviceService.findCacheDevice(); - for (int i = 0, j = list.size(); i < j; i++) { - Device device = list.get(i); - JSONObject obj = new JSONObject(); - String device_code = device.getDevice_code(); - JSONObject jo = new JSONObject(); - if (ObjectUtil.isNull(device)) { - continue; - } - if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshStationDeviceDriver.getMode()); - jo.put("move", lnshStationDeviceDriver.getMove()); - jo.put("action", lnshStationDeviceDriver.getAction()); - jo.put("io_action", lnshStationDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshStationDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshStationDeviceDriver.getIsonline()); - jo.put("error", lnshStationDeviceDriver.getError()); - jo.put("isError", lnshStationDeviceDriver.getIserror()); - jo.put("message", lnshStationDeviceDriver.getMessage()); - jo.put("task", lnshStationDeviceDriver.getTask()); - jo.put("weight", lnshStationDeviceDriver.getWeight()); - jo.put("material", lnshStationDeviceDriver.getMaterial()); - jo.put("barcode", lnshStationDeviceDriver.getBarcode()); - jo.put("specifications", lnshStationDeviceDriver.getSpecifications()); - jo.put("batch", lnshStationDeviceDriver.getBatch()); - jo.put("pallet_type", lnshStationDeviceDriver.getContainer_type()); - - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { - lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletizingManipulatorSiteDeviceDriver.getMode()); - jo.put("move", lnshPalletizingManipulatorSiteDeviceDriver.getMove()); - jo.put("action", lnshPalletizingManipulatorSiteDeviceDriver.getAction()); - jo.put("io_action", lnshPalletizingManipulatorSiteDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshPalletizingManipulatorSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshPalletizingManipulatorSiteDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorSiteDeviceDriver.getError()); - jo.put("isError", lnshPalletizingManipulatorSiteDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorSiteDeviceDriver.getMessage()); - jo.put("task", lnshPalletizingManipulatorSiteDeviceDriver.getTask()); - jo.put("weight", lnshPalletizingManipulatorSiteDeviceDriver.getWeight()); - jo.put("material", lnshPalletizingManipulatorSiteDeviceDriver.getMaterial()); - jo.put("barcode", lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()); - jo.put("specifications", lnshPalletizingManipulatorSiteDeviceDriver.getSpecifications()); - jo.put("AlongSide", lnshPalletizingManipulatorSiteDeviceDriver.getAlongSide()); - jo.put("BshortSide", lnshPalletizingManipulatorSiteDeviceDriver.getBshortSide()); - jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal()); - jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness()); - jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch()); - } else if (device.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) { - lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPackageSiteDeviceDriver.getMode()); - jo.put("move", lnshPackageSiteDeviceDriver.getMove()); - jo.put("action", lnshPackageSiteDeviceDriver.getAction()); - jo.put("io_action", lnshPackageSiteDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshPackageSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshPackageSiteDeviceDriver.getIsonline()); - jo.put("error", lnshPackageSiteDeviceDriver.getError()); - jo.put("isError", lnshPackageSiteDeviceDriver.getIserror()); - jo.put("message", lnshPackageSiteDeviceDriver.getMessage()); - jo.put("task", lnshPackageSiteDeviceDriver.getTask()); - jo.put("weight", lnshPackageSiteDeviceDriver.getWeight()); - jo.put("material", lnshPackageSiteDeviceDriver.getMaterial()); - jo.put("barcode", lnshPackageSiteDeviceDriver.getBarcode()); - } else if (device.getDeviceDriver() instanceof LnshMixingMillDeviceDriver) { - lnshMixingMillDeviceDriver = (LnshMixingMillDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshMixingMillDeviceDriver.getMode()); - jo.put("status", lnshMixingMillDeviceDriver.getStatus()); - jo.put("isOnline", lnshMixingMillDeviceDriver.getIsonline()); - jo.put("error", lnshMixingMillDeviceDriver.getError()); - jo.put("open_time", lnshMixingMillDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshMixingMillDeviceDriver.getStandby_time()); - jo.put("production_time", lnshMixingMillDeviceDriver.getProduction_time()); - jo.put("error_time", lnshMixingMillDeviceDriver.getError_time()); - jo.put("isError", lnshMixingMillDeviceDriver.getIserror()); - jo.put("message", lnshMixingMillDeviceDriver.getMessage()); - jo.put("weight", lnshMixingMillDeviceDriver.getWeight()); - jo.put("material", lnshMixingMillDeviceDriver.getMaterial()); - jo.put("order_No", lnshMixingMillDeviceDriver.getOrder_No()); - jo.put("mix_num", lnshMixingMillDeviceDriver.getMix_num()); - } else if (device.getDeviceDriver() instanceof LnshPressDeviceDriver) { - lnshPressDeviceDriver = (LnshPressDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPressDeviceDriver.getMode()); - jo.put("status", lnshPressDeviceDriver.getStatus()); - jo.put("isOnline", lnshPressDeviceDriver.getIsonline()); - jo.put("error", lnshPressDeviceDriver.getError()); - jo.put("open_time", lnshPressDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshPressDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPressDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPressDeviceDriver.getError_time()); - jo.put("isError", lnshPressDeviceDriver.getIserror()); - jo.put("message", lnshPressDeviceDriver.getMessage()); - jo.put("weight", lnshPressDeviceDriver.getWeight()); - jo.put("qty", lnshPressDeviceDriver.getQty()); - jo.put("material", lnshPressDeviceDriver.getMaterial()); - jo.put("qualified", lnshPressDeviceDriver.getQualified()); - jo.put("unqualified", lnshPressDeviceDriver.getUnqualified()); - jo.put("order_No", lnshPressDeviceDriver.getOrder_No()); - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { - lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletizingManipulatorDeviceDriver.getMode()); - jo.put("status", lnshPalletizingManipulatorDeviceDriver.getStatus()); - jo.put("action", lnshPalletizingManipulatorDeviceDriver.getAction()); - jo.put("isOnline", lnshPalletizingManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorDeviceDriver.getError()); - jo.put("put_station", lnshPalletizingManipulatorDeviceDriver.getPut_station()); - jo.put("material", lnshPalletizingManipulatorDeviceDriver.getMaterial()); - jo.put("encoder_qty", lnshPalletizingManipulatorDeviceDriver.getEncoder_qty()); - jo.put("batch", lnshPalletizingManipulatorDeviceDriver.getBatch()); - jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications()); - jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshKilnTrussDeviceDriver) { - lnshKilnTrussDeviceDriver = (LnshKilnTrussDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshKilnTrussDeviceDriver.getMode()); - jo.put("status", lnshKilnTrussDeviceDriver.getStatus()); - jo.put("isOnline", lnshKilnTrussDeviceDriver.getIsonline()); - jo.put("error", lnshKilnTrussDeviceDriver.getError()); - jo.put("open_time", lnshKilnTrussDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshKilnTrussDeviceDriver.getStandby_time()); - jo.put("production_time", lnshKilnTrussDeviceDriver.getProduction_time()); - jo.put("error_time", lnshKilnTrussDeviceDriver.getError_time()); - jo.put("isError", lnshKilnTrussDeviceDriver.getIserror()); - jo.put("message", lnshKilnTrussDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { - lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshKilnLaneDeviceDriver.getMode()); - jo.put("status", lnshKilnLaneDeviceDriver.getStatus()); - jo.put("isOnline", lnshKilnLaneDeviceDriver.getIsonline()); - jo.put("error", lnshKilnLaneDeviceDriver.getError()); - jo.put("isError", lnshKilnLaneDeviceDriver.getIserror()); - jo.put("open_time", lnshKilnLaneDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshKilnLaneDeviceDriver.getStandby_time()); - jo.put("production_time", lnshKilnLaneDeviceDriver.getProduction_time()); - jo.put("error_time", lnshKilnLaneDeviceDriver.getError_time()); - jo.put("car_sum", lnshKilnLaneDeviceDriver.getCar_sum()); - jo.put("nullCar_qty", lnshKilnLaneDeviceDriver.getNullCar_qty()); - jo.put("burning_car_qty", lnshKilnLaneDeviceDriver.getBurning_car_qty()); - jo.put("message", lnshKilnLaneDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshOutKilnTrussDeviceDriver) { - lnshOutKilnTrussDeviceDriver = (LnshOutKilnTrussDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshOutKilnTrussDeviceDriver.getMode()); - jo.put("status", lnshOutKilnTrussDeviceDriver.getStatus()); - jo.put("isOnline", lnshOutKilnTrussDeviceDriver.getIsonline()); - jo.put("error", lnshOutKilnTrussDeviceDriver.getError()); - jo.put("outKiln_move", lnshOutKilnTrussDeviceDriver.getOutKiln_move()); - jo.put("outKiln_barcode", lnshOutKilnTrussDeviceDriver.getOutKiln_barcode()); - jo.put("outKiln_device", lnshOutKilnTrussDeviceDriver.getOutKiln_device()); - jo.put("open_time", lnshOutKilnTrussDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshOutKilnTrussDeviceDriver.getStandby_time()); - jo.put("production_time", lnshOutKilnTrussDeviceDriver.getProduction_time()); - jo.put("error_time", lnshOutKilnTrussDeviceDriver.getError_time()); - jo.put("isError", lnshOutKilnTrussDeviceDriver.getIserror()); - jo.put("message", lnshOutKilnTrussDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { - lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshFoldDiscSiteDeviceDriver.getMode()); - jo.put("status", lnshFoldDiscSiteDeviceDriver.getStatus()); - jo.put("isOnline", lnshFoldDiscSiteDeviceDriver.getIsonline()); - jo.put("error", lnshFoldDiscSiteDeviceDriver.getError()); - jo.put("open_time", lnshFoldDiscSiteDeviceDriver.getOpen_time()); - jo.put("close_time", lnshFoldDiscSiteDeviceDriver.getClose_time()); - jo.put("standby_time", lnshFoldDiscSiteDeviceDriver.getStandby_time()); - jo.put("production_time", lnshFoldDiscSiteDeviceDriver.getProduction_time()); - jo.put("error_time", lnshFoldDiscSiteDeviceDriver.getError_time()); - jo.put("container_qty", lnshFoldDiscSiteDeviceDriver.getContainer_qty()); - jo.put("isError", lnshFoldDiscSiteDeviceDriver.getIserror()); - jo.put("message", lnshFoldDiscSiteDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshPalletStorageDeviceDriver) { - lnshPalletStorageDeviceDriver = (LnshPalletStorageDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletStorageDeviceDriver.getMode()); - jo.put("status", lnshPalletStorageDeviceDriver.getStatus()); - jo.put("isOnline", lnshPalletStorageDeviceDriver.getIsonline()); - jo.put("error", lnshPalletStorageDeviceDriver.getError()); - jo.put("open_time", lnshPalletStorageDeviceDriver.getOpen_time()); - jo.put("close_time", lnshPalletStorageDeviceDriver.getClose_time()); - jo.put("standby_time", lnshPalletStorageDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPalletStorageDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPalletStorageDeviceDriver.getError_time()); - jo.put("tray_crib_qty", lnshPalletStorageDeviceDriver.getTray_crib_qty()); - jo.put("total_container", lnshPalletStorageDeviceDriver.getTotal_container()); - jo.put("isError", lnshPalletStorageDeviceDriver.getIserror()); - jo.put("message", lnshPalletStorageDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { - lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPackagePalletManipulatorDeviceDriver.getMode()); - jo.put("status", lnshPackagePalletManipulatorDeviceDriver.getStatus()); - jo.put("onoff_status", lnshPackagePalletManipulatorDeviceDriver.getOnoff_status()); - jo.put("specifications", lnshPackagePalletManipulatorDeviceDriver.getSpecifications()); - jo.put("batch", lnshPackagePalletManipulatorDeviceDriver.getBatch()); - jo.put("isOnline", lnshPackagePalletManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPackagePalletManipulatorDeviceDriver.getError()); - jo.put("putStation", lnshPackagePalletManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", lnshPackagePalletManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshPackagePalletManipulatorDeviceDriver.getMaterial()); - jo.put("qty", lnshPackagePalletManipulatorDeviceDriver.getQty()); - jo.put("open_time", lnshPackagePalletManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshPackagePalletManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPackagePalletManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPackagePalletManipulatorDeviceDriver.getError_time()); - jo.put("order_No", lnshPackagePalletManipulatorDeviceDriver.getOrder_No()); - jo.put("isError", lnshPackagePalletManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPackagePalletManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { - rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", rljnPackagePalletSplitManipulatorDeviceDriver.getMode()); - jo.put("status", rljnPackagePalletSplitManipulatorDeviceDriver.getStatus()); - jo.put("isOnline", rljnPackagePalletSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", rljnPackagePalletSplitManipulatorDeviceDriver.getError()); - jo.put("putStation", rljnPackagePalletSplitManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", rljnPackagePalletSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", rljnPackagePalletSplitManipulatorDeviceDriver.getMaterial()); - jo.put("qty", rljnPackagePalletSplitManipulatorDeviceDriver.getQty()); - jo.put("open_time", rljnPackagePalletSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", rljnPackagePalletSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", rljnPackagePalletSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", rljnPackagePalletSplitManipulatorDeviceDriver.getError_time()); - jo.put("order_No", rljnPackagePalletSplitManipulatorDeviceDriver.getOrder_No()); - jo.put("onoff_status", rljnPackagePalletSplitManipulatorDeviceDriver.getOnoff_status()); - jo.put("getStation", rljnPackagePalletSplitManipulatorDeviceDriver.getGetStation()); - jo.put("specifications", rljnPackagePalletSplitManipulatorDeviceDriver.getSpecifications()); - jo.put("batch", rljnPackagePalletSplitManipulatorDeviceDriver.getBatch()); - jo.put("total_split", rljnPackagePalletSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("isError", rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", rljnPackagePalletSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { - lnshLabelingMachineDeviceDriver = (LnshLabelingMachineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshLabelingMachineDeviceDriver.getMode()); - jo.put("status", lnshLabelingMachineDeviceDriver.getStatus()); - jo.put("isOnline", lnshLabelingMachineDeviceDriver.getIsonline()); - jo.put("open_time", lnshLabelingMachineDeviceDriver.getOpen_time()); - jo.put("close_time", lnshLabelingMachineDeviceDriver.getClose_time()); - jo.put("standby_time", lnshLabelingMachineDeviceDriver.getStandby_time()); - jo.put("production_time", lnshLabelingMachineDeviceDriver.getProduction_time()); - jo.put("error_time", lnshLabelingMachineDeviceDriver.getError_time()); - jo.put("labeling_qty", lnshLabelingMachineDeviceDriver.getLabeling_qty()); - jo.put("isError", lnshLabelingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLabelingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { - lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshSplitManipulatorDeviceDriver.getMode()); - jo.put("isOnline", lnshSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshSplitManipulatorDeviceDriver.getError()); - jo.put("getStation", lnshSplitManipulatorDeviceDriver.getGetStation()); - jo.put("barcode", lnshSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshSplitManipulatorDeviceDriver.getMaterial()); - jo.put("batch", lnshSplitManipulatorDeviceDriver.getBatch()); - jo.put("specifications", lnshSplitManipulatorDeviceDriver.getSpecifications()); - jo.put("qty", lnshSplitManipulatorDeviceDriver.getQty()); - jo.put("total_split", lnshSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("open_time", lnshSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time()); - jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshPackageLineDeviceDriver) { - lnshPackageLineDeviceDriver = (LnshPackageLineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPackageLineDeviceDriver.getMode()); - jo.put("status", lnshPackageLineDeviceDriver.getStatus()); - jo.put("isOnline", lnshPackageLineDeviceDriver.getIsonline()); - jo.put("open_time", lnshPackageLineDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshPackageLineDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPackageLineDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPackageLineDeviceDriver.getError_time()); - jo.put("barcode", lnshPackageLineDeviceDriver.getBarcode()); - jo.put("isError", lnshPackageLineDeviceDriver.getIserror()); - jo.put("message", lnshPackageLineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { - lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshLaminatingMachineDeviceDriver.getMode()); - jo.put("move", lnshLaminatingMachineDeviceDriver.getMove()); - jo.put("container_type", lnshLaminatingMachineDeviceDriver.getContainer_type()); - jo.put("barcode", lnshLaminatingMachineDeviceDriver.getBarcode()); - jo.put("task", lnshLaminatingMachineDeviceDriver.getTask()); - jo.put("error", lnshLaminatingMachineDeviceDriver.getError()); - jo.put("isOnline", lnshLaminatingMachineDeviceDriver.getIsonline()); - jo.put("isError", lnshLaminatingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLaminatingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { - lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshRGVDeviceDriver.getMode()); - jo.put("status", lnshRGVDeviceDriver.getStatus()); - jo.put("move_1", lnshRGVDeviceDriver.getMove_1()); - jo.put("move_2", lnshRGVDeviceDriver.getMove_2()); - jo.put("action_1", lnshRGVDeviceDriver.getAction_1()); - jo.put("action_2", lnshRGVDeviceDriver.getAction_2()); - jo.put("walk_y", lnshRGVDeviceDriver.getWalk_y()); - jo.put("error", lnshRGVDeviceDriver.getError()); - jo.put("task1", lnshRGVDeviceDriver.getTask1()); - jo.put("task2", lnshRGVDeviceDriver.getTask2()); - jo.put("isOnline", lnshRGVDeviceDriver.getIsonline()); - jo.put("isError", lnshRGVDeviceDriver.getIserror()); - jo.put("message", lnshRGVDeviceDriver.getMessage()); - jo.put("open_time", lnshRGVDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshRGVDeviceDriver.getStandby_time()); - jo.put("production_time", lnshRGVDeviceDriver.getProduction_time()); - jo.put("error_time", lnshRGVDeviceDriver.getError_time()); - jo.put("task_qty", lnshRGVDeviceDriver.getTask_qty()); - jo.put("finishTask_qty", lnshRGVDeviceDriver.getFinishTask_qty()); - jo.put("batch", lnshRGVDeviceDriver.getBatch()); - jo.put("specifications", lnshRGVDeviceDriver.getSpecifications()); - jo.put("qty", lnshRGVDeviceDriver.getQty()); - } else { - jo.put("device_code", device.getDevice_code()); - } - backja.add(jo); - } - } else { + try { + MDC.put(log_file_type, log_type); + JSONArray datas = JSONArray.parseArray(jsonObject); + log.info("putAction--------------:输入参数" + datas.toString()); for (int i = 0; i < datas.size(); i++) { - JSONObject jo = new JSONObject(); JSONObject data = datas.getJSONObject(i); String device_code = data.getString("device_code"); + String code = data.getString("code"); + String value = data.getString("value"); Device device = DeviceAppService.findDeviceByCode(device_code); if (ObjectUtil.isEmpty(device)) { throw new Exception("未找到对应设备:" + device_code); } - - if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { - standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", standardAutodoorDeviceDriver.getMode()); - jo.put("action", standardAutodoorDeviceDriver.getAction()); - jo.put("isOnline", true); - jo.put("error", standardAutodoorDeviceDriver.getError()); - jo.put("isError", standardAutodoorDeviceDriver.getIserror()); - } else if (device.getDeviceDriver() instanceof StandardCoveyorMonitorDeviceDriver) { - standardCoveyorMonitorDeviceDriver = (StandardCoveyorMonitorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", standardCoveyorMonitorDeviceDriver.getMode()); - jo.put("move", standardCoveyorMonitorDeviceDriver.getMove()); - jo.put("hasGoods", standardCoveyorMonitorDeviceDriver.getHasGoods()); - jo.put("isOnline", standardCoveyorMonitorDeviceDriver.getIsonline()); - jo.put("error", standardCoveyorMonitorDeviceDriver.getError()); - jo.put("isError", standardCoveyorMonitorDeviceDriver.getIserror()); - jo.put("message", standardCoveyorMonitorDeviceDriver.getMessage()); - //普通站点 - } else if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("move", standardOrdinarySiteDeviceDriver.getMove()); - jo.put("container", standardOrdinarySiteDeviceDriver.getContainer()); - jo.put("hasGoods", standardOrdinarySiteDeviceDriver.getHasGoods()); - jo.put("isOnline", true); - //点击弹出 - jo.put("is_click", true); - jo.put("device_type", device.getDevice_type()); - jo.put("error", standardOrdinarySiteDeviceDriver.getError()); - jo.put("isError", standardOrdinarySiteDeviceDriver.getIserror()); - jo.put("container", standardOrdinarySiteDeviceDriver.getContainer()); - jo.put("message", standardOrdinarySiteDeviceDriver.getMessage()); - jo.put("material", standardOrdinarySiteDeviceDriver.getMaterial()); - jo.put("batch", standardOrdinarySiteDeviceDriver.getBatch()); - - } else if (device.getDeviceDriver() instanceof StandardScannerDeviceDriver) { - standardScannerDeviceDriver = (StandardScannerDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("isOnline", true); - jo.put("device_type", device.getDevice_type()); - //点击弹出 - jo.put("is_click", true); - jo.put("ip", standardScannerDeviceDriver.getIp()); - jo.put("container", StrUtil.isEmpty(standardScannerDeviceDriver.readBarcode()) ? "" : standardScannerDeviceDriver.readBarcode()); - - } else if (device.getDeviceDriver() instanceof MachinesSiteDeviceDriver) { - machinesSiteDeviceDriver = (MachinesSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", machinesSiteDeviceDriver.getMode()); - jo.put("io_action", machinesSiteDeviceDriver.getIoaction()); - jo.put("isOnline", machinesSiteDeviceDriver.getIsonline()); - } - //机械手码垛驱动（区分托盘类型） - else if (device.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { - standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", standardManipulatorStackingSiteDeviceDriver.getMode()); - jo.put("move", standardManipulatorStackingSiteDeviceDriver.getMove()); - jo.put("action", standardManipulatorStackingSiteDeviceDriver.getAction()); - jo.put("io_action", standardManipulatorStackingSiteDeviceDriver.getIo_action()); - jo.put("hasGoods", standardManipulatorStackingSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", standardManipulatorStackingSiteDeviceDriver.getIsonline()); - jo.put("error", standardManipulatorStackingSiteDeviceDriver.getError()); - jo.put("isError", standardManipulatorStackingSiteDeviceDriver.getIserror()); - jo.put("container", standardManipulatorStackingSiteDeviceDriver.getContainer()); - jo.put("message", standardManipulatorStackingSiteDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof StandardPhotoelectricInspectSiteDeviceDriver) { - standardPhotoelectricInspectSiteDeviceDriver = (StandardPhotoelectricInspectSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", standardPhotoelectricInspectSiteDeviceDriver.getMode()); - jo.put("move", standardPhotoelectricInspectSiteDeviceDriver.getMove()); - jo.put("hasGoods", standardPhotoelectricInspectSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", standardPhotoelectricInspectSiteDeviceDriver.getIsonline()); - jo.put("error", standardPhotoelectricInspectSiteDeviceDriver.getError()); - jo.put("isError", standardPhotoelectricInspectSiteDeviceDriver.getIserror()); - jo.put("container", standardPhotoelectricInspectSiteDeviceDriver.getContainer()); - jo.put("message", standardPhotoelectricInspectSiteDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshStationDeviceDriver.getMode()); - jo.put("move", lnshStationDeviceDriver.getMove()); - jo.put("action", lnshStationDeviceDriver.getAction()); - jo.put("io_action", lnshStationDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshStationDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshStationDeviceDriver.getIsonline()); - jo.put("error", lnshStationDeviceDriver.getError()); - jo.put("isError", lnshStationDeviceDriver.getIserror()); - jo.put("message", lnshStationDeviceDriver.getMessage()); - jo.put("task", lnshStationDeviceDriver.getTask()); - jo.put("weight", lnshStationDeviceDriver.getWeight()); - jo.put("material", lnshStationDeviceDriver.getMaterial()); - jo.put("barcode", lnshStationDeviceDriver.getBarcode()); - jo.put("specifications", lnshStationDeviceDriver.getSpecifications()); - jo.put("batch", lnshStationDeviceDriver.getBatch()); - jo.put("pallet_type", lnshStationDeviceDriver.getContainer_type()); - - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { - lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletizingManipulatorSiteDeviceDriver.getMode()); - jo.put("move", lnshPalletizingManipulatorSiteDeviceDriver.getMove()); - jo.put("action", lnshPalletizingManipulatorSiteDeviceDriver.getAction()); - jo.put("io_action", lnshPalletizingManipulatorSiteDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshPalletizingManipulatorSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshPalletizingManipulatorSiteDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorSiteDeviceDriver.getError()); - jo.put("isError", lnshPalletizingManipulatorSiteDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorSiteDeviceDriver.getMessage()); - jo.put("task", lnshPalletizingManipulatorSiteDeviceDriver.getTask()); - jo.put("weight", lnshPalletizingManipulatorSiteDeviceDriver.getWeight()); - jo.put("material", lnshPalletizingManipulatorSiteDeviceDriver.getMaterial()); - jo.put("barcode", lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()); - jo.put("specifications", lnshPalletizingManipulatorSiteDeviceDriver.getSpecifications()); - jo.put("AlongSide", lnshPalletizingManipulatorSiteDeviceDriver.getAlongSide()); - jo.put("BshortSide", lnshPalletizingManipulatorSiteDeviceDriver.getBshortSide()); - jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal()); - jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness()); - jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch()); - } else if (device.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) { - lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPackageSiteDeviceDriver.getMode()); - jo.put("move", lnshPackageSiteDeviceDriver.getMove()); - jo.put("action", lnshPackageSiteDeviceDriver.getAction()); - jo.put("io_action", lnshPackageSiteDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshPackageSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshPackageSiteDeviceDriver.getIsonline()); - jo.put("error", lnshPackageSiteDeviceDriver.getError()); - jo.put("isError", lnshPackageSiteDeviceDriver.getIserror()); - jo.put("message", lnshPackageSiteDeviceDriver.getMessage()); - jo.put("task", lnshPackageSiteDeviceDriver.getTask()); - jo.put("weight", lnshPackageSiteDeviceDriver.getWeight()); - jo.put("material", lnshPackageSiteDeviceDriver.getMaterial()); - jo.put("barcode", lnshPackageSiteDeviceDriver.getBarcode()); - } else if (device.getDeviceDriver() instanceof LnshMixingMillDeviceDriver) { - lnshMixingMillDeviceDriver = (LnshMixingMillDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshMixingMillDeviceDriver.getMode()); - jo.put("status", lnshMixingMillDeviceDriver.getStatus()); - jo.put("isOnline", lnshMixingMillDeviceDriver.getIsonline()); - jo.put("error", lnshMixingMillDeviceDriver.getError()); - jo.put("open_time", lnshMixingMillDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshMixingMillDeviceDriver.getStandby_time()); - jo.put("production_time", lnshMixingMillDeviceDriver.getProduction_time()); - jo.put("error_time", lnshMixingMillDeviceDriver.getError_time()); - jo.put("isError", lnshMixingMillDeviceDriver.getIserror()); - jo.put("message", lnshMixingMillDeviceDriver.getMessage()); - jo.put("weight", lnshMixingMillDeviceDriver.getWeight()); - jo.put("material", lnshMixingMillDeviceDriver.getMaterial()); - jo.put("order_No", lnshMixingMillDeviceDriver.getOrder_No()); - jo.put("mix_num", lnshMixingMillDeviceDriver.getMix_num()); - } else if (device.getDeviceDriver() instanceof LnshPressDeviceDriver) { - lnshPressDeviceDriver = (LnshPressDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPressDeviceDriver.getMode()); - jo.put("status", lnshPressDeviceDriver.getStatus()); - jo.put("isOnline", lnshPressDeviceDriver.getIsonline()); - jo.put("error", lnshPressDeviceDriver.getError()); - jo.put("open_time", lnshPressDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshPressDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPressDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPressDeviceDriver.getError_time()); - jo.put("isError", lnshPressDeviceDriver.getIserror()); - jo.put("message", lnshPressDeviceDriver.getMessage()); - jo.put("weight", lnshPressDeviceDriver.getWeight()); - jo.put("qty", lnshPressDeviceDriver.getQty()); - jo.put("material", lnshPressDeviceDriver.getMaterial()); - jo.put("qualified", lnshPressDeviceDriver.getQualified()); - jo.put("unqualified", lnshPressDeviceDriver.getUnqualified()); - jo.put("order_No", lnshPressDeviceDriver.getOrder_No()); - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { - lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletizingManipulatorDeviceDriver.getMode()); - jo.put("status", lnshPalletizingManipulatorDeviceDriver.getStatus()); - jo.put("action", lnshPalletizingManipulatorDeviceDriver.getAction()); - jo.put("isOnline", lnshPalletizingManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorDeviceDriver.getError()); - jo.put("put_station", lnshPalletizingManipulatorDeviceDriver.getPut_station()); - jo.put("material", lnshPalletizingManipulatorDeviceDriver.getMaterial()); - jo.put("encoder_qty", lnshPalletizingManipulatorDeviceDriver.getEncoder_qty()); - jo.put("batch", lnshPalletizingManipulatorDeviceDriver.getBatch()); - jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications()); - jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshKilnTrussDeviceDriver) { - lnshKilnTrussDeviceDriver = (LnshKilnTrussDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshKilnTrussDeviceDriver.getMode()); - jo.put("status", lnshKilnTrussDeviceDriver.getStatus()); - jo.put("isOnline", lnshKilnTrussDeviceDriver.getIsonline()); - jo.put("error", lnshKilnTrussDeviceDriver.getError()); - jo.put("open_time", lnshKilnTrussDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshKilnTrussDeviceDriver.getStandby_time()); - jo.put("production_time", lnshKilnTrussDeviceDriver.getProduction_time()); - jo.put("error_time", lnshKilnTrussDeviceDriver.getError_time()); - jo.put("isError", lnshKilnTrussDeviceDriver.getIserror()); - jo.put("message", lnshKilnTrussDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { - lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshKilnLaneDeviceDriver.getMode()); - jo.put("status", lnshKilnLaneDeviceDriver.getStatus()); - jo.put("isOnline", lnshKilnLaneDeviceDriver.getIsonline()); - jo.put("error", lnshKilnLaneDeviceDriver.getError()); - jo.put("isError", lnshKilnLaneDeviceDriver.getIserror()); - jo.put("open_time", lnshKilnLaneDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshKilnLaneDeviceDriver.getStandby_time()); - jo.put("production_time", lnshKilnLaneDeviceDriver.getProduction_time()); - jo.put("error_time", lnshKilnLaneDeviceDriver.getError_time()); - jo.put("car_sum", lnshKilnLaneDeviceDriver.getCar_sum()); - jo.put("nullCar_qty", lnshKilnLaneDeviceDriver.getNullCar_qty()); - jo.put("burning_car_qty", lnshKilnLaneDeviceDriver.getBurning_car_qty()); - jo.put("message", lnshKilnLaneDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshOutKilnTrussDeviceDriver) { - lnshOutKilnTrussDeviceDriver = (LnshOutKilnTrussDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshOutKilnTrussDeviceDriver.getMode()); - jo.put("status", lnshOutKilnTrussDeviceDriver.getStatus()); - jo.put("isOnline", lnshOutKilnTrussDeviceDriver.getIsonline()); - jo.put("error", lnshOutKilnTrussDeviceDriver.getError()); - jo.put("outKiln_move", lnshOutKilnTrussDeviceDriver.getOutKiln_move()); - jo.put("outKiln_barcode", lnshOutKilnTrussDeviceDriver.getOutKiln_barcode()); - jo.put("outKiln_device", lnshOutKilnTrussDeviceDriver.getOutKiln_device()); - jo.put("open_time", lnshOutKilnTrussDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshOutKilnTrussDeviceDriver.getStandby_time()); - jo.put("production_time", lnshOutKilnTrussDeviceDriver.getProduction_time()); - jo.put("error_time", lnshOutKilnTrussDeviceDriver.getError_time()); - jo.put("isError", lnshOutKilnTrussDeviceDriver.getIserror()); - jo.put("message", lnshOutKilnTrussDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { - lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshFoldDiscSiteDeviceDriver.getMode()); - jo.put("status", lnshFoldDiscSiteDeviceDriver.getStatus()); - jo.put("isOnline", lnshFoldDiscSiteDeviceDriver.getIsonline()); - jo.put("error", lnshFoldDiscSiteDeviceDriver.getError()); - jo.put("open_time", lnshFoldDiscSiteDeviceDriver.getOpen_time()); - jo.put("close_time", lnshFoldDiscSiteDeviceDriver.getClose_time()); - jo.put("standby_time", lnshFoldDiscSiteDeviceDriver.getStandby_time()); - jo.put("production_time", lnshFoldDiscSiteDeviceDriver.getProduction_time()); - jo.put("error_time", lnshFoldDiscSiteDeviceDriver.getError_time()); - jo.put("container_qty", lnshFoldDiscSiteDeviceDriver.getContainer_qty()); - jo.put("isError", lnshFoldDiscSiteDeviceDriver.getIserror()); - jo.put("message", lnshFoldDiscSiteDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshPalletStorageDeviceDriver) { - lnshPalletStorageDeviceDriver = (LnshPalletStorageDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletStorageDeviceDriver.getMode()); - jo.put("status", lnshPalletStorageDeviceDriver.getStatus()); - jo.put("isOnline", lnshPalletStorageDeviceDriver.getIsonline()); - jo.put("error", lnshPalletStorageDeviceDriver.getError()); - jo.put("open_time", lnshPalletStorageDeviceDriver.getOpen_time()); - jo.put("close_time", lnshPalletStorageDeviceDriver.getClose_time()); - jo.put("standby_time", lnshPalletStorageDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPalletStorageDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPalletStorageDeviceDriver.getError_time()); - jo.put("tray_crib_qty", lnshPalletStorageDeviceDriver.getTray_crib_qty()); - jo.put("total_container", lnshPalletStorageDeviceDriver.getTotal_container()); - jo.put("isError", lnshPalletStorageDeviceDriver.getIserror()); - jo.put("message", lnshPalletStorageDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { - lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPackagePalletManipulatorDeviceDriver.getMode()); - jo.put("status", lnshPackagePalletManipulatorDeviceDriver.getStatus()); - jo.put("onoff_status", lnshPackagePalletManipulatorDeviceDriver.getOnoff_status()); - jo.put("specifications", lnshPackagePalletManipulatorDeviceDriver.getSpecifications()); - jo.put("batch", lnshPackagePalletManipulatorDeviceDriver.getBatch()); - jo.put("isOnline", lnshPackagePalletManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPackagePalletManipulatorDeviceDriver.getError()); - jo.put("putStation", lnshPackagePalletManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", lnshPackagePalletManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshPackagePalletManipulatorDeviceDriver.getMaterial()); - jo.put("qty", lnshPackagePalletManipulatorDeviceDriver.getQty()); - jo.put("open_time", lnshPackagePalletManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshPackagePalletManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPackagePalletManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPackagePalletManipulatorDeviceDriver.getError_time()); - jo.put("order_No", lnshPackagePalletManipulatorDeviceDriver.getOrder_No()); - jo.put("isError", lnshPackagePalletManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPackagePalletManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { - rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", rljnPackagePalletSplitManipulatorDeviceDriver.getMode()); - jo.put("status", rljnPackagePalletSplitManipulatorDeviceDriver.getStatus()); - jo.put("isOnline", rljnPackagePalletSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", rljnPackagePalletSplitManipulatorDeviceDriver.getError()); - jo.put("putStation", rljnPackagePalletSplitManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", rljnPackagePalletSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", rljnPackagePalletSplitManipulatorDeviceDriver.getMaterial()); - jo.put("qty", rljnPackagePalletSplitManipulatorDeviceDriver.getQty()); - jo.put("open_time", rljnPackagePalletSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", rljnPackagePalletSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", rljnPackagePalletSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", rljnPackagePalletSplitManipulatorDeviceDriver.getError_time()); - jo.put("order_No", rljnPackagePalletSplitManipulatorDeviceDriver.getOrder_No()); - jo.put("onoff_status", rljnPackagePalletSplitManipulatorDeviceDriver.getOnoff_status()); - jo.put("getStation", rljnPackagePalletSplitManipulatorDeviceDriver.getGetStation()); - jo.put("specifications", rljnPackagePalletSplitManipulatorDeviceDriver.getSpecifications()); - jo.put("batch", rljnPackagePalletSplitManipulatorDeviceDriver.getBatch()); - jo.put("total_split", rljnPackagePalletSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("isError", rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", rljnPackagePalletSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { - lnshLabelingMachineDeviceDriver = (LnshLabelingMachineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshLabelingMachineDeviceDriver.getMode()); - jo.put("status", lnshLabelingMachineDeviceDriver.getStatus()); - jo.put("isOnline", lnshLabelingMachineDeviceDriver.getIsonline()); - jo.put("open_time", lnshLabelingMachineDeviceDriver.getOpen_time()); - jo.put("close_time", lnshLabelingMachineDeviceDriver.getClose_time()); - jo.put("standby_time", lnshLabelingMachineDeviceDriver.getStandby_time()); - jo.put("production_time", lnshLabelingMachineDeviceDriver.getProduction_time()); - jo.put("error_time", lnshLabelingMachineDeviceDriver.getError_time()); - jo.put("labeling_qty", lnshLabelingMachineDeviceDriver.getLabeling_qty()); - jo.put("isError", lnshLabelingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLabelingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { - lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshSplitManipulatorDeviceDriver.getMode()); - jo.put("isOnline", lnshSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshSplitManipulatorDeviceDriver.getError()); - jo.put("getStation", lnshSplitManipulatorDeviceDriver.getGetStation()); - jo.put("barcode", lnshSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshSplitManipulatorDeviceDriver.getMaterial()); - jo.put("batch", lnshSplitManipulatorDeviceDriver.getBatch()); - jo.put("specifications", lnshSplitManipulatorDeviceDriver.getSpecifications()); - jo.put("qty", lnshSplitManipulatorDeviceDriver.getQty()); - jo.put("total_split", lnshSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("open_time", lnshSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time()); - jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshPackageLineDeviceDriver) { - lnshPackageLineDeviceDriver = (LnshPackageLineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPackageLineDeviceDriver.getMode()); - jo.put("status", lnshPackageLineDeviceDriver.getStatus()); - jo.put("isOnline", lnshPackageLineDeviceDriver.getIsonline()); - jo.put("open_time", lnshPackageLineDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshPackageLineDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPackageLineDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPackageLineDeviceDriver.getError_time()); - jo.put("barcode", lnshPackageLineDeviceDriver.getBarcode()); - jo.put("isError", lnshPackageLineDeviceDriver.getIserror()); - jo.put("message", lnshPackageLineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { + LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver; + //晟华覆膜机 + if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshLaminatingMachineDeviceDriver.getMode()); - jo.put("move", lnshLaminatingMachineDeviceDriver.getMove()); - jo.put("container_type", lnshLaminatingMachineDeviceDriver.getContainer_type()); - jo.put("barcode", lnshLaminatingMachineDeviceDriver.getBarcode()); - jo.put("task", lnshLaminatingMachineDeviceDriver.getTask()); - jo.put("error", lnshLaminatingMachineDeviceDriver.getError()); - jo.put("isOnline", lnshLaminatingMachineDeviceDriver.getIsonline()); - jo.put("isError", lnshLaminatingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLaminatingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { - lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshRGVDeviceDriver.getMode()); - jo.put("status", lnshRGVDeviceDriver.getStatus()); - jo.put("move_1", lnshRGVDeviceDriver.getMove_1()); - jo.put("move_2", lnshRGVDeviceDriver.getMove_2()); - jo.put("action_1", lnshRGVDeviceDriver.getAction_1()); - jo.put("action_2", lnshRGVDeviceDriver.getAction_2()); - jo.put("walk_y", lnshRGVDeviceDriver.getWalk_y()); - jo.put("error", lnshRGVDeviceDriver.getError()); - jo.put("task1", lnshRGVDeviceDriver.getTask1()); - jo.put("task2", lnshRGVDeviceDriver.getTask2()); - jo.put("isOnline", lnshRGVDeviceDriver.getIsonline()); - jo.put("isError", lnshRGVDeviceDriver.getIserror()); - jo.put("message", lnshRGVDeviceDriver.getMessage()); - jo.put("open_time", lnshRGVDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshRGVDeviceDriver.getStandby_time()); - jo.put("production_time", lnshRGVDeviceDriver.getProduction_time()); - jo.put("error_time", lnshRGVDeviceDriver.getError_time()); - jo.put("task_qty", lnshRGVDeviceDriver.getTask_qty()); - jo.put("finishTask_qty", lnshRGVDeviceDriver.getFinishTask_qty()); - jo.put("batch", lnshRGVDeviceDriver.getBatch()); - jo.put("specifications", lnshRGVDeviceDriver.getSpecifications()); - jo.put("qty", lnshRGVDeviceDriver.getQty()); - } else { - jo.put("device_code", device.getDevice_code()); + org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.ItemProtocol itemProtocol = new org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.ItemProtocol(lnshLaminatingMachineDeviceDriver); + if (!lnshLaminatingMachineDeviceDriver.isExistFieldName(code, itemProtocol)) { + throw new Exception("设备:" + device_code + "未找到对应信号:" + code); + } + lnshLaminatingMachineDeviceDriver.writing(code, value); } - backja.add(jo); } + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONObject()); + log.info("putAction--------------:输出参数" + resultJson.toString()); + return resultJson; + } finally { + MDC.remove(log_file_type); + } + } + + @Override + public Map queryDevice(String jsonObject) throws Exception { + try { + MDC.put(log_file_type, log_type); + log.info("queryDevice--------------:输入参数" + jsonObject.toString()); + JSONArray backja = new JSONArray(); + JSONArray datas = JSONArray.parseArray(jsonObject); + + //无光电普通站点 + StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; + //监控点 + StandardCoveyorMonitorDeviceDriver standardCoveyorMonitorDeviceDriver; + //扫码器 + StandardScannerDeviceDriver standardScannerDeviceDriver; + //自动门 + StandardAutodoorDeviceDriver standardAutodoorDeviceDriver; + //嘉耐-码垛机械手 + LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver; + //嘉耐-窑车道 + LnshKilnLaneDeviceDriver lnshKilnLaneDeviceDriver; + //嘉耐-包装码垛机械手 + LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver; + //晟华-贴标机 + LnshLabelingMachineDeviceDriver lnshLabelingMachineDeviceDriver; + //嘉耐-拆垛机械手 + LnshSplitManipulatorDeviceDriver lnshSplitManipulatorDeviceDriver; + //嘉耐-RGV + LnshRGVDeviceDriver lnshRGVDeviceDriver; + //嘉耐-工位(交互模板) + LnshStationDeviceDriver lnshStationDeviceDriver; + //嘉耐-缓存货架 + LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver; + //嘉耐-包装码拆垛机械手 + RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver; + //嘉耐-码垛机械手工位 + LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; + + if (datas.size() == 0) { + List list = DeviceService.findCacheDevice(); + for (int i = 0, j = list.size(); i < j; i++) { + Device device = list.get(i); + JSONObject obj = new JSONObject(); + String device_code = device.getDevice_code(); + JSONObject jo = new JSONObject(); + if (ObjectUtil.isNull(device)) { + continue; + } + if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { + lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshStationDeviceDriver.getMode()); + jo.put("move", lnshStationDeviceDriver.getMove()); + jo.put("action", lnshStationDeviceDriver.getAction()); + jo.put("io_action", lnshStationDeviceDriver.getIo_action()); + jo.put("hasGoods", lnshStationDeviceDriver.getHasGoods()); + jo.put("isOnline", lnshStationDeviceDriver.getIsonline()); + jo.put("error", lnshStationDeviceDriver.getError()); + jo.put("isError", lnshStationDeviceDriver.getIserror()); + jo.put("message", lnshStationDeviceDriver.getMessage()); + jo.put("task", lnshStationDeviceDriver.getTask()); + jo.put("weight", lnshStationDeviceDriver.getWeight()); + jo.put("material", lnshStationDeviceDriver.getMaterial()); + jo.put("barcode", lnshStationDeviceDriver.getBarcode()); + jo.put("specifications", lnshStationDeviceDriver.getSpecifications()); + jo.put("batch", lnshStationDeviceDriver.getBatch()); + jo.put("pallet_type", lnshStationDeviceDriver.getContainer_type()); + + } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { + lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshPalletizingManipulatorSiteDeviceDriver.getMode()); + jo.put("move", lnshPalletizingManipulatorSiteDeviceDriver.getMove()); + jo.put("action", lnshPalletizingManipulatorSiteDeviceDriver.getAction()); + jo.put("io_action", lnshPalletizingManipulatorSiteDeviceDriver.getIo_action()); + jo.put("hasGoods", lnshPalletizingManipulatorSiteDeviceDriver.getHasGoods()); + jo.put("isOnline", lnshPalletizingManipulatorSiteDeviceDriver.getIsonline()); + jo.put("error", lnshPalletizingManipulatorSiteDeviceDriver.getError()); + jo.put("isError", lnshPalletizingManipulatorSiteDeviceDriver.getIserror()); + jo.put("message", lnshPalletizingManipulatorSiteDeviceDriver.getMessage()); + jo.put("task", lnshPalletizingManipulatorSiteDeviceDriver.getTask()); + jo.put("weight", lnshPalletizingManipulatorSiteDeviceDriver.getWeight()); + jo.put("material", lnshPalletizingManipulatorSiteDeviceDriver.getMaterial()); + jo.put("barcode", lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()); + jo.put("specifications", lnshPalletizingManipulatorSiteDeviceDriver.getSpecifications()); + jo.put("AlongSide", lnshPalletizingManipulatorSiteDeviceDriver.getAlongSide()); + jo.put("BshortSide", lnshPalletizingManipulatorSiteDeviceDriver.getBshortSide()); + jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal()); + jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness()); + jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch()); + } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { + lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshPalletizingManipulatorDeviceDriver.getMode()); + jo.put("status", lnshPalletizingManipulatorDeviceDriver.getStatus()); + jo.put("action", lnshPalletizingManipulatorDeviceDriver.getAction()); + jo.put("isOnline", lnshPalletizingManipulatorDeviceDriver.getIsonline()); + jo.put("error", lnshPalletizingManipulatorDeviceDriver.getError()); + jo.put("put_station", lnshPalletizingManipulatorDeviceDriver.getPut_station()); + jo.put("material", lnshPalletizingManipulatorDeviceDriver.getMaterial()); + jo.put("encoder_qty", lnshPalletizingManipulatorDeviceDriver.getEncoder_qty()); + jo.put("batch", lnshPalletizingManipulatorDeviceDriver.getBatch()); + jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications()); + jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror()); + jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { + lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshKilnLaneDeviceDriver.getMode()); + jo.put("status", lnshKilnLaneDeviceDriver.getStatus()); + jo.put("isOnline", lnshKilnLaneDeviceDriver.getIsonline()); + jo.put("error", lnshKilnLaneDeviceDriver.getError()); + jo.put("isError", lnshKilnLaneDeviceDriver.getIserror()); + jo.put("open_time", lnshKilnLaneDeviceDriver.getOpen_time()); + jo.put("standby_time", lnshKilnLaneDeviceDriver.getStandby_time()); + jo.put("production_time", lnshKilnLaneDeviceDriver.getProduction_time()); + jo.put("error_time", lnshKilnLaneDeviceDriver.getError_time()); + jo.put("car_sum", lnshKilnLaneDeviceDriver.getCar_sum()); + jo.put("nullCar_qty", lnshKilnLaneDeviceDriver.getNullCar_qty()); + jo.put("burning_car_qty", lnshKilnLaneDeviceDriver.getBurning_car_qty()); + jo.put("message", lnshKilnLaneDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { + lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshPackagePalletManipulatorDeviceDriver.getMode()); + jo.put("status", lnshPackagePalletManipulatorDeviceDriver.getStatus()); + jo.put("onoff_status", lnshPackagePalletManipulatorDeviceDriver.getOnoff_status()); + jo.put("specifications", lnshPackagePalletManipulatorDeviceDriver.getSpecifications()); + jo.put("batch", lnshPackagePalletManipulatorDeviceDriver.getBatch()); + jo.put("isOnline", lnshPackagePalletManipulatorDeviceDriver.getIsonline()); + jo.put("error", lnshPackagePalletManipulatorDeviceDriver.getError()); + jo.put("putStation", lnshPackagePalletManipulatorDeviceDriver.getPut_station()); + jo.put("barcode", lnshPackagePalletManipulatorDeviceDriver.getBarcode()); + jo.put("material", lnshPackagePalletManipulatorDeviceDriver.getMaterial()); + jo.put("qty", lnshPackagePalletManipulatorDeviceDriver.getQty()); + jo.put("open_time", lnshPackagePalletManipulatorDeviceDriver.getOpen_time()); + jo.put("standby_time", lnshPackagePalletManipulatorDeviceDriver.getStandby_time()); + jo.put("production_time", lnshPackagePalletManipulatorDeviceDriver.getProduction_time()); + jo.put("error_time", lnshPackagePalletManipulatorDeviceDriver.getError_time()); + jo.put("order_No", lnshPackagePalletManipulatorDeviceDriver.getOrder_No()); + jo.put("isError", lnshPackagePalletManipulatorDeviceDriver.getIserror()); + jo.put("message", lnshPackagePalletManipulatorDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { + rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", rljnPackagePalletSplitManipulatorDeviceDriver.getMode()); + jo.put("status", rljnPackagePalletSplitManipulatorDeviceDriver.getStatus()); + jo.put("isOnline", rljnPackagePalletSplitManipulatorDeviceDriver.getIsonline()); + jo.put("error", rljnPackagePalletSplitManipulatorDeviceDriver.getError()); + jo.put("putStation", rljnPackagePalletSplitManipulatorDeviceDriver.getPut_station()); + jo.put("barcode", rljnPackagePalletSplitManipulatorDeviceDriver.getBarcode()); + jo.put("material", rljnPackagePalletSplitManipulatorDeviceDriver.getMaterial()); + jo.put("qty", rljnPackagePalletSplitManipulatorDeviceDriver.getQty()); + jo.put("open_time", rljnPackagePalletSplitManipulatorDeviceDriver.getOpen_time()); + jo.put("standby_time", rljnPackagePalletSplitManipulatorDeviceDriver.getStandby_time()); + jo.put("production_time", rljnPackagePalletSplitManipulatorDeviceDriver.getProduction_time()); + jo.put("error_time", rljnPackagePalletSplitManipulatorDeviceDriver.getError_time()); + jo.put("order_No", rljnPackagePalletSplitManipulatorDeviceDriver.getOrder_No()); + jo.put("onoff_status", rljnPackagePalletSplitManipulatorDeviceDriver.getOnoff_status()); + jo.put("getStation", rljnPackagePalletSplitManipulatorDeviceDriver.getGetStation()); + jo.put("specifications", rljnPackagePalletSplitManipulatorDeviceDriver.getSpecifications()); + jo.put("batch", rljnPackagePalletSplitManipulatorDeviceDriver.getBatch()); + jo.put("total_split", rljnPackagePalletSplitManipulatorDeviceDriver.getTotal_split()); + jo.put("isError", rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()); + jo.put("message", rljnPackagePalletSplitManipulatorDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { + lnshLabelingMachineDeviceDriver = (LnshLabelingMachineDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshLabelingMachineDeviceDriver.getMode()); + jo.put("status", lnshLabelingMachineDeviceDriver.getStatus()); + jo.put("isOnline", lnshLabelingMachineDeviceDriver.getIsonline()); + jo.put("open_time", lnshLabelingMachineDeviceDriver.getOpen_time()); + jo.put("close_time", lnshLabelingMachineDeviceDriver.getClose_time()); + jo.put("standby_time", lnshLabelingMachineDeviceDriver.getStandby_time()); + jo.put("production_time", lnshLabelingMachineDeviceDriver.getProduction_time()); + jo.put("error_time", lnshLabelingMachineDeviceDriver.getError_time()); + jo.put("labeling_qty", lnshLabelingMachineDeviceDriver.getLabeling_qty()); + jo.put("isError", lnshLabelingMachineDeviceDriver.getIserror()); + jo.put("message", lnshLabelingMachineDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { + lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshSplitManipulatorDeviceDriver.getMode()); + jo.put("isOnline", lnshSplitManipulatorDeviceDriver.getIsonline()); + jo.put("error", lnshSplitManipulatorDeviceDriver.getError()); + jo.put("getStation", lnshSplitManipulatorDeviceDriver.getGetStation()); + jo.put("barcode", lnshSplitManipulatorDeviceDriver.getBarcode()); + jo.put("material", lnshSplitManipulatorDeviceDriver.getMaterial()); + jo.put("batch", lnshSplitManipulatorDeviceDriver.getBatch()); + jo.put("specifications", lnshSplitManipulatorDeviceDriver.getSpecifications()); + jo.put("qty", lnshSplitManipulatorDeviceDriver.getQty()); + jo.put("total_split", lnshSplitManipulatorDeviceDriver.getTotal_split()); + jo.put("open_time", lnshSplitManipulatorDeviceDriver.getOpen_time()); + jo.put("standby_time", lnshSplitManipulatorDeviceDriver.getStandby_time()); + jo.put("production_time", lnshSplitManipulatorDeviceDriver.getProduction_time()); + jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time()); + jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror()); + jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { + lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshLaminatingMachineDeviceDriver.getMode()); + jo.put("move", lnshLaminatingMachineDeviceDriver.getMove()); + jo.put("container_type", lnshLaminatingMachineDeviceDriver.getContainer_type()); + jo.put("barcode", lnshLaminatingMachineDeviceDriver.getBarcode()); + jo.put("task", lnshLaminatingMachineDeviceDriver.getTask()); + jo.put("error", lnshLaminatingMachineDeviceDriver.getError()); + jo.put("isOnline", lnshLaminatingMachineDeviceDriver.getIsonline()); + jo.put("isError", lnshLaminatingMachineDeviceDriver.getIserror()); + jo.put("message", lnshLaminatingMachineDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { + lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshRGVDeviceDriver.getMode()); + jo.put("status", lnshRGVDeviceDriver.getStatus()); + jo.put("move_1", lnshRGVDeviceDriver.getMove_1()); + jo.put("move_2", lnshRGVDeviceDriver.getMove_2()); + jo.put("action_1", lnshRGVDeviceDriver.getAction_1()); + jo.put("action_2", lnshRGVDeviceDriver.getAction_2()); + jo.put("walk_y", lnshRGVDeviceDriver.getWalk_y()); + jo.put("error", lnshRGVDeviceDriver.getError()); + jo.put("task1", lnshRGVDeviceDriver.getTask1()); + jo.put("task2", lnshRGVDeviceDriver.getTask2()); + jo.put("isOnline", lnshRGVDeviceDriver.getIsonline()); + jo.put("isError", lnshRGVDeviceDriver.getIserror()); + jo.put("message", lnshRGVDeviceDriver.getMessage()); + jo.put("open_time", lnshRGVDeviceDriver.getOpen_time()); + jo.put("standby_time", lnshRGVDeviceDriver.getStandby_time()); + jo.put("production_time", lnshRGVDeviceDriver.getProduction_time()); + jo.put("error_time", lnshRGVDeviceDriver.getError_time()); + jo.put("task_qty", lnshRGVDeviceDriver.getTask_qty()); + jo.put("finishTask_qty", lnshRGVDeviceDriver.getFinishTask_qty()); + jo.put("batch", lnshRGVDeviceDriver.getBatch()); + jo.put("specifications", lnshRGVDeviceDriver.getSpecifications()); + jo.put("qty", lnshRGVDeviceDriver.getQty()); + } else { + jo.put("device_code", device.getDevice_code()); + } + backja.add(jo); + } + } else { + for (int i = 0; i < datas.size(); i++) { + JSONObject jo = new JSONObject(); + JSONObject data = datas.getJSONObject(i); + String device_code = data.getString("device_code"); + Device device = DeviceAppService.findDeviceByCode(device_code); + if (ObjectUtil.isEmpty(device)) { + throw new Exception("未找到对应设备:" + device_code); + } + + if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { + standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", standardAutodoorDeviceDriver.getMode()); + jo.put("action", standardAutodoorDeviceDriver.getAction()); + jo.put("isOnline", true); + jo.put("error", standardAutodoorDeviceDriver.getError()); + jo.put("isError", standardAutodoorDeviceDriver.getIserror()); + } else if (device.getDeviceDriver() instanceof StandardCoveyorMonitorDeviceDriver) { + standardCoveyorMonitorDeviceDriver = (StandardCoveyorMonitorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", standardCoveyorMonitorDeviceDriver.getMode()); + jo.put("move", standardCoveyorMonitorDeviceDriver.getMove()); + jo.put("hasGoods", standardCoveyorMonitorDeviceDriver.getHasGoods()); + jo.put("isOnline", standardCoveyorMonitorDeviceDriver.getIsonline()); + jo.put("error", standardCoveyorMonitorDeviceDriver.getError()); + jo.put("isError", standardCoveyorMonitorDeviceDriver.getIserror()); + jo.put("message", standardCoveyorMonitorDeviceDriver.getMessage()); + //普通站点 + } else if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { + standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("move", standardOrdinarySiteDeviceDriver.getMove()); + jo.put("container", standardOrdinarySiteDeviceDriver.getContainer()); + jo.put("hasGoods", standardOrdinarySiteDeviceDriver.getHasGoods()); + jo.put("isOnline", true); + //点击弹出 + jo.put("is_click", true); + jo.put("device_type", device.getDevice_type()); + jo.put("error", standardOrdinarySiteDeviceDriver.getError()); + jo.put("isError", standardOrdinarySiteDeviceDriver.getIserror()); + jo.put("container", standardOrdinarySiteDeviceDriver.getContainer()); + jo.put("message", standardOrdinarySiteDeviceDriver.getMessage()); + jo.put("material", standardOrdinarySiteDeviceDriver.getMaterial()); + jo.put("batch", standardOrdinarySiteDeviceDriver.getBatch()); + + } else if (device.getDeviceDriver() instanceof StandardScannerDeviceDriver) { + standardScannerDeviceDriver = (StandardScannerDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("isOnline", true); + jo.put("device_type", device.getDevice_type()); + //点击弹出 + jo.put("is_click", true); + jo.put("ip", standardScannerDeviceDriver.getIp()); + jo.put("container", StrUtil.isEmpty(standardScannerDeviceDriver.readBarcode()) ? "" : standardScannerDeviceDriver.readBarcode()); + + } else if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { + lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshStationDeviceDriver.getMode()); + jo.put("move", lnshStationDeviceDriver.getMove()); + jo.put("action", lnshStationDeviceDriver.getAction()); + jo.put("io_action", lnshStationDeviceDriver.getIo_action()); + jo.put("hasGoods", lnshStationDeviceDriver.getHasGoods()); + jo.put("isOnline", lnshStationDeviceDriver.getIsonline()); + jo.put("error", lnshStationDeviceDriver.getError()); + jo.put("isError", lnshStationDeviceDriver.getIserror()); + jo.put("message", lnshStationDeviceDriver.getMessage()); + jo.put("task", lnshStationDeviceDriver.getTask()); + jo.put("weight", lnshStationDeviceDriver.getWeight()); + jo.put("material", lnshStationDeviceDriver.getMaterial()); + jo.put("barcode", lnshStationDeviceDriver.getBarcode()); + jo.put("specifications", lnshStationDeviceDriver.getSpecifications()); + jo.put("batch", lnshStationDeviceDriver.getBatch()); + jo.put("pallet_type", lnshStationDeviceDriver.getContainer_type()); + + } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { + lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshPalletizingManipulatorSiteDeviceDriver.getMode()); + jo.put("move", lnshPalletizingManipulatorSiteDeviceDriver.getMove()); + jo.put("action", lnshPalletizingManipulatorSiteDeviceDriver.getAction()); + jo.put("io_action", lnshPalletizingManipulatorSiteDeviceDriver.getIo_action()); + jo.put("hasGoods", lnshPalletizingManipulatorSiteDeviceDriver.getHasGoods()); + jo.put("isOnline", lnshPalletizingManipulatorSiteDeviceDriver.getIsonline()); + jo.put("error", lnshPalletizingManipulatorSiteDeviceDriver.getError()); + jo.put("isError", lnshPalletizingManipulatorSiteDeviceDriver.getIserror()); + jo.put("message", lnshPalletizingManipulatorSiteDeviceDriver.getMessage()); + jo.put("task", lnshPalletizingManipulatorSiteDeviceDriver.getTask()); + jo.put("weight", lnshPalletizingManipulatorSiteDeviceDriver.getWeight()); + jo.put("material", lnshPalletizingManipulatorSiteDeviceDriver.getMaterial()); + jo.put("barcode", lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()); + jo.put("specifications", lnshPalletizingManipulatorSiteDeviceDriver.getSpecifications()); + jo.put("AlongSide", lnshPalletizingManipulatorSiteDeviceDriver.getAlongSide()); + jo.put("BshortSide", lnshPalletizingManipulatorSiteDeviceDriver.getBshortSide()); + jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal()); + jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness()); + jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch()); + } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { + lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshPalletizingManipulatorDeviceDriver.getMode()); + jo.put("status", lnshPalletizingManipulatorDeviceDriver.getStatus()); + jo.put("action", lnshPalletizingManipulatorDeviceDriver.getAction()); + jo.put("isOnline", lnshPalletizingManipulatorDeviceDriver.getIsonline()); + jo.put("error", lnshPalletizingManipulatorDeviceDriver.getError()); + jo.put("put_station", lnshPalletizingManipulatorDeviceDriver.getPut_station()); + jo.put("material", lnshPalletizingManipulatorDeviceDriver.getMaterial()); + jo.put("encoder_qty", lnshPalletizingManipulatorDeviceDriver.getEncoder_qty()); + jo.put("batch", lnshPalletizingManipulatorDeviceDriver.getBatch()); + jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications()); + jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror()); + jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { + lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshKilnLaneDeviceDriver.getMode()); + jo.put("status", lnshKilnLaneDeviceDriver.getStatus()); + jo.put("isOnline", lnshKilnLaneDeviceDriver.getIsonline()); + jo.put("error", lnshKilnLaneDeviceDriver.getError()); + jo.put("isError", lnshKilnLaneDeviceDriver.getIserror()); + jo.put("open_time", lnshKilnLaneDeviceDriver.getOpen_time()); + jo.put("standby_time", lnshKilnLaneDeviceDriver.getStandby_time()); + jo.put("production_time", lnshKilnLaneDeviceDriver.getProduction_time()); + jo.put("error_time", lnshKilnLaneDeviceDriver.getError_time()); + jo.put("car_sum", lnshKilnLaneDeviceDriver.getCar_sum()); + jo.put("nullCar_qty", lnshKilnLaneDeviceDriver.getNullCar_qty()); + jo.put("burning_car_qty", lnshKilnLaneDeviceDriver.getBurning_car_qty()); + jo.put("message", lnshKilnLaneDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { + lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshPackagePalletManipulatorDeviceDriver.getMode()); + jo.put("status", lnshPackagePalletManipulatorDeviceDriver.getStatus()); + jo.put("onoff_status", lnshPackagePalletManipulatorDeviceDriver.getOnoff_status()); + jo.put("specifications", lnshPackagePalletManipulatorDeviceDriver.getSpecifications()); + jo.put("batch", lnshPackagePalletManipulatorDeviceDriver.getBatch()); + jo.put("isOnline", lnshPackagePalletManipulatorDeviceDriver.getIsonline()); + jo.put("error", lnshPackagePalletManipulatorDeviceDriver.getError()); + jo.put("putStation", lnshPackagePalletManipulatorDeviceDriver.getPut_station()); + jo.put("barcode", lnshPackagePalletManipulatorDeviceDriver.getBarcode()); + jo.put("material", lnshPackagePalletManipulatorDeviceDriver.getMaterial()); + jo.put("qty", lnshPackagePalletManipulatorDeviceDriver.getQty()); + jo.put("open_time", lnshPackagePalletManipulatorDeviceDriver.getOpen_time()); + jo.put("standby_time", lnshPackagePalletManipulatorDeviceDriver.getStandby_time()); + jo.put("production_time", lnshPackagePalletManipulatorDeviceDriver.getProduction_time()); + jo.put("error_time", lnshPackagePalletManipulatorDeviceDriver.getError_time()); + jo.put("order_No", lnshPackagePalletManipulatorDeviceDriver.getOrder_No()); + jo.put("isError", lnshPackagePalletManipulatorDeviceDriver.getIserror()); + jo.put("message", lnshPackagePalletManipulatorDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { + rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", rljnPackagePalletSplitManipulatorDeviceDriver.getMode()); + jo.put("status", rljnPackagePalletSplitManipulatorDeviceDriver.getStatus()); + jo.put("isOnline", rljnPackagePalletSplitManipulatorDeviceDriver.getIsonline()); + jo.put("error", rljnPackagePalletSplitManipulatorDeviceDriver.getError()); + jo.put("putStation", rljnPackagePalletSplitManipulatorDeviceDriver.getPut_station()); + jo.put("barcode", rljnPackagePalletSplitManipulatorDeviceDriver.getBarcode()); + jo.put("material", rljnPackagePalletSplitManipulatorDeviceDriver.getMaterial()); + jo.put("qty", rljnPackagePalletSplitManipulatorDeviceDriver.getQty()); + jo.put("open_time", rljnPackagePalletSplitManipulatorDeviceDriver.getOpen_time()); + jo.put("standby_time", rljnPackagePalletSplitManipulatorDeviceDriver.getStandby_time()); + jo.put("production_time", rljnPackagePalletSplitManipulatorDeviceDriver.getProduction_time()); + jo.put("error_time", rljnPackagePalletSplitManipulatorDeviceDriver.getError_time()); + jo.put("order_No", rljnPackagePalletSplitManipulatorDeviceDriver.getOrder_No()); + jo.put("onoff_status", rljnPackagePalletSplitManipulatorDeviceDriver.getOnoff_status()); + jo.put("getStation", rljnPackagePalletSplitManipulatorDeviceDriver.getGetStation()); + jo.put("specifications", rljnPackagePalletSplitManipulatorDeviceDriver.getSpecifications()); + jo.put("batch", rljnPackagePalletSplitManipulatorDeviceDriver.getBatch()); + jo.put("total_split", rljnPackagePalletSplitManipulatorDeviceDriver.getTotal_split()); + jo.put("isError", rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()); + jo.put("message", rljnPackagePalletSplitManipulatorDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { + lnshLabelingMachineDeviceDriver = (LnshLabelingMachineDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshLabelingMachineDeviceDriver.getMode()); + jo.put("status", lnshLabelingMachineDeviceDriver.getStatus()); + jo.put("isOnline", lnshLabelingMachineDeviceDriver.getIsonline()); + jo.put("open_time", lnshLabelingMachineDeviceDriver.getOpen_time()); + jo.put("close_time", lnshLabelingMachineDeviceDriver.getClose_time()); + jo.put("standby_time", lnshLabelingMachineDeviceDriver.getStandby_time()); + jo.put("production_time", lnshLabelingMachineDeviceDriver.getProduction_time()); + jo.put("error_time", lnshLabelingMachineDeviceDriver.getError_time()); + jo.put("labeling_qty", lnshLabelingMachineDeviceDriver.getLabeling_qty()); + jo.put("isError", lnshLabelingMachineDeviceDriver.getIserror()); + jo.put("message", lnshLabelingMachineDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { + lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshSplitManipulatorDeviceDriver.getMode()); + jo.put("isOnline", lnshSplitManipulatorDeviceDriver.getIsonline()); + jo.put("error", lnshSplitManipulatorDeviceDriver.getError()); + jo.put("getStation", lnshSplitManipulatorDeviceDriver.getGetStation()); + jo.put("barcode", lnshSplitManipulatorDeviceDriver.getBarcode()); + jo.put("material", lnshSplitManipulatorDeviceDriver.getMaterial()); + jo.put("batch", lnshSplitManipulatorDeviceDriver.getBatch()); + jo.put("specifications", lnshSplitManipulatorDeviceDriver.getSpecifications()); + jo.put("qty", lnshSplitManipulatorDeviceDriver.getQty()); + jo.put("total_split", lnshSplitManipulatorDeviceDriver.getTotal_split()); + jo.put("open_time", lnshSplitManipulatorDeviceDriver.getOpen_time()); + jo.put("standby_time", lnshSplitManipulatorDeviceDriver.getStandby_time()); + jo.put("production_time", lnshSplitManipulatorDeviceDriver.getProduction_time()); + jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time()); + jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror()); + jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { + lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshLaminatingMachineDeviceDriver.getMode()); + jo.put("move", lnshLaminatingMachineDeviceDriver.getMove()); + jo.put("container_type", lnshLaminatingMachineDeviceDriver.getContainer_type()); + jo.put("barcode", lnshLaminatingMachineDeviceDriver.getBarcode()); + jo.put("task", lnshLaminatingMachineDeviceDriver.getTask()); + jo.put("error", lnshLaminatingMachineDeviceDriver.getError()); + jo.put("isOnline", lnshLaminatingMachineDeviceDriver.getIsonline()); + jo.put("isError", lnshLaminatingMachineDeviceDriver.getIserror()); + jo.put("message", lnshLaminatingMachineDeviceDriver.getMessage()); + } else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { + lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", device.getDevice_code()); + jo.put("mode", lnshRGVDeviceDriver.getMode()); + jo.put("status", lnshRGVDeviceDriver.getStatus()); + jo.put("move_1", lnshRGVDeviceDriver.getMove_1()); + jo.put("move_2", lnshRGVDeviceDriver.getMove_2()); + jo.put("action_1", lnshRGVDeviceDriver.getAction_1()); + jo.put("action_2", lnshRGVDeviceDriver.getAction_2()); + jo.put("walk_y", lnshRGVDeviceDriver.getWalk_y()); + jo.put("error", lnshRGVDeviceDriver.getError()); + jo.put("task1", lnshRGVDeviceDriver.getTask1()); + jo.put("task2", lnshRGVDeviceDriver.getTask2()); + jo.put("isOnline", lnshRGVDeviceDriver.getIsonline()); + jo.put("isError", lnshRGVDeviceDriver.getIserror()); + jo.put("message", lnshRGVDeviceDriver.getMessage()); + jo.put("open_time", lnshRGVDeviceDriver.getOpen_time()); + jo.put("standby_time", lnshRGVDeviceDriver.getStandby_time()); + jo.put("production_time", lnshRGVDeviceDriver.getProduction_time()); + jo.put("error_time", lnshRGVDeviceDriver.getError_time()); + jo.put("task_qty", lnshRGVDeviceDriver.getTask_qty()); + jo.put("finishTask_qty", lnshRGVDeviceDriver.getFinishTask_qty()); + jo.put("batch", lnshRGVDeviceDriver.getBatch()); + jo.put("specifications", lnshRGVDeviceDriver.getSpecifications()); + jo.put("qty", lnshRGVDeviceDriver.getQty()); + } else { + jo.put("device_code", device.getDevice_code()); + } + backja.add(jo); + } + } + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", backja); + log.info("queryDevice--------------:输出参数" + resultJson.toString()); + return resultJson; + } finally { + MDC.remove(log_file_type); } - JSONObject resultJson = new JSONObject(); - resultJson.put("status", HttpStatus.OK); - resultJson.put("message", "操作成功"); - resultJson.put("data", backja); - log.info("queryDevice--------------:输出参数" + resultJson.toString()); - return resultJson; } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index dcd1da5..d8bea1e 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -24,7 +24,6 @@ import org.nl.acs.device_driver.standard_conveyor_control_with_plcscanner.Standa import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_storage.StandardStorageDeviceDriver; -import org.nl.acs.device_driver.traffic_light.TrafficLightDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.opc.Device; @@ -586,8 +585,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } LampThreecolorDeviceDriver lampThreecolorDeviceDriver; - //交通灯 - TrafficLightDeviceDriver trafficLightDeviceDriver; + //变更三色灯状态 if (!ObjectUtils.isEmpty(device.getExtraValue().get("link_three_lamp"))) { String lamd_device = device.getExtraValue().get("link_three_lamp").toString(); @@ -597,15 +595,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu lampThreecolorDeviceDriver.writing(0); } } - //变更交通灯状态 - if (!ObjectUtils.isEmpty(device.getExtraValue().get("link_three_lamp"))) { - String lamd_device = device.getExtraValue().get("link_three_lamp").toString(); - Device lamddevice = appService.findDeviceByCode(lamd_device); - if (lamddevice.getDeviceDriver() instanceof TrafficLightDeviceDriver) { - trafficLightDeviceDriver = (TrafficLightDeviceDriver) lamddevice.getDeviceDriver(); - trafficLightDeviceDriver.writing(2); - } - } + removeByCodeFromCache(entity.getInstruction_code()); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java index e239e45..d9504d0 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java @@ -8,7 +8,6 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_kiln_lane.LnshKilnLaneDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_labeling_machine.LnshLabelingMachineDeviceDriver; @@ -20,9 +19,6 @@ import org.nl.acs.device_driver.lnsh.lnsh_rgv.LnshRGVDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_split_manipulator.LnshSplitManipulatorDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; import org.nl.acs.device_driver.lnsh.rljn_package_palletSplit_manipulator.RljnPackagePalletSplitManipulatorDeviceDriver; -import org.nl.acs.device_driver.machines_site.MachinesSiteDeviceDriver; -import org.nl.acs.device_driver.non_line_inspect_site.NonLineInspectSiteDeviceDriver; -import org.nl.acs.device_driver.non_line_manipulator_inspect_site.NonLineManipulatorInspectSiteDeviceDriver; import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control.StandardCoveyorControlDeviceDriver; @@ -31,13 +27,9 @@ import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardC import org.nl.acs.device_driver.standard_conveyor_monitor.StandardCoveyorMonitorDeviceDriver; import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.device_driver.standard_manipulator_inspect_site.StandardManipulatorInspectSiteDeviceDriver; -import org.nl.acs.device_driver.standard_manipulator_stacking_site.StandardManipulatorStackingSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; -import org.nl.acs.device_driver.standard_photoelectric_inspect_site.StandardPhotoelectricInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_rgv.StandardRGVDeviceDriver; import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver; -import org.nl.acs.device_driver.weighing_site.WeighingSiteDeviceDriver; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; @@ -214,12 +206,6 @@ public class StageServiceImpl implements StageService { StandardEmptyPalletSiteDeviceDriver standardEmptyPalletSiteDeviceDriver; //检测站点 StandardInspectSiteDeviceDriver standardInspectSiteDevicedriver; - //检测站点-无PLC - NonLineInspectSiteDeviceDriver nonLineInspectSiteDeviceDriver; - //区域管制站点（机械手） - StandardManipulatorInspectSiteDeviceDriver standardManipulatorInspectSiteDeviceDriver; - //区域管制站点-无PLC - NonLineManipulatorInspectSiteDeviceDriver nonLineManipulatorInspectSiteDeviceDriver; //控制点 StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver; //控制点-带扫码 @@ -230,20 +216,11 @@ public class StageServiceImpl implements StageService { StandardCoveyorMonitorDeviceDriver standardCoveyorMonitorDeviceDriver; //扫码器 StandardScannerDeviceDriver standardScannerDeviceDriver; - //机台设备 - MachinesSiteDeviceDriver machinesSiteDeviceDriver; //自动门 StandardAutodoorDeviceDriver standardAutodoorDeviceDriver; - //称重设备 - WeighingSiteDeviceDriver weighingSiteDeviceDriver; - //机械手码垛驱动（区分托盘类型） - StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver; - //光电检测站点（优先入库） - StandardPhotoelectricInspectSiteDeviceDriver standardPhotoelectricInspectSiteDeviceDriver; //中刚洛耐RGV StandardRGVDeviceDriver standardRGVDeviceDriver; - //电子围栏 - ElectricFenceDeviceDriver electricFenceDeviceDriver; + //电子围栏viceDriver electricFenceDeviceDriver; //嘉耐-码垛机械手 LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver; //嘉耐-窑车道 @@ -465,131 +442,6 @@ public class StageServiceImpl implements StageService { jo.put("container", standardInspectSiteDevicedriver.getContainer()); jo.put("message", standardInspectSiteDevicedriver.getMessage()); } - //检测站点-无PLC - else if (device.getDeviceDriver() instanceof NonLineInspectSiteDeviceDriver) { - nonLineInspectSiteDeviceDriver = (NonLineInspectSiteDeviceDriver) device.getDeviceDriver(); - if (nonLineInspectSiteDeviceDriver.getMode() == 0) { - mode = "未知"; - } else if (nonLineInspectSiteDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (nonLineInspectSiteDeviceDriver.getMode() == 2) { - mode = "联机"; - } - if (nonLineInspectSiteDeviceDriver.getMove() == 0) { - move = "无货"; - } else if (nonLineInspectSiteDeviceDriver.getMove() == 1) { - move = "有货"; - } else if (nonLineInspectSiteDeviceDriver.getMove() == 2) { - move = "有托盘有货"; - } - obj.put("device_name", nonLineInspectSiteDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("isOnline", nonLineInspectSiteDeviceDriver.getIs_online()); - jo.put("hasGoods", nonLineInspectSiteDeviceDriver.getHasGoods()); - jo.put("error", nonLineInspectSiteDeviceDriver.getError()); - jo.put("isError", nonLineInspectSiteDeviceDriver.getIserror()); - jo.put("container", nonLineInspectSiteDeviceDriver.getContainer()); - jo.put("message", nonLineInspectSiteDeviceDriver.getMessage()); - } - //区域管制站点（机械手） - else if (device.getDeviceDriver() instanceof StandardManipulatorInspectSiteDeviceDriver) { - standardManipulatorInspectSiteDeviceDriver = (StandardManipulatorInspectSiteDeviceDriver) device.getDeviceDriver(); - if (standardManipulatorInspectSiteDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (standardManipulatorInspectSiteDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (standardManipulatorInspectSiteDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (standardManipulatorInspectSiteDeviceDriver.getMode() == 3) { - mode = "呼叫空盘"; - } else if (standardManipulatorInspectSiteDeviceDriver.getMode() == 4) { - mode = "申请任务"; - } - if (standardManipulatorInspectSiteDeviceDriver.getMove() == 0) { - move = "无货"; - } else if (standardManipulatorInspectSiteDeviceDriver.getMove() == 1) { - move = "有货"; - } else if (standardManipulatorInspectSiteDeviceDriver.getMove() == 2) { - move = "有托盘有货"; - } - if (standardManipulatorInspectSiteDeviceDriver.getActoin() == 0) { - action = "禁止取放"; - } else if (standardManipulatorInspectSiteDeviceDriver.getActoin() == 1) { - action = "允许取货"; - } else if (standardManipulatorInspectSiteDeviceDriver.getActoin() == 2) { - action = "允许放货"; - } else if (standardManipulatorInspectSiteDeviceDriver.getActoin() == 3) { - action = "允许取放"; - } - if (standardManipulatorInspectSiteDeviceDriver.getIo_action() == 0) { - io_action = "禁止进出"; - } else if (standardManipulatorInspectSiteDeviceDriver.getIo_action() == 1) { - io_action = "允许进入"; - } else if (standardManipulatorInspectSiteDeviceDriver.getIo_action() == 2) { - io_action = "允许离开"; - } else if (standardManipulatorInspectSiteDeviceDriver.getIo_action() == 3) { - io_action = "允许进出"; - } - obj.put("device_name", standardManipulatorInspectSiteDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("action", action); - jo.put("io_action", io_action); - jo.put("hasGoods", standardManipulatorInspectSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", standardManipulatorInspectSiteDeviceDriver.getIsonline()); - jo.put("error", standardManipulatorInspectSiteDeviceDriver.getError()); - jo.put("isError", standardManipulatorInspectSiteDeviceDriver.getIserror()); - jo.put("container", standardManipulatorInspectSiteDeviceDriver.getContainer()); - jo.put("message", standardManipulatorInspectSiteDeviceDriver.getMessage()); - } - //区域管制站点-无PLC（机械手） - else if (device.getDeviceDriver() instanceof NonLineManipulatorInspectSiteDeviceDriver) { - nonLineManipulatorInspectSiteDeviceDriver = (NonLineManipulatorInspectSiteDeviceDriver) device.getDeviceDriver(); - if (nonLineManipulatorInspectSiteDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getMode() == 2) { - mode = "联机"; - } - if (nonLineManipulatorInspectSiteDeviceDriver.getMove() == 0) { - move = "无货"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getMove() == 1) { - move = "有货"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getMove() == 2) { - move = "有托盘有货"; - } - if (nonLineManipulatorInspectSiteDeviceDriver.getAction() == 0) { - action = "禁止取放"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getAction() == 1) { - action = "允许取货"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getAction() == 2) { - action = "允许放货"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getAction() == 3) { - action = "允许取放"; - } - if (nonLineManipulatorInspectSiteDeviceDriver.getIoaction() == 0) { - io_action = "禁止进出"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getIoaction() == 1) { - io_action = "允许进入"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getIoaction() == 2) { - io_action = "允许离开"; - } else if (nonLineManipulatorInspectSiteDeviceDriver.getIoaction() == 3) { - io_action = "允许进出"; - } - obj.put("device_name", nonLineManipulatorInspectSiteDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("action", action); - jo.put("io_action", io_action); - jo.put("hasGoods", nonLineManipulatorInspectSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", nonLineManipulatorInspectSiteDeviceDriver.getIs_online()); - jo.put("error", nonLineManipulatorInspectSiteDeviceDriver.getError()); - jo.put("isError", nonLineManipulatorInspectSiteDeviceDriver.getIserror()); - jo.put("container", nonLineManipulatorInspectSiteDeviceDriver.getContainer()); - jo.put("message", nonLineManipulatorInspectSiteDeviceDriver.getMessage()); - } //空盘站点 else if (device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) { standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) device.getDeviceDriver(); @@ -703,97 +555,8 @@ public class StageServiceImpl implements StageService { jo.put("is_click", true); jo.put("ip", standardScannerDeviceDriver.getIp()); jo.put("container", StrUtil.isEmpty(standardScannerDeviceDriver.readBarcode()) ? "" : standardScannerDeviceDriver.readBarcode()); - } else if (device.getDeviceDriver() instanceof WeighingSiteDeviceDriver) { - weighingSiteDeviceDriver = (WeighingSiteDeviceDriver) device.getDeviceDriver(); - obj.put("device_name", weighingSiteDeviceDriver.getDevice().getDevice_name()); - jo.put("isOnline", true); - jo.put("instruction_message", weighingSiteDeviceDriver.getInst_message()); - } else if (device.getDeviceDriver() instanceof MachinesSiteDeviceDriver) { - machinesSiteDeviceDriver = (MachinesSiteDeviceDriver) device.getDeviceDriver(); - if (machinesSiteDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (machinesSiteDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (machinesSiteDeviceDriver.getMode() == 2) { - mode = "联机"; - } - if (machinesSiteDeviceDriver.getIoaction() == 0) { - io_action = "禁止进出"; - } else if (machinesSiteDeviceDriver.getIoaction() == 1) { - io_action = "允许进入"; - } else if (machinesSiteDeviceDriver.getIoaction() == 2) { - io_action = "允许离开"; - } else if (machinesSiteDeviceDriver.getIoaction() == 3) { - io_action = "允许进出"; - } - obj.put("device_name", machinesSiteDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("io_action", io_action); - jo.put("isOnline", machinesSiteDeviceDriver.getIsonline()); - } - //机械手码垛驱动（区分托盘类型） - else if (device.getDeviceDriver() instanceof StandardManipulatorStackingSiteDeviceDriver) { - standardManipulatorStackingSiteDeviceDriver = (StandardManipulatorStackingSiteDeviceDriver) device.getDeviceDriver(); - if (standardManipulatorStackingSiteDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMode() == 3) { - mode = "运行中"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMode() == 4) { - mode = "申请任务"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMode() == 5) { - mode = "申请空盘"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMode() == 6) { - mode = "申请入库"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMode() == 7) { - mode = "换盘去应急位"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMode() == 8) { - mode = "换盘去托盘库"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMode() == 9) { - mode = "入托盘库"; - } - if (standardManipulatorStackingSiteDeviceDriver.getMove() == 0) { - move = "无货"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMove() == 1) { - move = "有货"; - } else if (standardManipulatorStackingSiteDeviceDriver.getMove() == 2) { - move = "有托盘有货"; - } - if (standardManipulatorStackingSiteDeviceDriver.getAction() == 0) { - action = "禁止取放"; - } else if (standardManipulatorStackingSiteDeviceDriver.getAction() == 1) { - action = "允许取货"; - } else if (standardManipulatorStackingSiteDeviceDriver.getAction() == 2) { - action = "允许放货"; - } else if (standardManipulatorStackingSiteDeviceDriver.getAction() == 3) { - action = "允许取放"; - } - if (standardManipulatorStackingSiteDeviceDriver.getIo_action() == 0) { - io_action = "禁止进出"; - } else if (standardManipulatorStackingSiteDeviceDriver.getIo_action() == 1) { - io_action = "允许进入"; - } else if (standardManipulatorStackingSiteDeviceDriver.getIo_action() == 2) { - io_action = "允许离开"; - } else if (standardManipulatorStackingSiteDeviceDriver.getIo_action() == 3) { - io_action = "允许进出"; - } - obj.put("device_name", standardManipulatorStackingSiteDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("action", action); - jo.put("io_action", io_action); - jo.put("hasGoods", standardManipulatorStackingSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", standardManipulatorStackingSiteDeviceDriver.getIsonline()); - jo.put("error", standardManipulatorStackingSiteDeviceDriver.getError()); - jo.put("isError", standardManipulatorStackingSiteDeviceDriver.getIserror()); - jo.put("container", standardManipulatorStackingSiteDeviceDriver.getContainer()); - jo.put("message", standardManipulatorStackingSiteDeviceDriver.getMessage()); - } - //中钢洛耐RGV - else if (device.getDeviceDriver() instanceof StandardRGVDeviceDriver) { + //中钢洛耐RGV + } else if (device.getDeviceDriver() instanceof StandardRGVDeviceDriver) { standardRGVDeviceDriver = (StandardRGVDeviceDriver) device.getDeviceDriver(); if (standardRGVDeviceDriver.getMode() == 0) { mode = "未联机"; @@ -818,42 +581,6 @@ public class StageServiceImpl implements StageService { jo.put("isError", standardRGVDeviceDriver.getIserror()); jo.put("container", standardRGVDeviceDriver.getContainer()); jo.put("message", standardRGVDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof StandardPhotoelectricInspectSiteDeviceDriver) { - standardPhotoelectricInspectSiteDeviceDriver = (StandardPhotoelectricInspectSiteDeviceDriver) device.getDeviceDriver(); - if (standardPhotoelectricInspectSiteDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (standardPhotoelectricInspectSiteDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (standardPhotoelectricInspectSiteDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (standardPhotoelectricInspectSiteDeviceDriver.getMode() == 4) { - mode = "待机入窑"; - } - if (standardPhotoelectricInspectSiteDeviceDriver.getMove() == 0) { - move = "无货"; - } else if (standardPhotoelectricInspectSiteDeviceDriver.getMove() == 1) { - move = "有货"; - } else if (standardPhotoelectricInspectSiteDeviceDriver.getMove() == 2) { - move = "有托盘有货"; - } - obj.put("device_name", standardPhotoelectricInspectSiteDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("hasGoods", standardPhotoelectricInspectSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", standardPhotoelectricInspectSiteDeviceDriver.getIsonline()); - jo.put("error", standardPhotoelectricInspectSiteDeviceDriver.getError()); - jo.put("isError", standardPhotoelectricInspectSiteDeviceDriver.getIserror()); - jo.put("container", standardPhotoelectricInspectSiteDeviceDriver.getContainer()); - jo.put("message", standardPhotoelectricInspectSiteDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof ElectricFenceDeviceDriver) { - electricFenceDeviceDriver = (ElectricFenceDeviceDriver) device.getDeviceDriver(); - obj.put("device_name", electricFenceDeviceDriver.getDevice().getDevice_name()); - jo.put("isOnline", true); - //点击弹出 - jo.put("is_click", true); - jo.put("device_type", device.getDevice_type()); - jo.put("error", electricFenceDeviceDriver.getError()); - jo.put("isError", electricFenceDeviceDriver.getIserror()); } else if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); if (lnshStationDeviceDriver.getMode() == 0) { diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java index b889c2c..c3b9222 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java @@ -39,7 +39,7 @@ public class LokiController { @PostMapping("/logs") @ApiOperation("获取日志") - @RateLimiter(value = 1.0, timeout = 300) // 限流 + @RateLimiter(value = 1, timeout = 300) // 限流 public ResponseEntity getLogData(@RequestBody JSONObject json) { return new ResponseEntity<>(lokiService.getLogData(json), HttpStatus.OK); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdcAutoReconnection.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdcAutoReconnection.java deleted file mode 100644 index f138f8f..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdcAutoReconnection.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.nl.modules.quartz.task; - -import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.config.AcsConfig; -import org.nl.acs.config.server.AcsConfigService; -import org.nl.start.auto.run.AutoRunService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 自动清理日志 - */ -@Slf4j -@Component -public class NdcAutoReconnection { - - @Autowired - AcsConfigService acsConfigService; - - @Autowired - AutoRunService autoRunService; - - public void run(String threadCode) throws Exception { - if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.NDC_RECONNECTION).toString(), "1")) { - - if (!autoRunService.getThreadByCode(threadCode).isAlive()) { - autoRunService.startThread(threadCode); - } - - } - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdxyDeviceStatus.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdxyDeviceStatus.java deleted file mode 100644 index 2e6091e..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdxyDeviceStatus.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.nl.modules.quartz.task; - - -import cn.hutool.core.map.MapUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.modules.mnt.websocket.MsgType; -import org.nl.modules.mnt.websocket.SocketMsg; -import org.nl.modules.mnt.websocket.WebSocketServer; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * 纽迪希亚设备状态 - */ - -@Slf4j -@Component -public class NdxyDeviceStatus { - @Autowired - DeviceService deviceService; - - @Autowired - DeviceAppService deviceAppService; - - public void run() throws Exception { - - try { - log.info("run 执行成功"); - JSONObject json = new JSONObject(); - JSONArray device = new JSONArray(); - JSONArray device2 = new JSONArray(); - JSONArray device3 = new JSONArray(); - JSONObject jo = new JSONObject(); - Map whereJson1; - Map whereJson2; - Map whereJson3; - JSONArray array1 = deviceService.selectDeviceListOne(); - JSONArray array2 = deviceService.selectDeviceListTwo(); - JSONArray array3 = deviceService.selectDeviceListThree(); - for (int i = 0; i < array1.size(); i++) { - whereJson1 = (Map) array1.get(i); - String device_code = MapUtil.getStr(whereJson1, "device_code"); - Device deviceApp = deviceAppService.findDeviceByCode(device_code); - StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - if (deviceApp.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) deviceApp.getDeviceDriver(); - jo.put("device_code", device_code); - jo.put("quantity", standardOrdinarySiteDeviceDriver.getQty()); - jo.put("material_type", standardOrdinarySiteDeviceDriver.getMaterial()); - jo.put("hasGood", standardOrdinarySiteDeviceDriver.getHasGoods()); - jo.put("remark", standardOrdinarySiteDeviceDriver.getRemark()); - } - device.add(jo); - } - for (int i = 0; i < array2.size(); i++) { - whereJson2 = (Map) array2.get(i); - String device_code = MapUtil.getStr(whereJson2, "device_code"); - Device deviceApp = deviceAppService.findDeviceByCode(device_code); - StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - if (deviceApp.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) deviceApp.getDeviceDriver(); - jo.put("device_code", device_code); - jo.put("quantity", standardOrdinarySiteDeviceDriver.getQty()); - jo.put("material_type", standardOrdinarySiteDeviceDriver.getMaterial()); - jo.put("hasGood", standardOrdinarySiteDeviceDriver.getHasGoods()); - jo.put("remark", standardOrdinarySiteDeviceDriver.getRemark()); - } - device2.add(jo); - } - for (int i = 0; i < array3.size(); i++) { - whereJson3 = (Map) array3.get(i); - String device_code = MapUtil.getStr(whereJson3, "device_code"); - Device deviceApp = deviceAppService.findDeviceByCode(device_code); - StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - if (deviceApp.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) deviceApp.getDeviceDriver(); - jo.put("device_code", device_code); - jo.put("quantity", standardOrdinarySiteDeviceDriver.getQty()); - jo.put("material_type", standardOrdinarySiteDeviceDriver.getMaterial()); - jo.put("hasGood", standardOrdinarySiteDeviceDriver.getHasGoods()); - jo.put("remark", standardOrdinarySiteDeviceDriver.getRemark()); - } - device3.add(jo); - } - json.put("device", device); - json.put("device2", device2); - json.put("device3", device3); - SocketMsg deviceInfo = new SocketMsg(json, MsgType.INFO); - WebSocketServer.sendInfo(deviceInfo, "ndxy_data"); - - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvDeviceStatus.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvDeviceStatus.java deleted file mode 100644 index 399b35a..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvDeviceStatus.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.nl.modules.quartz.task; - -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.agv.server.AgvService; -import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.DeviceType; -import org.nl.utils.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 查询magicAGV设备状态 - */ -@Slf4j -@Component -public class QueryMagicAgvDeviceStatus { - - @Autowired - InstructionService instructionService; - - @Autowired - AgvService agvService; - - - public void run() throws Exception { - HttpResponse response = agvService.queryMagicAgvDeviceStatus(); - if (response.getStatus() == 200) { - JSONArray ja = JSONArray.parseArray(response.body()); - log.info("查询magicAGV设备状态:" + ja.toString()); - for (int i = 0; i < ja.size(); i++) { - JSONObject jo = ja.getJSONObject(i); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - - ElectricFenceDeviceDriver electricFenceDeviceDriver; - List deviceAll = appService.findDevice(DeviceType.safetydoor); - for (int j = 0; j < deviceAll.size(); j++) { - Device device = deviceAll.get(i); - if (device.getDeviceDriver() instanceof ElectricFenceDeviceDriver) { - electricFenceDeviceDriver = (ElectricFenceDeviceDriver) device.getDeviceDriver(); - if (jo.getString("state").equals("IDLE")) { - electricFenceDeviceDriver.writing(1); - } - else if (jo.getString("state").equals("EXECUTING")) { - electricFenceDeviceDriver.writing(2); - } - } - } - } - } - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java index f6bf1ab..b0854de 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvTaskStatus.java @@ -30,7 +30,6 @@ public class QueryMagicAgvTaskStatus { public void run() throws Exception { List instList = instructionService.findAllInstFromCache(); - log.info("instList：{}", instList.size()); if (instList.size() > 0) { for (int i = 0; i < instList.size(); i++) { Instruction inst = instList.get(i); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java deleted file mode 100644 index 0452d66..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.nl.modules.quartz.task; - -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.agv.server.AgvService; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 查询AGV任务状态 - */ -@Slf4j -@Component -public class QueryXZAgvTaskStatus { - - @Autowired - InstructionService instructionService; - - @Autowired - AgvService agvService; - - - public void run() throws Exception { - List instList = instructionService.findAllInstFromCache(); - if (instList.size() > 0) { - for (int i = 0; i < instList.size(); i++) { - Instruction inst = instList.get(i); - if (!StrUtil.equals(inst.getSend_status(), "1")) continue; - String instcode = inst.getInstruction_code(); - HttpResponse response = agvService.queryXZAgvInstStatus(instcode); - JSONObject jo = JSONObject.parseObject(response.body()); - if (MapUtil.isEmpty(jo)) continue; - //反馈结果状态 - log.info("instcode：" + instcode + "," + jo.toString()); - //指令执行状态 - String state = jo.getString("state"); - String processingVehicle = ""; - //正在执行指令agv车号 - if (!StrUtil.isEmpty(jo.getString("processingVehicle"))) { - processingVehicle = jo.getString("processingVehicle"); - inst.setCarno(processingVehicle); - } - -// RAW：初始状态 -// ACTIVE：业务订单已激活 -// DISPATCHABLE：业务订单已通过系统验证，等待被调度执行 -// BEING_PROCESSED：业务订单正在被执行 -// WITHDRAWN：业务订单已被撤销 -// FINISHED：业务订单已完成 -// FAILED：业务订单已失败 -// UNROUTABLE：无法规划该业务订单的执行路线 - - //执行中 - if ("BEING_PROCESSED".equals(state)) { - if (inst != null) { - inst.setInstruction_status("1"); - instructionService.update(inst); - } - } else if ("FINISHED".equals(state)) { - if (inst != null) { - inst.setInstruction_status("2"); - instructionService.finish(inst); - } - } else if ("WITHDRAWN".equals(state) || "FAILED".equals(state)) { - if (inst != null) { - inst.setInstruction_status("4"); - instructionService.update(inst); - //instructionService.removeByCodeFromCache(instcode); - } - } else { - - } - - } - } - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/Test.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/Test.java deleted file mode 100644 index ae7cb15..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/Test.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.modules.quartz.task; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.mnt.websocket.MsgType; -import org.nl.modules.mnt.websocket.SocketMsg; -import org.nl.modules.mnt.websocket.WebSocketServer; -import org.springframework.stereotype.Component; - -/** - * 测试用 - * - * @author Zheng Jie - * @date 2019-01-08 - */ -@Slf4j -@Component -public class Test { - - public void run() { - - try { - log.info("run 执行成功"); - JSONObject json = new JSONObject(); - JSONArray device = new JSONArray(); - JSONObject jo = new JSONObject(); - jo.put("name", "A1"); - JSONObject jo2 = new JSONObject(); - jo2.put("name", "B1"); - JSONObject jo3 = new JSONObject(); - jo3.put("name", "C1"); - device.add(jo); - device.add(jo2); - device.add(jo3); - json.put("device", device); - json.put("print", "0"); - json.put("cpbh", "A111111"); - json.put("cpmc", "123456"); - SocketMsg deviceInfo = new SocketMsg(json, MsgType.INFO); - WebSocketServer.sendInfo(deviceInfo, "test_data"); - - } catch (Exception e) { - - } - - - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/UpdateDeviceStatus.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/UpdateDeviceStatus.java deleted file mode 100644 index bd68237..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/UpdateDeviceStatus.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.nl.modules.quartz.task; - -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.non_line_inspect_site.NonLineInspectSiteDeviceDriver; -import org.nl.acs.device_driver.non_line_manipulator_inspect_site.NonLineManipulatorInspectSiteDeviceDriver; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.utils.SpringContextHolder; -import org.nl.wql.core.bean.WQLObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 查询上位系统PLC设备状态 - */ -@Slf4j -@Component -public class UpdateDeviceStatus { - - @Autowired - AcsToWmsService acsToWmsService; - - public void run() throws Exception { - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - JSONArray rows = acsToWmsService.getDeviceStatusToWms(); - for (int i = 0; i < rows.size(); i++) { - JSONObject row = rows.getJSONObject(i); - String device_code = ""; - JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + row.getString("device_code") + "'").uniqueResult(0); - if (!ObjectUtil.isEmpty(device_json)) { - device_code = (String) device_json.get("parent_storage_code") == null ? row.getString("device_code") : (String) device_json.get("storage_code"); - } - Device device = appService.findDeviceByCode(device_code); - if (device != null) { - NonLineInspectSiteDeviceDriver nonLineInspectSiteDeviceDriver; - if (device.getDeviceDriver() instanceof NonLineInspectSiteDeviceDriver) { - nonLineInspectSiteDeviceDriver = (NonLineInspectSiteDeviceDriver) device.getDeviceDriver(); - nonLineInspectSiteDeviceDriver.setMode(row.getInteger("mode")); - nonLineInspectSiteDeviceDriver.setMove(row.getInteger("move")); - nonLineInspectSiteDeviceDriver.setError(row.getInteger("error")); - nonLineInspectSiteDeviceDriver.setAction(row.getInteger("action")); - nonLineInspectSiteDeviceDriver.setIoaction(row.getInteger("ioaction")); - } - NonLineManipulatorInspectSiteDeviceDriver nonLineManipulatorInspectSiteDeviceDriver; - if (device.getDeviceDriver() instanceof NonLineManipulatorInspectSiteDeviceDriver) { - nonLineManipulatorInspectSiteDeviceDriver = (NonLineManipulatorInspectSiteDeviceDriver) device.getDeviceDriver(); - nonLineManipulatorInspectSiteDeviceDriver.setMode(row.getInteger("mode")); - nonLineManipulatorInspectSiteDeviceDriver.setMove(row.getInteger("move")); - nonLineManipulatorInspectSiteDeviceDriver.setError(row.getInteger("error")); - nonLineManipulatorInspectSiteDeviceDriver.setAction(row.getInteger("action")); - nonLineManipulatorInspectSiteDeviceDriver.setIoaction(row.getInteger("ioaction")); - } - } - } - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/queryAOrderDterail.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/queryAOrderDterail.java deleted file mode 100644 index ef86639..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/queryAOrderDterail.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.modules.quartz.task; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.mnt.websocket.MsgType; -import org.nl.modules.mnt.websocket.SocketMsg; -import org.nl.modules.mnt.websocket.WebSocketServer; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Component; - -import java.io.IOException; - -/** - * 测试用 - * - * @author Zheng Jie - * @date 2019-01-08 - */ -@Slf4j -@Component -public class queryAOrderDterail { - - public void run() { - try { - WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder"); - String where = "1=1 and is_deleted= '0'"; - ResultBean rb = wo.query( where, "order_id desc"); - final JSONObject json = rb.pageResult(); - JSONArray newja = new JSONArray(); - JSONArray ja = json.getJSONArray("content"); - for (int i = 0; i < ja.size(); i++) { - JSONObject jo = (JSONObject) ja.get(i); - JSONArray orderDteail_ja = WQLObject.getWQLObject("acs_produceshiftorderdetail").query("is_deleted= '0' and order_id ='" + jo.getString("order_id") + "'").getResultJSONArray(0); - if (orderDteail_ja.size() > 0) { - JSONArray children = new JSONArray(); - for (int j = 0; j < orderDteail_ja.size(); j++) { - JSONObject orderDteail_jo = orderDteail_ja.getJSONObject(j); - JSONObject new_jo = new JSONObject(); - new_jo.put("order_id", orderDteail_jo.getString("orderdetail_id")); - new_jo.put("order_code", orderDteail_jo.getString("orderdetail_code")); - new_jo.put("is_active", orderDteail_jo.getString("is_active")); - new_jo.put("is_delete", orderDteail_jo.getString("is_delete")); - new_jo.put("create_by", orderDteail_jo.getString("create_by")); - new_jo.put("create_time", orderDteail_jo.getString("create_time")); - new_jo.put("update_by", orderDteail_jo.getString("update_by")); - new_jo.put("update_time", orderDteail_jo.getString("update_time")); - new_jo.put("customer_code", orderDteail_jo.getString("customer_code")); - new_jo.put("customer_name", orderDteail_jo.getString("customer_name")); - new_jo.put("order_qty", orderDteail_jo.getString("order_qty")); - new_jo.put("type", "orderDteail"); - jo.put("flag", "1"); - children.add(new_jo); - } - jo.put("children", children); - } - jo.put("type", "order"); - //区分工单明细 - jo.put("flag", "0"); - newja.add(jo); - } - json.put("content", newja); - System.out.println("json:" + json); - SocketMsg deviceInfo = new SocketMsg(json, MsgType.INFO); - WebSocketServer.sendInfo(deviceInfo, "queryAOrderDterail"); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml b/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml index f9ff10b..cc612a8 100644 --- a/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -8,7 +8,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:llsh_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:rljn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rljn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} # password: ${DB_PWD:P@ssw0rd} diff --git a/acs/hd/nladmin-system/src/main/resources/logback-spring.xml b/acs/hd/nladmin-system/src/main/resources/logback-spring.xml index 0583757..914767a 100644 --- a/acs/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -19,7 +19,7 @@ https://juejin.cn/post/6844903775631572999 - + - + --> @@ -83,13 +83,23 @@ https://juejin.cn/post/6844903775631572999 - + - + + + + + + + + + + + diff --git a/acs/qd/.env.development b/acs/qd/.env.development index 42ce1c5..7bab6fd 100644 --- a/acs/qd/.env.development +++ b/acs/qd/.env.development @@ -1,7 +1,7 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://127.0.0.1:8010' +VUE_APP_BASE_API = 'http://192.168.81.140:8013' VUE_APP_WS_API = 'ws://127.0.0.1:8010' # 是否启用 babel-plugin-dynamic-import-node插件 diff --git a/acs/qd/src/components/Crud/RR.operation.vue b/acs/qd/src/components/Crud/RR.operation.vue index df2c138..6bcfcbb 100644 --- a/acs/qd/src/components/Crud/RR.operation.vue +++ b/acs/qd/src/components/Crud/RR.operation.vue @@ -1,8 +1,16 @@ - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_truss.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_truss.vue deleted file mode 100644 index 7397c8e..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_truss.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue deleted file mode 100644 index bf3140b..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_one_rgv.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_one_rgv.vue index e5300ae..7bf9e72 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_one_rgv.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_one_rgv.vue @@ -13,6 +13,7 @@ v-model="opc_id" placeholder="无" clearable + filterable @change="changeOpc" > - -
- -
- 设备协议： -
- - - - OpcServer: - - - - - - PLC: - - - - - - - - - -
- 输送系统： -
- - - - - - - - - - - - -
- 指令相关： -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- AGV相关： -
- - - - - - - - - - - - - - - - - -
- PLC读取字段： -
- - - - - - - - - - - - - - - - - -
- PLC写入字段： -
- - - - - - - - - - - - - - - - - -
- - 保存 - -
- - -
- - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_line.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_line.vue deleted file mode 100644 index fbedcf5..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_line.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue index ae02053..e8184d5 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue @@ -13,6 +13,7 @@ v-model="opc_id" placeholder="无" clearable + filterable @change="changeOpc" > - -
- - -
- 设备协议： -
- - - - OpcServer: - - - - - - PLC: - - - - - - - - - -
- 输送系统： -
- - - - - - - - - - - - -
- 指令相关： -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- AGV相关： -
- - - - - - - - - - - - - - - - - -
- PLC读取字段： -
- - - - - - - - - - - - - - - - - -
- PLC写入字段： -
- - - - - - - - - - - - - - - - - -
- - 保存 - -
- - -
- - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_pallet_storage.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_pallet_storage.vue deleted file mode 100644 index 9d82e16..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_pallet_storage.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue index eb1381d..2c59f65 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue @@ -13,6 +13,7 @@ v-model="opc_id" placeholder="无" clearable + filterable @change="changeOpc" > - -
- -
- 设备协议： -
- - - - OpcServer: - - - - - - PLC: - - - - - - - - - -
- 输送系统： -
- - - - - - - - - - - - -
- 指令相关： -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- AGV相关： -
- - - - - - - - - - - - - - - - - -
- PLC读取字段： -
- - - - - - - - - - - - - - - - - -
- PLC写入字段： -
- - - - - - - - - - - - - - - - - -
- - 保存 - -
- - -
- - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue index 3ffc285..c2ae6c0 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue @@ -13,6 +13,7 @@ v-model="opc_id" placeholder="无" clearable + filterable @change="changeOpc" > - +
@@ -13,6 +13,7 @@ v-model="opc_id" placeholder="无" clearable + filterable @change="changeOpc" > - - - - - - - +
@@ -119,7 +113,7 @@ > - + - + - - - - + + + +