From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index a4c881a..90aa577 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -206,31 +206,35 @@
/**
* 警务网格绑定
+ *
* @param placeVO
*/
public void jwGridCodeBind(PlaceVO placeVO) {
if (!Strings.isBlank(placeVO.getLng())) {
- String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() +")'";
+ String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() + ")'";
// 点落面警务网格
List<PoliceAffairsGridEntity> policeAffairsGridEntities
= SpringUtil.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
- if (policeAffairsGridEntities.size()>0){
+ if (policeAffairsGridEntities.size() > 0) {
// 设置警务网格并更新
placeVO.setJwGridCode(policeAffairsGridEntities.get(0).getJwGridCode());
+ // 更新
+ updateById(placeVO);
}
}
}
/**
* 设置是否现场采集（1km 范围内）
+ *
* @param placeVO
*/
public void setIsScene(PlaceVO placeVO) {
- if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())){
+ if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())) {
Integer placeEntity = baseMapper.comparisonPosition(placeVO);
- if (placeEntity==1){
+ if (placeEntity == 1) {
placeVO.setIsScene(1);
- }else {
+ } else {
placeVO.setIsScene(2);
}
}
@@ -238,14 +242,15 @@
/**
* 设置是否现场采集（1km 范围内）,非地址总表数据
+ *
* @param placeVO
*/
public void setIsSceneNotHouseCode(PlaceVO placeVO) {
- if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())){
+ if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())) {
boolean flag = baseMapper.comparisonPositionNotHouseCode(placeVO);
- if (flag){
+ if (flag) {
placeVO.setIsScene(1);
- }else {
+ } else {
placeVO.setIsScene(2);
}
}
@@ -1217,7 +1222,13 @@
for (NinePlaceExcel ninePlaceExcel : aa) {
for (DictBiz dictBiz : nineType) {
if (StringUtils.isNotBlank(ninePlaceExcel.getNineType()) && ninePlaceExcel.getNineType().equals(dictBiz.getDictKey())) {
- ninePlaceExcel.setNineType(dictBiz.getDictValue());
+ if (ninePlaceExcel.getNineType().contains("10,11,12")) {
+ ninePlaceExcel.setNineType("小学校（幼儿园、校外培训机构）- " + dictBiz.getDictValue());
+ } else if (ninePlaceExcel.getNineType().contains("13,14,15")) {
+ ninePlaceExcel.setNineType("小医院（诊所、养老院）- " + dictBiz.getDictValue());
+ } else {
+ ninePlaceExcel.setNineType(dictBiz.getDictValue());
+ }
}
}
}
--
Gitblit v1.9.3