From a8f9f2047d6c8734deaca07ff22e5289dd7b04e0 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期六, 31 八月 2024 11:54:56 +0800 Subject: [PATCH] 合同考核调用工单调整 --- ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 2 +- ycl-server/src/main/java/com/ycl/task/OsdTask.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java index 75443d2..72ec970 100644 --- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java +++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java @@ -80,7 +80,7 @@ log.info("寮�濮嬭幏鍙朞SD"); // YSApi.getOsd("51.95.66.42",YSUserName,YSPassword); - DHApi.getOsd("51.95.67.189",DHUserName,DHPassword); +// DHApi.getOsd("51.95.67.189",DHUserName,DHPassword); //鎵归噺淇敼娴峰悍鍝佺墝闆嗗悎 List<String> hkList = new ArrayList<>(); //鎵归噺淇敼澶у崕鍝佺墝闆嗗悎 @@ -96,7 +96,6 @@ if(!CollectionUtils.isEmpty(serialNumbers)) { List<TMonitor> monitors = monitorMapper.selectByNumbers(serialNumbers); monitors = monitors.stream().filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) && !"127.0.0.1".equals(monitor.getIp())).collect(Collectors.toList()); -// monitors = monitors.stream().filter(monitor -> monitor.getId() < 7000).collect(Collectors.toList()); log.info("澶勭悊鏁版嵁澶у皬{}", monitors.size()); for (TMonitor monitor : monitors) { executorService.submit(() -> { @@ -117,6 +116,7 @@ } else if (DeviceType.YS.getType().equals(monitor.getDeviceType())) { //TODO锛氬畤瑙哸pi } + log.info("//鏈煡鍝佺墝鎴栬�卆pi璋冪敤澶辫触锛屾尐涓墽琛屾墍鏈塧pi"); //鏈煡鍝佺墝鎴栬�卆pi璋冪敤澶辫触锛屾尐涓墽琛屾墍鏈塧pi OSDResult osd = tryAllApi(monitor, hkList, dhList, ysList); if (osd != null) { diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml index 2dba5e9..f57cebe 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml @@ -240,7 +240,7 @@ SELECT wo.id,wo.work_order_no,wo.unit_id,woet.error_name as errorType,woet.distribute_time,woar.create_time as auditTime FROM t_work_order wo LEFT JOIN t_work_order_error_type woet ON woet.work_order_no = wo.work_order_no - LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_id = wo.id + LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_no = wo.work_order_no WHERE wo.deleted = 0 AND wo.status = #{status} AND woar.result = #{auditStatus} AND wo.deduct = 0 AND woar.create_time between #{startTime} and #{endTime} </select> -- Gitblit v1.8.0