更改家族园地和大事件

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyEventsController.java

@@ -32,12 +32,12 @@ import java.util.List;
 @Api(value = "家族大事件", tags = "家族大事件")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/app/events" )
+@RequestMapping("/app/events")
 public class FamilyEventsController extends BaseController {
 
     private final ITbFamilyEventsService iTbFamilyEventsService;
-    @Autowired
-    private ITbEventsImgService eventsImgService;
+
+    private final ITbEventsImgService eventsImgService;
 
 
     /**
@@ -45,9 +45,7 @@ public class FamilyEventsController extends BaseController {
      */
     @ApiOperation(value = "家族大事件列表", notes = "家族大事件列表")
     @GetMapping("/list")
-    public AjaxResult list(TbFamilyEvents tbFamilyEvents)
-    {
-//        startPage();
+    public AjaxResult list(TbFamilyEvents tbFamilyEvents) {
         List<TbFamilyEvents> list = iTbFamilyEventsService.queryList(tbFamilyEvents);
         return AjaxResult.success(list);
     }
@@ -57,8 +55,8 @@ public class FamilyEventsController extends BaseController {
      * 获取家族大事件详细信息
      */
     @ApiOperation(value = "家族大事件详细信息", notes = "家族大事件详细信息")
-    @GetMapping(value = "/{id}" )
-    public AjaxResult detail(@PathVariable("id" ) Long id) {
+    @GetMapping(value = "/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id) {
         return AjaxResult.success(iTbFamilyEventsService.getFamilyEvents(id));
     }
 
@@ -66,18 +64,19 @@ public class FamilyEventsController extends BaseController {
      * 新增家族大事件
      */
     @ApiOperation("新增家族大事件")
-    @Log(title = "家族大事件" , businessType = BusinessType.INSERT)
+    @Log(title = "家族大事件", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody TbFamilyEvents tbFamilyEvents) {
-        // 插入图片列表
-        List<TbEventsImg> imgList = tbFamilyEvents.getImgList();
-        if (imgList.size() <= 0) {
-            return AjaxResult.success();
-        }
-        imgList.forEach(item -> {
-            item.setEventsId(tbFamilyEvents.getId());
-        });
-        if(eventsImgService.saveBatch(imgList)){
+    public AjaxResult add(@RequestBody List<TbFamilyEvents> tbFamilyEvents) {
+        int row=iTbFamilyEventsService.deleteTbFamilyEventsByFamilyId(tbFamilyEvents.get(0).getFamilyId());
+        if (iTbFamilyEventsService.saveBatch(tbFamilyEvents)) {
+            tbFamilyEvents.forEach(item -> {
+                // 插入图片列表
+                List<TbEventsImg> imgList = item.getImgList();
+                imgList.forEach(img -> {
+                    img.setEventsId(item.getId());
+                });
+                eventsImgService.saveBatch(imgList);
+            });
             return AjaxResult.success();
         }
         return AjaxResult.error("发表失败");
@@ -87,7 +86,7 @@ public class FamilyEventsController extends BaseController {
      * 修改家族大事件
      */
     @ApiOperation("修改家族大事件")
-    @Log(title = "家族大事件" , businessType = BusinessType.UPDATE)
+    @Log(title = "家族大事件", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult edit(@RequestBody TbFamilyEvents tbFamilyEvents) {
         Date date = new Date();
@@ -99,8 +98,8 @@ public class FamilyEventsController extends BaseController {
      * 删除家族大事件
      */
     @ApiOperation("删除家族大事件")
-    @Log(title = "家族大事件" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/del")
+    @Log(title = "家族大事件", businessType = BusinessType.DELETE)
+    @DeleteMapping("/del/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(iTbFamilyEventsService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyGardenController.java

@@ -31,7 +31,7 @@ import java.util.List;
 @Api(value = "家族园地", tags = "家族园地")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/app/garden" )
+@RequestMapping("/app/garden")
 public class FamilyGardenController extends BaseController {
 
     private final ITbFamilyGardenService iTbFamilyGardenService;
@@ -43,11 +43,9 @@ public class FamilyGardenController extends BaseController {
      */
     @ApiOperation(value = "家族园地列表", notes = "家族园地列表")
     @GetMapping("/list")
-    public TableDataInfo list(TbFamilyGarden tbFamilyGarden)
-    {
-        startPage();
+    public AjaxResult list(TbFamilyGarden tbFamilyGarden) {
         List<TbFamilyGarden> list = iTbFamilyGardenService.queryList(tbFamilyGarden);
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
 
@@ -55,8 +53,8 @@ public class FamilyGardenController extends BaseController {
      * 获取家族园地详细信息
      */
     @ApiOperation(value = "家族园地详细信息", notes = "家族园地详细信息")
-    @GetMapping(value = "/{id}" )
-    public AjaxResult detail(@PathVariable("id" ) Long id) {
+    @GetMapping(value = "/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id) {
         return AjaxResult.success(iTbFamilyGardenService.getFamilyGarden(id));
     }
 
@@ -64,19 +62,18 @@ public class FamilyGardenController extends BaseController {
      * 新增家族园地
      */
     @ApiOperation("新增家族园地")
-    @Log(title = "家族园地" , businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody TbFamilyGarden tbFamilyGarden) {
-        Date date = new Date();
-        tbFamilyGarden.setCreateTime(date);
-        List<TbGardenImg> imgList = tbFamilyGarden.getImgList();
-        if (imgList.size() <= 0) {
-            return AjaxResult.success();
-        }
-        imgList.forEach(item -> {
-            item.setGardenId(tbFamilyGarden.getId());
-        });
-        if(gardenImgService.saveBatch(imgList)){
+    @Log(title = "家族园地", businessType = BusinessType.INSERT)
+    @PostMapping("/saveOrUpdate")
+    public AjaxResult saveOrUpdate(@RequestBody TbFamilyGarden tbFamilyGarden) {
+        tbFamilyGarden.setCreateTime(new Date());
+        if (iTbFamilyGardenService.saveOrUpdate(tbFamilyGarden)) {
+            List<TbGardenImg> imgList = tbFamilyGarden.getImgList();
+            imgList.forEach(item -> {
+                item.setGardenId(tbFamilyGarden.getId());
+            });
+            //先删除原本照片再新增
+            gardenImgService.deleteTbGardenImgByGardenId(tbFamilyGarden.getId());
+            gardenImgService.saveBatch(imgList);
             return AjaxResult.success();
         }
         return AjaxResult.error("发表失败");
@@ -88,7 +85,7 @@ public class FamilyGardenController extends BaseController {
      * 修改家族园地
      */
     @ApiOperation("修改家族园地")
-    @Log(title = "家族园地" , businessType = BusinessType.UPDATE)
+    @Log(title = "家族园地", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     public AjaxResult edit(@RequestBody TbFamilyGarden tbFamilyGarden) {
         return toAjax(iTbFamilyGardenService.updateById(tbFamilyGarden) ? 1 : 0);
@@ -98,8 +95,8 @@ public class FamilyGardenController extends BaseController {
      * 删除家族园地
      */
     @ApiOperation("删除家族园地")
-    @Log(title = "家族园地" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/del")
+    @Log(title = "家族园地", businessType = BusinessType.DELETE)
+    @DeleteMapping("/del/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(iTbFamilyGardenService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbFamilyEventsMapper.java

@@ -11,4 +11,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TbFamilyEventsMapper extends BaseMapper<TbFamilyEvents> {
 
+    /**
+     * 根据familyId删除大事件
+     * @param familyId
+     * @return
+     */
+    public int deleteTbFamilyEventsByFamilyId(Long familyId);
+
 }

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbGardenImgMapper.java

@@ -11,4 +11,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TbGardenImgMapper extends BaseMapper<TbGardenImg> {
 
+    /**
+     * 根据gardenId删除图片
+     *
+     * @param gardenId
+     * @return
+     */
+    public int deleteTbGardenImgByGardenId(Long gardenId);
+
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyEventsService.java

@@ -16,4 +16,11 @@ public interface ITbFamilyEventsService extends IService<TbFamilyEvents> {
 
     TbFamilyEvents getFamilyEvents(Long id);
 
+    /**
+     * 根据familyId删除大事件
+     * @param familyId
+     * @return
+     */
+    public int deleteTbFamilyEventsByFamilyId(Long familyId);
+
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbGardenImgService.java

@@ -10,5 +10,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @date 2020-10-22
  */
 public interface ITbGardenImgService extends IService<TbGardenImg> {
-
+    /**
+     * 根据gardenId删除图片
+     *
+     * @param gardenId
+     * @return
+     */
+    public int deleteTbGardenImgByGardenId(Long gardenId);
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyEventsServiceImpl.java

@@ -22,54 +22,27 @@ import java.util.List;
  */
 @Service
 public class TbFamilyEventsServiceImpl extends ServiceImpl<TbFamilyEventsMapper, TbFamilyEvents> implements ITbFamilyEventsService {
-    @Autowired
-    private ITbFamilyService familyService;
+
     @Autowired
     private ITbEventsImgService eventsImgService;
 
 
-
     @Override
-    public List<TbFamilyEvents> queryList(TbFamilyEvents  entity) {
-        LambdaQueryWrapper<TbFamilyEvents> lqw = new LambdaQueryWrapper<TbFamilyEvents>().orderByDesc(TbFamilyEvents::getCreateTime);
-        if (entity.getFamilyId() != null){
-            lqw.eq(TbFamilyEvents::getFamilyId ,entity.getFamilyId());
-        }
-        if (StringUtils.isNotBlank(entity.getTitle())){
-            lqw.like(TbFamilyEvents::getTitle ,entity.getTitle());
-        }
+    public List<TbFamilyEvents> queryList(TbFamilyEvents events) {
+        LambdaQueryWrapper<TbFamilyEvents> lqw = new LambdaQueryWrapper<TbFamilyEvents>().eq(TbFamilyEvents::getFamilyId, events.getFamilyId());
         List<TbFamilyEvents> list = this.list(lqw);
-        list.forEach(item->{
-            TbFamily family = familyService.getById(item.getFamilyId());
-            item.setFamily(family);
-        });
-
-        if (entity.getId() != null){
-            List<Long> ids = new ArrayList<>();
-            list.forEach(item -> {
-                ids.add(item.getId());
-            });
-            List<TbEventsImg> imgList = eventsImgService.list(new LambdaQueryWrapper<TbEventsImg>()
-                    .in(TbEventsImg::getEventsId, ids)
-            );
+        if (list.size() > 0) {
             list.forEach(item -> {
-                // 加入图片列表
-                List<TbEventsImg> imgs = new ArrayList<>();
-                imgList.forEach(img -> {
-                    if (img.getEventsId().equals(item.getId())) {
-                        imgs.add(img);
-                    }
-                });
-                item.setImgList(imgs);
+                List<TbEventsImg> imgList = eventsImgService.list(new LambdaQueryWrapper<TbEventsImg>().eq(TbEventsImg::getEventsId, item.getId()));
+                item.setImgList(imgList);
             });
         }
-
-
         return list;
     }
 
     /**
      * 家族大事件详情
+     *
      * @param id
      * @return
      */
@@ -86,5 +59,10 @@ public class TbFamilyEventsServiceImpl extends ServiceImpl<TbFamilyEventsMapper,
         return familyEvents;
     }
 
+    @Override
+    public int deleteTbFamilyEventsByFamilyId(Long familyId) {
+        return baseMapper.deleteTbFamilyEventsByFamilyId(familyId);
+    }
+
 
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyGardenServiceImpl.java

@@ -23,53 +23,30 @@ import java.util.List;
 @Service
 public class TbFamilyGardenServiceImpl extends ServiceImpl<TbFamilyGardenMapper, TbFamilyGarden> implements ITbFamilyGardenService {
     @Autowired
-    private ITbFamilyService familyService;
-    @Autowired
     private ITbGardenImgService gardenImgService;
 
 
     @Override
-    public List<TbFamilyGarden> queryList(TbFamilyGarden  entity) {
-        LambdaQueryWrapper<TbFamilyGarden> lqw = new LambdaQueryWrapper<TbFamilyGarden>().orderByDesc(TbFamilyGarden::getCreateTime);
-        if (entity.getFamilyId() != null){
-            lqw.eq(TbFamilyGarden::getFamilyId ,entity.getFamilyId());
-        }
-        if (StringUtils.isNotBlank(entity.getTitle())){
-            lqw.like(TbFamilyGarden::getTitle ,entity.getTitle());
+    public List<TbFamilyGarden> queryList(TbFamilyGarden entity) {
+        LambdaQueryWrapper<TbFamilyGarden> lqw = new LambdaQueryWrapper<TbFamilyGarden>();
+        if (entity.getFamilyId() != null) {
+            lqw.eq(TbFamilyGarden::getFamilyId, entity.getFamilyId());
         }
         List<TbFamilyGarden> list = this.list(lqw);
-        list.forEach(item->{
-            TbFamily family = familyService.getById(item.getFamilyId());
-            item.setFamily(family);
-        });
-
-        if(entity.getId() != null)
-        {
-            List<Long> ids = new ArrayList<>();
-            list.forEach(item -> {
-                ids.add(item.getId());
-            });
-            List<TbGardenImg> imgList = gardenImgService.list(new LambdaQueryWrapper<TbGardenImg>()
-                    .in(TbGardenImg::getGardenId, ids)
-            );
+        if (list.size() > 0) {
             list.forEach(item -> {
                 // 加入图片列表
-                List<TbGardenImg> imgs = new ArrayList<>();
-                imgList.forEach(img -> {
-                    if (img.getGardenId().equals(item.getId())) {
-                        imgs.add(img);
-                    }
-                });
-                item.setImgList(imgs);
+                List<TbGardenImg> imgList = gardenImgService.list(new LambdaQueryWrapper<TbGardenImg>().in(TbGardenImg::getGardenId, item.getId()));
+                item.setImgList(imgList);
             });
 
         }
-
         return list;
     }
 
     /**
      * 家族园地详情
+     *
      * @param id
      * @return
      */

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbGardenImgServiceImpl.java

@@ -15,4 +15,8 @@ import com.ruoyi.app.service.ITbGardenImgService;
 @Service
 public class TbGardenImgServiceImpl extends ServiceImpl<TbGardenImgMapper, TbGardenImg> implements ITbGardenImgService {
 
+    @Override
+    public int deleteTbGardenImgByGardenId(Long gardenId) {
+        return baseMapper.deleteTbGardenImgByGardenId(gardenId);
+    }
 }

ruoyi-system/src/main/resources/mapper/app/TbFamilyEventsMapper.xml

@@ -16,5 +16,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
     </resultMap>
 
+    <!--根据familyId删除大事件-->
+    <delete id="deleteTbFamilyEventsByFamilyId" parameterType="Long">
+        delete from tb_family_events where family_id = #{familyId}
+    </delete>
 
 </mapper>

ruoyi-system/src/main/resources/mapper/app/TbGardenImgMapper.xml

@@ -10,5 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="url"    column="url"    />
     </resultMap>
 
+    <!--根据gardenId删除图片-->
+    <delete id="deleteTbGardenImgByGardenId" parameterType="Long">
+        delete from tb_garden_img where garden_id = #{gardenId}
+    </delete>
 
 </mapper>