From 1ccdcb4a890687d59b272f5397e8b41ae4ce2254 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 07 十一月 2023 16:23:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/ArdAccessFenceService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/ArdAccessFenceService.java b/ard-work/src/main/java/com/ruoyi/sy/service/ArdAccessFenceService.java
index 8d752cd..1c919ea 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/ArdAccessFenceService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/ArdAccessFenceService.java
@@ -1,6 +1,7 @@
package com.ruoyi.sy.service;
import com.ruoyi.sy.domain.ArdAccessFence;
+import com.ruoyi.sy.domain.ArdSyCar;
import com.ruoyi.sy.param.OilWallParam;
import com.ruoyi.sy.vo.CarVo;
@@ -16,7 +17,11 @@
int delAccess(String carId);
- List<ArdAccessFence> all();
+ List<ArdAccessFence> all(String url);
- int addCar(CarVo carVo);
+ int delCar(String id);
+
+ int updCarAlarm(String id);
+
+ int addCar(CarVo carVo,Integer isAlarm,String lng,String lat);
}
--
Gitblit v1.9.3