From 5bef8207905e1e3e67c3c5015c44963a15ab7b27 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Thu, 9 Oct 2025 14:39:44 +0800 Subject: [PATCH] 1 --- .../java/com/ruoyi/busi/domain/BusiProdNew.java | 5 +++++ .../src/main/resources/application-druid.yml | 14 +++++++------- .../resources/mapper/busi/BusiProdNewMapper.xml | 6 ++++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProdNew.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProdNew.java index 38f039d..5962a47 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProdNew.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProdNew.java @@ -71,6 +71,11 @@ public class BusiProdNew extends DlBaseEntity @ApiModelProperty("文章来源") private String newsFrom; + /** 展示平台(PC、APP) */ + @Excel(name = "展示平台(PC、APP)") + @ApiModelProperty("展示平台(PC、APP)") + private String showPlat; + /** 文章发布日期 */ @Excel(name = "文章发布日期") @ApiModelProperty("文章发布日期") diff --git a/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml b/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml index 208cbef..95f124b 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml +++ b/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml @@ -5,15 +5,15 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver druid: # # 主库数据源-点亮开发库 -# master: -# url: jdbc:mysql://82.156.161.160:3306/dl_site_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: site -# password: 123456 -# 主库数据源-客户测试服务器 master: - url: jdbc:mysql://8.220.74.244:3306/dl_site_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://82.156.161.160:3306/dl_site_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: site - password: Chengda@2025~ + password: 123456 +# 主库数据源-客户生产服务器 +# master: +# url: jdbc:mysql://8.220.74.244:3306/dl_site_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: site +# password: Chengda@2025~ # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdNewMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdNewMapper.xml index dfb626b..01dbec0 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdNewMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdNewMapper.xml @@ -11,6 +11,7 @@ + @@ -42,6 +43,7 @@ prod_title, prod_keyword, prod_description, + show_plat, news_from, public_date, main_pic, @@ -106,6 +108,10 @@ AND product.news_from like concat('%', #{entity.newsFrom}, '%') + + AND product.show_plat like concat('%', + #{entity.showPlat}, '%') + GROUP BY product.id