From 1973464fd3144ff019107333747bbbedf95bc0ae Mon Sep 17 00:00:00 2001 From: psh Date: Mon, 24 Jun 2024 11:23:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=9C=AB=E6=9B=B4=E6=96=B0=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../run/OneNDCSocketConnectionAutoRun.java | 4 +- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 5 +- .../guhuashi/GuhuashiSiteDeviceDriver.java | 30 ++++---- .../tianneng/guhuashi/ItemProtocol.java | 74 +++++++++---------- .../impl/DeviceExecuteLogServiceImpl.java | 2 + .../src/main/java/org/nl/acs/opc/OpcUtl.java | 8 ++ .../wms/sch/point/service/task/SyncPoint.java | 2 +- .../task/tasks/auto/mapper/AutoMapper.xml | 1 + 8 files changed, 70 insertions(+), 56 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index 37d8786..f6a924d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -234,10 +234,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } else { //上报异常信息 //（不需要WCS反馈） - if (phase == 0x67 || phase == 0x70 || phase == 0x71 || phase == 0x72 || phase == 0x73 || phase == 0x74) { + if (phase == 0x70 || phase == 0x71 || phase == 0x72 || phase == 0x73 || phase == 0x74) { device = deviceAppService.findDeviceByCode("AGV0" +agvaddr); } else { - device = deviceAppService.findDeviceByCode("AGV0" + arr[20]); + device = deviceAppService.findDeviceByCode("AGV0" + Integer.toString(arr[20])); } if (ObjectUtil.isNotEmpty(device)) { if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index a18e07b..3395d42 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -125,9 +125,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic acsToWmsService.notify(request); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0); } + TaskDto task = new TaskDto(); + if(ObjectUtil.isNotEmpty(inst)){ + task = taskService.findById(inst.getTask_id()); + } - TaskDto task = taskService.findById(inst.getTask_id()); //分配 车id //(不需要WCS反馈) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java index 9ba91c7..2149452 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java @@ -146,14 +146,14 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements VW7046 = this.itemProtocol.getVW7046(); VW7056 = this.itemProtocol.getVW7056(); VW7058 = this.itemProtocol.getVW7058(); - VW7076 = this.itemProtocol.getVW7076(); - VW70001 = this.itemProtocol.getVW70001(); - VW70002 = this.itemProtocol.getVW70002(); - VW70003 = this.itemProtocol.getVW70003(); - VW70004 = this.itemProtocol.getVW70004(); - VW70005 = this.itemProtocol.getVW70005(); - VW70006 = this.itemProtocol.getVW70006(); - VW70007 = this.itemProtocol.getVW70007(); +// VW7076 = this.itemProtocol.getVW7076(); +// VW70001 = this.itemProtocol.getVW70001(); +// VW70002 = this.itemProtocol.getVW70002(); +// VW70003 = this.itemProtocol.getVW70003(); +// VW70004 = this.itemProtocol.getVW70004(); +// VW70005 = this.itemProtocol.getVW70005(); +// VW70006 = this.itemProtocol.getVW70006(); +// VW70007 = this.itemProtocol.getVW70007(); if(VW7058!=last_VW7058){ //固化室状态变更后通知lms更新固化室状态 @@ -207,13 +207,13 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements last_VW7056 = VW7056; last_VW7058 = VW7058; last_VW7076 = VW7076; - last_VW70001 = VW70001; - last_VW70002 = VW70002; - last_VW70003 = VW70003; - last_VW70004 = VW70004; - last_VW70005 = VW70005; - last_VW70006 = VW70006; - last_VW70007 = VW70007; +// last_VW70001 = VW70001; +// last_VW70002 = VW70002; +// last_VW70003 = VW70003; +// last_VW70004 = VW70004; +// last_VW70005 = VW70005; +// last_VW70006 = VW70006; +// last_VW70007 = VW70007; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/ItemProtocol.java index c4bccb5..54703a2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/ItemProtocol.java @@ -34,26 +34,26 @@ public class ItemProtocol { public static String item_VW7056 = "VW7056"; public static String item_VW7058 = "VW7058"; public static String item_VW7076 = "VW7076"; - public static String item_VW70001 = "VW7000.1"; - public static String item_VW70002 = "VW7000.2"; - public static String item_VW70003 = "VW7000.3"; - public static String item_VW70004 = "VW7000.4"; - public static String item_VW70005 = "VW7000.5"; - public static String item_VW70006 = "VW7000.6"; - public static String item_VW70007 = "VW7000.7"; + public static String item_VW70001 = "VW70001"; + public static String item_VW70002 = "VW70002"; + public static String item_VW70003 = "VW70003"; + public static String item_VW70004 = "VW70004"; + public static String item_VW70005 = "VW70005"; + public static String item_VW70006 = "VW70006"; + public static String item_VW70007 = "VW70007"; //写入信号 - public static String item_VW70040 = "VW7004.0"; - public static String item_VW70041 = "VW7004.1"; - public static String item_VW70042 = "VW7004.2"; - public static String item_VW70043 = "VW7004.3"; - public static String item_VW70044 = "VW7004.4"; - public static String item_VW70045 = "VW7004.5"; - public static String item_VW70050 = "VW7005.0"; - public static String item_VW70051 = "VW7005.1"; - public static String item_VW70052 = "VW7005.2"; - public static String item_VW70053 = "VW7005.3"; - public static String item_VW70054 = "VW7005.4"; + public static String item_VW70040 = "VW70040"; + public static String item_VW70041 = "VW70041"; + public static String item_VW70042 = "VW70042"; + public static String item_VW70043 = "VW70043"; + public static String item_VW70044 = "VW70044"; + public static String item_VW70045 = "VW70045"; + public static String item_VW70050 = "VW70050"; + public static String item_VW70051 = "VW70051"; + public static String item_VW70052 = "VW70052"; + public static String item_VW70053 = "VW70053"; + public static String item_VW70054 = "VW70054"; private GuhuashiSiteDeviceDriver driver; @@ -224,33 +224,33 @@ public class ItemProtocol { list.add(new ItemDto(item_VW7040, "阶段累加分", "VW7040")); list.add(new ItemDto(item_VW7042, "实际运行程序套数", "VW7042")); list.add(new ItemDto(item_VW7044, "正在执行的阶段数", "VW7044")); - list.add(new ItemDto(item_VW7046, "报警内容", "VW7046")); +// list.add(new ItemDto(item_VW7046, "报警内容", "VW7046")); list.add(new ItemDto(item_VW7056, "工作模式", "VW7056")); list.add(new ItemDto(item_VW7058, "设备状态", "VW7058")); list.add(new ItemDto(item_VW7076, "心跳", "VW7076")); - list.add(new ItemDto(item_VW70001, "工艺运行中信号", "VW7004.0")); - list.add(new ItemDto(item_VW70002, "工艺运行结束信号", "VW7004.1")); - list.add(new ItemDto(item_VW70003, "固化室内允许进板或出板信号（室内温度低于允许进入温度）", "VW7004.2")); - list.add(new ItemDto(item_VW70004, "固化室前门已开信号", "VW7004.3")); - list.add(new ItemDto(item_VW70005, "固化室前门已关信号", "VW7004.4")); - list.add(new ItemDto(item_VW70006, "固化室后门已开信号", "VW7005.0")); - list.add(new ItemDto(item_VW70007, "固化室后门已关信号", "VW7005.1")); +// list.add(new ItemDto(item_VW70001, "工艺运行中信号", "VW7004.0")); +// list.add(new ItemDto(item_VW70002, "工艺运行结束信号", "VW7004.1")); +// list.add(new ItemDto(item_VW70003, "固化室内允许进板或出板信号（室内温度低于允许进入温度）", "VW7004.2")); +// list.add(new ItemDto(item_VW70004, "固化室前门已开信号", "VW7004.3")); +// list.add(new ItemDto(item_VW70005, "固化室前门已关信号", "VW7004.4")); +// list.add(new ItemDto(item_VW70006, "固化室后门已开信号", "VW7005.0")); +// list.add(new ItemDto(item_VW70007, "固化室后门已关信号", "VW7005.1")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_VW70040, "", "VW7004.0")); - list.add(new ItemDto(item_VW70041, "", "VW7004.1")); - list.add(new ItemDto(item_VW70042, "", "VW7004.2")); - list.add(new ItemDto(item_VW70043, "", "VW7004.3")); - list.add(new ItemDto(item_VW70044, "", "VW7004.4")); - list.add(new ItemDto(item_VW70045, "", "VW7004.5")); - list.add(new ItemDto(item_VW70050, "", "VW7005.0")); - list.add(new ItemDto(item_VW70051, "", "VW7005.1")); - list.add(new ItemDto(item_VW70052, "", "VW7005.2")); - list.add(new ItemDto(item_VW70053, "", "VW7005.3")); - list.add(new ItemDto(item_VW70054, "", "VW7005.4")); +// list.add(new ItemDto(item_VW70040, "", "VW7004.0")); +// list.add(new ItemDto(item_VW70041, "", "VW7004.1")); +// list.add(new ItemDto(item_VW70042, "", "VW7004.2")); +// list.add(new ItemDto(item_VW70043, "", "VW7004.3")); +// list.add(new ItemDto(item_VW70044, "", "VW7004.4")); +// list.add(new ItemDto(item_VW70045, "", "VW7004.5")); +// list.add(new ItemDto(item_VW70050, "", "VW7005.0")); +// list.add(new ItemDto(item_VW70051, "", "VW7005.1")); +// list.add(new ItemDto(item_VW70052, "", "VW7005.2")); +// list.add(new ItemDto(item_VW70053, "", "VW7005.3")); +// list.add(new ItemDto(item_VW70054, "", "VW7005.4")); return list; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java index 410e126..fb04fbe 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java @@ -33,6 +33,8 @@ public class DeviceExecuteLogServiceImpl implements DeviceExecuteLogService { e.printStackTrace(); } finally { MDC.remove("device_code_log"); + log.info("successNum:" + OpcUtl.successNum); + log.info("errNum:" + OpcUtl.errNum); } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java index 6c33d64..787e8c5 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java @@ -23,6 +23,9 @@ public class OpcUtl { private static int timeout = 1 * 60 * 1000; private static String key = "rpc.socketTimeout"; + public static int successNum=0; + public static int errNum=0; + static { checkTimeout(); } @@ -224,9 +227,14 @@ public class OpcUtl { server = new Server(getConnection(host, clsid, user, password, domain), Executors.newSingleThreadScheduledExecutor()); server.connect(); + successNum++; return server; } catch (Exception e) { + errNum++; throw new BadRequestException(e.getMessage()); + }finally{ + log.info("successNum:"+successNum); + log.info("errNum:"+errNum); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java index 65e1ce6..290a61c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java @@ -51,7 +51,7 @@ public class SyncPoint { SchBasePoint schBasePoint = new SchBasePoint(); schBasePoint.setRegion_code("ZC"); List schBasePointList = schBasePointService.getPointList(schBasePoint); - JSONArray jsonArray = JSONArray.parseArray(result.body()); + JSONArray jsonArray = JSONObject.parseObject(result.body()).getJSONArray("data"); for (int i = 0; i < jsonArray.size(); i++) { JSONObject jsonObject = jsonArray.getJSONObject(i); for (SchBasePoint temp : schBasePointList) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml index f3530c2..a8f62c1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml @@ -49,6 +49,7 @@ AND p.point_status = '1' AND p.is_used = TRUE AND p.point_code like '%01-01%' + AND (p.ing_task_code = '' OR p.ing_task_code IS NULL) ORDER BY p.row_num, p.col_num LIMIT 1;