From be91e24a735423f45361c9aea5eb45bb14065aa2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 24 一月 2024 15:04:22 +0800
Subject: [PATCH] 位置共享审批提交

---
 ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java |   99 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 92 insertions(+), 7 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 1abb135..15ff5c2 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,14 +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.storage.minio.utils.MinioUtils;
-import com.ruoyi.rongcloud.service.RongCloudService;
 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;
@@ -46,8 +48,8 @@
     private IArdAppPositionService ardAppPositionService;
     @Autowired
     private ISysUserService sysUserService;
-    @Autowired
-    private RongCloudService rongCloudService;
+//    @Autowired
+//    private MinioUtils minioUtil;
 
     /**
      * 鏌ヨapp浣嶇疆鍒楄〃
@@ -94,7 +96,7 @@
     @PostMapping
     public AjaxResult add(@RequestBody ArdAppPosition ardAppPosition)
     {
-        return toAjax(ardAppPositionService.insertArdAppPosition(ardAppPosition));
+        return AjaxResult.success(ardAppPositionService.insertArdAppPosition(ardAppPosition));
     }
 
     /**
@@ -131,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鐢ㄦ埛
      */
@@ -187,6 +199,7 @@
         lists.add(offlineMap);
         return AjaxResult.success(lists);
     }
+
     /**
      * 鑾峰彇鐢ㄦ埛璇︽儏
      */
@@ -201,7 +214,79 @@
     @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();
+        }
+    }
+
+    @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