update 收藏接口修复排序问题

xyzc-common/xyzc-common-core/src/main/java/com/xyzc/common/core/utils/AssertUtils.java

@@ -21,7 +21,7 @@ public class AssertUtils {
     }
 
     /**
-     * 判断数组长度是否为1，不唯一抛出异常
+     * 判断数组长度是否为1，不为一抛出异常
      *
      * @param list    数组长度
      * @param errCode 错误码

xyzc-start/src/main/java/com/xyzc/start/controller/InsertDataDemoController.java

@@ -0,0 +1,54 @@
+package com.xyzc.start.controller;
+
+import com.xyzc.common.core.utils.Result;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 插入数据demo
+ */
+@RestController
+@RequestMapping("insert")
+public class InsertDataDemoController {
+
+    /**
+     * 添加绘画模型
+     */
+    @PostMapping("addDrawModel")
+    public Result<String> addPaintingModel() {
+
+        return Result.ok("插入数据成功");
+    }
+
+    /**
+     * 查询所有的绘画模型id
+     */
+    @GetMapping("graphicsIds")
+    public Result<String> queryPaintingModel() {
+
+        return Result.ok("查询数据成功");
+    }
+
+
+    /**
+     * 添加图像，并将绘画模型与 图像关联，将ugc 用户一起关联
+     */
+    @PostMapping("addImage")
+    public Result<String> addImage() {
+
+        return Result.ok("插入数据成功");
+    }
+
+    /**
+     * 添加ugc用户
+     */
+    @PostMapping("addUgcUser")
+    public Result<String> addUgcUser() {
+
+        return Result.ok("插入数据成功");
+    }
+
+
+}

xyzc-start/src/main/java/com/xyzc/start/controller/MyCollectController.java

