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 6d1c2e3..dca848e 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 @@ -45,32 +45,8 @@ public enum DriverTypeEnum { 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"), @@ -79,34 +55,18 @@ public enum DriverTypeEnum { 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_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"), 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..c150608 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_driver/electric_fence/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/electric_fence/ItemProtocol.java index b91dd96..7757bd7 100644 --- 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 @@ -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/hailiang/hailiang_coating/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/ItemProtocol.java index cce09b0..842ab4c 100644 --- 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 @@ -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/hailiang/hailiang_labeling/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/ItemProtocol.java index 455eb8a..31aa567 100644 --- 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 @@ -40,7 +40,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/hailiang/hailiang_packing/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/ItemProtocol.java index e904060..c2976b6 100644 --- 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 @@ -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/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 736ed28..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 @@ -97,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_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_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_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..473d64b 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 @@ -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_palletizing_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java index 005dc5c..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; } 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 3ab11bd..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; } 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_station/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java index 2f9b719..93145eb 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,7 +128,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/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 4910e4e..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; } 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 index ece85be..d4fb30f 100644 --- 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 @@ -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_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/traffic_light/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/traffic_light/ItemProtocol.java index 5f49e02..5b85749 100644 --- 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 @@ -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/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..2bd7ad6 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 @@ -469,7 +469,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONArray jsonArray = JSONArray.parseArray(result); return jsonArray; }finally { - MDC.remove(log_type); + MDC.remove(log_file_type); } } 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 23fe5ca..635b39a 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 @@ -59,6 +59,7 @@ import org.nl.acs.task.service.dto.TaskDto; import org.nl.exception.WDKException; import org.nl.utils.SpringContextHolder; import org.nl.wql.core.bean.WQLObject; +import org.slf4j.MDC; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -77,12 +78,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { private final RouteLineService RouteLineService; private final ProduceshiftorderService produceshiftorderService; + private String log_file_type = "log_file_type"; + 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{ + try { JSONArray errArr = new JSONArray(); for (int i = 0; i < tasks.size(); i++) { JSONObject task = tasks.getJSONObject(i); @@ -181,7 +185,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { nextjo.put("batch", ""); nextjo.put("islock", "false"); DeviceService.changeDeviceStatus(nextjo); - TaskDto task_dto = jo.toJavaObject(TaskDto.class); + TaskDto task_dto = jo.toJavaObject(TaskDto.class); try { TaskService.create(task_dto); } catch (Exception e) { @@ -259,115 +263,122 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { @Override public Map createOrder(String param) throws Exception { - JSONArray orders = JSONArray.parseArray(param); - log.info("createOrder--------------:输入参数：" + orders.toString()); + try { + MDC.put(log_file_type, log_type); + JSONArray orders = JSONArray.parseArray(param); + log.info("createOrder--------------:输入参数：" + orders.toString()); - for (int i = 0; i < orders.size(); i++) { - Boolean is_flag = false; + for (int i = 0; i < orders.size(); i++) { + Boolean is_flag = false; - JSONObject json = orders.getJSONObject(i); - String producetask_code = json.getString("producetask_code"); - String device_code = json.getString("device_code"); - String product_code = json.getString("product_code"); - String material_code = json.getString("material_code"); - String material_name = json.getString("material_name"); - String cust_code = json.getString("cust_code"); - String cust_name = json.getString("cust_name"); - String model = json.getString("model"); - String molten_pool = json.getString("molten_pool"); - String weight = json.getString("weight"); - String qty = json.getString("plan_qty"); + JSONObject json = orders.getJSONObject(i); + String producetask_code = json.getString("producetask_code"); + String device_code = json.getString("device_code"); + String product_code = json.getString("product_code"); + String material_code = json.getString("material_code"); + String material_name = json.getString("material_name"); + String cust_code = json.getString("cust_code"); + String cust_name = json.getString("cust_name"); + String model = json.getString("model"); + String molten_pool = json.getString("molten_pool"); + String weight = json.getString("weight"); + String qty = json.getString("plan_qty"); - if (StrUtil.isEmpty(producetask_code)) { - throw new WDKException("工单号不能为空"); + if (StrUtil.isEmpty(producetask_code)) { + throw new WDKException("工单号不能为空"); + } + + Device device = DeviceAppService.findDeviceByCode(device_code); + if (ObjectUtil.isEmpty(device)) { + 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)) { + throw new WDKException("数量不能为空"); + } + if (StrUtil.isEmpty(material_code)) { + throw new WDKException("物料编号不能为空！"); + } + lnshPalletizingManipulatorDeviceDriver.writing("to_order_No", producetask_code); + lnshPalletizingManipulatorDeviceDriver.writing("to_material_qty", qty); + lnshPalletizingManipulatorDeviceDriver.writing("to_material_code", material_code); + is_flag = true; + } + if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { + lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); + if (StrUtil.isEmpty(qty)) { + throw new WDKException("数量不能为空"); + } + if (StrUtil.isEmpty(material_code)) { + throw new WDKException("物料编号不能为空！"); + } + lnshPackagePalletManipulatorDeviceDriver.writing("to_order_No", producetask_code); + lnshPackagePalletManipulatorDeviceDriver.writing("to_material_qty", qty); + lnshPackagePalletManipulatorDeviceDriver.writing("to_material_code", material_code); + is_flag = true; + } + //下发成功后，写入工单信息表记录 + if (is_flag) { + ProduceshiftorderDto dto = new ProduceshiftorderDto(); + dto.setOrder_code(producetask_code); + dto.setProduct_code(product_code); + dto.setDevice_code(device_code); + dto.setOrder_status("1"); + dto.setMaterial_code(material_code); + dto.setMaterial_name(material_name); + dto.setCust_code(cust_code); + dto.setCust_name(cust_name); + dto.setModel(model); + dto.setMolten_pool(molten_pool); + dto.setWeight(weight); + dto.setQty(qty); + produceshiftorderService.create(dto); + } } - Device device = DeviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device)) { - throw new Exception("未找到对应设备:" + device_code); - } + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONObject()); + log.info("createOrder--------------:输出参数" + resultJson.toString()); + return resultJson; - 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)) { - throw new WDKException("数量不能为空"); - } - if (StrUtil.isEmpty(material_code)) { - throw new WDKException("物料编号不能为空！"); - } - lnshPalletizingManipulatorDeviceDriver.writing("to_order_No",producetask_code); - lnshPalletizingManipulatorDeviceDriver.writing("to_material_qty",qty); - lnshPalletizingManipulatorDeviceDriver.writing("to_material_code",material_code); - is_flag = true; - } - if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { - lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); - if (StrUtil.isEmpty(qty)) { - throw new WDKException("数量不能为空"); - } - if (StrUtil.isEmpty(material_code)) { - throw new WDKException("物料编号不能为空！"); - } - lnshPackagePalletManipulatorDeviceDriver.writing("to_order_No",producetask_code); - lnshPackagePalletManipulatorDeviceDriver.writing("to_material_qty",qty); - lnshPackagePalletManipulatorDeviceDriver.writing("to_material_code",material_code); - is_flag = true; - } - //下发成功后，写入工单信息表记录 - if (is_flag) { - ProduceshiftorderDto dto = new ProduceshiftorderDto(); - dto.setOrder_code(producetask_code); - dto.setProduct_code(product_code); - dto.setDevice_code(device_code); - dto.setOrder_status("1"); - dto.setMaterial_code(material_code); - dto.setMaterial_name(material_name); - dto.setCust_code(cust_code); - dto.setCust_name(cust_name); - dto.setModel(model); - dto.setMolten_pool(molten_pool); - dto.setWeight(weight); - dto.setQty(qty); - produceshiftorderService.create(dto); - } + } 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("createOrder--------------:输出参数" + resultJson.toString()); - return resultJson; } @Override @@ -404,9 +415,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { electricFenceDeviceDriver = (ElectricFenceDeviceDriver) device.getDeviceDriver(); if (electricFenceDeviceDriver.getSuspended()) { throw new RuntimeException("交通管制无法进入"); - } else if (StrUtil.equals(type,"1")) { + } else if (StrUtil.equals(type, "1")) { electricFenceDeviceDriver.setSuspended(true); - } else if (StrUtil.equals(type,"2")) { + } else if (StrUtil.equals(type, "2")) { electricFenceDeviceDriver.setSuspended(false); } } @@ -421,7 +432,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { @Override public Map putAction(String jsonObject) throws Exception { - JSONArray datas = JSONArray.parseArray(jsonObject); + JSONArray datas = JSONArray.parseArray(jsonObject); log.info("putAction--------------:输入参数" + datas.toString()); for (int i = 0; i < datas.size(); i++) { JSONObject data = datas.getJSONObject(i); @@ -593,9 +604,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { 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(); + } 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()); @@ -613,8 +623,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("qualified", lnshPressDeviceDriver.getQualified()); jo.put("unqualified", lnshPressDeviceDriver.getUnqualified()); jo.put("order_No", lnshPressDeviceDriver.getOrder_No()); - } - else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshPalletizingManipulatorDeviceDriver.getMode()); @@ -629,8 +638,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications()); jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror()); jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshKilnTrussDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshKilnTrussDeviceDriver) { lnshKilnTrussDeviceDriver = (LnshKilnTrussDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshKilnTrussDeviceDriver.getMode()); @@ -643,8 +651,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("error_time", lnshKilnTrussDeviceDriver.getError_time()); jo.put("isError", lnshKilnTrussDeviceDriver.getIserror()); jo.put("message", lnshKilnTrussDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshKilnLaneDeviceDriver.getMode()); @@ -660,8 +667,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { 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) { + } else if (device.getDeviceDriver() instanceof LnshOutKilnTrussDeviceDriver) { lnshOutKilnTrussDeviceDriver = (LnshOutKilnTrussDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshOutKilnTrussDeviceDriver.getMode()); @@ -677,8 +683,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("error_time", lnshOutKilnTrussDeviceDriver.getError_time()); jo.put("isError", lnshOutKilnTrussDeviceDriver.getIserror()); jo.put("message", lnshOutKilnTrussDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshFoldDiscSiteDeviceDriver.getMode()); @@ -693,8 +698,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("container_qty", lnshFoldDiscSiteDeviceDriver.getContainer_qty()); jo.put("isError", lnshFoldDiscSiteDeviceDriver.getIserror()); jo.put("message", lnshFoldDiscSiteDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshPalletStorageDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshPalletStorageDeviceDriver) { lnshPalletStorageDeviceDriver = (LnshPalletStorageDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshPalletStorageDeviceDriver.getMode()); @@ -710,8 +714,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("total_container", lnshPalletStorageDeviceDriver.getTotal_container()); jo.put("isError", lnshPalletStorageDeviceDriver.getIserror()); jo.put("message", lnshPalletStorageDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshPackagePalletManipulatorDeviceDriver.getMode()); @@ -732,8 +735,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("order_No", lnshPackagePalletManipulatorDeviceDriver.getOrder_No()); jo.put("isError", lnshPackagePalletManipulatorDeviceDriver.getIserror()); jo.put("message", lnshPackagePalletManipulatorDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { + } else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", rljnPackagePalletSplitManipulatorDeviceDriver.getMode()); @@ -756,8 +758,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("total_split", rljnPackagePalletSplitManipulatorDeviceDriver.getTotal_split()); jo.put("isError", rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()); jo.put("message", rljnPackagePalletSplitManipulatorDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { lnshLabelingMachineDeviceDriver = (LnshLabelingMachineDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshLabelingMachineDeviceDriver.getMode()); @@ -771,8 +772,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("labeling_qty", lnshLabelingMachineDeviceDriver.getLabeling_qty()); jo.put("isError", lnshLabelingMachineDeviceDriver.getIserror()); jo.put("message", lnshLabelingMachineDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshSplitManipulatorDeviceDriver.getMode()); @@ -791,8 +791,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time()); jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror()); jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshPackageLineDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshPackageLineDeviceDriver) { lnshPackageLineDeviceDriver = (LnshPackageLineDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshPackageLineDeviceDriver.getMode()); @@ -805,8 +804,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("barcode", lnshPackageLineDeviceDriver.getBarcode()); jo.put("isError", lnshPackageLineDeviceDriver.getIserror()); jo.put("message", lnshPackageLineDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshLaminatingMachineDeviceDriver.getMode()); @@ -818,8 +816,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("isOnline", lnshLaminatingMachineDeviceDriver.getIsonline()); jo.put("isError", lnshLaminatingMachineDeviceDriver.getIserror()); jo.put("message", lnshLaminatingMachineDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshRGVDeviceDriver.getMode()); @@ -859,7 +856,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { throw new Exception("未找到对应设备:" + device_code); } - if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { + if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", standardAutodoorDeviceDriver.getMode()); @@ -868,16 +865,16 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { 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()); - //普通站点 + 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()); @@ -937,7 +934,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("isError", standardPhotoelectricInspectSiteDeviceDriver.getIserror()); jo.put("container", standardPhotoelectricInspectSiteDeviceDriver.getContainer()); jo.put("message", standardPhotoelectricInspectSiteDeviceDriver.getMessage()); - }else if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshStationDeviceDriver.getMode()); @@ -957,7 +954,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("batch", lnshStationDeviceDriver.getBatch()); jo.put("pallet_type", lnshStationDeviceDriver.getContainer_type()); - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshPalletizingManipulatorSiteDeviceDriver.getMode()); @@ -1012,9 +1009,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { 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(); + } 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()); @@ -1032,8 +1028,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("qualified", lnshPressDeviceDriver.getQualified()); jo.put("unqualified", lnshPressDeviceDriver.getUnqualified()); jo.put("order_No", lnshPressDeviceDriver.getOrder_No()); - } - else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshPalletizingManipulatorDeviceDriver.getMode()); @@ -1048,8 +1043,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications()); jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror()); jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshKilnTrussDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshKilnTrussDeviceDriver) { lnshKilnTrussDeviceDriver = (LnshKilnTrussDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshKilnTrussDeviceDriver.getMode()); @@ -1062,8 +1056,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("error_time", lnshKilnTrussDeviceDriver.getError_time()); jo.put("isError", lnshKilnTrussDeviceDriver.getIserror()); jo.put("message", lnshKilnTrussDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshKilnLaneDeviceDriver.getMode()); @@ -1079,8 +1072,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { 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) { + } else if (device.getDeviceDriver() instanceof LnshOutKilnTrussDeviceDriver) { lnshOutKilnTrussDeviceDriver = (LnshOutKilnTrussDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshOutKilnTrussDeviceDriver.getMode()); @@ -1096,8 +1088,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("error_time", lnshOutKilnTrussDeviceDriver.getError_time()); jo.put("isError", lnshOutKilnTrussDeviceDriver.getIserror()); jo.put("message", lnshOutKilnTrussDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshFoldDiscSiteDeviceDriver.getMode()); @@ -1112,8 +1103,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("container_qty", lnshFoldDiscSiteDeviceDriver.getContainer_qty()); jo.put("isError", lnshFoldDiscSiteDeviceDriver.getIserror()); jo.put("message", lnshFoldDiscSiteDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshPalletStorageDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshPalletStorageDeviceDriver) { lnshPalletStorageDeviceDriver = (LnshPalletStorageDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshPalletStorageDeviceDriver.getMode()); @@ -1129,8 +1119,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("total_container", lnshPalletStorageDeviceDriver.getTotal_container()); jo.put("isError", lnshPalletStorageDeviceDriver.getIserror()); jo.put("message", lnshPalletStorageDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshPackagePalletManipulatorDeviceDriver.getMode()); @@ -1151,8 +1140,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("order_No", lnshPackagePalletManipulatorDeviceDriver.getOrder_No()); jo.put("isError", lnshPackagePalletManipulatorDeviceDriver.getIserror()); jo.put("message", lnshPackagePalletManipulatorDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { + } else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", rljnPackagePalletSplitManipulatorDeviceDriver.getMode()); @@ -1175,8 +1163,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("total_split", rljnPackagePalletSplitManipulatorDeviceDriver.getTotal_split()); jo.put("isError", rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()); jo.put("message", rljnPackagePalletSplitManipulatorDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { lnshLabelingMachineDeviceDriver = (LnshLabelingMachineDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshLabelingMachineDeviceDriver.getMode()); @@ -1190,8 +1177,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("labeling_qty", lnshLabelingMachineDeviceDriver.getLabeling_qty()); jo.put("isError", lnshLabelingMachineDeviceDriver.getIserror()); jo.put("message", lnshLabelingMachineDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshSplitManipulatorDeviceDriver.getMode()); @@ -1210,8 +1196,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time()); jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror()); jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshPackageLineDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshPackageLineDeviceDriver) { lnshPackageLineDeviceDriver = (LnshPackageLineDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshPackageLineDeviceDriver.getMode()); @@ -1224,8 +1209,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("barcode", lnshPackageLineDeviceDriver.getBarcode()); jo.put("isError", lnshPackageLineDeviceDriver.getIserror()); jo.put("message", lnshPackageLineDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshLaminatingMachineDeviceDriver.getMode()); @@ -1237,8 +1221,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("isOnline", lnshLaminatingMachineDeviceDriver.getIsonline()); jo.put("isError", lnshLaminatingMachineDeviceDriver.getIserror()); jo.put("message", lnshLaminatingMachineDeviceDriver.getMessage()); - } - else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { + } else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver(); jo.put("device_code", device.getDevice_code()); jo.put("mode", lnshRGVDeviceDriver.getMode()); 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); }