Merge branch 'kjs' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into kjs

2024-09-10 16:41:36 +08:00 · 2024-09-10 16:41:36 +08:00 · 1bc08ad2e6
parent 5213bb530e 22c6414dd1
commit 1bc08ad2e6
9 changed files with 14 additions and 321 deletions
--- a/buildpackage/src/main/resources/application-hclocal.yml
+++ b/buildpackage/src/main/resources/application-hclocal.yml
@ -1,27 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: D:\yongansystem\kangarooDataCenter\v3\logs
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-#          url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?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: bd993088e8a7c3dc5f44441617f9b4bf
-#          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-           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: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: D:\yongansystem\kangarooDataCenter\v3\logs
-zt:
-  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
--- a/buildpackage/src/main/resources/application-llg.yml
+++ b/buildpackage/src/main/resources/application-llg.yml
@ -1,60 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-    #    日志保存路径
-    path: /Users/apple/Desktop/log/local
-spring:
-  data:
-    mongodb:
-#      host: 192.168.2.237
-#      port: 27017
-#      database: businesscenter
-#      auto-index-creation: true
-#      password: hzya1314
-#      username: hzya
-  flyway:
-    # 启动flyway migration, 默认为true
-    enabled: false
-  datasource:
-    dynamic:
-      druid:
-        filters: stat,log4j2
-      datasource:
-        master:
-#          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
-#          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
-          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
-savefile:
-  #    文件保存路径
-  path: /Users/apple/Desktop/log/local
-zt:
-  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
-cbs8:
-  appId: 1P4AGrpz
-  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
-  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
-  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
-  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
-  # 这个私钥到时候上传到cbs，和下面到是同一对
-  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
-  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
-  cbs_public_key: 0469146F06BF3B01236E84632441E826
-  #电子回单下载临时存放位置
-  elec_path: /Users/xiangerlin/Downloads/
-OA:
-  data_source_code: yc_oa
--- a/buildpackage/src/main/resources/application-local.yml
+++ b/buildpackage/src/main/resources/application-local.yml
@ -1,26 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-    #    日志保存路径
-    path: /Users/xiangerlin/work/app/logs/kjs
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-          url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter_kjs?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: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-  #    文件保存路径
-  path: /Users/xiangerlin/work/app/file/kjs
-dingtalk:
-  appKey: dingq3vbsswvyujiuwa7
-  appSecret: m4IRNcKQn-W9QBLERHWt0iW2hSirvxPS684xiNw-4QFMNg2gsBCur9T4QMvvAR4I
-  appId: dd39187a-079a-466c-b4b7-9ef3172e9e61
-  agentId: 3209295620 appkey:dingbltm9wszcl7hoxyg
--- a/buildpackage/src/main/resources/application-xel.yml
+++ b/buildpackage/src/main/resources/application-xel.yml
@ -1,26 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: /Users/xiangerlin/work/app/logs/kjs
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-          url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter_kjs?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: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: /Users/xiangerlin/work/app/logs/kjs
-dingtalk:
-  appKey: dingbltm9wszcl7hoxyg
-  appSecret: ex3a9qwdTXWf_VKJEddAg8YE7x98kIl3Nsy_7g0NdwvK3w3nXdUhJ3XQP4lUYs2d
-  appId: dd39187a-079a-466c-b4b7-9ef3172e9e61
-  agentId: 3209295620 appkey:dingbltm9wszcl7hoxyg
--- a/buildpackage/src/main/resources/application-yc.yml
+++ b/buildpackage/src/main/resources/application-yc.yml
@ -1,90 +0,0 @@
-#logging:
-#  #日志级别 指定目录级别
-#  level:
-#    root: info
-#  encodings: UTF-8
-#  file:
-#    #    日志保存路径
-#    path: /zt/log
-#spring:
-#  flyway:
-#    # 启动flyway migration, 默认为true
-#    enabled: false
-#  datasource:
-#    dynamic:
-#      druid:
-#        filters: stat,log4j2
-#      datasource:
-#        master:
-#          url: jdbc:dm://10.75.51.82:5238?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
-#          username: businesscenter
-#          password: 6842568689469adad597d144ee104063
-#          driver-class-name: dm.jdbc.driver.DmDriver
-#savefile:
-#  #    文件保存路径
-#  path: /zt/file
-#公司mysql
-#ax:
-#  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
-#logging:
-#  #日志级别 指定目录级别warn
-#  level:
-#    root: info
-#  encodings: UTF-8
-#  file:
-#    #    日志保存路径
-#    path: /home/webservice/zt/log
-#spring:
-#  datasource:
-#    dynamic:
-#      datasource:
-#        master:
-#          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: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-#savefile:
-#  #    文件保存路径
-#  path: /home/webservice/zt/file
-
-
-#公司服务器达梦
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-    #    日志保存路径
-    path: /zt/log
-spring:
-  flyway:
-    # 启动flyway migration, 默认为true
-    enabled: false
-  datasource:
-    dynamic:
-      druid:
-        filters: stat,log4j2
-      datasource:
-        master:
-          url: jdbc:dm://ufidahz.com.cn:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
-          username: hzyazt
-          password: 62e4295b615a30dbf3b8ee96f41c820b
-          driver-class-name: dm.jdbc.driver.DmDriver
-savefile:
-  #    文件保存路径
-  path: /zt/file
-cbs8:
-  appId: 1P4AGrpz
-  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
-  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
-  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
-  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
-  # 这个私钥到时候上传到cbs，和下面到是同一对
-  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
-  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
-  cbs_public_key: 0469146F06BF3B01236E84632441E826
-  #电子回单下载临时存放位置
-  elec_path: /zt/elecfile
-OA:
-  data_source_code: yc_oa
--- a/buildpackage/src/main/resources/application-ydc.yml
+++ b/buildpackage/src/main/resources/application-ydc.yml
@ -1,21 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: /Users/xiangerlin/work/app/logs/ydc
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-          url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?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: bd993088e8a7c3dc5f44441617f9b4bf
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: /Users/xiangerlin/work/app/logs/ydc
--- a/buildpackage/src/main/resources/application-yuqh.yml
+++ b/buildpackage/src/main/resources/application-yuqh.yml
@ -1,23 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: E:\yongansystem\log
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-          url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?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: bd993088e8a7c3dc5f44441617f9b4bf
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: E:\yongansystem\log
-zt:
-  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
--- a/buildpackage/src/main/resources/application-zqtlocal.yml
+++ b/buildpackage/src/main/resources/application-zqtlocal.yml
@ -1,39 +0,0 @@
-#######################zqtlocal环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: warn
-  encodings: UTF-8
-  file:
-    #    日志保存路径
-    path: D:/local/logs/
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-          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: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-  #    文件保存路径
-  path: D:/local/upload/
-  pluginpath : D:/local/plugin/
-  tomcatpath: E:\apache-tomcat-9.0.27\webapps\kangarooDataCenterV3\WEB-INF\classes\
-cbs8:
-  appId: 1P4AGrpz
-  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
-  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
-  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
-  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
-  # 这个私钥到时候上传到cbs，和下面到是同一对
-  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
-  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
-  cbs_public_key: 0469146F06BF3B01236E84632441E826
-  #电子回单下载临时存放位置
-  elec_path: /Users/xiangerlin/Downloads/
-OA:
-  data_source_code: yc_oa
-zt:
-  url: http://127.0.0.1:9082/kangarooDataCenterV3/entranceController/externalCallInterface
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
@ -321,7 +321,7 @@ where id = #{id}
 		FROM
 		information_schema.TABLES
 		WHERE
