Merge remote-tracking branch 'origin/weiran'

cloud-market-common/src/main/java/com/muyu/cloud/market/domin/ProductRequest.java

@@ -0,0 +1,52 @@
+package com.muyu.cloud.market.domin;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author：weiran
+ * @Package：com.muyu.cloud.market.domin
+ * @Project：cloud-market
+ * @name：ProductRequest
+ * @Date：2024/9/6 20:17
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ProductRequest {
+
+    /**
+     * 中间表Id
+     */
+    private Integer middleId;
+    /**
+     * 产品Id
+     */
+    private Integer productId;
+    /**
+     * 请求参数Id
+     */
+    private Integer requestId;
+    /**
+     * 请求参数名称
+     */
+    private String requestName;
+    /**
+     * 是否必填
+     */
+    private String requestIfmust;
+    /**
+     * 请求参数类型
+     */
+    private String requestType;
+    /**
+     *请求参数说明
+     */
+    private String requestContent;
+
+
+
+}

cloud-market-server/src/main/java/com/muyu/cloud/market/controller/ProducttestController.java

@@ -2,6 +2,7 @@ package com.muyu.cloud.market.controller;
 
 import com.muyu.cloud.market.domin.Product;
 import com.muyu.cloud.market.domin.ProductHeader;
+import com.muyu.cloud.market.domin.ProductRequest;
 import com.muyu.cloud.market.domin.UserProductCount;
 import com.muyu.cloud.market.service.ProducttestService;
 import com.muyu.common.core.domain.Result;
@@ -60,11 +61,27 @@ public class ProducttestController {
     }
 
 
+    /**
+     * 请求Header
+     * @param productHeader
+     * @return
+     */
     @PostMapping("/productheader")
     @Operation(summary = "请求Header",description = "请求Header")
     public Result productheader(@Validated @RequestBody ProductHeader productHeader){
         return Result.success(producttestService.productheader(productHeader));
     }
 
+    /**
+     * 请求参数
+     * @param productRequest
+     * @return
+     */
+    @PostMapping("/productrequest")
+    @Operation(summary = "请求参数",description = "请求参数")
+    public Result productrequest(@Validated @RequestBody ProductRequest productRequest){
+        return Result.success(producttestService.productrequest(productRequest));
+    }
+
 
 }

cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/ProducttestMapper.java

@@ -3,6 +3,7 @@ package com.muyu.cloud.market.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.cloud.market.domin.Product;
 import com.muyu.cloud.market.domin.ProductHeader;
+import com.muyu.cloud.market.domin.ProductRequest;
 import com.muyu.cloud.market.domin.UserProductCount;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -38,4 +39,6 @@ public interface ProducttestMapper extends BaseMapper<UserProductCount> {
      * @return
      */
     ProductHeader productheader(ProductHeader productHeader);
+
+    List<ProductRequest> productrequest(ProductRequest productRequest);
 }

cloud-market-server/src/main/java/com/muyu/cloud/market/service/ProducttestService.java

@@ -3,6 +3,7 @@ package com.muyu.cloud.market.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.cloud.market.domin.Product;
 import com.muyu.cloud.market.domin.ProductHeader;
+import com.muyu.cloud.market.domin.ProductRequest;
 import com.muyu.cloud.market.domin.UserProductCount;
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -37,4 +38,11 @@ public interface ProducttestService extends IService<UserProductCount> {
      * @return
      */
     ProductHeader productheader(ProductHeader productHeader);
+
+    /**
+     * 请求参数
+     * @param productRequest
+     * @return
+     */
+    List<ProductRequest> productrequest(ProductRequest productRequest);
 }

cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/ProducttestServiceImpl.java

@@ -3,6 +3,7 @@ package com.muyu.cloud.market.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.cloud.market.domin.Product;
 import com.muyu.cloud.market.domin.ProductHeader;
+import com.muyu.cloud.market.domin.ProductRequest;
 import com.muyu.cloud.market.domin.UserProductCount;
 import com.muyu.cloud.market.mapper.ProducttestMapper;
 import com.muyu.cloud.market.service.ProducttestService;
@@ -70,4 +71,15 @@ public class ProducttestServiceImpl extends ServiceImpl<ProducttestMapper, UserP
     public ProductHeader productheader(ProductHeader productHeader) {
         return producttestMapper.productheader(productHeader);
     }
+
+
+    /**
+     * 请求参数
+     * @param productRequest
+     * @return
+     */
+    @Override
+    public List<ProductRequest> productrequest(ProductRequest productRequest) {
+        return producttestMapper.productrequest(productRequest);
+    }
 }

cloud-market-server/src/main/resources/mapper/market/ProducttestMapper.xml

@@ -34,6 +34,16 @@
         where product.product_id=#{productId}
     </select>
 
+    <select id="productrequest" resultType="com.muyu.cloud.market.domin.ProductRequest">
+        SELECT
+            product_request.*
+        FROM
+            product
+                LEFT JOIN middle_product_request on product.product_id = middle_product_request.product_id
+                left join product_request on middle_product_request.request_id=product_request.request_id
+        WHERE middle_product_request.product_id=#{productId}
+    </select>
+
     <update id="reducetestcount">
         UPDATE `h6_cloud_server`.`user_product_count`
     SET `test_count` = `test_count`-1 WHERE `user_id` = #{userId} and  `product_id` = #{productId};