住户删除不能排除

lin

2024-04-17 2af148a7b15f1273d12be7b910bc6d9e4e41d2c2

 src/main/java/org/springblade/modules/patrol/service/impl/PatrolGroupServiceImpl.java

@@ -5,11 +5,16 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.tool.node.TreeNode;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.patrol.dto.PatrolGroupDTO;
import org.springblade.modules.patrol.entity.PatrolGroup;
import org.springblade.modules.patrol.entity.PatrolGroupItem;
import org.springblade.modules.patrol.mapper.PatrolGroupMapper;
import org.springblade.modules.patrol.service.IPatrolGroupItemService;
import org.springblade.modules.patrol.service.IPatrolGroupService;
import org.springblade.modules.patrol.vo.PatrolGroupItemVO;
import org.springblade.modules.patrol.vo.PatrolGroupVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -19,6 +24,15 @@
 */
@Service
public class PatrolGroupServiceImpl extends ServiceImpl<PatrolGroupMapper, PatrolGroup> implements IPatrolGroupService {
   @Autowired
   private IPatrolGroupItemService patrolGroupItemService;

   @Override
   public IPage<PatrolGroupVO> selectPatrolGroupPage(IPage<PatrolGroupVO> page, PatrolGroupVO patrolGroup) {
      patrolGroup.setIsDeleted(0);
      List<PatrolGroupVO> patrolGroupVOS = baseMapper.selectPatrolGroupPage(page, patrolGroup);
      return page.setRecords(patrolGroupVOS);
   }

   @Override
   public IPage<PatrolGroup> selectPatrolConfig(IPage<Object> page, PatrolGroup patrolGroup) {
@@ -32,16 +46,17 @@

   /**
    * 查询巡查项树数据
    *
    * @return
    */
   @Override
   public Object getPatrolGroupTree(String type,String childType) {
   public Object getPatrolGroupTree(String type, String childType) {
      // 查询父树目录
      List<TreeNode> patrolGroupTree = baseMapper.getPatrolGroupTree(type);
      // 查询孩子树目录
      List<TreeNode> patrolGroupItemTree = baseMapper.getPatrolGroupItemTree(childType);
      // 数据处理
      return NodeTreeUtil.getNodeTree(patrolGroupTree,patrolGroupItemTree);
      return NodeTreeUtil.getNodeTree(patrolGroupTree, patrolGroupItemTree);
   }

   @Override
@@ -68,4 +83,18 @@
   public List<PatrolGroupDTO> getGroupDTORecord(String taskId) {
      return baseMapper.getGroupDTORecord(taskId);
   }

   @Override
   public boolean addTwo(PatrolGroupVO patrolGroup) {
      boolean orUpdate = saveOrUpdate(patrolGroup);
      if (orUpdate) {
         List<PatrolGroupItemVO> patrolGroupItemList = patrolGroup.getPatrolGroupItemList();
         for (PatrolGroupItemVO patrolGroupItemVO : patrolGroupItemList) {
            patrolGroupItemVO.setGroupId(patrolGroup.getId());
         }
         List<PatrolGroupItem> patrolGroupItems = BeanUtil.copy(patrolGroupItemList, PatrolGroupItem.class);
         patrolGroupItemService.saveOrUpdateBatch(patrolGroupItems);
      }
      return false;
   }
}