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 0340429..2c10437 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 @@ -41,42 +41,7 @@ public enum DriverTypeEnum { TRAFFIC_LIGHT(34, "traffic_light", "标准版-交通灯-欧姆龙plc", "alarmLamp"), - STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv"), - - 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_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_CRUSHER(52, "lnsh_crusher", "晟华-破碎机", "station"); - + STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv"); //驱动索引 private int index; 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 dfedda6..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/qd/src/views/acs/device/config.vue b/acs/qd/src/views/acs/device/config.vue index 5e77338..22358a9 100644 --- a/acs/qd/src/views/acs/device/config.vue +++ b/acs/qd/src/views/acs/device/config.vue @@ -92,34 +92,9 @@ import standard_conveyor_monitor from '@/views/acs/device/driver/standard_convey import non_line_manipulator_inspect_site from '@/views/acs/device/driver/non_line_manipulator_inspect_site' import non_line_inspect_site from '@/views/acs/device/driver/non_line_inspect_site' import manipulator_inspect_site_NDC from '@/views/acs/device/driver/manipulator_inspect_site_NDC' -import feedback_agv_status_site from '@/views/acs/device/driver/feedback_agv_status_site' import standard_manipulator_stacking_site from '@/views/acs/device/driver/standard_manipulator_stacking_site' import standard_photoelectric_inspect_site from '@/views/acs/device/driver/standard_photoelectric_inspect_site' -import ndxy_special from '@/views/acs/device/driver/ndxy_special' -import hailiang_labeling from '@/views/acs/device/driver/hailiang_labeling' -import ndxy_special_two from '@/views/acs/device/driver/ndxy_special_two' -import whxr_storage_conveyor from '@/views/acs/device/driver/whxr/whxr_storage_conveyor' -import whxr_ball_mill from '@/views/acs/device/driver/whxr/whxr_ball_mill' -import whxr_spary_tower from '@/views/acs/device/driver/whxr/whxr_spary_power' -import whxr_weight from '@/views/acs/device/driver/whxr/whxr_weight' import electric_fence from '@/views/acs/device/driver/electric_fence' -import lnsh_mixing_mill from '@/views/acs/device/driver/lnsh/lnsh_mixing_mill' -import lnsh_press from '@/views/acs/device/driver/lnsh/lnsh_press' -import lnsh_palletizing_manipulator from '@/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator' -import lnsh_kiln_truss from '@/views/acs/device/driver/lnsh/lnsh_kiln_truss' -import lnsh_out_kiln_truss from '@/views/acs/device/driver/lnsh/lnsh_out_kiln_truss' -import lnsh_pallet_storage from '@/views/acs/device/driver/lnsh/lnsh_pallet_storage' -import lnsh_labeling_machine from '@/views/acs/device/driver/lnsh/lnsh_labeling_machine' -import lnsh_split_manipulator from '@/views/acs/device/driver/lnsh/lnsh_split_manipulator' -import lnsh_rgv from '@/views/acs/device/driver/lnsh/lnsh_rgv' -import lnsh_fold_disc_site from '@/views/acs/device/driver/lnsh/lnsh_fold_disc_site' -import lnsh_kiln_lane from '@/views/acs/device/driver/lnsh/lnsh_kiln_lane' -import lnsh_package_line from '@/views/acs/device/driver/lnsh/lnsh_package_line' -import lnsh_package_pallet_manipulator from '@/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator' -import lnsh_station from '@/views/acs/device/driver/lnsh/lnsh_station' -import lnsh_Laminating_machine from '@/views/acs/device/driver/lnsh/lnsh_Laminating_machine' -import lnsh_package_site from '@/views/acs/device/driver/lnsh/lnsh_package_site' -import lnsh_crusher from '@/views/acs/device/driver/lnsh/lnsh_crusher' export default { name: 'DeviceConfig', @@ -127,11 +102,8 @@ export default { standard_emptypallet_site, standard_manipulator_inspect_site, standard_special_inspect_site, lamp_three_color, standard_storage, special_ordinary_site, standard_scanner, standard_conveyor_control_with_scanner, standard_conveyor_control_with_plcscanner, standard_conveyor_control, standard_conveyor_monitor, weighing_site, machines_site, non_line_manipulator_inspect_site, - non_line_inspect_site, manipulator_inspect_site_NDC, feedback_agv_status_site, standard_manipulator_stacking_site, - standard_photoelectric_inspect_site, ndxy_special, hailiang_labeling, ndxy_special_two, whxr_storage_conveyor, whxr_ball_mill, whxr_spary_tower, whxr_weight, - electric_fence, lnsh_mixing_mill, lnsh_press, lnsh_palletizing_manipulator, lnsh_fold_disc_site, lnsh_kiln_lane, lnsh_kiln_truss, - lnsh_package_line, lnsh_out_kiln_truss, lnsh_package_pallet_manipulator, lnsh_pallet_storage, lnsh_labeling_machine, lnsh_split_manipulator, lnsh_rgv, - lnsh_station, lnsh_Laminating_machine, lnsh_package_site, lnsh_crusher }, + non_line_inspect_site, manipulator_inspect_site_NDC, standard_manipulator_stacking_site, + standard_photoelectric_inspect_site, electric_fence }, dicts: ['device_type'], mixins: [crud], data() { diff --git a/acs/qd/src/views/acs/device/driver/feedback_agv_status_site.vue b/acs/qd/src/views/acs/device/driver/feedback_agv_status_site.vue deleted file mode 100644 index e7384aa..0000000 --- a/acs/qd/src/views/acs/device/driver/feedback_agv_status_site.vue +++ /dev/null @@ -1,331 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/hailiang_labeling.vue b/acs/qd/src/views/acs/device/driver/hailiang_labeling.vue deleted file mode 100644 index d5d9081..0000000 --- a/acs/qd/src/views/acs/device/driver/hailiang_labeling.vue +++ /dev/null @@ -1,458 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue deleted file mode 100644 index 8d7b59b..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue +++ /dev/null @@ -1,494 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_crusher.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_crusher.vue deleted file mode 100644 index 53dee78..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_crusher.vue +++ /dev/null @@ -1,474 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue deleted file mode 100644 index 2abf5fa..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_lane.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_lane.vue deleted file mode 100644 index e7b5c82..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_lane.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - 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 4594ef6..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_truss.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_labeling_machine.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_labeling_machine.vue deleted file mode 100644 index 1680294..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_labeling_machine.vue +++ /dev/null @@ -1,486 +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 a1f1b9a..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue +++ /dev/null @@ -1,518 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_out_kiln_truss.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_out_kiln_truss.vue deleted file mode 100644 index a9892cf..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_out_kiln_truss.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - 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 ac205be..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_line.vue +++ /dev/null @@ -1,488 +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 deleted file mode 100644 index e8184d5..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_site.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_site.vue deleted file mode 100644 index fdacbb7..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_site.vue +++ /dev/null @@ -1,474 +0,0 @@ - - - - - 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 7470359..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_pallet_storage.vue +++ /dev/null @@ -1,488 +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 deleted file mode 100644 index 7ac3c96..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_press.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_press.vue deleted file mode 100644 index 1eb49d6..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_press.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - 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 deleted file mode 100644 index 39a7c28..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue +++ /dev/null @@ -1,589 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_split_manipulator.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_split_manipulator.vue deleted file mode 100644 index f7d3193..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_split_manipulator.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue deleted file mode 100644 index 777974c..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue +++ /dev/null @@ -1,471 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/ndxy_special_two.vue b/acs/qd/src/views/acs/device/driver/ndxy_special_two.vue deleted file mode 100644 index 25bccb7..0000000 --- a/acs/qd/src/views/acs/device/driver/ndxy_special_two.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/whxr/whxr_ball_mill.vue b/acs/qd/src/views/acs/device/driver/whxr/whxr_ball_mill.vue deleted file mode 100644 index 8895c65..0000000 --- a/acs/qd/src/views/acs/device/driver/whxr/whxr_ball_mill.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/whxr/whxr_spary_power.vue b/acs/qd/src/views/acs/device/driver/whxr/whxr_spary_power.vue deleted file mode 100644 index 9c87417..0000000 --- a/acs/qd/src/views/acs/device/driver/whxr/whxr_spary_power.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/whxr/whxr_storage_conveyor.vue b/acs/qd/src/views/acs/device/driver/whxr/whxr_storage_conveyor.vue deleted file mode 100644 index 4f34037..0000000 --- a/acs/qd/src/views/acs/device/driver/whxr/whxr_storage_conveyor.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/whxr/whxr_weight.vue b/acs/qd/src/views/acs/device/driver/whxr/whxr_weight.vue deleted file mode 100644 index 9c87417..0000000 --- a/acs/qd/src/views/acs/device/driver/whxr/whxr_weight.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - -