fix 修复发现模型字段缺失

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

@@ -3,13 +3,11 @@ 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.DrawModelCollectVo;
 import com.xyzc.start.domain.vo.DrawModelVo;
 import com.xyzc.start.service.IDiscoverService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -42,8 +40,8 @@ public class DiscoverPageController {
      * 绘画模型
      */
     @GetMapping("/drawModel")
-    public Result<List<DrawModelVo>> drawModel(Long drawModelId) {
-        List<DrawModelVo> drawModelList = discoverService.queryDrawModelList(drawModelId);
+    public Result<List<DrawModelCollectVo>> drawModel(Long drawModelId) {
+        List<DrawModelCollectVo> drawModelList = discoverService.queryDrawModelList(drawModelId);
 
         return Result.ok(drawModelList);
     }
@@ -62,8 +60,8 @@ public class DiscoverPageController {
     /**
      * 进入具体绘画模型
      */
-    @GetMapping("/drawModel/{modelId}")
-    public Result<List<Void>> querydrawModel(String modelId) {
+    @GetMapping("/drawModelDetail/{modelId}")
+    public Result<List<Void>> queryDrawModel(@PathVariable String modelId) {
 
         return Result.ok();
     }

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

@@ -9,6 +9,7 @@ import com.xyzc.start.domain.bo.HobbyBo;
 import com.xyzc.start.domain.vo.BaseUserFuelFlowVo;
 import com.xyzc.start.domain.vo.BaseUserVo;
 import com.xyzc.start.domain.vo.IndustryVo;
+import com.xyzc.start.domain.vo.MemberCardUseDetail;
 import com.xyzc.start.service.IUserInfoService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -58,10 +59,10 @@ public class UserInfoController {
      * @param useDetailId 会员卡使用详情id
      */
     @GetMapping("/cardUseDetail/{cardId}")
-    public Result<BaseUserVo> cardUseDetail(@PathVariable("cardId") Long cardId, Long useDetailId) {
-        BaseUserVo baseUserVo = userInfoService.queryCardUseDetail(cardId);
+    public Result< List<MemberCardUseDetail>> cardUseDetail(@PathVariable("cardId") Long cardId, Long useDetailId) {
+        List<MemberCardUseDetail> cardUseDetails = userInfoService.queryCardUseDetail(cardId, useDetailId);
 
-        return Result.ok(baseUserVo);
+        return Result.ok(cardUseDetails);
     }
 
 

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

@@ -43,7 +43,7 @@ public class DrawModel extends BaseEntity {
 
     private String description;
 
-    private Long ossId;
+    private String ossUrl;
 
     @TableLogic
     private String delFlag;

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

@@ -14,7 +14,7 @@ public class DrawModelCollectVo extends DrawModelVo{
     private String collectId;
 
     /**
-     * 是否收藏
+     * 是否收藏， 0：未收藏，1：已收藏
      */
     private Integer isCollect;
 

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

@@ -42,7 +42,7 @@ public class DrawModelVo {
     /**
      * 绘画模型图片
      */
-    private String ossId;
+    private String ossUrl;
 
     /**
      * 使用人数

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

@@ -0,0 +1,38 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 会员卡使用详情
+ *
+ * @author 杨兴卓
+ */
+@Data
+public class MemberCardUseDetail {
+
+    /**
+     * 模型id
+     */
+    private Long modelId;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 模型使用次数
+     */
+    private Integer useCount;
+
+    /**
+     * 模型使用次数单位, 0-天，1-周，2-月，3-季
+     */
+    private Integer unit;
+
+    /**
+     * 当前模型已使用次数
+     */
+    private Integer alreadyUseCount;
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.DrawModel;
 import com.xyzc.start.domain.vo.DrawGraphicsVo;
+import com.xyzc.start.domain.vo.DrawModelCollectVo;
 import com.xyzc.start.domain.vo.DrawModelVo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -23,7 +24,7 @@ public interface DrawModelMapper extends BaseMapperPlus<DrawModel, DrawModelVo>
      * @param drawModelId
      * @return
      */
-    List<DrawModelVo> queryDrawModelList(Long drawModelId);
+    List<DrawModelCollectVo> queryDrawModelList(Long drawModelId);
 
 
 }

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

@@ -2,6 +2,7 @@ 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.DrawModelCollectVo;
 import com.xyzc.start.domain.vo.DrawModelVo;
 
 import java.util.List;
@@ -27,7 +28,7 @@ public interface IDiscoverService {
      * @param drawModelId
      * @return
      */
-    List<DrawModelVo> queryDrawModelList(Long drawModelId);
+    List<DrawModelCollectVo> queryDrawModelList(Long drawModelId);
 
 
 }

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

@@ -102,5 +102,5 @@ public interface IUserInfoService {
      * @param cardId
      * @return
      */
-    BaseUserVo queryCardUseDetail(Long cardId);
+    List<MemberCardUseDetail> queryCardUseDetail(Long cardId, Long useDetailId);
 }

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

@@ -3,6 +3,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.DrawModelCollectVo;
 import com.xyzc.start.domain.vo.DrawModelVo;
 import com.xyzc.start.mapper.DrawGraphicsMapper;
 import com.xyzc.start.mapper.DrawModelMapper;
@@ -44,7 +45,7 @@ public class DiscoverServiceImpl implements IDiscoverService {
      * @return
      */
     @Override
-    public List<DrawModelVo> queryDrawModelList(Long drawModelId) {
+    public List<DrawModelCollectVo> queryDrawModelList(Long drawModelId) {
 
         return drawModelMapper.queryDrawModelList(drawModelId);
     }

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -179,11 +180,92 @@ public class UserInfoServiceImpl implements IUserInfoService {
      * @return
      */
     @Override
-    public BaseUserVo queryCardUseDetail(Long cardId) {
-//        List<> baseUserMemberCardMapper.queryCardUseDetail(cardId);
-        return null;
+    public List<MemberCardUseDetail> queryCardUseDetail(Long cardId, Long useDetailId) {
+        List<MemberCardUseDetail> objects = new ArrayList<>();
+
+        if (useDetailId != null && useDetailId < 124L) {
+            return null;
+        }
+
+        MemberCardUseDetail memberCardUseDetail = new MemberCardUseDetail();
+        memberCardUseDetail.setModelId(1242112L);
+        memberCardUseDetail.setUseCount(32);
+        memberCardUseDetail.setUnit(0);
+        memberCardUseDetail.setModelName("GPT 3.5");
+        memberCardUseDetail.setAlreadyUseCount(123);
+
+        MemberCardUseDetail memberCardUseDetail2 = new MemberCardUseDetail();
+        memberCardUseDetail2.setModelId(12421122L);
+        memberCardUseDetail2.setUseCount(32);
+        memberCardUseDetail2.setUnit(1);
+        memberCardUseDetail2.setModelName("GPT 4.o");
+        memberCardUseDetail2.setAlreadyUseCount(1323);
+
+        MemberCardUseDetail memberCardUseDetail3 = new MemberCardUseDetail();
+        memberCardUseDetail3.setModelId(124242112L);
+        memberCardUseDetail3.setUseCount(3432);
+        memberCardUseDetail3.setModelName("SD 2.2");
+        memberCardUseDetail3.setAlreadyUseCount(1223);
+        memberCardUseDetail3.setUnit(3);
+
+        MemberCardUseDetail memberCardUseDetail4 = new MemberCardUseDetail();
+        memberCardUseDetail4.setModelId(1242112L);
+        memberCardUseDetail4.setUseCount(32);
+        memberCardUseDetail4.setModelName("GPT 3.5");
+        memberCardUseDetail4.setUnit(1);
+        memberCardUseDetail4.setAlreadyUseCount(1243);
+
+        MemberCardUseDetail memberCardUseDetail5 = new MemberCardUseDetail();
+        memberCardUseDetail5.setModelId(1242112L);
+        memberCardUseDetail5.setUseCount(32);
+        memberCardUseDetail5.setModelName("GPT 3.5");
+        memberCardUseDetail5.setUnit(2);
+        memberCardUseDetail5.setAlreadyUseCount(1273);
+
+
+        MemberCardUseDetail memberCardUseDetail7 = new MemberCardUseDetail();
+        memberCardUseDetail7.setModelId(1242112L);
+        memberCardUseDetail7.setUseCount(32);
+        memberCardUseDetail7.setModelName("GPT 3.5");
+        memberCardUseDetail7.setAlreadyUseCount(1283);
+        memberCardUseDetail7.setUnit(3);
+
+
+        MemberCardUseDetail memberCardUseDetail8 = new MemberCardUseDetail();
+        memberCardUseDetail8.setModelId(1242112L);
+        memberCardUseDetail8.setUseCount(32);
+        memberCardUseDetail8.setUnit(3);
+        memberCardUseDetail8.setModelName("GPT 3.5");
+        memberCardUseDetail8.setAlreadyUseCount(12833);
+
+        MemberCardUseDetail memberCardUseDetail9 = new MemberCardUseDetail();
+        memberCardUseDetail9.setModelId(1242112L);
+        memberCardUseDetail9.setUseCount(32);
+        memberCardUseDetail9.setUnit(2);
+        memberCardUseDetail9.setModelName("火绒 1.5");
+        memberCardUseDetail9.setAlreadyUseCount(123);
+
+        MemberCardUseDetail memberCardUseDetail10 = new MemberCardUseDetail();
+        memberCardUseDetail10.setModelId(124L);
+        memberCardUseDetail10.setUseCount(32);
+        memberCardUseDetail10.setUnit(1);
+        memberCardUseDetail10.setModelName("火山 3.5");
+        memberCardUseDetail10.setAlreadyUseCount(1203);
+
+
+        objects.add(memberCardUseDetail);
+        objects.add(memberCardUseDetail2);
+        objects.add(memberCardUseDetail3);
+        objects.add(memberCardUseDetail4);
+        objects.add(memberCardUseDetail5);
+        objects.add(memberCardUseDetail7);
+        objects.add(memberCardUseDetail8);
+        objects.add(memberCardUseDetail9);
+        objects.add(memberCardUseDetail10);
+        return objects;
     }
 
+
     /**
      * 收藏或取消收藏
      *

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

@@ -18,7 +18,6 @@
                mc.oss_id              as oss_url,
                mc.card_name           as card_name,
                mc.description         as card_descritpion,
-               mc.is_base_card        as is_base_card,
                mc.everyday_use_number as everyday_use_number,
                bumc.expire_time       as expire_time,
                bumc.create_time       as create_time

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

@@ -27,10 +27,9 @@
                oss.url as photo_oss_id,
                bupf.type,
                bupf.description
-        from xy_base_user_photo_folder bupf,
-             sys_oss oss
+        from xy_base_user_photo_folder bupf
+             left join sys_oss oss on bupf.photo_oss_id = oss.oss_id
         where bupf.base_user_id = #{userId}
-          and oss.oss_id = bupf.photo_oss_id
           and bupf.id = #{id}
           and bupf.del_flag = '0'
     </select>

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

@@ -5,8 +5,22 @@
 <mapper namespace="com.xyzc.start.mapper.DrawModelMapper">
 
 
-    <select id="queryDrawModelList" resultType="com.xyzc.start.domain.vo.DrawModelVo">
-        select * from xy_draw_model
+    <select id="queryDrawModelList" resultType="com.xyzc.start.domain.vo.DrawModelCollectVo">
+        select xdm.id,
+               xdm.model_name,
+               xdm.oss_url,
+               xdm.description,
+               xuu.id       AS ugc_user_id,
+               xuu.avatar   AS ugc_user_avatar,
+               xuu.ugc_nick 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_base_user_collect xbuc on xdm.id = xbuc.collect_id
+            and xbuc.base_user_id = #{userId}
+            and xbuc.type = 1
+        where xdm.del_flag = '0'
     </select>