From 42ecdcec04d26f19426b4ca0c7b2274bbe5b6cce Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 11:06:53 +0800 Subject: [PATCH] ~ --- .../app/controller/AppTopicController.java | 9 +++++++ .../java/com/ruoyi/app/domain/AppTopic.java | 9 +++++++ .../com/ruoyi/app/domain/vo/AppTopicVo.java | 26 +++++++++++++++++++ .../ruoyi/app/service/IAppTopicService.java | 2 ++ .../app/service/impl/AppTopicServiceImpl.java | 20 ++++++++++++++ .../app/service/impl/PayServiceImpl.java | 1 + .../resources/mapper/app/AppTopicMapper.xml | 12 ++++++++- 7 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppTopicVo.java diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java index 375765b..a55d179 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java @@ -4,6 +4,7 @@ import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.app.domain.vo.AppTopicVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -52,6 +53,14 @@ public class AppTopicController extends BaseController return getDataTable(list); } + @GetMapping("/topicList") + @ApiOperation(value = "组装过查询话题信息列表", notes = "组装过查询话题信息列表", httpMethod = "GET") + public TableDataInfo topicList(AppTopic appTopic) + { + List list = appTopicService.topicList(appTopic); + return getDataTable(list); + } + /** * 导出话题信息列表 */ diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppTopic.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppTopic.java index 0c4a5ba..9be0bfc 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppTopic.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppTopic.java @@ -1,5 +1,6 @@ package com.ruoyi.app.domain; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; @@ -11,6 +12,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author wyh * @date 2024-04-23 */ +@Data public class AppTopic extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,6 +24,13 @@ public class AppTopic extends BaseEntity @Excel(name = "学校名称") private String name; + + @Excel(name = "父级id") + private Long parentId; + + /** 类型：0-话题分类，1-话题数据 */ + @Excel(name = "类型：0-话题分类，1-话题数据") + private Long type; public void setId(Long id) { this.id = id; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppTopicVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppTopicVo.java new file mode 100644 index 0000000..b79d26c --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppTopicVo.java @@ -0,0 +1,26 @@ +package com.ruoyi.app.domain.vo; + +import com.ruoyi.app.domain.AppTopic; +import com.ruoyi.app.domain.AppUser; +import com.ruoyi.app.domain.UserSkill; +import com.ruoyi.common.core.annotation.Excel; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.ArrayList; +import java.util.List; + +/** + * app用户对象 app_user + * + * @author wyh + * @date 2024-04-23 + */ +@Data +public class AppTopicVo extends AppTopic +{ + private static final long serialVersionUID = 1L; + + private List children = new ArrayList<>(); +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppTopicService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppTopicService.java index ae81809..ac30327 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppTopicService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppTopicService.java @@ -2,6 +2,7 @@ package com.ruoyi.app.service; import java.util.List; import com.ruoyi.app.domain.AppTopic; +import com.ruoyi.app.domain.vo.AppTopicVo; /** * 话题信息Service接口 @@ -26,6 +27,7 @@ public interface IAppTopicService * @return 话题信息集合 */ public List selectAppTopicList(AppTopic appTopic); + public List topicList(AppTopic appTopic); /** * 新增话题信息 diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppTopicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppTopicServiceImpl.java index 5d0f27f..e28b3ce 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppTopicServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppTopicServiceImpl.java @@ -1,7 +1,11 @@ package com.ruoyi.app.service.impl; +import java.util.ArrayList; import java.util.List; + +import com.ruoyi.app.domain.vo.AppTopicVo; import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.app.mapper.AppTopicMapper; @@ -44,6 +48,22 @@ public class AppTopicServiceImpl implements IAppTopicService return appTopicMapper.selectAppTopicList(appTopic); } + @Override + public List topicList(AppTopic appTopic) { + appTopic.setType(0l); + List list = appTopicMapper.selectAppTopicList(appTopic); + List appTopicVos = new ArrayList<>(); + for (AppTopic topic : list) { + AppTopicVo appTopicVo = new AppTopicVo(); + BeanUtils.copyProperties(topic,appTopicVo); + appTopic = new AppTopic(); + appTopic.setParentId(appTopicVo.getId()); + appTopicVo.setChildren(appTopicMapper.selectAppTopicList(appTopic)); + appTopicVos.add(appTopicVo); + } + return appTopicVos; + } + /** * 新增话题信息 * diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/PayServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/PayServiceImpl.java index b20e15c..bae891c 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/PayServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/PayServiceImpl.java @@ -35,6 +35,7 @@ public class PayServiceImpl implements IPayService { parameterMap.put("spbill_create_ip","127.0.0.1"); parameterMap.put("notify_url", weChatConfig.getWechat_notify_url()); parameterMap.put("trade_type", "JSAPI"); + //parameterMap.put("trade_type", "APP"); //parameterMap.put("trade_type", "MWEB"); //parameterMap.put("openid", openId); String sign = PayUtils.createSign(weChatConfig.getAPP_KEY(), parameterMap); diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppTopicMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppTopicMapper.xml index 39ddbac..b1f483e 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppTopicMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppTopicMapper.xml @@ -12,10 +12,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, name, create_time, update_time, create_by, updateBy, remark from app_topic + select id, name, create_time, update_time, create_by, updateBy, remark,parent_id, type from app_topic @@ -52,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by, updateBy, remark, + parent_id, + type, #{name}, @@ -60,6 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createBy}, #{updateBy}, #{remark}, + #{parentId}, + #{type}, @@ -72,6 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by = #{createBy}, updateBy = #{updateBy}, remark = #{remark}, + parent_id = #{parentId}, + type = #{type}, where id = #{id}