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-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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();
--
Gitblit v1.9.3