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/service/impl/EmergencySpaceServiceImpl.java | 67 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 9 deletions(-)
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 8d9b4fd..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
@@ -2,10 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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;
@@ -17,6 +16,7 @@
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;
import java.util.Objects;
@@ -27,6 +27,7 @@
* @author BladeX
* @since 2024-10-28
*/
+@Slf4j
@Service
public class EmergencySpaceServiceImpl extends ServiceImpl<EmergencySpaceMapper, EmergencySpaceEntity> implements IEmergencySpaceService {
@@ -60,19 +61,24 @@
for (EmergencySpaceExcel emergencySpaceExcel : data) {
// 数据拷贝
EmergencySpaceEntity emergencySpaceEntity = Objects.requireNonNull(BeanUtil.copy(emergencySpaceExcel, EmergencySpaceEntity.class));
- // 防控转换
+ // 类型转换
+ if (!Strings.isBlank(emergencySpaceExcel.getType())){
+ emergencySpaceEntity.setType(Integer.parseInt(emergencySpaceExcel.getType()));
+ }
+ // 防控级别转换
if (!Strings.isBlank(emergencySpaceExcel.getPreLevel())){
emergencySpaceEntity.setPreLevel(Integer.parseInt(emergencySpaceExcel.getPreLevel()));
}
// 经纬度转换
- if (!Strings.isBlank(emergencySpaceExcel.getLng())) {
- emergencySpaceEntity.setLng(PositionUtil.tranformPos(emergencySpaceExcel.getLng()).toString());
- }
- if (!Strings.isBlank(emergencySpaceExcel.getLat())) {
- emergencySpaceEntity.setLat(PositionUtil.tranformPos(emergencySpaceExcel.getLat()).toString());
- }
+// if (!Strings.isBlank(emergencySpaceExcel.getLng())) {
+// emergencySpaceEntity.setLng(PositionUtil.tranformPos(emergencySpaceExcel.getLng()).toString());
+// }
+// if (!Strings.isBlank(emergencySpaceExcel.getLat())) {
+// emergencySpaceEntity.setLat(PositionUtil.tranformPos(emergencySpaceExcel.getLat()).toString());
+// }
// 设置企业id
setFirm(emergencySpaceExcel,emergencySpaceEntity);
+ log.info("应急空间名称：{},企业名称：{}",emergencySpaceEntity.getName(),emergencySpaceExcel.getFirmName());
// 是否已入库
Long id = isSave(emergencySpaceEntity);
if (null!=id){
@@ -98,6 +104,9 @@
QueryWrapper<EmergencySpaceEntity> wrapper = new QueryWrapper<>();
wrapper.eq("name",emergencySpaceEntity.getName())
.eq("is_deleted",0);
+ if (null!=emergencySpaceEntity.getFirmId()){
+ wrapper.eq("firm_id",emergencySpaceEntity.getFirmId());
+ }
EmergencySpaceEntity one = getOne(wrapper);
if (null!=one){
return one.getId();
@@ -117,6 +126,7 @@
FirmInfo firmInfo = firmInfoService.getOne(wrapper);
if (null!=firmInfo){
emergencySpaceEntity.setFirmId(firmInfo.getId());
+ emergencySpaceEntity.setFullName(firmInfo.getName() + emergencySpaceExcel.getName());
}
}
@@ -131,4 +141,43 @@
List<Map<String,Object>> list = baseMapper.getStatisticData(emergencySpace);
return list;
}
+
+ /**
+ * 获取应急池容量
+ * @return
+ */
+ @Override
+ public String getEmePool() {
+ return baseMapper.getEmePool();
+ }
+
+ /**
+ * 通过空间分析点位，找到离风险源最近的防控点 风险源找1,1找2,2找3
+ * @param emergencySpace pre_level: 1:一级防控点 2：二级防控点 3：三级防控点
+ * @return
+ */
+ @Override
+ public Object spatialAnalysisPoint(EmergencySpaceVO emergencySpace) {
+ List<EmergencySpaceVO> list = new ArrayList<>();
+ if (null==emergencySpace.getPreLevel()){
+ 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));
+ // 查询三级
+ emergencySpace.setPreLevel(3);
+ list.add(baseMapper.spatialAnalysisPoint(emergencySpace));
+ // 返回结果
+ return list;
+ }
}
--
Gitblit v1.9.3