From a1272d78844574b86645149a0d8ca257c2b8fe91 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 26 Dec 2024 09:43:14 +0800
Subject: [PATCH] 风险源统计等级空的设置为其他
---
src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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 8a92110..af3fc5c 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,7 +2,10 @@
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;
@@ -25,6 +28,7 @@
* @author BladeX
* @since 2024-10-28
*/
+@Slf4j
@Service
public class EmergencySpaceServiceImpl extends ServiceImpl<EmergencySpaceMapper, EmergencySpaceEntity> implements IEmergencySpaceService {
@@ -39,7 +43,12 @@
*/
@Override
public IPage<EmergencySpaceVO> selectEmergencySpacePage(IPage<EmergencySpaceVO> page, EmergencySpaceVO emergencySpace) {
- return page.setRecords(baseMapper.selectEmergencySpacePage(page, emergencySpace));
+ List<EmergencySpaceVO> emergencySpaceVOS = baseMapper.selectEmergencySpacePage(page, emergencySpace);
+ for (EmergencySpaceVO emergencySpaceVO : emergencySpaceVOS) {
+ // 设置应急空间主要用途
+ emergencySpaceVO.setMainFuncName(DictBizCache.getValues("emergency_space_use",emergencySpaceVO.getMainFunc()));
+ }
+ return page.setRecords(emergencySpaceVOS);
}
/**
@@ -53,19 +62,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){
@@ -91,6 +105,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();
@@ -124,4 +141,13 @@
List<Map<String,Object>> list = baseMapper.getStatisticData(emergencySpace);
return list;
}
+
+ /**
+ * 获取应急池容量
+ * @return
+ */
+ @Override
+ public String getEmePool() {
+ return baseMapper.getEmePool();
+ }
}
--
Gitblit v1.9.3