From 6e54b432ab969eccb47b0aa388b95bf14e398790 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 31 八月 2023 10:34:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java |   70 ++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
index 79aa9f5..e091a7b 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
@@ -3,11 +3,23 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellParam;
 import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.utils.result.Results;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +35,7 @@
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -41,6 +54,12 @@
     @Resource
     private IArdAlarmpointsWellService ardAlarmpointsWellService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
     /**
      * 鏌ヨ浜曠鐞嗗垪琛�
      */
@@ -53,6 +72,13 @@
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('alarmpoints:well:list')")
+    @GetMapping("/nonPageList")
+    @ApiOperation("鏌ヨ浜曞垪琛�-涓嶅垎椤�")
+    public AjaxResult nonPageList(ArdAlarmpointsWell ardAlarmpointsWell) {
+        List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell);
+        return success(list);
+    }
     /**
      * 瀵煎嚭浜曠鐞嗗垪琛�
      */
@@ -84,7 +110,11 @@
     @PostMapping
     @ApiOperation("鏂板浜�")
     public AjaxResult add(@RequestBody ArdAlarmpointsWell ardAlarmpointsWell) {
-        return toAjax(ardAlarmpointsWellService.insertArdAlarmpointsWell(ardAlarmpointsWell));
+        try {
+            return toAjax(ardAlarmpointsWellService.insertArdAlarmpointsWell(ardAlarmpointsWell));
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
     }
 
     /**
@@ -95,7 +125,11 @@
     @PutMapping
     @ApiOperation("淇敼浜�")
     public AjaxResult edit(@RequestBody ArdAlarmpointsWell ardAlarmpointsWell) {
+        try {
         return toAjax(ardAlarmpointsWellService.updateArdAlarmpointsWell(ardAlarmpointsWell));
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
     }
 
     /**
@@ -145,4 +179,38 @@
         }
         return options;
     }
+
+    @GetMapping("/wellById/{id}")
+    @ApiOperation("鏌ヨ鍗曟潯鍏磋叮鐐�")
+    public Results wellById(@PathVariable String id) {
+        return Results.succeed(ardAlarmpointsWellService.wellById(id));
+    }
+
+    @PostMapping("/wellList")
+    @ApiOperation("鏌ヨ鏉冮檺涓嬫墍鏈夊叴瓒ｇ偣")
+    public Results wellList(){
+        String usersId = SecurityUtils.getUserId();
+        //鏍规嵁userId鏌ヨ閮ㄩ棬Id
+        SysUser sysUser = sysUserService.selectUserById(usersId);
+        //鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
+        List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+        //鏍规嵁deptId鑾峰彇瀵瑰簲鍏磋叮鐐规暟鎹�
+        List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.wellList(deptList);
+        return Results.succeed(list);
+    }
+
+    @PostMapping("/conditionList")
+    @ApiOperation("鏌ヨ骞剁瓫閫夋潈闄愪笅鎵�鏈夊叴瓒ｇ偣")
+    public Results conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam){
+        String usersId = SecurityUtils.getUserId();
+        //鏍规嵁userId鏌ヨ閮ㄩ棬Id
+        SysUser sysUser = sysUserService.selectUserById(usersId);
+        //鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
+        List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+        ardAlarmpointsWellParam.setDeptList(deptList);
+        //鏍规嵁deptId鑾峰彇瀵瑰簲鍏磋叮鐐规暟鎹�
+        return Results.succeed(ardAlarmpointsWellService.conditionList(ardAlarmpointsWellParam));
+    }
+
+
 }

--
Gitblit v1.9.3