dianliang/dl_site_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
Vinjor 2025-10-09 14:39:44 +08:00
parent fa504d9517
commit 5bef820790
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProdNew.java
View File

@ -71,6 +71,11 @@ public class BusiProdNew extends DlBaseEntity
@ApiModelProperty("文章来源") @ApiModelProperty("文章来源")
private String newsFrom; private String newsFrom;
/** 展示平台（PC、APP） */
@Excel(name = "展示平台（PC、APP）")
@ApiModelProperty("展示平台（PC、APP）")
private String showPlat;
/** 文章发布日期 */ /** 文章发布日期 */
@Excel(name = "文章发布日期") @Excel(name = "文章发布日期")
@ApiModelProperty("文章发布日期") @ApiModelProperty("文章发布日期")

14
dl_admin/ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -5,15 +5,15 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
druid: 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: 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 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: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

6
dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdNewMapper.xml
View File

@ -11,6 +11,7 @@
<result property="prodTitle" column="prod_title"/> <result property="prodTitle" column="prod_title"/>
<result property="prodKeyword" column="prod_keyword"/> <result property="prodKeyword" column="prod_keyword"/>
<result property="prodDescription" column="prod_description"/> <result property="prodDescription" column="prod_description"/>
<result property="showPlat" column="show_plat"/>
<result property="newsFrom" column="news_from"/> <result property="newsFrom" column="news_from"/>
<result property="publicDate" column="public_date"/> <result property="publicDate" column="public_date"/>
<result property="mainPic" column="main_pic"/> <result property="mainPic" column="main_pic"/>
@ -42,6 +43,7 @@
prod_title, prod_title,
prod_keyword, prod_keyword,
prod_description, prod_description,
show_plat,
news_from, news_from,
public_date, public_date,
main_pic, main_pic,
@ -106,6 +108,10 @@
AND product.news_from like concat('%', AND product.news_from like concat('%',
#{entity.newsFrom}, '%') #{entity.newsFrom}, '%')
</if> </if>
<if test="entity.showPlat != null and entity.showPlat != ''">
AND product.show_plat like concat('%',
#{entity.showPlat}, '%')
</if>
</where> </where>
GROUP BY GROUP BY
product.id product.id