新增大屏接口

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/PmsProductBigDataController.java

@@ -3,10 +3,12 @@ package com.hwrj.cloud.admin.controller;
 import com.hwrj.cloud.admin.dto.param.BigDataListInfoVo;
 import com.hwrj.cloud.admin.dto.param.BigDataListParam;
 import com.hwrj.cloud.admin.dto.param.BigDataListVo;
+import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.service.PmsProductService;
 import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.api.CommonResult;
 import io.swagger.annotations.Api;
+import net.sf.jsqlparser.statement.select.SelectBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +29,12 @@ public class PmsProductBigDataController {
         return CommonResult.success(CommonPage.restPage(list));
     }
 
+    @GetMapping(value = "/product/type")
+    public CommonResult<List<SelectVo> > bigDataType() throws IOException {
+        List<SelectVo> list = productService.bigDataType();
+        return CommonResult.success(list);
+    }
+
     @GetMapping(value = "/product/info")
     public CommonResult<BigDataListInfoVo> bigDatainfo(Long id) {
         BigDataListInfoVo bigDataListInfoVo = productService.bigDatainfo(id);

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/PmsProductExcelDao.java

@@ -1,9 +1,6 @@
 package com.hwrj.cloud.admin.dao;
 
-import com.hwrj.cloud.admin.dto.param.BigDataListInfoVo;
-import com.hwrj.cloud.admin.dto.param.BigDataListParam;
-import com.hwrj.cloud.admin.dto.param.BigDataListVo;
-import com.hwrj.cloud.admin.dto.param.PmsProductParam;
+import com.hwrj.cloud.admin.dto.param.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,4 +12,6 @@ public interface PmsProductExcelDao {
     List<BigDataListVo> bigDataList(BigDataListParam bigDataListParam);
 
     BigDataListInfoVo bigDatainfo(@Param("id")Long id);
+
+    List<SelectVo> bigDataType();
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/SelectVo.java

@@ -0,0 +1,9 @@
+package com.hwrj.cloud.admin.dto.param;
+
+import lombok.Data;
+
+@Data
+public class SelectVo<T> {
+    private T lable;
+    private String text;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/PmsProductService.java

@@ -7,6 +7,7 @@ import com.hwrj.cloud.admin.dto.PmsProductResult;
 import com.hwrj.cloud.admin.dto.param.BigDataListInfoVo;
 import com.hwrj.cloud.admin.dto.param.BigDataListParam;
 import com.hwrj.cloud.admin.dto.param.BigDataListVo;
+import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.model.PmsProduct;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
@@ -85,4 +86,6 @@ public interface PmsProductService {
     List<BigDataListVo> bigDataList(BigDataListParam bigDataListParam);
 
     BigDataListInfoVo bigDatainfo(Long id);
+
+    List<SelectVo> bigDataType();
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductServiceImpl.java

@@ -9,6 +9,7 @@ import com.hwrj.cloud.admin.common.PmsProductOutput;
 import com.hwrj.cloud.admin.dto.param.BigDataListInfoVo;
 import com.hwrj.cloud.admin.dto.param.BigDataListParam;
 import com.hwrj.cloud.admin.dto.param.BigDataListVo;
+import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.service.CmsPrefrenceAreaService;
 import com.hwrj.cloud.admin.service.CmsSubjectService;
 import com.hwrj.cloud.admin.dao.*;
@@ -379,5 +380,9 @@ public class PmsProductServiceImpl implements PmsProductService {
     public BigDataListInfoVo bigDatainfo(Long id){
         return productExcelDao.bigDatainfo(id);
     }
+    @Override
+    public List<SelectVo> bigDataType(){
+        return productExcelDao.bigDataType();
+    }
 
 }

forest-admin/admin-server/src/main/resources/dao/ProductExcelDao.xml

@@ -130,7 +130,7 @@
     <if test="brandId != null">
         AND a.brand_id = #{brandId}
     </if>
-    <if test="search != search and search != ''">
+    <if test="search != null and search != ''">
         AND concat(a.`name`, a.brand_name) LIKE concat(concat('%', #{search}, '%'))
     </if>
     </select>
@@ -154,4 +154,14 @@
             AND a.id = #{id}
         </if>
     </select>
+    <select id="bigDataType" resultType="com.hwrj.cloud.admin.dto.param.SelectVo">
+        SELECT
+        a.id AS lable,
+        a. NAME AS 'text'
+        FROM
+        pms_product_category a
+        WHERE
+        a.show_status = 1
+        AND a.parent_id = 0
+    </select>
 </mapper>