From b61c4537a78d58412ef7ccd6e2c30152d807c5b7 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 29 七月 2024 11:04:54 +0800
Subject: [PATCH] 电磁锁密码查询去除上一组密码修改提交
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 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 340b055..523ac98 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
@@ -4,24 +4,22 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
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.SysConfig;
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.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.utils.data.Query;
import com.ruoyi.utils.pagehelper.JpaPageInfo;
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;
@@ -61,6 +59,9 @@
@Autowired
private ISysDeptService sysDeptService;
+
+ @Autowired
+ private ISysConfigService sysConfigService;
/**
* 鏌ヨ浜曠鐞嗗垪琛�
@@ -192,24 +193,26 @@
@PostMapping("/wellList")
@ApiOperation("鏌ヨ鏉冮檺涓嬫墍鏈夊叴瓒ｇ偣")
public Results wellList() {
- String usersId = SecurityUtils.getUserId();
+ /*String usersId = SecurityUtils.getUserId();
//鏍规嵁userId鏌ヨ閮ㄩ棬Id
SysUser sysUser = sysUserService.selectUserById(usersId);
//鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
- List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());*/
+ List<Long> deptList = sysDeptService.selectDeptIdBySubAndUserId(SecurityUtils.getDeptId(),SecurityUtils.getUserId());
//鏍规嵁deptId鑾峰彇瀵瑰簲鍏磋叮鐐规暟鎹�
List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.wellList(deptList);
return Results.succeed(list);
}
@PostMapping("/conditionList")
- @ApiOperation("鏌ヨ骞剁瓫閫夋潈闄愪笅鎵�鏈夊叴瓒ｇ偣")
+ @ApiOperation("鏌ョ湅閮ㄩ棬涓嬬瓫閫夋潯浠剁殑鍏磋叮鐐�")
public Results conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam) {
- String usersId = SecurityUtils.getUserId();
+ /*String usersId = SecurityUtils.getUserId();
//鏍规嵁userId鏌ヨ閮ㄩ棬Id
SysUser sysUser = sysUserService.selectUserById(usersId);
//鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
- List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());*/
+ List<Long> deptList = sysDeptService.selectDeptIdBySubAndUserId(SecurityUtils.getDeptId(),SecurityUtils.getUserId());
ardAlarmpointsWellParam.setDeptList(deptList);
//鏍规嵁deptId鑾峰彇瀵瑰簲鍏磋叮鐐规暟鎹�
return Results.succeed(ardAlarmpointsWellService.conditionList(ardAlarmpointsWellParam));
@@ -226,4 +229,36 @@
return AjaxResult.success(jpaPageInfo);
}
+ @GetMapping("/getRTUDataYJ8")
+ @ApiOperation("鏌ヨ璁惧杩愯鐘舵��")
+ public AjaxResult getRTUDataYJ8(String wellId){
+ return AjaxResult.success(Query.getRTUDataYJ8(wellId));
+ }
+
+ @GetMapping("/getWellDataByWellId")
+ @ApiOperation("鏌ヨ璁惧鍔ㄩ潤鎬佸睘鎬�")
+ public AjaxResult getWellData(String wellId){
+ SysConfig config = new SysConfig();
+ config.setConfigKey("3coracle");
+ List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config);
+ Map<String,Object> result = ardAlarmpointsWellService.getWellDataByWellId(wellId,sysConfigResult);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping("/getWellDataByPatrolplanIdAndPosition")
+ @ApiOperation("鏌ヨ鏈�杩戝贰妫�璁惧鍔ㄩ潤鎬佸睘鎬�")
+ public AjaxResult getWellDataByPatrolplanIdAndPosition(@RequestBody Map<String,Object> para){
+ SysConfig config = new SysConfig();
+ config.setConfigKey("3coracle");
+ List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config);
+ Map<String,Object> result = ardAlarmpointsWellService.getWellDataByPatrolplanIdAndPosition(para,sysConfigResult);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping("/getWellById")
+ @ApiOperation("鏍规嵁鏌ヨ鍏磋叮鐐瑰熀鏈睘鎬�")
+ public AjaxResult getWellById(@RequestBody Map<String,String> para){
+ ArdAlarmpointsWell result = ardAlarmpointsWellService.getWellById(para.get("id"));
+ return AjaxResult.success(result);
+ }
}
--
Gitblit v1.9.3