From 97f4a9b9621eca21da79df727121f5fac12cc42a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 22 一月 2024 10:01:41 +0800
Subject: [PATCH] app单兵端发起查看指挥端位置及车辆位置提交
---
ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java | 80 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 18 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
index 1ed5b73..bb57243 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
@@ -1,28 +1,21 @@
package com.ruoyi.app.position.controller;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellParam;
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.service.IArdAppPositionService;
-import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
-import com.ruoyi.rongcloud.service.RongCloudService;
-import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserOnlineService;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.utils.minio.MinioUtil;
+import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -55,8 +48,8 @@
private IArdAppPositionService ardAppPositionService;
@Autowired
private ISysUserService sysUserService;
- @Autowired
- private RongCloudService rongCloudService;
+// @Autowired
+// private MinioUtils minioUtil;
/**
* 鏌ヨapp浣嶇疆鍒楄〃
@@ -103,7 +96,7 @@
@PostMapping
public AjaxResult add(@RequestBody ArdAppPosition ardAppPosition)
{
- return toAjax(ardAppPositionService.insertArdAppPosition(ardAppPosition));
+ return AjaxResult.success(ardAppPositionService.insertArdAppPosition(ardAppPosition));
}
/**
@@ -140,7 +133,17 @@
return AjaxResult.success(list);
}
-
+ /**
+ * 鑾峰彇鎵�鏈塧pp鐢ㄦ埛
+ */
+ @ApiOperation("鑾峰彇鎵�鏈塧pp鐢ㄦ埛")
+ @GetMapping("/getAppUserList")
+ public AjaxResult getAppUserList(Long deptId) {
+ SysUser user = new SysUser();
+ user.setDeptId(deptId);
+ List<SysUser> list = sysUserService.selectAllAppUserList(user);
+ return AjaxResult.success(list);
+ }
/**
* 鑾峰彇鎵�鏈塧pp鐢ㄦ埛
*/
@@ -159,19 +162,27 @@
if(ardAppPosition!=null) {
Map<String, Object> params =new HashMap<>();
params.put("longitude", ardAppPosition.getLongitude());
- params.put("lagitude", ardAppPosition.getLatitude());
+ params.put("latitude", ardAppPosition.getLatitude());
params.put("altitude", ardAppPosition.getAltitude());
params.put("bearing", ardAppPosition.getBearing());
sysUser.setParams(params);
}
- if(sysUser.getAppOnlineState().equals("1"))
+ if(StringUtils.isNotNull(sysUser.getAppOnlineState()))
{
- onLineList.add(sysUser);
+ if(sysUser.getAppOnlineState().equals("1"))
+ {
+ onLineList.add(sysUser);
+ }
+ else
+ {
+ offLineList.add(sysUser);
+ }
}
else
{
offLineList.add(sysUser);
}
+
}
Map<String,Object> onlineMap=new HashMap<>();
onlineMap.put("children",onLineList);
@@ -188,6 +199,7 @@
lists.add(offlineMap);
return AjaxResult.success(lists);
}
+
/**
* 鑾峰彇鐢ㄦ埛璇︽儏
*/
@@ -202,7 +214,39 @@
@ApiOperation("涓婁紶鏂囦欢")
public AjaxResult uploadFile(MultipartFile file,String type)
{
- String url = MinioUtils.putObjectAndGetUrl("app",type, file);
+ String url = MinioUtil.putObjectAndGetUrl("app",type, file);
return AjaxResult.success(url);
}
+
+ @GetMapping("/getOnlinePCOrCommander")
+ @ApiOperation("鏌ヨ鏈儴闂ㄥ湪绾縋C绔強鎸囨尌绔�")
+ public AjaxResult getOnlinePCOrCommander() {
+ String usersId = SecurityUtils.getUserId();
+ Map<String,List<SysUser>> result = ardAppPositionService.getOnlinePCOrCommander(usersId);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping("/sendCheckCommandersPosition")
+ @ApiOperation("鍙戣捣鏌ョ湅鎸囨尌绔綅缃�")
+ public AjaxResult sendCheckCommandersPosition(@RequestBody Map<String,Object> para) {
+ String usersId = SecurityUtils.getUserId();
+ try{
+ ardAppPositionService.sendCheckCommandersPosition(usersId,para);
+ return AjaxResult.success();
+ }catch(Exception e){
+ return AjaxResult.error();
+ }
+ }
+
+ @PostMapping("/sendCheckSYCarsPosition")
+ @ApiOperation("鍙戣捣鏌ョ湅杞﹁締浣嶇疆")
+ public AjaxResult sendCheckSYCarsPosition(@RequestBody Map<String,Object> para) {
+ String usersId = SecurityUtils.getUserId();
+ try{
+ ardAppPositionService.sendCheckSYCarsPosition(usersId,para);
+ return AjaxResult.success();
+ }catch(Exception e){
+ return AjaxResult.error();
+ }
+ }
}
--
Gitblit v1.9.3