-		TABLE_SCHEMA = 'businesscenter_kjs'
+		TABLE_SCHEMA = 'businesscenter'
 		and TABLE_NAME =  #{tableName}
 	</select>

@ -345,7 +345,8 @@ where id = #{id}
                `sts` varchar(1) DEFAULT NULL COMMENT '状态(Y正常N删除)',
                `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID',
                `company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
-                `data_id` varchar(100) DEFAULT NULL COMMENT 'data_id'
+                `data_id` varchar(100) DEFAULT NULL COMMENT 'data_id',
+                `mdm_up_id` varchar(100) DEFAULT NULL COMMENT 'mdm_up_id',
            </when>
            <when test="tableType  == '2'.toString()">
                `id` varchar(50) NOT NULL COMMENT '唯一标识码',
@ -926,7 +927,6 @@ where id = #{id}
            USER_TAB_COLUMNS
        WHERE
          TABLE_NAME =  #{tableName}
-        and table_schema = 'businesscenter_kjs'

    </select>

@ -935,7 +935,6 @@ where id = #{id}
        SELECT LOWER(COLUMN_NAME)
        FROM information_schema.columns
        WHERE table_name = #{tableName}
-            and table_schema = 'businesscenter_kjs'
    </select>
    <!-- 分页查询列表 采用like格式 -->
    <select id="queryMdmST" resultType="com.alibaba.fastjson.JSONObject"  parameterType="java.util.HashMap">
@ -963,19 +962,25 @@ where id = #{id}
                    ${item.leftBracket} ${item.filedId}
                    <choose>
                        <when test="item.compareType == '1'.toString() ">
-                            =
+                            = #{item.filedVaule}
                        </when>
                        <when test="item.compareType == '2'.toString() ">
-                           !=
+                           != #{item.filedVaule}
                        </when>
                        <when test="item.compareType == '3'.toString() ">
-                            &gt;
+                            &gt; #{item.filedVaule}
                        </when>
                        <when test="item.compareType == '4'.toString() ">
-                            &lt;
+                            &lt; #{item.filedVaule}
+                        </when>
+                        <when test="item.compareType == '5'.toString() ">
+                            like concat('%',#{item.filedVaule},'%')
+                        </when>
+                        <when test="item.compareType == '6'.toString() ">
+                            not like concat('%',#{item.filedVaule},'%')
                        </when>
                    </choose>
-                    #{item.filedVaule}
+
                    <choose>
                        <when test="item.connectionSymbol == '1'.toString() ">
                            <choose>