From f6ee41cfe5090e50c1c840e42d4bd31e4a6c14e4 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 29 Aug 2024 10:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E6=9F=A5=E8=AF=A2=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-llg.yml    | 21 +++++-------
 .../glPznr/entity/SenderGlPznrEntity.xml      |  1 -
 .../nxproof/glfzxzl/entity/GlFzxzlEntity.xml  | 33 +++----------------
 .../frame/webapp/web/init/FlywayConfig.java   |  2 +-
 4 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/buildpackage/src/main/resources/application-llg.yml b/buildpackage/src/main/resources/application-llg.yml
index 0a16527c..0b33d662 100644
--- a/buildpackage/src/main/resources/application-llg.yml
+++ b/buildpackage/src/main/resources/application-llg.yml
@@ -23,22 +23,19 @@ spring:
     dynamic:
       druid:
         filters: stat,log4j2
+        validationQuery: SELECT 1 # 验证数据库服务可用性的sql.用来检测连接是否有效的sql 因数据库方言而差, 例如 oracle 应该写成 SELECT 1 FROM DUAL
       datasource:
         master:
-#          url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
-#          username: hzyazt
+
+#          url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+#          username: root
 #          password: 62e4295b615a30dbf3b8ee96f41c820b
-#          driver-class-name: dm.jdbc.driver.DmDriver
-#          type: com.alibaba.druid.pool.DruidDataSource
-          url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
-          username: root
+#          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+
+          url: jdbc:sqlserver://192.168.2.247:9433;DatabaseName=businesscenter;encrypt=false;trustServerCertificate=true
+          username: sa
           password: 62e4295b615a30dbf3b8ee96f41c820b
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-#          url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
-#          url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
-#          username: hzyazt
-#          password: 62e4295b615a30dbf3b8ee96f41c820b
-#          driver-class-name: dm.jdbc.driver.DmDriver
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 savefile:
   #    文件保存路径
   path: /Users/apple/Desktop/log/local
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
index 3d6087d0..cdd53c87 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPznr/entity/SenderGlPznrEntity.xml
@@ -145,7 +145,6 @@
         , ZBID
         , EDID
         , JFSQID
-        , fzdm10
         , fzdm11
         , fzdm12
         , fzdm13
diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml
index fb4e35d0..de8a862a 100644
--- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml
+++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glfzxzl/entity/GlFzxzlEntity.xml
@@ -282,29 +282,6 @@ update GL_Fzxzl  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{m
 
     <!-- 分页查询列表 采用like格式 -->
     <select id="queryFzhs" resultType="com.alibaba.fastjson.JSONObject" parameterType = "com.hzya.frame.grpU8.nxproof.glfzxzl.entity.GlFzxzlEntityDto">
-        select
-        <include refid="GlFzxzlEntity_Base_Column_List" />
-        from GL_Fzxzl
-        <trim prefix="where" prefixOverrides="and">
-            <if test="gsdm != null and gsdm != ''"> and gsdm like concat('%',#{gsdm},'%') </if>
-            <if test="kjnd != null and kjnd != ''"> and kjnd like concat('%',#{kjnd},'%') </if>
-            <if test="lbdm != null and lbdm != ''"> and lbdm like concat('%',#{lbdm},'%') </if>
-            <if test="fzdm != null and fzdm != ''"> and fzdm like concat('%',#{fzdm},'%') </if>
-            <if test="fzmc != null and fzmc != ''"> and fzmc like concat('%',#{fzmc},'%') </if>
-            <if test="zjm != null and zjm != ''"> and zjm like concat('%',#{zjm},'%') </if>
-            <if test="f1 != null and f1 != ''"> and f1 like concat('%',#{f1},'%') </if>
-            <if test="f2 != null and f2 != ''"> and f2 like concat('%',#{f2},'%') </if>
-            <if test="syzt != null and syzt != ''"> and syzt like concat('%',#{syzt},'%') </if>
-            <if test="bz != null and bz != ''"> and bz like concat('%',#{bz},'%') </if>
-            <if test="sjly != null and sjly != ''"> and Sjly like concat('%',#{sjly},'%') </if>
-            <if test="jlrId != null"> and Jlr_ID like concat('%',#{jlrId},'%') </if>
-            <if test="jlRq != null and jlRq != ''"> and Jl_RQ like concat('%',#{jlRq},'%') </if>
-            <if test="xgrId != null"> and Xgr_ID like concat('%',#{xgrId},'%') </if>
-            <if test="xgRq != null and xgRq != ''"> and Xg_RQ like concat('%',#{xgRq},'%') </if>
-            <if test="sfmx != null and sfmx != ''"> and SFMX like concat('%',#{sfmx},'%') </if>
-            <if test="gnlb != null and gnlb != ''"> and GNLB like concat('%',#{gnlb},'%') </if>
-            <if test="gnlbmc != null and gnlbmc != ''"> and GNLBMC like concat('%',#{gnlbmc},'%') </if>
-        </trim>
         SELECT
         fzxlb.lbdm,
         fzxlb.gsdm,
@@ -314,21 +291,19 @@ update GL_Fzxzl  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{m
         FROM
         gl_fzxlb fzxlb
         LEFT JOIN gl_fzxzl fzxzl ON fzxzl.kjnd= fzxlb.kjnd  AND fzxzl.gsdm = fzxlb.gsdm  AND fzxzl.lbdm = fzxlb.lbdm
-        WHERE
         <trim prefix="where" prefixOverrides="and">
             <if test="sfyz != null and sfyz != ''"> and fzxlb.SFYZ = #{sfyz} </if>
-
             <if test="glFzxzlNrEntityDtos != null and glFzxzlNrEntityDtos.size > 0">
-                and (
+                and
                 <foreach collection="glFzxzlNrEntityDtos" index="index" item="item" open="(" separator="or" close=")">
-                    fzxlb.gsdm =  #{item.gsdm}
+                   ( fzxlb.gsdm =  #{item.gsdm}
                     AND fzxlb.kjnd = #{item.kjnd}
                     AND (
-                    <foreach collection="item" index="index1" item="item1" open="(" separator="or" close=")">
+                    <foreach collection="item.glFzxzlNrDmEntityDtos" index="index1" item="item1" open="(" separator="or" close=")">
                        fzxlb.lbdm = #{item1.lbdm} AND fzxzl.fzdm = #{item1.fzdm}
                     </foreach>
+                        ) )
                 </foreach>
-                )
             </if>
         </trim>
     </select>
diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java b/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java
index 8630f562..4dda931a 100644
--- a/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java
+++ b/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java
@@ -48,7 +48,7 @@ public class FlywayConfig {
 
     @PostConstruct
     public void migrateOrder() {
-        if("false".equals(enabled)){
+        if(!"false".equals(enabled)){
             String pwd = AESUtil.decrypt(password);
             DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource;
             DataSource dsDatasource = null;