From 65c70dc02672da77c3a75cdd629eca587b5def8f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Jul 2021 20:56:31 +0800
Subject: [PATCH] 巡逻任务接口修改
---
src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml | 5 ++
src/main/java/org/springblade/modules/system/mapper/RegionMapper.java | 7 +++
src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java | 7 +++
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 6 +++
src/main/java/org/springblade/modules/system/service/IRegionService.java | 7 +++
src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java | 15 +++++++
src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java | 14 +++++++
src/main/java/org/springblade/modules/system/controller/RegionController.java | 17 ++++++++
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 9 ++++
src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java | 8 ++++
10 files changed, 94 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java b/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java
index 892db21..683210e 100644
--- a/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java
+++ b/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java
@@ -139,6 +139,20 @@
return R.status(routeinService.removeByIds(Func.toLongList(ids)));
}
+
+ /**
+ * 根据区域id删除巡逻路线信息
+ * @param regionId 区域id
+ * @return
+ */
+ @PostMapping("/removeByRegionId")
+ public R removeByRegionId(@ApiParam(value = "主键集合", required = true) @RequestParam String regionId,HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.status(routeinService.removeByRegionId(regionId));
+ }
+
/**
* 巡逻路线新增
*
diff --git a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java
index da6ad85..6bf7c56 100644
--- a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java
+++ b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.routeIn.entity.Routein;
import org.springblade.modules.routeIn.vo.RouteinVO;
@@ -43,4 +44,11 @@
void insertlx(Routein routein);
void updatelx(Integer id, String routeName, String regionId, String a, String rTime, String creatName, String remarks);
List<RouteinVO> selectList(String routeName,String id);
+
+ /**
+ * 根据区域id删除巡逻路线信息
+ * @param regionId 区域id
+ * @return
+ */
+ int removeByRegionId(@Param("regionId") String regionId);
}
diff --git a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml
index 21f7f59..fabb6b3 100644
--- a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml
+++ b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml
@@ -78,4 +78,9 @@
</if>
</select>
+ <!--根据区域id删除巡逻路线信息-->
+ <delete id="removeByRegionId">
+ delete from sys_routein where regionId = #{regionId}
+ </delete>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java b/src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java
index 722e800..b66366a 100644
--- a/src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java
+++ b/src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java
@@ -43,4 +43,11 @@
void insertlx(Routein routein);
void updatelx(Integer id, String routeName, String regionId, String a, String rTime, String creatName, String remarks);
List<RouteinVO> selectList(String routeName,String id);
+
+ /**
+ * 根据区域id删除巡逻路线信息
+ * @param regionId 区域id
+ * @return
+ */
+ Boolean removeByRegionId(String regionId);
}
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 045e925..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
@@ -25,6 +25,7 @@
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;
@@ -63,4 +64,18 @@
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;
+ }
}
diff --git a/src/main/java/org/springblade/modules/system/controller/RegionController.java b/src/main/java/org/springblade/modules/system/controller/RegionController.java
index cc96841..2454602 100644
--- a/src/main/java/org/springblade/modules/system/controller/RegionController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RegionController.java
@@ -107,7 +107,10 @@
})
@ApiOperationSupport(order = 4)
@ApiOperation(value = "懒加载列表", notes = "传入menu")
- public R<List<RegionVO>> lazyTree(String parentCode, @ApiIgnore @RequestParam Map<String, Object> menu) {
+ public R<List<RegionVO>> lazyTree(String parentCode, @ApiIgnore @RequestParam Map<String, Object> menu,HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
List<RegionVO> list = regionService.lazyTree(parentCode, menu);
return R.data(RegionWrapper.build().listNodeLazyVO(list));
}
@@ -123,6 +126,18 @@
}
/**
+ * 自定义新增 行政区划表
+ */
+ @PostMapping("/saves")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "新增", notes = "传入region")
+ public R saves(@Valid @RequestBody Region region) {
+ int count = regionService.getByParentCodeCount(region.getParentCode());
+ region.setCode(region.getParentCode()+count);
+ return R.status(regionService.save(region));
+ }
+
+ /**
* 修改 行政区划表
*/
@PostMapping("/update")
diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
index 5652a98..f71d385 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.java
@@ -65,4 +65,11 @@
* @return
*/
Region selRegionDetail(@Param("districtName")String districtName,@Param("cityName") String cityName);
+
+ /**
+ * 查询为当前父编码的个数
+ * @param parentCode
+ * @return
+ */
+ int getByParentCodeCount(@Param("parentCode") String parentCode);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
index 3c13a5e..411325b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -107,4 +107,10 @@
<select id="selRegionDetail" resultType="org.springblade.modules.system.entity.Region">
SELECT * FROM blade_region where district_name = #{districtName} and city_name = #{cityName}
</select>
+
+ <!--查询为当前父编码的个数-->
+ <select id="getByParentCodeCount" resultType="java.lang.Integer">
+ select ifnull(count(*),0) num from blade_region
+ where parent_code = #{parentCode}
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IRegionService.java b/src/main/java/org/springblade/modules/system/service/IRegionService.java
index 1cb65a6..2923cd3 100644
--- a/src/main/java/org/springblade/modules/system/service/IRegionService.java
+++ b/src/main/java/org/springblade/modules/system/service/IRegionService.java
@@ -90,4 +90,11 @@
* @return
*/
Region selRegionDetail(@Param("districtName")String districtName, @Param("cityName") String cityName);
+
+ /**
+ * 查询为当前父编码的个数
+ * @param parentCode
+ * @return
+ */
+ int getByParentCodeCount(String parentCode);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
index 4c39ce0..d136e83 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
@@ -125,4 +125,13 @@
}
+ /**
+ * 查询为当前父编码的个数
+ * @param parentCode
+ * @return
+ */
+ @Override
+ public int getByParentCodeCount(String parentCode) {
+ return baseMapper.getByParentCodeCount(parentCode);
+ }
}
--
Gitblit v1.9.3