@@ -28,8 +28,8 @@ public class MyCollectController {
      * 收藏的绘画模型
      */
     @GetMapping("/collectDraw")
-    public Result<List<DrawModelCollectVo>> getCollectDrawModel(Long id, String modelName) {
-        List<DrawModelCollectVo> drawModelList = myCollectService.getCollectDrawModel(id, modelName);
+    public Result<List<DrawModelCollectVo>> getCollectDrawModel(Long collectId, String name) {
+        List<DrawModelCollectVo> drawModelList = myCollectService.getCollectDrawModel(collectId, name);
 
         return Result.ok(drawModelList);
     }
@@ -38,8 +38,8 @@ public class MyCollectController {
      * 收藏的图像
      */
     @GetMapping("/collectImage")
-    public Result<List<DrawGraphicsCollectVo>> getCollectImage(Long graphicsId, String graphicsName) {
-        List<DrawGraphicsCollectVo> drawGraphicsList = myCollectService.getCollectImage(graphicsId, graphicsName);
+    public Result<List<DrawGraphicsCollectVo>> getCollectImage(Long collectId, String name) {
+        List<DrawGraphicsCollectVo> drawGraphicsList = myCollectService.getCollectImage(collectId, name);
 
         return Result.ok(drawGraphicsList);
     }
@@ -48,8 +48,8 @@ public class MyCollectController {
      * 收藏的应用
      */
     @GetMapping("/collectApp")
-    public Result<List<AppCollectVo>> getCollectApp(Long appId, String appName) {
-        List<AppCollectVo> appList = myCollectService.getCollectApp(appId, appName);
+    public Result<List<AppCollectVo>> getCollectApp(Long collectId, String name) {
+        List<AppCollectVo> appList = myCollectService.getCollectApp(collectId, name);
 
         return Result.ok(appList);
     }

xyzc-start/src/main/java/com/xyzc/start/domain/vo/AppCollectVo.java

@@ -12,7 +12,7 @@ public class AppCollectVo {
     /**
      * 应用收藏id
      */
-    private Long id;
+    private Long collectId;
 
     /**
      * 应用logo地址

xyzc-start/src/main/java/com/xyzc/start/mapper/BaseUserCollectMapper.java

@@ -48,28 +48,28 @@ public interface BaseUserCollectMapper extends BaseMapperPlus<BaseUserCollect, B
      * 根据上一个id，分页查询绘画模型
      *
      * @param userId
-     * @param id
+     * @param collectId
      * @return
      */
-    List<DrawModelCollectVo> queryDrawModelById(Long userId, Long id, String modelName);
+    List<DrawModelCollectVo> queryDrawModelById(Long userId, Long collectId, String name);
 
     /**
      * 根据上一个id，分页查询图像
      *
      * @param userId
-     * @param graphicsId
+     * @param collectId
      * @return
      */
-    List<DrawGraphicsCollectVo> queryDrawGraphicsById(Long userId, Long graphicsId, String graphicsName);
+    List<DrawGraphicsCollectVo> queryDrawGraphicsById(Long userId, Long collectId, String name);
 
     /**
      * 根据上一个id，分页查询应用
      *
      * @param userId
-     * @param appId
+     * @param collectId
      * @return
      */
-    List<AppCollectVo> queryAppById(Long userId, Long appId, String appName);
+    List<AppCollectVo> queryAppById(Long userId, Long collectId, String name);
 
     /**
      * 根据用户id查询收藏的应用

xyzc-start/src/main/java/com/xyzc/start/service/IMyCollectService.java

@@ -11,11 +11,11 @@ public interface IMyCollectService {
 
     /**
      * 根据上一个id 获取收藏的绘画模型列表
-     * @param id Long
-     * @param modelName String
+     * @param collectId Long
+     * @param name String
      * @return List<DrawModelCollectVo>
      */
-    List<DrawModelCollectVo> getCollectDrawModel(Long id, String modelName);
+    List<DrawModelCollectVo> getCollectDrawModel(Long collectId, String name);
 
     /**
      * 根据上一个id 获取收藏的应用列表
@@ -28,9 +28,9 @@ public interface IMyCollectService {
     /**
      * 根据上一个id 获取收藏的图片列表
      *
-     * @param graphicsId
-     * @param graphicsName 图像名称
+     * @param collectId
+     * @param name 图像名称
      * @return
      */
-    List<DrawGraphicsCollectVo> getCollectImage(Long graphicsId, String graphicsName);
+    List<DrawGraphicsCollectVo> getCollectImage(Long collectId, String name);
 }

xyzc-start/src/main/java/com/xyzc/start/service/impl/MyCollectServiceImpl.java

@@ -23,31 +23,37 @@ public class MyCollectServiceImpl implements IMyCollectService {
 
     /**
      *
-     * @param id
+     * @param collectId
      * @return
      */
     @Override
-    public List<DrawModelCollectVo> getCollectDrawModel(Long id, String modelName) {
+    public List<DrawModelCollectVo> getCollectDrawModel(Long collectId, String name) {
 
-        return baseUserCollectMapper.queryDrawModelById(SecurityUser.getUserId(), id, modelName);
+        return baseUserCollectMapper.queryDrawModelById(SecurityUser.getUserId(), collectId, name);
     }
 
     /**
      *
-     * @param appId
-     * @param appName 应用名称模糊查询
+     * @param collectId
+     * @param name 应用名称模糊查询
      * @return
      */
     @Override
-    public List<AppCollectVo> getCollectApp(Long appId, String appName) {
+    public List<AppCollectVo> getCollectApp(Long collectId, String name) {
 
-        return baseUserCollectMapper.queryAppById(SecurityUser.getUserId(), appId, appName);
+        return baseUserCollectMapper.queryAppById(SecurityUser.getUserId(), collectId, name);
     }
 
+    /**
+     *
+     * @param collectId
+     * @param name 图像名称
+     * @return
+     */
     @Override
-    public List<DrawGraphicsCollectVo> getCollectImage(Long graphicsId, String graphicsName) {
+    public List<DrawGraphicsCollectVo> getCollectImage(Long collectId, String name) {
 
-        return baseUserCollectMapper.queryDrawGraphicsById(SecurityUser.getUserId(), graphicsId, graphicsName);
+        return baseUserCollectMapper.queryDrawGraphicsById(SecurityUser.getUserId(), collectId, name);
     }
 
 

xyzc-start/src/main/java/com/xyzc/start/service/impl/SchemeServiceImpl.java

@@ -39,7 +39,6 @@ public class SchemeServiceImpl implements ISchemeService {
         List<SchemeVo> schemeVoList = schemeMapper.getCurrentMember();
 
         // 有且只有一个会员卡套餐生效
-        //TODO 上线需要更改
         AssertUtils.isUnique(schemeVoList, ErrorCode.SCHEME_NOT_UNIQUE);
         SchemeVo schemeVo = schemeVoList.get(0);
         // 根据套餐查询会员卡

xyzc-start/src/main/resources/mapper/WebStart/BaseUserCollectMapper.xml

@@ -54,18 +54,18 @@
         WHERE xdm.id = xbuc.collect_id
           AND xbuc.base_user_id = #{userId}
           AND xdm.del_flag = '0'
-        <if test="id != null">
-            AND xbuc.id &lt; #{id}
+        <if test="name != null">
+            AND xdm.model_name LIKE CONCAT( '%', #{name}, '%')
         </if>
-        <if test="modelName != null">
-            AND xdm.model_name LIKE CONCAT( '%', #{modelName}, '%')
+        <if test="collectId != null">
+            AND xbuc.id &lt; #{collectId}
         </if>
-        ORDER BY id DESC
+        ORDER BY xbuc.id DESC
         LIMIT 10
     </select>
 
     <select id="queryAppById" resultType="com.xyzc.start.domain.vo.AppCollectVo">
-        SELECT xbuc.id,
+        SELECT xbuc.id                  AS collect_id,
                app.app_name,
                app.description         AS app_desc,
                oss.url                 AS app_logo,
@@ -85,13 +85,13 @@
                  LEFT JOIN sys_oss oss2 ON oss2.oss_id = am.ai_model_logo_oss_id
         WHERE   bu.id = #{userId} AND app.del_flag = '0'
                  AND xbuc.is_collect = 1 AND xbuc.type = 3
-            <if test="appId != null">
-                and app.id &lt; #{appId}
+            <if test="name != null">
+                and app.app_name like concat('%',#{name},'%')
             </if>
-            <if test="appName != null">
-                and app.app_name like concat('%',#{appName},'%')
+            <if test="collectId != null">
+                and xbuc.id &lt; #{collectId}
             </if>
-        ORDER BY xbuc.create_time DESC
+        ORDER BY xbuc.id DESC
         LIMIT 10
     </select>
 
@@ -109,14 +109,14 @@
                  LEFT JOIN xy_draw_model xdm ON dg.model_id = xdm.id
                  LEFT JOIN sys_oss oss ON oss.oss_id = dg.oss_id
         WHERE xbuc.base_user_id = #{userId}
-          and xbuc.type = 2
-        <if test="graphicsId != null">
-            and xbuc.collect_id > #{graphicsId}
+          and xbuc.type = 2 AND dg.del_flag = '0'
+        <if test="name != null">
+            and dg.title like concat('%',#{name},'%')
         </if>
-        <if test="graphicsName != null">
-            and dg.title like concat('%',#{graphicsName},'%')
+        <if test="collectId != null">
+            and xbuc.collect_id &lt; #{collectId}
         </if>
-        ORDER BY xbuc.create_time DESC
+        ORDER BY xbuc.id DESC
         LIMIT 10
     </select>