update 套餐接口修复

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

@@ -1,7 +1,6 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
-import com.xyzc.common.web.security.user.SecurityUser;
 import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.IAppPageService;

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

@@ -1,12 +1,7 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
-import com.xyzc.start.domain.FuelPackage;
-import com.xyzc.start.domain.MemberCard;
-import com.xyzc.start.domain.vo.AiModelVo;
-import com.xyzc.start.domain.vo.FuelPackageVo;
-import com.xyzc.start.domain.vo.MemberCardVo;
-import com.xyzc.start.domain.vo.SchemeVo;
+import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.ISchemeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +16,6 @@ import java.util.List;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/scheme")
-@CrossOrigin
 public class SchemeController {
 
     private final ISchemeService schemeService;
@@ -38,10 +32,10 @@ public class SchemeController {
 
 
     /**
-     * id查询会员卡详细套餐
+     * id查询会员卡详细权益
      */
     @GetMapping("/currentMember/{memberId}")
-    public Result<MemberCardVo> currentMemberById(@RequestParam("memberId") Long memberId) {
+    public Result<MemberCardVo> currentMemberById(@PathVariable("memberId") Long memberId) {
         MemberCardVo memberCard = schemeService.queryCurrentMemberById(memberId);
 
         return Result.ok(memberCard);
@@ -58,10 +52,10 @@ public class SchemeController {
     }
 
     /**
-     * id查询燃料包详细套餐
+     * id查询燃料包详细权益
      */
     @GetMapping("/currentFuel/{fuelId}")
-    public Result<FuelPackageVo> currentFuelById(@RequestParam("fuelId") Long fuelId) {
+    public Result<FuelPackageVo> currentFuelById(@PathVariable Long fuelId) {
         FuelPackageVo fuelPackage = schemeService.queryCurrentFuelById(fuelId);
 
         return Result.ok(fuelPackage);
@@ -73,8 +67,8 @@ public class SchemeController {
      * @param modelId 模型id
      */
     @GetMapping("/fuelLaw")
-    public Result<List<AiModelVo>> queryfuelLawList(Long modelId) {
-        List<AiModelVo> fuelPackageList = schemeService.queryModelLawList(modelId);
+    public Result<List<AiModelLawVo>> queryfuelLawList(Long modelId) {
+        List<AiModelLawVo> fuelPackageList = schemeService.queryModelLawList(modelId);
 
         return Result.ok(fuelPackageList);
     }

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

@@ -0,0 +1,33 @@
+package com.xyzc.start.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 燃料使用规则
+ * <p>
+ * author: 杨兴卓
+ */
+@Data
+public class AiModelLawVo {
+
+    /**
+     * 模型id
+     */
+    private Long modelId;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 使用燃料量
+     */
+    private Integer consumeFuelNumber;
+
+    /**
+     * 消耗燃料单位
+     */
+    private Integer consumeFuelUnit;
+
+}

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

@@ -2,6 +2,7 @@ package com.xyzc.start.domain.vo;
 
 import com.xyzc.start.domain.WebAppGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 
 import java.util.List;
@@ -12,6 +13,7 @@ public class WebAppGroupVo {
     /**
      * 分类id
      */
+    @AutoMapping(target = "id")
     private Long groupId;
 
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.AiModel;
+import com.xyzc.start.domain.vo.AiModelLawVo;
 import com.xyzc.start.domain.vo.AiModelVo;
 import com.xyzc.start.domain.vo.FuelPackageVo;
 
@@ -21,6 +22,6 @@ public interface AiModelMapper extends BaseMapperPlus<AiModel, AiModelVo> {
      * @param modelId 模型id
      * @return
      */
-    List<AiModelVo> queryModelLawList(Long modelId);
+    List<AiModelLawVo> queryModelLawList(Long modelId);
 
 }

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

@@ -1,9 +1,6 @@
 package com.xyzc.start.service;
 
-import com.xyzc.start.domain.vo.AiModelVo;
-import com.xyzc.start.domain.vo.FuelPackageVo;
-import com.xyzc.start.domain.vo.MemberCardVo;
-import com.xyzc.start.domain.vo.SchemeVo;
+import com.xyzc.start.domain.vo.*;
 
 import java.util.List;
 
@@ -47,6 +44,6 @@ public interface ISchemeService {
      * @param modelId 模型id
      * @return
      */
-    List<AiModelVo> queryModelLawList(Long modelId);
+    List<AiModelLawVo> queryModelLawList(Long modelId);
 
 }

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

@@ -78,7 +78,7 @@ public class SchemeServiceImpl implements ISchemeService {
      * @return
      */
     @Override
-    public List<AiModelVo> queryModelLawList(Long modelId) {
+    public List<AiModelLawVo> queryModelLawList(Long modelId) {
 
         return aiModelMapper.queryModelLawList(modelId);
     }
@@ -92,6 +92,7 @@ public class SchemeServiceImpl implements ISchemeService {
     @Override
     public MemberCardVo queryCurrentMemberById(Long memberId) {
 
+        // 传入用户自己的值去
         return schemeMapper.queryMemberCardByMemberId(SecurityUser.getUserId(), memberId);
     }
 

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

@@ -5,10 +5,10 @@
 <mapper namespace="com.xyzc.start.mapper.AiModelMapper">
 
 
-    <select id="queryModelLawList" resultType="com.xyzc.start.domain.vo.AiModelVo">
+    <select id="queryModelLawList" resultType="com.xyzc.start.domain.vo.AiModelLawVo">
         SELECT
-            id,
-            ai_model_name,
+            id                  AS model_id,
+            ai_model_name       AS model_name,
             consume_fuel_number,
             consume_fuel_unit
         FROM xy_ai_model
@@ -19,4 +19,7 @@
         LIMIT 20
 
     </select>
+
+
+
 </mapper>