From 53a8a9426f21c7f853c406e462486029c78018b2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 03 八月 2024 09:33:08 +0800
Subject: [PATCH] 电磁锁临时电子围栏加入主动操控失效提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
index e39bf04..ed6a975 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
@@ -9,15 +9,12 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.sy.domain.ArdSyUser;
-import com.ruoyi.sy.domain.ArdTankLock;
-import com.ruoyi.sy.domain.ArdTankWall;
+import com.ruoyi.sy.domain.*;
import com.ruoyi.sy.gps31.PositionContainer;
-import com.ruoyi.sy.mapper.ArdSyUserMapper;
-import com.ruoyi.sy.mapper.ArdTankLockMapper;
-import com.ruoyi.sy.mapper.ArdTankWallMapper;
+import com.ruoyi.sy.mapper.*;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.utils.forest.SYClient;
+import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.gps.GeoTools;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -28,8 +25,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.sy.mapper.ArdTankLockProcessLogMapper;
-import com.ruoyi.sy.domain.ArdTankLockProcessLog;
import com.ruoyi.sy.service.IArdTankLockProcessLogService;
import javax.annotation.Resource;
@@ -58,11 +53,12 @@
private ArdTankLockMapper ardTankLockMapper;
@Resource
+ private ArdTankWallTemporaryMapper ardTankWallTemporaryMapper;
+
+ @Resource
private SYClient sYClient;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- private Map<String,Timer> timerMap = new HashMap();
/**
* 鏌ヨ缃愯溅閿佹搷鎺ф棩蹇�
@@ -176,6 +172,23 @@
}else{
return AjaxResult.error("涓変竴骞冲彴鎶ラ敊");
}
+ //鎸傛帴浜嗕复鏃剁數瀛愬洿鏍�
+ List<ArdTankWallTemporary> ardTankWallTemporaryList = ardTankWallTemporaryMapper.getArdTankWallTemporaryByCarId((String) para.get("carId"));
+ if(!ardTankWallTemporaryList.isEmpty()){
+ for(ArdTankWallTemporary ardTankWallTemporary : ardTankWallTemporaryList){
+ Double longitude = ardTankWallTemporary.getLongitude();
+ Double latitude = ardTankWallTemporary.getLatitude();
+ Integer distance = ardTankWallTemporary.getDistance();
+
+ Double[] From = new Double[]{longitude,latitude};
+ Double[] To = new Double[]{Double.valueOf(lng),Double.valueOf(lat)};
+ Number realDistance = GisUtil.getDistance(From,To);
+ if(realDistance.intValue() <= distance){//瀹為檯璺濈灏忎簬鍗婂緞
+ return AjaxResult.error("褰撳墠杞﹁締姝ｅ鍦�" + ardTankWallTemporary.getWallName() + "涓�");
+ }
+ }
+ return AjaxResult.error("褰撳墠杞﹁締姝ｅ鍦ㄤ复鏃剁數瀛愬洿鏍忓");
+ }
List<ArdTankWall> ardTankWallList = ardTankWallMapper.getArdTankWallProcessByLockId(lockId);//鏌ヨ閿佹寕鎺ョ殑鍏ㄩ儴闇�瑕佸姩浣滅殑鐢靛瓙鍥存爮
if(!ardTankWallList.isEmpty()){//鎸傛帴浜嗗姩浣滅數瀛愬洿鏍�
--
Gitblit v1.9.3