From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/position/service/IArdAppPositionService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/IArdAppPositionService.java b/ard-work/src/main/java/com/ruoyi/app/position/service/IArdAppPositionService.java
index 835646e..68c1db2 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/IArdAppPositionService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/IArdAppPositionService.java
@@ -1,6 +1,9 @@
package com.ruoyi.app.position.service;
import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.alarm.wall.domain.ArdAlarmWall;
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.scheduling.domian.SchedulingParam;
@@ -42,7 +45,7 @@
* @param ardAppPosition app浣嶇疆
* @return 缁撴灉
*/
- public int insertArdAppPosition(ArdAppPosition ardAppPosition);
+ public List<ArdAlarmWall> insertArdAppPosition(ArdAppPosition ardAppPosition);
/**
* 淇敼app浣嶇疆
@@ -80,4 +83,13 @@
* 2023/8/17 13:56:36
*/
public List<SysUser>getNearAppUsersWithPolygon(SchedulingParam param);
+
+ public Map<String,List<SysUser>> getOnlinePCOrCommander(String usersId);
+
+ public List<Map<String,Object>> getOnlineCommanderPosition(String soilderId);
+
+ public List<ArdAppPosition> getAPPPositionByUserIdAndTime(Map<String,String> para);
+
+ public List<Map<String,Object>> getOnlineAPPSoilderByCommanderId(String userId);
+
}
--
Gitblit v1.9.3