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 index 3d4d9d7..65821d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiSubscribeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiSubscribeController.java @@ -1,30 +1,16 @@ package com.ruoyi.busi.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.busi.domain.BusiSubscribe; -import com.ruoyi.busi.service.IBusiSubscribeService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; /** * 订阅Controller @@ -34,73 +20,40 @@ import com.ruoyi.common.core.page.TableDataInfo; */ @RestController @RequestMapping("/busi/subscribe") -public class BusiSubscribeController extends BaseController -{ +public class BusiSubscribeController extends BaseController { @Autowired private IBusiSubscribeService busiSubscribeService; /** - * 查询订阅列表 - */ - @GetMapping("/list") - public AjaxResult list(BusiSubscribe busiSubscribe, - @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) - { - Page page = new Page<>(pageNum, pageSize); - IPage list = busiSubscribeService.queryListPage(busiSubscribe,page); - return success(list); + * 根据用户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); } - /** - * 导出订阅列表 - */ - @Log(title = "订阅", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, BusiSubscribe busiSubscribe) - { - List list = busiSubscribeService.list(); - ExcelUtil util = new ExcelUtil(BusiSubscribe.class); - util.exportExcel(response, list, "订阅数据"); - } /** - * 获取订阅详细信息 - */ - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { - return success(busiSubscribeService.getById(id)); - } - - /** - * 新增订阅 - */ + * 保存订阅内容 + * + * @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 - public AjaxResult add(@RequestBody BusiSubscribe busiSubscribe) - { - return toAjax(busiSubscribeService.save(busiSubscribe)); - } - - /** - * 修改订阅 - */ - @Log(title = "订阅", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody BusiSubscribe busiSubscribe) - { - return toAjax(busiSubscribeService.updateById(busiSubscribe)); - } - - /** - * 删除订阅 - */ - @Log(title = "订阅", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { - List list = new ArrayList<>(Arrays.asList(ids)); - return toAjax(busiSubscribeService.removeByIds(list)); + @PostMapping(value = "/save") + public AjaxResult save(@RequestBody BusiSubscribe busiSubscribe) { + 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 index 1e18d44..9fa721f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiSubscribe.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiSubscribe.java @@ -27,7 +27,8 @@ public class BusiSubscribe extends DlBaseEntity /** $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 index 98e012f..4029cb1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiSubscribeMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiSubscribeMapper.java @@ -17,5 +17,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface BusiSubscribeMapper extends BaseMapper { - IPage queryListPage(@Param("entity") BusiSubscribe entity, Page page); } 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 index 26e1956..9ac3496 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiSubscribeService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiSubscribeService.java @@ -14,5 +14,4 @@ import com.ruoyi.busi.domain.BusiSubscribe; */ public interface IBusiSubscribeService extends IService { - IPage queryListPage(BusiSubscribe pageReqVO, Page page); } 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 index ab60151..c73ad30 100644 --- 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 @@ -23,8 +23,5 @@ public class BusiSubscribeServiceImpl extends ServiceImpl queryListPage(BusiSubscribe pageReqVO, Page page) { - return busiSubscribeMapper.queryListPage(pageReqVO, page); - } + } 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 index 9cb8994..e5d2c2c 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiSubscribeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiSubscribeMapper.xml @@ -18,10 +18,4 @@ select id, json_obj, create_time, update_time, creator, updater, del_flag from dl_busi_subscribe - \ No newline at end of file