PC home page APIs

src/main/java/com/example/afrishop_v3/repository/TbCfStationItemRepository.java

@@ -42,4 +42,6 @@ public interface TbCfStationItemRepository extends PagingAndSortingRepository<Tb
     @Query(value = "select i from #{#entityName} i inner join AdvertisementItem a on i.itemId=a.itemId where a.adId=?1")
     Page<TbCfStationItem> getAdvertisementItem2(String adId, Pageable pageable);
 
+    List<TbCfStationItem> findTop4ByItemCategoryOrderByCreateTime(String category);
+
 }

src/main/java/com/example/afrishop_v3/security/WebSecurityConfig.java

@@ -48,7 +48,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     }
 
 
-
     @Bean
     @Override
     public AuthenticationManager authenticationManagerBean() throws Exception {
@@ -65,7 +64,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         http.cors().and().csrf().disable()
                 .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
-                .authorizeRequests().antMatchers("/api/auth/**","/search/image/**", "/itemStation/**", "/startPage/**", "/goodsType/**", "/home/**", "/spider/**", "/store/**", "/shopify/**", "/community/**","/version/**","/flutterwave/notify/**","/dpo/notify/**","/advertisement/**").permitAll()
+                .authorizeRequests().antMatchers("/api/auth/**", "/search/image/**", "/itemStation/**", "/startPage/**", "/goodsType/**", "/home/**", "/spider/**", "/store/**", "/shopify/**", "/community/**", "/version/**",
+                "/flutterwave/notify/**", "/dpo/notify/**", "/advertisement/**", "/website/column/**").permitAll()
                 .antMatchers("/api/test/**").permitAll()
                 .anyRequest().authenticated();
 

src/main/java/com/example/afrishop_v3/vo/StationToGoodsType.java

+package com.example.afrishop_v3.vo;
+
+
+import com.example.afrishop_v3.models.TbCfStationItem;
+
+import java.util.List;
+
+public class StationToGoodsType {
+
+    private String CategoryId;
+    private String Goodstypetitle;
+    private String GoodstypeUrl;
+    private   List<TbCfStationItem> stationlist;
+
+    public String getCategoryId() {
+        return CategoryId;
+    }
+
+    public String getGoodstypetitle() {
+        return Goodstypetitle;
+    }
+
+    public List<TbCfStationItem> getStationlist() {
+        return stationlist;
+    }
+
+    public void setCategoryId(String categoryId) {
+        CategoryId = categoryId;
+    }
+
+    public void setGoodstypetitle(String goodstypetitle) {
+        Goodstypetitle = goodstypetitle;
+    }
+
+    public void setStationlist(List<TbCfStationItem> stationlist) {
+        this.stationlist = stationlist;
+    }
+
+    public String getGoodstypeUrl() {
+        return GoodstypeUrl;
+    }
+
+    public void setGoodstypeUrl(String goodstypeUrl) {
+        GoodstypeUrl = goodstypeUrl;
+    }
+}

src/main/java/com/example/afrishop_v3/website/controller/ColumnController.java

@@ -4,10 +4,14 @@ package com.example.afrishop_v3.website.controller;
 import com.example.afrishop_v3.base.Result;
 import com.example.afrishop_v3.models.TbCfDescripiton;
 import com.example.afrishop_v3.models.TbCfGoodstwotype;
+import com.example.afrishop_v3.models.TbCfGoodstype;
+import com.example.afrishop_v3.models.TbCfStationItem;
 import com.example.afrishop_v3.repository.TbCfDescripitonRepository;
 import com.example.afrishop_v3.repository.TbCfGoodstwotypeRepository;
 import com.example.afrishop_v3.repository.TbCfGoodstypeRepository;
+import com.example.afrishop_v3.repository.TbCfStationItemRepository;
 import com.example.afrishop_v3.vo.Category;
+import com.example.afrishop_v3.vo.StationToGoodsType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,10 +22,10 @@ import java.util.*;
 /**
  * @Auther: wudepeng
  * @Date: 2020/11/23
- * @Description:PC官网首页商品分类管理
+ * @Description:PC官网首页内容管理
  */
 @RestController
-@RequestMapping(value = "/website/column")
+@RequestMapping(value = "/website")
 public class ColumnController {
 
     private final TbCfGoodstypeRepository repository;
@@ -30,17 +34,19 @@ public class ColumnController {
 
     private final TbCfDescripitonRepository tertiaryRepository;
 
-    public ColumnController(TbCfGoodstypeRepository repository, TbCfGoodstwotypeRepository secondaryRepository, TbCfDescripitonRepository tertiaryRepository) {
+    private final TbCfStationItemRepository itemRepository;
+
+    public ColumnController(TbCfGoodstypeRepository repository, TbCfGoodstwotypeRepository secondaryRepository, TbCfDescripitonRepository tertiaryRepository, TbCfStationItemRepository itemRepository) {
         this.repository = repository;
         this.secondaryRepository = secondaryRepository;
         this.tertiaryRepository = tertiaryRepository;
-
+        this.itemRepository = itemRepository;
     }
 
     /**
      * 查询所有一级分类
      */
-    @GetMapping
+    @GetMapping("/column")
     public Result findTopCategory() {
 
         return new Result(repository.findAll());
@@ -49,7 +55,7 @@ public class ColumnController {
     /**
      * 查询一级分类的子分类
      */
-    @GetMapping("/{id}")
+    @GetMapping("/column/{id}")
     public Result findCategoryChildrens(@PathVariable("id") String id) {
         LinkedList<Category> categoryList = new LinkedList();
 
@@ -69,4 +75,25 @@ public class ColumnController {
         return new Result(categoryList);
     }
 
+
+    /**
+     * 首页商品分类商品展示（每个分类展示4个）
+     */
+    @GetMapping("/findItemByCategory")
+    public Result findItemByCategory() {
+        List<StationToGoodsType> listStation = new ArrayList<>();
+        Iterable<TbCfGoodstype> list = repository.findAll();
+        for (TbCfGoodstype goods : list) {
+            StationToGoodsType goodsType = new StationToGoodsType();
+            goodsType.setCategoryId(goods.getGoodstypeId());
+            goodsType.setGoodstypetitle(goods.getGoodstypeTitle());
+            goodsType.setGoodstypeUrl(goods.getGoodstypeUrl());
+            List<TbCfStationItem> station = itemRepository.findTop4ByItemCategoryOrderByCreateTime(goods.getGoodstypeId());
+            goodsType.setStationlist(station);
+            listStation.add(goodsType);
+        }
+        return new Result(listStation);
+    }
+
+
 }