From 5eff6c46f7e39c9ad3109288e60a783c285f634e Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 13 Mar 2024 16:12:24 +0800
Subject: [PATCH] 自动生成警单

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml             |    2 +-
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 9b1f1ee..bb67690 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -296,7 +296,7 @@
                  (#{latitude} * 3.1415) / 180) * SIN((bu.lat * 3.1415) / 180) +
                  COS((#{latitude} * 3.1415) / 180) * COS((bu.lat * 3.1415) / 180) * COS((#{longitude} * 3.1415) / 180
                  - (bu.lng * 3.1415) / 180)) * 6370.996
-                 ), 2) &lt;= 0.5
+                 ), 2) &lt;= 1
           and  bu.role_id like concat('%','1727864411451359233','%')
           and bu.is_deleted = 0
     </select>
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 3109bed..6fcefc9 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -832,13 +832,15 @@
 	public List<User> getPoliceUser(String longitude, String latitude, String houseCode) {
 		List<User> policeUser = baseMapper.getPoliceUser(longitude, latitude);
 		// todo 自动生成警单
-		IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
-		PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
-		policeAlarmRecordsEntity.setHouseCode(houseCode);
-		if (policeUser != null && policeUser.size() == 1) {
-			policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
+		if (StringUtils.isNotBlank(houseCode)) {
+			IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
+			PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
+			policeAlarmRecordsEntity.setHouseCode(houseCode);
+			if (policeUser != null && policeUser.size() == 1) {
+				policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
+			}
+			policeAlarmRecordsService.save(policeAlarmRecordsEntity);
 		}
-		policeAlarmRecordsService.save(policeAlarmRecordsEntity);
 		return policeUser;
 	}
 }

--
Gitblit v1.9.3