Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java

@@ -19,11 +19,13 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.modules.routeIn.entity.Routein;
import org.springblade.modules.routeIn.mapper.RouteinMapper;
import org.springblade.modules.routeIn.service.IRouteinService;
import org.springblade.modules.routeIn.vo.RouteinVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@@ -43,6 +45,11 @@
   }

   @Override
   public List<RouteinVO> tree() {
      return baseMapper.tree();
   }

   @Override
   public void insertlx(Routein routein) {
      baseMapper.insertlx(routein);
   }
@@ -53,8 +60,22 @@
   }

   @Override
   public List<RouteinVO> selectList(String routeName) {
      return baseMapper.selectList(routeName);
   public List<RouteinVO> selectList(String routeName,String id) {
      return baseMapper.selectList(routeName,id);
   }

   /**
    * 根据区域id删除巡逻路线信息
    * @param regionId 区域id
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public Boolean removeByRegionId(String regionId) {
      int i = baseMapper.removeByRegionId(regionId);
      if(i>0){
         return true;
      }
      return false;
   }
}