修整绘画模型，绘画图像，收藏

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

@@ -1,6 +1,7 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
+import com.xyzc.start.domain.vo.DrawGraphicsSquareVo;
 import com.xyzc.start.domain.vo.DrawGraphicsVo;
 import com.xyzc.start.domain.vo.DrawModelVo;
 import com.xyzc.start.service.IDiscoverService;
@@ -30,8 +31,8 @@ public class DiscoverPageController {
      * 绘画广场
      */
     @GetMapping("/drawSquare")
-    public Result<List<DrawGraphicsVo>> drawSquare(Long graphicsId) {
-        List<DrawGraphicsVo> drawGraphicsList = discoverService.queryGraphics(graphicsId);
+    public Result<List<DrawGraphicsSquareVo>> drawSquare(Long graphicsId) {
+        List<DrawGraphicsSquareVo> drawGraphicsList = discoverService.queryGraphics(graphicsId);
 
         return Result.ok(drawGraphicsList);
     }

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

@@ -1,10 +1,7 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
-import com.xyzc.start.domain.vo.AppVo;
-import com.xyzc.start.domain.vo.CollectAppVo;
-import com.xyzc.start.domain.vo.DrawGraphicsVo;
-import com.xyzc.start.domain.vo.DrawModelCollectVo;
+import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.IMyCollectService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -33,6 +30,7 @@ public class MyCollectController {
     @GetMapping("/collectDraw")
     public Result<List<DrawModelCollectVo>> getCollectDrawModel(Long id) {
         List<DrawModelCollectVo> drawModelList = myCollectService.getCollectDrawModel(id);
+
         return Result.ok(drawModelList);
     }
 
@@ -40,8 +38,9 @@ public class MyCollectController {
      * 收藏的图像
      */
     @GetMapping("/collectImage")
-    public Result<List<DrawGraphicsVo>> getCollectImage(Long id) {
-        List<DrawGraphicsVo> drawGraphicsList = myCollectService.getCollectImage(id);
+    public Result<List<DrawGraphicsCollectVo>> getCollectImage(Long graphicsId) {
+        List<DrawGraphicsCollectVo> drawGraphicsList = myCollectService.getCollectImage(graphicsId);
+
         return Result.ok(drawGraphicsList);
     }
 
@@ -49,8 +48,8 @@ public class MyCollectController {
      * 收藏的应用
      */
     @GetMapping("/collectApp")
-    public Result<List<CollectAppVo>> getCollectApp(Long id) {
-        List<CollectAppVo> appList = myCollectService.getCollectApp(id);
+    public Result<List<CollectAppVo>> getCollectApp(Long appId) {
+        List<CollectAppVo> appList = myCollectService.getCollectApp(appId);
 
         return Result.ok(appList);
     }

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

@@ -51,6 +51,7 @@ public class MyPhotoFolderController {
     @DeleteMapping("/photo/{id}")
     public Result<Void> deletePhoto(@PathVariable("id") Long id) {
         userInfoService.deletePhoto(id);
+
         return Result.ok();
     }
 
@@ -63,6 +64,7 @@ public class MyPhotoFolderController {
     @DeleteMapping("/photo")
     public Result<Void> deletePhotos(@RequestBody List<Long> ids) {
         userInfoService.deletePhotos(ids);
+
         return Result.ok();
     }
 

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

@@ -26,6 +26,11 @@ public class CollectAppVo {
     private String appDesc;
 
     /**
+     * appId
+     */
+    private Long appId;
+
+    /**
      * 应用精选，0-未精选，1-已精选
      */
     private Integer isChoiceness;
@@ -48,7 +53,7 @@ public class CollectAppVo {
     /**
      * 应用类型
      */
-    private String type;
+    private Integer type;
 
     /**
      * 收藏状态，0-未收藏，1-已收藏

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

@@ -0,0 +1,11 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DrawGraphicsCollectVo extends DrawGraphicsSquareVo{
+
+    private String collectId;
+}

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

@@ -0,0 +1,42 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+
+/**
+ * DrawGraphicsSquareVo
+ *
+ * @author 杨兴卓
+ */
+@Data
+public class DrawGraphicsSquareVo {
+
+    /**
+     * 图像id
+     */
+    private Long graphicsId;
+
+    /**
+     * 图像地址
+     */
+    private String ossUrl;
+
+    /**
+     * 图像标题
+     */
+    private String title;
+
+    /**
+     * 使用人数
+     */
+    private Integer useCount;
+
+    /**
+     * 该用户是否收藏了
+     */
+    private Integer isCollect;
+
+    /**
+     * 绘画模型名称
+     */
+    private String modelName;
+}

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

@@ -21,7 +21,7 @@ public class DrawGraphicsVo {
     /**
      * 绘画模型id
      */
-    private String modelId;
+    private Long modelId;
 
     /**
      * 使用次数，真
@@ -78,4 +78,9 @@ public class DrawGraphicsVo {
      */
     private String ugcUserAvatar;
 
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
 }

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

@@ -58,19 +58,19 @@ public interface BaseUserCollectMapper extends BaseMapperPlus<BaseUserCollect, B
      * 根据上一个id，分页查询图像
      *
      * @param userId
-     * @param id
+     * @param graphicsId
      * @return
      */
-    List<DrawGraphicsVo> queryDrawGraphicsById(Long userId, Long id);
+    List<DrawGraphicsCollectVo> queryDrawGraphicsById(Long userId, Long graphicsId);
 
     /**
      * 根据上一个id，分页查询应用
      *
      * @param userId
-     * @param id
+     * @param appId
      * @return
      */
-    List<CollectAppVo> queryAppById(Long userId, Long id);
+    List<CollectAppVo> queryAppById(Long userId, Long appId);
 
     /**
      * 根据用户id查询收藏的应用

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

@@ -3,6 +3,7 @@ package com.xyzc.start.mapper;
 
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.DrawGraphics;
+import com.xyzc.start.domain.vo.DrawGraphicsSquareVo;
 import com.xyzc.start.domain.vo.DrawGraphicsVo;
 
 import java.util.List;
@@ -12,10 +13,11 @@ public interface DrawGraphicsMapper extends BaseMapperPlus<DrawGraphics, DrawGra
     /**
      * 根据图像id分页查询
      *
+     * @param userId
      * @param graphicsId
      * @return
      */
-    List<DrawGraphicsVo> queryGraphics(Long graphicsId);
+    List<DrawGraphicsSquareVo> queryGraphics(Long userId, Long graphicsId);
 
 
 }

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

@@ -26,9 +26,4 @@ public interface DrawModelMapper extends BaseMapperPlus<DrawModel, DrawModelVo>
     List<DrawModelVo> queryDrawModelList(Long drawModelId);
 
 
-    /**
-     *
-     */
-
-
 }

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

@@ -1,5 +1,6 @@
 package com.xyzc.start.service;
 
+import com.xyzc.start.domain.vo.DrawGraphicsSquareVo;
 import com.xyzc.start.domain.vo.DrawGraphicsVo;
 import com.xyzc.start.domain.vo.DrawModelVo;
 
@@ -18,7 +19,7 @@ public interface IDiscoverService {
      * @param graphicsId Long
      * @return List<DrawGraphicsVo>
      */
-    List<DrawGraphicsVo> queryGraphics(Long graphicsId);
+    List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId);
 
     /**
      * 分页查询绘画模型

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

@@ -1,9 +1,6 @@
 package com.xyzc.start.service;
 
-import com.xyzc.start.domain.vo.AppVo;
-import com.xyzc.start.domain.vo.CollectAppVo;
-import com.xyzc.start.domain.vo.DrawGraphicsVo;
-import com.xyzc.start.domain.vo.DrawModelCollectVo;
+import com.xyzc.start.domain.vo.*;
 
 import java.util.List;
 
@@ -21,16 +18,16 @@ public interface IMyCollectService {
 
     /**
      * 根据上一个id 获取收藏的应用列表
-     * @param id
+     * @param appId
      * @return
      */
-    List<CollectAppVo> getCollectApp(Long id);
+    List<CollectAppVo> getCollectApp(Long appId);
 
     /**
      * 根据上一个id 获取收藏的图片列表
      *
-     * @param id
+     * @param graphicsId
      * @return
      */
-    List<DrawGraphicsVo> getCollectImage(Long id);
+    List<DrawGraphicsCollectVo> getCollectImage(Long graphicsId);
 }

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

@@ -1,5 +1,7 @@
 package com.xyzc.start.service.impl;
 
+import com.xyzc.common.web.security.user.SecurityUser;
+import com.xyzc.start.domain.vo.DrawGraphicsSquareVo;
 import com.xyzc.start.domain.vo.DrawGraphicsVo;
 import com.xyzc.start.domain.vo.DrawModelVo;
 import com.xyzc.start.mapper.DrawGraphicsMapper;
@@ -30,9 +32,9 @@ public class DiscoverServiceImpl implements IDiscoverService {
      * @return
      */
     @Override
-    public List<DrawGraphicsVo> queryGraphics(Long graphicsId) {
+    public List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId) {
 
-        return drawGraphicsMapper.queryGraphics(graphicsId);
+        return drawGraphicsMapper.queryGraphics(SecurityUser.getUserId(), graphicsId);
     }
 
     /**
@@ -43,6 +45,7 @@ public class DiscoverServiceImpl implements IDiscoverService {
      */
     @Override
     public List<DrawModelVo> queryDrawModelList(Long drawModelId) {
+
         return drawModelMapper.queryDrawModelList(drawModelId);
     }
 

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

@@ -2,10 +2,7 @@ package com.xyzc.start.service.impl;
 
 
 import com.xyzc.common.web.security.user.SecurityUser;
-import com.xyzc.start.domain.vo.AppVo;
-import com.xyzc.start.domain.vo.CollectAppVo;
-import com.xyzc.start.domain.vo.DrawGraphicsVo;
-import com.xyzc.start.domain.vo.DrawModelCollectVo;
+import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.mapper.BaseUserCollectMapper;
 import com.xyzc.start.service.IMyCollectService;
 import lombok.RequiredArgsConstructor;
@@ -31,17 +28,20 @@ public class MyCollectServiceImpl implements IMyCollectService {
      */
     @Override
     public List<DrawModelCollectVo> getCollectDrawModel(Long id) {
+
         return baseUserCollectMapper.queryDrawModelById(SecurityUser.getUserId(), id);
     }
 
     @Override
-    public List<CollectAppVo> getCollectApp(Long id) {
-        return baseUserCollectMapper.queryAppById(SecurityUser.getUserId(), id);
+    public List<CollectAppVo> getCollectApp(Long appId) {
+
+        return baseUserCollectMapper.queryAppById(SecurityUser.getUserId(), appId);
     }
 
     @Override
-    public List<DrawGraphicsVo> getCollectImage(Long id) {
-        return baseUserCollectMapper.queryDrawGraphicsById(SecurityUser.getUserId(), id);
+    public List<DrawGraphicsCollectVo> getCollectImage(Long graphicsId) {
+
+        return baseUserCollectMapper.queryDrawGraphicsById(SecurityUser.getUserId(), graphicsId);
     }
 
 

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

@@ -55,33 +55,39 @@
                app.app_name,
                app.description         AS app_desc,
                oss.url                 AS app_logo,
+               app.id                  AS app_id,
                app.is_choiceness,
                app.use_count,
                xbuc.type               AS type,
                am.ai_model_logo_oss_id AS ai_model_logo,
-               am.ai_model_name        AS ai_model_name
+               am.ai_model_name        AS ai_model_name,
+               xbuc.is_collect         AS is_collect
         FROM xy_base_user bu
                  LEFT JOIN xy_base_user_collect xbuc ON bu.id = xbuc.base_user_id
-            AND xbuc.is_collect = 1 AND xbuc.type = 3
                  LEFT JOIN xy_app app ON app.id = xbuc.collect_id
                  LEFT JOIN sys_oss oss ON oss.oss_id = app.oss_id
                  LEFT JOIN xy_ai_model_app xama ON app.id = xama.app_id
                  LEFT JOIN xy_ai_model am ON xama.ai_model_id = am.id
                  LEFT JOIN sys_oss oss2 ON oss2.oss_id = am.ai_model_logo_oss_id
-        WHERE bu.id = #{userId}
+        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 > #{appId}
+            </if>
     </select>
 
-    <select id="queryDrawGraphicsById" resultType="com.xyzc.start.domain.vo.DrawGraphicsVo">
+    <select id="queryDrawGraphicsById" resultType="com.xyzc.start.domain.vo.DrawGraphicsCollectVo">
         SELECT xbuc.id         AS collect_id,
-               xbuc.base_user_id,
                xbuc.collect_id AS graphics_id,
                xbuc.is_collect,
-               xbuc.create_time,
-               oss.url         AS oss_id,
-               xg.title
+               oss.url         AS oss_url,
+               dg.title,
+               dg.use_count,
+               xdm.model_name
         FROM xy_base_user_collect xbuc
-                 LEFT JOIN xy_draw_graphics xg ON xbuc.collect_id = xg.id
-                 LEFT JOIN sys_oss oss ON oss.oss_id = xg.oss_id
+                 LEFT JOIN xy_draw_graphics dg ON xbuc.collect_id = dg.id
+                 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
         ORDER BY xbuc.create_time DESC

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

@@ -5,10 +5,24 @@
 <mapper namespace="com.xyzc.start.mapper.DrawGraphicsMapper">
 
 
-    <select id="queryGraphics" resultType="com.xyzc.start.domain.vo.DrawGraphicsVo">
-        SELECT * FROM xy_draw_graphics
+    <select id="queryGraphics" resultType="com.xyzc.start.domain.vo.DrawGraphicsSquareVo">
+        SELECT
+            dg.id           AS graphics_id,
+            oss.url         AS oss_url,
+            dg.title,
+            dm.model_name   AS model_name,
+            dg.use_count    AS use_count,
+            buc.is_collect  AS is_collect
+        FROM xy_draw_graphics dg
+            LEFT JOIN sys_oss oss       ON dg.oss_id = oss.oss_id
+            LEFT JOIN xy_draw_model dm  ON dg.model_id = dm.id
+            LEFT JOIN xy_base_user_collect buc ON buc.collect_id = dg.id AND buc.type = 2
+        WHERE dg.del_flag = '0'
+        <if test="graphicsId != null">
+             AND dg.id &lt; #{graphicsId}
+        </if>
+        ORDER BY dg.id DESC
+        LIMIT 20
     </select>
 
-
-
 </mapper>

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

@@ -6,7 +6,7 @@
 
 
     <select id="queryDrawModelList" resultType="com.xyzc.start.domain.vo.DrawModelVo">
-
+        select * from xy_draw_model
     </select>