From 9b18851aafd2994f89dacd8ac82426d7c2e123b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 27 Feb 2026 12:34:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(credit):=20=E4=BF=AE=E5=A4=8D=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除实体类中的多余 TableField 注解 - 修改 SQL 查询逻辑，使用 match_name 字段替代原来的 company_name - 统一多个信用相关实体的字段映射方式 - 添加新的生产环境配置文件 application-ysb2.yml - 更新默认激活的环境配置为 ysb2 --- .../entity/CreditAdministrativeLicense.java | 1 - .../gxwebsoft/credit/entity/CreditBranch.java | 1 - .../entity/CreditHistoricalLegalPerson.java | 1 - .../credit/entity/CreditNearbyCompany.java | 1 - .../entity/CreditSuspectedRelationship.java | 1 - .../xml/CreditAdministrativeLicenseMapper.xml | 2 +- .../credit/mapper/xml/CreditBranchMapper.xml | 2 +- .../xml/CreditHistoricalLegalPersonMapper.xml | 2 +- .../mapper/xml/CreditNearbyCompanyMapper.xml | 2 +- .../xml/CreditSuspectedRelationshipMapper.xml | 2 +- src/main/resources/application-ysb2.yml | 101 ++++++++++++++++++ src/main/resources/application.yml | 2 +- 12 files changed, 107 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/application-ysb2.yml diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java b/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java index 10211f4..3bacf7c 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java @@ -72,7 +72,6 @@ public class CreditAdministrativeLicense implements Serializable { private Integer companyId; @Schema(description = "主体企业") - @TableField("company_name") private String companyName; @Schema(description = "是否推荐") diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java b/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java index 9725cd5..168336e 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java @@ -56,7 +56,6 @@ public class CreditBranch implements Serializable { private Integer companyId; @Schema(description = "主题企业") - @TableField("company_name") private String companyName; @Schema(description = "是否推荐") diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java b/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java index 7fdc887..791306c 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java @@ -50,7 +50,6 @@ public class CreditHistoricalLegalPerson implements Serializable { private Integer companyId; @Schema(description = "主体企业") - @TableField("company_name") private String companyName; @Schema(description = "是否推荐") diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java b/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java index b71cac2..2c3d895 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java @@ -80,7 +80,6 @@ public class CreditNearbyCompany implements Serializable { private Integer companyId; @Schema(description = "主体企业") - @TableField("company_name") private String companyName; @Schema(description = "纳税人识别号") diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java b/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java index 59339c9..29eaf7b 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java @@ -65,7 +65,6 @@ public class CreditSuspectedRelationship implements Serializable { private Integer companyId; @Schema(description = "主体企业") - @TableField("company_name") private String companyName; @Schema(description = "是否推荐") diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml index 3c512fe..7bcd283 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName + SELECT a.*, b.match_name AS companyName, u.real_name AS realName FROM credit_administrative_license a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml index 4aadd0b..4c002fe 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName + SELECT a.*, COALESCE(match_name, a.company_name) AS companyName, u.real_name AS realName FROM credit_branch a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml index 42e1f28..228acc0 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName + SELECT a.*, COALESCE(match_name, a.company_name) AS companyName, u.real_name AS realName FROM credit_historical_legal_person a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml index ad16c3f..927dbd4 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName + SELECT a.*, COALESCE(match_name, a.company_name) AS companyName, u.real_name AS realName FROM credit_nearby_company a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml index b2062e8..1a670f9 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName + SELECT a.*, COALESCE(match_name, a.company_name) AS companyName, u.real_name AS realName FROM credit_suspected_relationship a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/resources/application-ysb2.yml b/src/main/resources/application-ysb2.yml new file mode 100644 index 0000000..e424b10 --- /dev/null +++ b/src/main/resources/application-ysb2.yml @@ -0,0 +1,101 @@ +# 生产环境配置 +server: + port: 9200 + +# 数据源配置 +spring: + datasource: + url: jdbc:mysql://47.119.165.234:13308/ysb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai + username: ysb + password: 5Zf45CE2YneBfXkR + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + druid: + remove-abandoned: true + + # redis + redis: + database: 0 + host: 47.119.165.234 + port: 16379 + password: redis_WSDb88 + +# 日志配置 +logging: + file: + name: websoft-modules.log + level: + root: WARN + com.gxwebsoft: ERROR + com.baomidou.mybatisplus: ERROR + +socketio: + host: 0.0.0.0 #IP地址 + +# MQTT配置 +mqtt: + enabled: false # 启用MQTT服务 + host: tcp://132.232.214.96:1883 + username: swdev + password: Sw20250523 + client-id-prefix: hjm_car_ + topic: /SW_GPS/# + qos: 2 + connection-timeout: 10 + keep-alive-interval: 20 + auto-reconnect: true +# Mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath*:com/gxwebsoft/**/*Mapper.xml + configuration: + map-underscore-to-camel-case: true + cache-enabled: true + global-config: + banner: false + # SqlRunner.db().xxx 需要开启该开关，否则会报： + # Mapped Statements collection does not contain value for com.baomidou.mybatisplus.core.mapper.SqlRunner.Delete + enable-sql-runner: true + db-config: + id-type: auto + logic-delete-value: 1 + logic-not-delete-value: 0 +# 框架配置 +config: + # 文件服务器 + file-server: https://file-s209.shoplnk.cn + # 生产环境接口 + server-url: https://server.websoft.top/api + # 业务模块接口 + api-url: https://ysb-api.websoft.top/api + upload-path: /www/wwwroot/file.ws + + # 阿里云OSS云存储 + endpoint: https://oss-cn-shenzhen.aliyuncs.com + accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP + accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM + bucketName: oss-gxwebsoft + bucketDomain: https://oss.wsdns.cn + aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com + +# 生产环境证书配置 +certificate: + load-mode: VOLUME # 生产环境从Docker挂载卷加载 + cert-root-path: /www/wwwroot/file.ws + +# 支付配置缓存 +payment: + cache: + # 支付配置缓存键前缀，生产环境使用 Payment:1* 格式 + key-prefix: "Payment:1" + # 缓存过期时间（小时） + expire-hours: 24 +# 阿里云翻译配置 +aliyun: + translate: + access-key-id: LTAI5tEsyhW4GCKbds1qsopg + access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO + endpoint: mt.cn-hangzhou.aliyuncs.com +wechatpay: + transfer: + scene-id: 1005 + scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"配送员"},{"info_type":"报酬说明","info_content":"12月份配送费"}]' diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cf7c925..f1a8a82 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ server: # 多环境配置 spring: profiles: - active: glt2 + active: ysb2 application: name: server