From b1e8a099eb3117bcbd5f2e0c9a2eb0accabd8cbf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 11 Feb 2025 08:56:46 +0800
Subject: [PATCH] 通过风险源点位分析三级防控点查询修改
---
src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml | 3 +++
src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java | 10 +++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml b/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
index 12dabbc..561e44c 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
@@ -66,6 +66,9 @@
<if test="emergencySpace.preLevel!=null">
and pre_level = #{emergencySpace.preLevel}
</if>
+ <if test="emergencySpace.firmId!=null">
+ and firm_id = #{emergencySpace.firmId}
+ </if>
ORDER BY distance
LIMIT 1
</select>
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java
index 3302b49..fba0ce6 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java
@@ -5,8 +5,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.DictBizCache;
-import org.springblade.common.cache.SysCache;
-import org.springblade.common.utils.PositionUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.yw.entity.EmergencySpaceEntity;
import org.springblade.modules.yw.entity.FirmInfo;
@@ -18,7 +16,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -166,7 +163,14 @@
emergencySpace.setPreLevel(1);
}
// 查询一级
+ // 先查询当前风险源点对应的企业
+ QueryWrapper<FirmInfo> wrapper = new QueryWrapper<>();
+ wrapper.eq("lng",emergencySpace.getLng()).eq("lat",emergencySpace.getLat());
+ FirmInfo firmInfo = firmInfoService.getOne(wrapper);
+ emergencySpace.setFirmId(firmInfo.getId());
list.add(baseMapper.spatialAnalysisPoint(emergencySpace));
+ // 其他项查询设置为空
+ emergencySpace.setFirmId(null);
// 查询二级
emergencySpace.setPreLevel(2);
list.add(baseMapper.spatialAnalysisPointToLines(emergencySpace));
--
Gitblit v1.9.3