From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java b/src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java
index 379c968..99ba5e8 100644
--- a/src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java
+++ b/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;
+ }
}
--
Gitblit v1.9.3