From 41c654be651fd12fe77a280eaf58e4ca05d58420 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 23:42:50 +0800
Subject: [PATCH] 1.处警员列表接口修改 2.设备更新接口修改
---
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java | 11 +++++
blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java | 11 +++++
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 9 ++--
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java | 7 +++
blade-service/blade-system/src/main/java/org/springblade/system/service/IRegionService.java | 7 +++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/feign/RegionFeignApi.java | 25 ++++++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 17 ++++++++
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml | 5 ++
8 files changed, 88 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index 189c26c..7bbc177 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -33,10 +33,12 @@
import org.springblade.jfpt.deploy.service.IDeployService;
import org.springblade.jfpt.equipment.entity.Equipment;
import org.springblade.jfpt.equipment.feign.DeptFeignApi;
+import org.springblade.jfpt.equipment.feign.RegionFeignApi;
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.equipment.vo.EquipmentVO;
import org.springblade.jfpt.equipment.vo.EquipmentVOS;
import org.springblade.jfpt.equipment.wrapper.EqWrapper;
+import org.springblade.system.entity.Region;
import org.springblade.system.user.entity.User;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -64,6 +66,8 @@
private final org.springblade.jfpt.catalog.service.catalogService catalogService;
private final DeptFeignApi deptFeignApi;
+
+ private final RegionFeignApi regionFeignApi;
/**
* 详情
@@ -354,6 +358,19 @@
if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
equipment.setHeartbeat(null);
}
+ //判断省市区的值是否为数字或者中文字符串
+ if(null!=equipment.getProvince()){
+ //如果不是数字，则需调用接口匹配数据(直接取区、县参数)
+ if (!equipment.getDistrict().matches("^[0-9]*$") && !equipment.getCity().matches("^[0-9]*$")){
+ Region region = regionFeignApi.selRegionDetail(equipment.getDistrict(),equipment.getCity());
+ if (null!=region){
+ //封装数据
+ equipment.setProvince(region.getProvinceCode());
+ equipment.setCity(region.getCityCode());
+ equipment.setDistrict(region.getDistrictCode());
+ }
+ }
+ }
// String deviceName = equipment.getDeviceName();
// String deviceNumber = equipment.getDeviceNumber();
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/feign/RegionFeignApi.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/feign/RegionFeignApi.java
new file mode 100644
index 0000000..eb6a15e
--- /dev/null
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/feign/RegionFeignApi.java
@@ -0,0 +1,25 @@
+package org.springblade.jfpt.equipment.feign;
+
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiOperation;
+import org.springblade.core.tool.api.R;
+import org.springblade.system.entity.Region;
+import org.springblade.system.vo.RegionVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = "blade-system")
+public interface RegionFeignApi {
+
+ /**
+ * 根据区县名称查询行政信息
+ * @param districtName 区，县名称
+ * @param cityName 市名称
+ * @return
+ */
+ @GetMapping("/region/selRegionDetail")
+ Region selRegionDetail(@RequestParam("districtName") String districtName,
+ @RequestParam("cityName") String cityName);
+}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java
index 6f58321..095b113 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RegionController.java
@@ -198,5 +198,16 @@
ExcelUtil.export(response, "行政区划模板", "行政区划表", list, RegionExcel.class);
}
+ /**
+ * 根据区县名称查询行政信息
+ * @param districtName 区，县名称
+ * @param cityName 市名称
+ * @return
+ */
+ @GetMapping("/selRegionDetail")
+ public Region selRegionDetail(String districtName,String cityName){
+ return regionService.selRegionDetail(districtName,cityName);
+ }
+
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java
index 4a9eeb1..53e492d 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java
@@ -59,4 +59,11 @@
*/
List<RegionExcel> exportRegion(@Param("ew") Wrapper<Region> queryWrapper);
+ /**
+ * 根据区县名称查询行政信息
+ * @param districtName 区，县名称
+ * @param cityName 市名称
+ * @return
+ */
+ Region selRegionDetail(@Param("districtName")String districtName,@Param("cityName") String cityName);
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml
index 285df4a..b63c422 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml
@@ -102,4 +102,9 @@
SELECT * FROM blade_region ${ew.customSqlSegment}
</select>
+ <!--根据区县名称查询行政信息-->
+ <select id="selRegionDetail" resultType="org.springblade.system.entity.Region">
+ SELECT * FROM blade_region where district_name = #{districtName} and city_name = #{cityName}
+ </select>
+
</mapper>
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRegionService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IRegionService.java
index c46f6fa..e613e9c 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRegionService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IRegionService.java
@@ -83,4 +83,11 @@
*/
List<RegionExcel> exportRegion(Wrapper<Region> queryWrapper);
+ /**
+ * 根据区县名称查询行政信息
+ * @param districtName 区，县名称
+ * @param cityName 市名称
+ * @return
+ */
+ Region selRegionDetail(String districtName,String cityName);
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java
index 48bc391..809828f 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java
@@ -117,4 +117,15 @@
public List<RegionExcel> exportRegion(Wrapper<Region> queryWrapper) {
return baseMapper.exportRegion(queryWrapper);
}
+
+ /**
+ * 根据区县名称查询行政信息
+ * @param districtName 区，县名称
+ * @param cityName 市名称
+ * @return
+ */
+ @Override
+ public Region selRegionDetail(String districtName,String cityName) {
+ return baseMapper.selRegionDetail(districtName,cityName);
+ }
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 7c7f9ae..3bede8c 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -55,6 +55,7 @@
<result column="work_status" property="work_status"/>
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
+ <result column="dept_name" property="deptName"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -139,11 +140,11 @@
</select>
<!--查询处警人员列表-->
- <select id="selectSecurityUserPageList" resultType="org.springblade.system.user.vo.UsersVo">
- SELECT bu.id,bu.name,bu.code,bu.real_name realName,bu.account,
- bu.email,bu.phone,bu.birthday,bu.create_time createTime,
+ <select id="selectSecurityUserPageList" resultMap="userResultMaps">
+ SELECT bu.id,bu.name,bu.code,bu.real_name,bu.account,
+ bu.email,bu.phone,bu.birthday,bu.create_time,
bu.sex,ifnull(bu.online_status,0) online_status,
- bd.dept_name deptName,p.jd,p.wd FROM blade_user bu
+ bd.dept_name,p.jd,p.wd FROM blade_user bu
LEFT JOIN
jfpt.sys_position p
on
--
Gitblit v1.9.3