From 3e376b110804a26858b1bbd89cec8d7aa6869138 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 07 二月 2024 13:19:07 +0800
Subject: [PATCH] 配置文件更新ssl配置

---
 ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java |   90 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 1 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 1fa38bd..7565542 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
@@ -2,13 +2,16 @@
 
 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.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 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;
@@ -93,7 +96,7 @@
     @PostMapping
     public AjaxResult add(@RequestBody ArdAppPosition ardAppPosition)
     {
-        return toAjax(ardAppPositionService.insertArdAppPosition(ardAppPosition));
+        return AjaxResult.success(ardAppPositionService.insertArdAppPosition(ardAppPosition));
     }
 
     /**
@@ -214,4 +217,89 @@
         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);
+    }
+
+    @GetMapping("/getOnlineCommanderPosition")
+    @ApiOperation("鍗曞叺绔煡鐪嬪凡閫氳繃瀹℃壒鐨勫湪绾挎寚鎸ョ浣嶇疆")
+    public AjaxResult getOnlineCommanderPosition() {
+        String soilderId = SecurityUtils.getUserId();
+        try{
+            List<Map<String,Object>> result = ardAppPositionService.getOnlineCommanderPosition(soilderId);
+            return AjaxResult.success(result);
+        }catch(Exception e){
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }
+
+    /*@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();
+        }
+    }*/
+
+    /*@GetMapping("/getCheckCommandersPosition")
+    @ApiOperation("鎸囨尌绔煡鐪嬫寚鎸ョ浣嶇疆鐢宠")
+    public AjaxResult getCheckCommandersPosition() {//寮冪敤
+        String usersId = SecurityUtils.getUserId();
+        try{
+            List<Map<String,Object>> result = ardAppPositionService.getCheckCommandersPosition(usersId);
+            return AjaxResult.success(result);
+        }catch(Exception e){
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }*/
+
+    /*@GetMapping("/getCheckSYCarsPosition")
+    @ApiOperation("鎸囨尌绔煡鐪嬭溅杈嗕綅缃敵璇�")
+    public AjaxResult getCheckSYCarsPosition() {//寮冪敤
+        String usersId = SecurityUtils.getUserId();
+        try{
+            List<Map<String,Object>> result = ardAppPositionService.getCheckSYCarsPosition(usersId);
+            return AjaxResult.success(result);
+        }catch(Exception e){
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }*/
+
+    /*@GetMapping("/getCheckPosition")
+    @ApiOperation("鎸囨尌绔煡鐪嬩綅缃敵璇�")
+    public AjaxResult getCheckPosition() {
+        String usersId = SecurityUtils.getUserId();
+        try{
+            Map<String,List<Map<String,Object>>> result = ardAppPositionService.getCheckPosition(usersId);
+            return AjaxResult.success(result);
+        }catch(Exception e){
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }*/
+
 }

--
Gitblit v1.9.3