diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiSubscribeController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiSubscribeController.java new file mode 100644 index 0000000..10636b5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiSubscribeController.java @@ -0,0 +1,61 @@ +package com.ruoyi.busi.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.busi.domain.BusiSubscribe; +import com.ruoyi.busi.service.IBusiSubscribeService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.DlBaseEntity; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 订阅Controller + * + * @author pqz + * @date 2025-04-01 + */ +@RestController +@RequestMapping("/busi/subscribe") +public class BusiSubscribeController extends BaseController { + @Autowired + private IBusiSubscribeService busiSubscribeService; + + /** + * 根据用户id查询订阅内容 + * + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 10:29 2025/4/1 + **/ + @GetMapping(value = "/getUserSub") + public AjaxResult getInfo() { + Long userId = SecurityUtils.getUserId(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(BusiSubscribe::getUserId, userId) + .eq(DlBaseEntity::getDelFlag, 0); + BusiSubscribe subscribe = busiSubscribeService.getOne(lambdaQueryWrapper); + return success(subscribe); + } + + + /** + * 保存订阅内容 + * + * @param busiSubscribe {@link BusiSubscribe} + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 10:30 2025/4/1 + **/ + @Log(title = "订阅", businessType = BusinessType.INSERT) + @PostMapping(value = "/save") + public AjaxResult save(@RequestBody BusiSubscribe busiSubscribe) { + Long userId = SecurityUtils.getUserId(); + busiSubscribe.setUserId(userId); + busiSubscribeService.saveOrUpdate(busiSubscribe); + return success(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiSubscribe.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiSubscribe.java new file mode 100644 index 0000000..9fa721f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiSubscribe.java @@ -0,0 +1,36 @@ +package com.ruoyi.busi.domain; + +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; +import com.ruoyi.common.core.domain.DlBaseEntity; + +/** + * 【请填写功能名称】对象 dl_busi_subscribe + * + * @author pqz + * @date 2025-04-01 + */ +@TableName("dl_busi_subscribe") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BusiSubscribe extends DlBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + /** 所有者id */ + private Long userId; + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String jsonObj; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiSubscribeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiSubscribeMapper.java new file mode 100644 index 0000000..4029cb1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiSubscribeMapper.java @@ -0,0 +1,20 @@ +package com.ruoyi.busi.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.busi.domain.BusiSubscribe; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订阅Mapper接口 + * + * @author pqz + * @date 2025-04-01 + */ +@Mapper +public interface BusiSubscribeMapper extends BaseMapper +{ +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiSubscribeService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiSubscribeService.java new file mode 100644 index 0000000..9ac3496 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiSubscribeService.java @@ -0,0 +1,17 @@ +package com.ruoyi.busi.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.busi.domain.BusiSubscribe; + +/** + * 订阅Service接口 + * + * @author pqz + * @date 2025-04-01 + */ +public interface IBusiSubscribeService extends IService +{ +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiSubscribeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiSubscribeServiceImpl.java new file mode 100644 index 0000000..c73ad30 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiSubscribeServiceImpl.java @@ -0,0 +1,27 @@ +package com.ruoyi.busi.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.busi.mapper.BusiSubscribeMapper; +import com.ruoyi.busi.domain.BusiSubscribe; +import com.ruoyi.busi.service.IBusiSubscribeService; + +/** + * 订阅Service业务层处理 + * + * @author pqz + * @date 2025-04-01 + */ +@Service +public class BusiSubscribeServiceImpl extends ServiceImpl implements IBusiSubscribeService +{ + @Autowired + private BusiSubscribeMapper busiSubscribeMapper; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberAddressController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberAddressController.java index f2567f8..a48b48b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberAddressController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberAddressController.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.utils.SecurityUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,13 +33,13 @@ public class MemberAddressController extends BaseController { /** * 根据用户id查询博主地址列表（不分页） * - * @param userId 用户id * @return com.ruoyi.common.core.domain.AjaxResult * @author PQZ * @date 10:39 2025/3/29 **/ - @GetMapping("/listByUserId") - public AjaxResult listByUserId(@RequestParam("userId") Long userId) { + @GetMapping("/listByUser") + public AjaxResult listByUserId() { + Long userId = SecurityUtils.getUserId(); return success(memberAddressService.listByUserId(userId)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBusiCardController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBusiCardController.java index eee1f50..a25fabf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBusiCardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBusiCardController.java @@ -6,13 +6,12 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.member.domain.MemberBusiCard; import com.ruoyi.member.service.IMemberBusiCardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -48,6 +47,19 @@ public class MemberBusiCardController extends BaseController { return success(list); } + /** + * 查询当前登录博主名片信息 + * + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 10:42 2025/4/1 + **/ + @GetMapping("/listByUser") + public AjaxResult listByUserId() { + Long userId = SecurityUtils.getUserId(); + return success(memberBusiCardService.queryListByUserId(userId)); + } + /** * 通过id获取博主名片信息 * @@ -78,11 +90,12 @@ public class MemberBusiCardController extends BaseController { /** * 手机端新增博主名片，提交审核 - * @author PQZ - * @date 10:35 2025/3/29 + * * @param memberBusiCard {@link MemberBusiCard} * @return com.ruoyi.common.core.domain.AjaxResult - **/ + * @author PQZ + * @date 10:35 2025/3/29 + **/ @Log(title = "博主名片", businessType = BusinessType.INSERT) @PostMapping("/toApply") public AjaxResult add(@RequestBody MemberBusiCard memberBusiCard) { @@ -91,7 +104,6 @@ public class MemberBusiCardController extends BaseController { } - /** * 删除博主名片 */ diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiSubscribeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiSubscribeMapper.xml new file mode 100644 index 0000000..e5d2c2c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiSubscribeMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + select id, json_obj, create_time, update_time, creator, updater, del_flag from dl_busi_subscribe + + + \ No newline at end of file