From 500412d3e15fa4886ae381203e6611b2ace781d1 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Mon, 17 Feb 2025 09:12:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=8E=B7=E5=8F=96=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=A0=86=E5=8F=A0=E7=82=B9sqlsharding=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=9C=E5=BC=82=E5=B8=B8=EF=BC=9B?=
 =?UTF-8?q?opt:=E5=8F=8D=E9=A6=88=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../point/dao/mapper/SchBasePointMapper.xml   | 29 +++++++------------
 .../main/java/org/nl/config/DruidFilter.java  | 16 ++--------
 .../acs/service/impl/AcsToWmsServiceImpl.java |  8 +++--
 .../wms/sch/service/impl/TaskServiceImpl.java |  6 ++--
 4 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
index 1d2286b20..3011eb33e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
@@ -3,27 +3,18 @@
 <mapper namespace="org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper">
     <select id="queryKZPoint" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-            point.*,
-            box.*,
-            sub.sale_order_name
+            sch_base_point.*,sale_order_name,package_box_sn
         FROM
-            sch_base_point point
-            LEFT JOIN bst_ivt_boxinfo box ON point.vehicle_code = box.box_no
-            LEFT JOIN (
-                SELECT
-                    MAX(sale_order_name) AS sale_order_name,
-                    package_box_sn
-                FROM
-                    pdm_bi_subpackagerelation
-                WHERE
-                    1 = 1
-                group by package_box_sn
-            ) sub ON point.vehicle_code = sub.package_box_sn
+            sch_base_point
+                LEFT JOIN
+            pdm_bi_subpackagerelation sub
+            ON sch_base_point.vehicle_code = sub.package_box_sn
         WHERE
-            point.is_used = '1'
-            AND point.is_delete = '0'
-            AND point.region_code = 'BKZ01'
-            ORDER BY out_empty_seq
+            sch_base_point.is_used = '1'
+          AND sch_base_point.is_delete = '0'
+          AND sch_base_point.region_code = 'BKZ01'
+        GROUP BY sch_base_point.point_code
+        ORDER BY out_empty_seq
     </select>
 
     <select id="queryLikeOrderRow" resultType="com.alibaba.fastjson.JSONObject">
diff --git a/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java b/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java
index 2752a6f01..004fa8f4f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java
+++ b/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java
@@ -39,12 +39,6 @@ public class DruidFilter extends FilterEventAdapter {
 
     @Override
     protected void statementExecuteAfter(StatementProxy statement, String sql, boolean result) {
-        String database="";
-        try {
-            ConnectionImpl connection = (ConnectionImpl)statement.getConnection();
-            database = connection.getDatabase();
-        }catch (Exception ex){
-        }
         int size = statement.getParametersSize();
         String executeSql = sql;
         int count = 0;
@@ -61,7 +55,7 @@ public class DruidFilter extends FilterEventAdapter {
                 }
                 executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params);
             }
-            log.info("[----SQL----][update][数据库:{}][ SQL: {} ]",database, executeSql);
+            log.info("[----SQL----][update][ SQL: {} ]", executeSql);
         }
         super.statementExecuteAfter(statement, sql, result);
     }
@@ -70,12 +64,6 @@ public class DruidFilter extends FilterEventAdapter {
     public ResultSetProxy statement_getResultSet(FilterChain chain, StatementProxy statement) throws SQLException {
         ResultSetProxy rs = super.statement_getResultSet(chain, statement);
         String executeSql = statement.getLastExecuteSql();
-        String database="";
-        try {
-            ConnectionImpl connection = (ConnectionImpl)statement.getConnection();
-            database = connection.getDatabase();
-        }catch (Exception ex){
-        }
         int result = 0;
         if (rs != null) {
             ResultSetImpl rss = rs.getResultSetRaw().unwrap(ResultSetImpl.class);
@@ -94,7 +82,7 @@ public class DruidFilter extends FilterEventAdapter {
         } catch (Exception ex) {
             log.warn("[-SQL解析异常-][{}]", ex.getMessage());
         }
-        log.info("[----SQL----][select][执行结果:{}][数据库:{}][ SQL: {} ]", result,database, executeSql);
+        log.info("[----SQL----][select][执行结果:{}][ SQL: {} ]", result, executeSql);
         return rs;
     }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 3ef678a16..ed9347597 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -208,9 +208,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 } else {
                     throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！");
                 }
-            }catch (Exception ex){
-                WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+row.getString("task_status")+"失败"),"task_id = '" + task_id + "'");
+            }catch (BadRequestException ex){
                 log.error(task_id+"acs更新任务失败:{}", ex);
+                WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+row.getString("task_status")+"失败:"+ex.getMessage()),"task_id = '" + task_id + "'");
+                throw ex;
+            }catch (Exception ex){
+                log.error(task_id+"acs更新任务失败:{}", ex);
+                WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+row.getString("task_status")+"失败,系统异常"),"task_id = '" + task_id + "'");
                 throw ex;
             }finally {
                 if (lock.isLocked() && lock.isHeldByCurrentThread()) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
index 1e5e714df..2414f260d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
@@ -144,10 +144,10 @@ public class TaskServiceImpl implements TaskService {
             } else {
                 throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！");
             }
-        }catch (Exception ex){
-            WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+MapUtil.getStr(map, "method_name")+"失败"),"task_id = '" + task_id + "'");
+        }catch (BadRequestException ex){
             log.error(task_id+"手动更新任务失败:{}", ex);
-            throw new BadRequestException(ex.getMessage());
+            WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+MapUtil.getStr(map, "method_name")+"失败:"+ex.getMessage()),"task_id = '" + task_id + "'");
+            throw ex;
         }
         finally {
             if (lock.isLocked() && lock.isHeldByCurrentThread()) {