fix 字段重大调整

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

@@ -32,8 +32,8 @@ public class DiscoverPageController {
      * 绘画广场
      */
     @GetMapping("/drawSquare")
-    public Result<List<DrawGraphicsSquareVo>> drawSquare(Long graphicsId, String keyword) {
-        List<DrawGraphicsSquareVo> drawGraphicsList = discoverService.queryGraphics(graphicsId, keyword);
+    public Result<List<DrawGraphicsSquareVo>> drawSquare(Long graphicsId, String keyword, Long length) {
+        List<DrawGraphicsSquareVo> drawGraphicsList = discoverService.queryGraphics(graphicsId, keyword, length);
 
         return Result.ok(drawGraphicsList);
     }
@@ -90,7 +90,6 @@ public class DiscoverPageController {
 
     /**
      * 应用精选、特色、玩转
-     *
      */
     @GetMapping("/selectedApp")
     public Result<List<BaseUserSelectAppVo>> selectedApp(@Valid AppQuery query) {
@@ -102,7 +101,6 @@ public class DiscoverPageController {
 
     /**
      * 数字人列表
-     *
      */
     @GetMapping("/digitalHuman")
     public Result<List<Void>> digitalHuman() {

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

@@ -28,8 +28,9 @@ public class MyPhotoFolderController {
      * @return 画夹
      */
     @GetMapping("/photoFolder")
-    public Result<List<BaseUserPhotoFolderVo>> photoFolder(Long id) {
-        List<BaseUserPhotoFolderVo> photoFolder = userInfoService.photoFolder(id);
+    public Result<List<BaseUserPhotoFolderVo>> photoFolder(Long id, Long length) {
+        List<BaseUserPhotoFolderVo> photoFolder = userInfoService.photoFolder(id, length);
+
         return Result.ok(photoFolder);
     }
 

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

@@ -34,7 +34,7 @@ public class SchemeController {
      * 会员卡订单展示
      */
     @GetMapping("/memberOrder")
-    public Result<List<Void>> memberOrder() {
+    public Result<BaseUserOrderVo> memberOrder() {
 //        List<SchemeVo> scheme = schemeService.memberOrder();
 
         return Result.ok();

xyzc-start/src/main/java/com/xyzc/start/domain/App.java

@@ -74,11 +74,6 @@ public class App extends BaseEntity {
     private String delFlag;
 
     /**
-     * 是否精选
-     */
-    private Integer isChoiceness;
-
-    /**
      * app路由
      */
     private String routePath;

xyzc-start/src/main/java/com/xyzc/start/domain/DrawAssistant.java

@@ -15,5 +15,5 @@ public class DrawAssistant {
     /**
      * 绘画助手名称
      */
-    private String assistant;
+    private String assistantName;
 }

xyzc-start/src/main/java/com/xyzc/start/domain/DrawGraphics.java

@@ -30,8 +30,8 @@ public class DrawGraphics {
 
     private Integer height;
 
-    private String promptWord;
+    private String prompt;
 
-    private String reversePromptWord;
+    private String reversePrompt;
 
 }

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

@@ -26,7 +26,7 @@ public class AiModelLawVo {
     private Integer consumeFuelNumber;
 
     /**
-     * 消耗燃料单位
+     * 消耗燃料单位，1-次；2-生成时间（秒）；3-生成结果（秒）
      */
     private Integer consumeFuelUnit;
 

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

@@ -0,0 +1,22 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户订单视图
+ *
+ * @author 杨兴卓
+ */
+@Data
+public class BaseUserOrderVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private Long id;
+
+
+
+}

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

@@ -26,4 +26,9 @@ public class BaseUserPhotoFolderVo {
      * 描述
      */
     private String description;
+
+    /**
+     * 图片生成状态，0:未启动;1:生成中;2:生成失败;3:生成成功
+     */
+    private Integer isGenerate;
 }

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

@@ -2,6 +2,7 @@ package com.xyzc.start.domain.vo;
 
 import com.xyzc.start.domain.DrawAssistant;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 
 /**
@@ -19,6 +20,7 @@ public class DrawAssistantVo {
     /**
      * 助手标题
      */
+    @AutoMapping(target = "assistantName")
     private String assistant;
 
 }

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

@@ -2,6 +2,7 @@ package com.xyzc.start.domain.vo;
 
 import com.xyzc.start.domain.DrawGraphics;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 
 /**
@@ -61,11 +62,13 @@ public class DrawGraphicsVo {
     /**
      * 正向提示词
      */
+    @AutoMapping(target = "prompt")
     private String promptWord;
 
     /**
      * 反向提示词
      */
+    @AutoMapping(target = "reversePrompt")
     private String reversePromptWord;
 
     /**

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

@@ -17,7 +17,7 @@ public interface BaseUserPhotoFolderMapper extends BaseMapperPlus<BaseUserPhotoF
      * @param id
      * @return
      */
-    List<BaseUserPhotoFolderVo> queryPhotoFolder(Long userId, Long id);
+    List<BaseUserPhotoFolderVo> queryPhotoFolder(Long userId, Long id, Long length);
 
     /**
      * @param userId

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

@@ -12,13 +12,20 @@ public interface CareerMapper extends BaseMapperPlus<Career, CareerVo> {
 
 
     /**
-     * 根据职业id分页查询职业
+     * 根据职业id分页查询app
      * todo:优化查询
      *
      * @param careerId
-     * @param appId 应用id
+     * @param appId    应用id
      * @return
      */
     List<AppPageVo> queryAppPageVoByCareerId(Long userId, Long careerId, Long appId);
 
+    /**
+     * 根据行业id查询所有职业
+     *
+     * @param industryIds
+     * @return
+     */
+    List<CareerVo> queryAppPageVoByIndustryIds(List<Long> industryIds);
 }

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

@@ -17,7 +17,7 @@ public interface DrawGraphicsMapper extends BaseMapperPlus<DrawGraphics, DrawGra
      * @param graphicsId
      * @return
      */
-    List<DrawGraphicsSquareVo> queryGraphics(Long userId, Long graphicsId, String keyword);
+    List<DrawGraphicsSquareVo> queryGraphics(Long userId, Long graphicsId, String keyword, Long length);
 
 
 }

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

@@ -18,7 +18,7 @@ public interface IDiscoverService {
      * @param graphicsId Long
      * @return List<DrawGraphicsVo>
      */
-    List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword);
+    List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword, Long length);
 
     /**
      * 分页查询绘画模型

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

@@ -39,12 +39,12 @@ public interface IUserInfoService {
     List<IndustryVo> getIndustryAll();
 
     /**
-     * 获取画夹的所有内容
+     * 分页获取画夹的
      *
      * @param id
      * @return
      */
-    List<BaseUserPhotoFolderVo> photoFolder(Long id);
+    List<BaseUserPhotoFolderVo> photoFolder(Long id, Long length);
 
     /**
      * 根据id获取图画

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

@@ -80,7 +80,7 @@ public class AppPageServiceImpl implements IAppPageService {
         // 将行业列表的id抽取出来
         List<Long> industryIds = industryVoList.stream().map(IndustryVo::getIndustryId).toList();
 
-        List<CareerVo> careerVos = careerMapper.selectVoBatchIds(industryIds);
+        List<CareerVo> careerVos = careerMapper.queryAppPageVoByIndustryIds(industryIds);
 
         //遍历行业列表，将职业列表通过行业id关联
         for (IndustryVo industryVo : industryVoList) {
@@ -112,6 +112,8 @@ public class AppPageServiceImpl implements IAppPageService {
         appPageCareerVo.setCareerName(appPageVos.get(0).getCareerName());
         appPageCareerVo.setAppPageList(appPageVos);
 
+        // TODO 记得精选
+
         return appPageCareerVo;
     }
 

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

@@ -36,13 +36,13 @@ public class DiscoverServiceImpl implements IDiscoverService {
      * @return
      */
     @Override
-    public List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword) {
+    public List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword, Long length) {
 
-        return drawGraphicsMapper.queryGraphics(SecurityUser.getUserId(), graphicsId, keyword);
+        return drawGraphicsMapper.queryGraphics(SecurityUser.getUserId(), graphicsId, keyword, length == null ? 10 : length);
     }
 
     /**
-     * 根据上一个id，列表查询模型助手
+     * 根据上一个id，列表查询模型
      *
      * @param drawModelId
      * @return

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

@@ -118,9 +118,9 @@ public class UserInfoServiceImpl implements IUserInfoService {
      * @return
      */
     @Override
-    public List<BaseUserPhotoFolderVo> photoFolder(Long id) {
+    public List<BaseUserPhotoFolderVo> photoFolder(Long id, Long length) {
 
-        return photoFolderMapper.queryPhotoFolder(SecurityUser.getUserId(), id);
+        return photoFolderMapper.queryPhotoFolder(SecurityUser.getUserId(), id, length == null ? 10 : length);
     }
 
     /**

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

@@ -36,24 +36,23 @@
     <select id="queryDrawModelById" resultType="com.xyzc.start.domain.vo.DrawModelCollectVo">
         SELECT xdm.id       AS id,
                xbuc.id      AS collect_id,
-               oss.url      AS oss_id,
+               xdm.oss_url      AS oss_url,
                xdm.model_name,
                xdm.description,
                xuu.id       AS ugc_user_id,
-               xuu.ugc_nick AS ugc_user_name,
-               oss2.url     AS ugc_user_avatar,
+               xuu.nick_name AS ugc_user_name,
+               xua.avatar     AS ugc_user_avatar,
                xdm.use_count AS use_count,
                xbuc.is_collect AS is_collect,
                xbuc.type    AS type
         FROM xy_base_user_collect xbuc
                  LEFT JOIN xy_draw_model xdm ON xdm.id = xbuc.collect_id
-                 LEFT JOIN sys_oss oss ON xdm.oss_id = oss.oss_id
-            AND `type` = 1
-                 LEFT JOIN xy_ugc_user xuu ON xdm.ugc_id = xuu.id
-                 LEFT JOIN sys_oss oss2 ON xuu.avatar = oss2.oss_id
+                 LEFT JOIN xy_ugc_user xuu ON xdm.ugc_user_id = xuu.id
+                 LEFT JOIN xy_ugc_avatar xua ON xuu.ugc_avatar_id = xua.id
         WHERE xdm.id = xbuc.collect_id
           AND xbuc.base_user_id = #{userId}
           AND xdm.del_flag = '0'
+          AND xbuc.type = 1
         <if test="name != null">
             AND xdm.model_name LIKE CONCAT( '%', #{name}, '%')
         </if>
@@ -70,7 +69,7 @@
                app.description         AS app_desc,
                oss.url                 AS app_logo,
                app.id                  AS app_id,
-               app.is_choiceness,
+               xda.discover_app_type   AS is_choiceness,
                app.use_count,
                xbuc.type               AS type,
                am.ai_model_logo_oss_id AS ai_model_logo,
@@ -79,6 +78,7 @@
         FROM xy_base_user_collect xbuc
                  LEFT JOIN xy_base_user bu ON bu.id = xbuc.base_user_id
                  LEFT JOIN xy_app app ON app.id = xbuc.collect_id
+                 LEFT JOIN xy_discover_app xda ON xbuc.collect_id = xda.app_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
@@ -99,17 +99,16 @@
         SELECT xbuc.id         AS collect_id,
                xbuc.collect_id AS graphics_id,
                xbuc.is_collect,
-               oss.url         AS oss_url,
-               dg.with,
+               dg.oss_url         AS oss_url,
+               dg.width,
                dg.height,
                dg.title,
                dg.use_count,
-               xdm.model_name,
+               xam.ai_model_name AS model_name,
                xbuc.type
         FROM xy_base_user_collect xbuc
                  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
+                 LEFT JOIN xy_ai_model xam ON dg.ai_model_id = xam.id
         WHERE xbuc.base_user_id = #{userId}
           and xbuc.type = 2  AND xbuc.is_collect = 1 AND  dg.del_flag = '0'
         <if test="name != null">

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

@@ -18,7 +18,7 @@
             AND bupf.id < #{id}
         </if>
         ORDER BY bupf.id DESC
-        LIMIT 10
+        LIMIT #{length}
     </select>
 
 

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

@@ -17,8 +17,7 @@
                xam.id          AS ai_model_id,
                oss2.url        AS ai_model_icon,
                app.use_count,
-               buc.is_collect AS is_collect,
-               app.is_choiceness
+               buc.is_collect AS is_collect
         FROM xy_industry xin
                  LEFT JOIN xy_career xc ON xin.id = xc.industry_id
                  LEFT JOIN xy_career_app xca ON xc.id = xca.career_id
@@ -39,5 +38,14 @@
 
     </select>
 
+    <select id="queryAppPageVoByIndustryIds" resultType="com.xyzc.start.domain.vo.CareerVo">
+        select * from xy_career
+        where industry_id in
+        <foreach collection="industryIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+
 
 </mapper>

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

@@ -8,14 +8,13 @@
     <select id="queryGraphics" resultType="com.xyzc.start.domain.vo.DrawGraphicsSquareVo">
         SELECT
             dg.id           AS graphics_id,
-            oss.url         AS oss_url,
+            dg.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_draw_model dm  ON dg.ai_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">
@@ -25,7 +24,7 @@
             AND dg.title LIKE CONCAT('%',#{keyword},'%')
         </if>
         ORDER BY dg.id DESC
-        LIMIT 20
+        LIMIT #{length}
     </select>
 
 </mapper>

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

@@ -12,11 +12,11 @@
                xdm.description,
                xuu.id       AS ugc_user_id,
                xua.avatar   AS ugc_user_avatar,
-               xuu.ugc_nick AS ugc_user_name,
+               xuu.nick_name AS ugc_user_name,
                xdm.use_count,
                xbuc.is_collect
         from xy_draw_model xdm
-                 left join xy_ugc_user xuu on xdm.ugc_id = xuu.id
+                 left join xy_ugc_user xuu on xdm.ugc_user_id = xuu.id
                  left join xy_base_user_collect xbuc on xdm.id = xbuc.collect_id
                  left join xy_ugc_avatar xua on xuu.ugc_avatar_id = xua.id
             and xbuc.base_user_id = #{userId}
@@ -25,6 +25,10 @@
         <if test="keyword != null">
             and xdm.model_name like concat('%',#{keyword},'%')
         </if>
+        <if test="drawModelId != null">
+            and xdm.id &lt; #{drawModelId}
+        </if>
+        order by xdm.id desc
     </select>