1

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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import java.util.Arrays;
+import com.ruoyi.busi.domain.BusiSubscribe;
-import java.util.List;
+import com.ruoyi.busi.service.IBusiSubscribeService;
-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.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.common.utils.SecurityUtils;
-import com.ruoyi.busi.service.IBusiSubscribeService;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 订阅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;
 
     /**
-     * 查询订阅列表
+     * 根据用户id查询订阅内容
-     */
+     *
-    @GetMapping("/list")
+     * @return com.ruoyi.common.core.domain.AjaxResult
-    public AjaxResult list(BusiSubscribe busiSubscribe,
+     * @author PQZ
-                           @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
+     * @date 10:29 2025/4/1
-                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize)
+     **/
-    {
+    @GetMapping(value = "/getUserSub")
-        Page<BusiSubscribe> page = new Page<>(pageNum, pageSize);
+    public AjaxResult getInfo() {
-        IPage<BusiSubscribe> list = busiSubscribeService.queryListPage(busiSubscribe,page);
+        Long userId = SecurityUtils.getUserId();
-        return success(list);
+        LambdaQueryWrapper<BusiSubscribe> 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<BusiSubscribe> list = busiSubscribeService.list();
-        ExcelUtil<BusiSubscribe> util = new ExcelUtil<BusiSubscribe>(BusiSubscribe.class);
-        util.exportExcel(response, list, "订阅数据");
-    }
 
     /**
-     * 获取订阅详细信息
+     * 保存订阅内容
-     */
+     *
-    @GetMapping(value = "/{id}")
+     * @param busiSubscribe {@link BusiSubscribe}
-    public AjaxResult getInfo(@PathVariable("id") String id)
+     * @return com.ruoyi.common.core.domain.AjaxResult
-    {
+     * @author PQZ
-        return success(busiSubscribeService.getById(id));
+     * @date 10:30 2025/4/1
-    }
+     **/
-
-    /**
-     * 新增订阅
-     */
     @Log(title = "订阅", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping(value = "/save")
-    public AjaxResult add(@RequestBody BusiSubscribe busiSubscribe)
+    public AjaxResult save(@RequestBody BusiSubscribe busiSubscribe) {
-    {
+        busiSubscribeService.saveOrUpdate(busiSubscribe);
-        return toAjax(busiSubscribeService.save(busiSubscribe));
+        return success();
-    }
-
-    /**
-     * 修改订阅
-     */
-    @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<String> list = new ArrayList<>(Arrays.asList(ids));
-        return toAjax(busiSubscribeService.removeByIds(list));
     }
 }

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;

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<BusiSubscribe>
 {
-    IPage<BusiSubscribe> queryListPage(@Param("entity") BusiSubscribe entity, Page<BusiSubscribe> page);
 }

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<BusiSubscribe>
 {
-    IPage<BusiSubscribe> queryListPage(BusiSubscribe pageReqVO, Page<BusiSubscribe> page);
 }

ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiSubscribeServiceImpl.java

@@ -23,8 +23,5 @@ public class BusiSubscribeServiceImpl extends ServiceImpl<BusiSubscribeMapper,Bu
     @Autowired
     private BusiSubscribeMapper busiSubscribeMapper;
 
-    @Override
+
-    public IPage<BusiSubscribe> queryListPage(BusiSubscribe pageReqVO, Page<BusiSubscribe> page) {
-        return busiSubscribeMapper.queryListPage(pageReqVO, page);
-    }
 }

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")
+    @GetMapping("/listByUser")
-    public AjaxResult listByUserId(@RequestParam("userId") Long userId) {
+    public AjaxResult listByUserId() {
+        Long userId = SecurityUtils.getUserId();
         return success(memberAddressService.listByUserId(userId));
     }
 

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 {
     }
 
 
-
     /**
      * 删除博主名片
      */

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
     </sql>
 
-    <select id="queryListPage" parameterType="BusiSubscribe" resultMap="BusiSubscribeResult">
-        <include refid="selectBusiSubscribeVo"/>
-        <where>
-            <if test="entity.jsonObj != null  and entity.jsonObj != ''"> and json_obj = #{entity.jsonObj}</if>
-        </where>
-    </select>
 </mapper>