sss

src/main/java/com/sysu/admin/controller/lz/everyday/LzEverydayImageRepository.java

@@ -2,5 +2,10 @@ package com.sysu.admin.controller.lz.everyday;
 
 import com.xiesx.fastboot.core.jpa.JpaPlusRepository;
 
+import java.util.List;
+
 public interface LzEverydayImageRepository extends JpaPlusRepository<LzEverydayImage, Integer> {
+
+    List<LzEverydayImage> findAllByEverydayId(Integer everydayId);
+
 }

src/main/java/com/sysu/admin/controller/lz/everyday/LzEverydayImgService.java

@@ -5,12 +5,18 @@ import com.xiesx.fastboot.core.jpa.JpaPlusRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class LzEverydayImgService extends BaseService<LzEverydayImage, Integer> {
 
     @Autowired
     private LzEverydayImageRepository lzEverydayImageRepository;
 
+    public List<LzEverydayImage> findAllByEverydayId(Integer everydayId){
+        return lzEverydayImageRepository.findAllByEverydayId(everydayId);
+    }
+
     @Override
     public JpaPlusRepository<LzEverydayImage, Integer> r() {
         return lzEverydayImageRepository;

src/main/java/com/sysu/admin/controller/lz/everyday/LzEverydayRepository.java

@@ -3,5 +3,10 @@ package com.sysu.admin.controller.lz.everyday;
 import com.sysu.admin.controller.lz.tree.LzTree;
 import com.xiesx.fastboot.core.jpa.JpaPlusRepository;
 
+import java.util.List;
+
 public interface LzEverydayRepository extends JpaPlusRepository<LzEveryday, Integer> {
+
+    List<LzEveryday> findAllByTreeId(Integer treeId);
+
 }

src/main/java/com/sysu/admin/controller/lz/everyday/LzEverydayService.java

@@ -5,11 +5,23 @@ import com.xiesx.fastboot.core.jpa.JpaPlusRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class LzEverydayService extends BaseService<LzEveryday, Integer> {
 
     @Autowired
     private LzEverydayRepository lzEverydayRepository;
+    @Autowired
+    private LzEverydayImgService lzEverydayImgService;
+
+    public List<LzEveryday> findListByTreeId(Integer treeId){
+        List<LzEveryday> lzEverydayList = lzEverydayRepository.findAllByTreeId(treeId);
+        lzEverydayList.forEach(lzEveryday -> {
+            lzEveryday.setLzEverydayImage(lzEverydayImgService.findAllByEverydayId(lzEveryday.getId()));
+        });
+        return lzEverydayList;
+    }
 
     @Override
     public JpaPlusRepository<LzEveryday, Integer> r() {

src/main/java/com/sysu/admin/site/lz/LzTreeController.java

@@ -4,8 +4,11 @@ import com.sysu.admin.controller.lz.area.LzArea;
 import com.sysu.admin.controller.lz.area.LzAreaService;
 import com.sysu.admin.controller.lz.clazz.LzClazz;
 import com.sysu.admin.controller.lz.clazz.LzClazzService;
+import com.sysu.admin.controller.lz.everyday.LzEveryday;
+import com.sysu.admin.controller.lz.everyday.LzEverydayService;
 import com.sysu.admin.controller.lz.tree.LzTree;
 import com.sysu.admin.controller.lz.tree.LzTreeService;
+import com.sysu.admin.site.CommonVo;
 import com.sysu.admin.utils.shape.GeoCastUtil;
 import com.xiesx.fastboot.base.result.BaseResult;
 import com.xiesx.fastboot.base.result.R;
@@ -28,6 +31,8 @@ public class LzTreeController {
     private LzAreaService lzAreaService;
     @Autowired
     private LzClazzService lzClazzService;
+    @Autowired
+    private LzEverydayService everydayService;
 
     @RequestMapping("/list")
     public BaseResult list(){
@@ -38,6 +43,14 @@ public class LzTreeController {
         return R.succ(list);
     }
 
+    @RequestMapping("/info")
+    public BaseResult info(@RequestBody CommonVo commonVo){
+        LzTree bean = lzTreeService.findOne(commonVo.getId().intValue());
+        List<LzEveryday> lzEverydayList = everydayService.findListByTreeId(bean.getId());
+        bean.setLzEverydays(lzEverydayList);
+        return R.succ(bean);
+    }
+
     @RequestMapping("/save")
     public BaseResult save(@RequestBody LzTree bean){
         bean.setPoint((Point) GeoCastUtil.wktToGeom(bean.getWkt()));