From 4d86269a103b9530ff3bd46836e0e89a3e43e42b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 24 九月 2025 17:20:21 +0800
Subject: [PATCH] 小程序接口修改
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java | 8 +---
ruoyi-system/src/main/java/com/ruoyi/system/service/TSysLiveService.java | 6 +++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java | 6 +--
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java | 7 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java | 25 ++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysLiveMapper.java | 7 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysEducationalInfoServiceImpl.java | 7 +++
ruoyi-system/src/main/resources/mapper/system/TSysEducationalInfoMapper.xml | 19 +++++++++
ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml | 23 +++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/wxPay/config/WxConfig.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/TSysEducationalInfoService.java | 6 +++
11 files changed, 105 insertions(+), 11 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java
index 926d98c..f4ca8ff 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java
@@ -44,12 +44,8 @@
*/
@ApiOperation(value = "获取教育资讯分页列表")
@PostMapping(value = "/pageList")
- public R<PageInfo<TSysEducationalInfo>> pageList(@RequestBody TSysEducationalInfoQuery query) {
- Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
- if(roleType == 5){
- query.setRoleType(roleType);
- }
- return R.ok(sysEducationalInfoService.pageList(query));
+ public R<PageInfo<TSysEducationalInfo>> pageListApp(@RequestBody TSysEducationalInfoQuery query) {
+ return R.ok(sysEducationalInfoService.pageListApp(query));
}
/**
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java
index 76437ba..da74297 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysLiveController.java
@@ -54,10 +54,8 @@
*/
@ApiOperation(value = "获取直播管理分页列表")
@PostMapping(value = "/pageList")
- public R<PageInfo<TSysLiveVO>> pageList(@RequestBody TSysLiveQuery query) {
- String userId = tokenService.getLoginUserApplet().getUserId();
- query.setAppUserId(userId);
- return R.ok(sysLiveService.pageList(query));
+ public R<PageInfo<TSysLiveVO>> pageListApp(@RequestBody TSysLiveQuery query) {
+ return R.ok(sysLiveService.pageListApp(query));
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java
index d246d38..5e06362 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java
@@ -25,4 +25,11 @@
* @return
*/
List<TSysEducationalInfo> pageList(@Param("query") TSysEducationalInfoQuery query, @Param("pageInfo")PageInfo<TSysEducationalInfo> pageInfo);
+ /**
+ * 获取教育资讯分页列表
+ * @param query
+ * @param pageInfo
+ * @return
+ */
+ List<TSysEducationalInfo> pageListApp(@Param("query") TSysEducationalInfoQuery query, @Param("pageInfo")PageInfo<TSysEducationalInfo> pageInfo);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysLiveMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysLiveMapper.java
index ab8879f..1bc0863 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysLiveMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysLiveMapper.java
@@ -26,4 +26,11 @@
* @return 直播管理列表
*/
List<TSysLiveVO> pageList(@Param("query") TSysLiveQuery query, @Param("pageInfo")PageInfo<TSysLiveVO> pageInfo);
+ /**
+ * 获取直播管理分页列表
+ *
+ * @param query 查询参数
+ * @return 直播管理列表
+ */
+ List<TSysLiveVO> pageListApp(@Param("query") TSysLiveQuery query, @Param("pageInfo")PageInfo<TSysLiveVO> pageInfo);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysEducationalInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysEducationalInfoService.java
index 1836feb..7421efa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysEducationalInfoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysEducationalInfoService.java
@@ -21,4 +21,10 @@
* @return
*/
PageInfo<TSysEducationalInfo> pageList(TSysEducationalInfoQuery query);
+ /**
+ * 获取教育资讯分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TSysEducationalInfo> pageListApp(TSysEducationalInfoQuery query);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysLiveService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysLiveService.java
index 77f824a..8eada09 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysLiveService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysLiveService.java
@@ -30,4 +30,10 @@
* @return
*/
PageInfo<TSysLiveVO> pageList(TSysLiveQuery query);
+ /**
+ * 获取直播管理分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TSysLiveVO> pageListApp(TSysLiveQuery query);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysEducationalInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysEducationalInfoServiceImpl.java
index 927069e..14bd192 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysEducationalInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysEducationalInfoServiceImpl.java
@@ -29,4 +29,11 @@
pageInfo.setRecords(list);
return pageInfo;
}
+ @Override
+ public PageInfo<TSysEducationalInfo> pageListApp(TSysEducationalInfoQuery query) {
+ PageInfo<TSysEducationalInfo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TSysEducationalInfo> list = this.baseMapper.pageListApp(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java
index 62b5b0e..1e8bbd3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java
@@ -91,4 +91,29 @@
pageInfo.setRecords(list);
return pageInfo;
}
+ @Override
+ public PageInfo<TSysLiveVO> pageListApp(TSysLiveQuery query) {
+ PageInfo<TSysLiveVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TSysLiveVO> list = this.baseMapper.pageListApp(query,pageInfo);
+ if (CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+ // 判断状态
+ for (TSysLiveVO sysLive : list) {
+ if(sysLive.getStartTime().isAfter(LocalDateTime.now())){
+ sysLive.setLiveStatus(1);
+ }
+ if(sysLive.getStartTime().isBefore(LocalDateTime.now()) && sysLive.getEndTime().isAfter(LocalDateTime.now())){
+ sysLive.setLiveStatus(2);
+ }
+ if(sysLive.getEndTime().isBefore(LocalDateTime.now())){
+ sysLive.setLiveStatus(3);
+ }
+ // 查看是否包含该值
+ boolean memberInSet = redisCache.isMemberInSet(Constants.LIVE_APPOINTMENT_PUSH + sysLive.getId(), query.getAppUserId());
+ sysLive.setAppointmentStatus(memberInSet ? 2 : 1);
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/config/WxConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/config/WxConfig.java
index c70a034..39c05ea 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/config/WxConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/config/WxConfig.java
@@ -13,7 +13,7 @@
*
* @author lihen
*/
-//@Configuration
+@Configuration
public class WxConfig {
private final WeixinPayProperties weixinPayProperties;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TSysEducationalInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSysEducationalInfoMapper.xml
index 1ee5f4c..0da46f1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TSysEducationalInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TSysEducationalInfoMapper.xml
@@ -44,5 +44,24 @@
</where>
ORDER BY create_time DESC
</select>
+ <select id="pageListApp" resultType="com.ruoyi.system.model.TSysEducationalInfo">
+ select
+ <include refid="Base_Column_List" />
+ from t_sys_educational_info
+ <where>
+ <if test="query.infoTitle != null and query.infoTitle != ''">
+ and info_title like concat('%',#{query.infoTitle},'%')
+ </if>
+ <if test="query.showType != null">
+ and show_type = #{query.showType}
+ </if>
+ <if test="query.status != null">
+ and status = #{query.status}
+ </if>
+ and show_type in (1,3)
+ AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY create_time DESC
+ </select>
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml
index fd8083c..c127795 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml
@@ -53,4 +53,27 @@
ORDER BY create_time DESC
</select>
+ <select id="pageListApp" resultType="com.ruoyi.system.vo.TSysLiveVO">
+ SELECT
+ <include refid="Base_Column_List"/>
+ FROM t_sys_live
+ <where>
+ <if test="query.liveTitle != null and query.liveTitle != ''">
+ AND live_title LIKE concat('%',#{query.liveTitle},'%')
+ </if>
+ <if test="query.liveStatus != null and query.liveStatus == 1">
+ AND date_format(start_time,'%y%m%d %H%i%s') > date_format(NOW(),'%y%m%d %H%i%s')
+ </if>
+ <if test="query.liveStatus != null and query.liveStatus == 2">
+ AND date_format(start_time,'%y%m%d %H%i%s') <= date_format(NOW(),'%y%m%d %H%i%s')
+ AND date_format(end_time,'%y%m%d %H%i%s') >= date_format(NOW(),'%y%m%d %H%i%s')
+ </if>
+ <if test="query.liveStatus != null and query.liveStatus == 3">
+ AND date_format(end_time,'%y%m%d %H%i%s') < date_format(NOW(),'%y%m%d %H%i%s')
+ </if>
+ AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY create_time DESC
+ </select>
+
</mapper>
--
Gitblit v1.7.1