From babddaa73918a054346b9af3f3926831c4667c1b Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 17:17:10 +0800
Subject: [PATCH] 巡检计划从表查询及删除导出
---
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 9 +
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointMapper.java | 14 +-
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 4
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolpointController.java | 10 --
ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml | 4
ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml | 2
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatroluserServiceImpl.java | 21 ++--
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointService.java | 19 ---
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java | 7 -
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointServiceImpl.java | 29 ++---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java | 34 +++---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java | 5
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatroluserService.java | 10 -
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 2
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java | 10 --
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatroluserMapper.java | 7 -
ard-work/src/main/resources/mapper/app/ArdAppPatrolpointMapper.xml | 2
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 57 ++++++++---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolplanService.java | 12 --
19 files changed, 118 insertions(+), 140 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java
index 0cd3df9..e9c80ad 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.common.annotation.DataScope;
@@ -12,7 +13,7 @@
* @author 鍒樿嫃涔�
* @date 2023-03-07
*/
-public interface ArdAlarmpointsWellMapper {
+public interface ArdAlarmpointsWellMapper extends BaseMapper<ArdAlarmpointsWell> {
/**
* 鏌ヨ浜曠鐞�
*
@@ -86,4 +87,6 @@
public boolean checkWellIdExists(String wellId);
+ List<ArdAlarmpointsWell> wellByPlanId(String id);
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
index 85a8259..c9054d5 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -1,13 +1,19 @@
package com.ruoyi.app.patrolplan.controller;
import java.util.List;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
+import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
+import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.ir.annotations.Reference;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -41,6 +47,12 @@
@Autowired
private IArdAppPatrolplanService ardAppPatrolplanService;
+ @Resource
+ IArdAppPatrolpointService ardAppPatrolpointService;
+
+ @Resource
+ IArdAppPatroluserService ardAppPatroluserService;
+
/**
* 鏌ヨapp宸℃璁″垝鍒楄〃
*/
@@ -69,14 +81,39 @@
}
/**
- * 鑾峰彇app宸℃璁″垝璇︾粏淇℃伅
+ * 鏍规嵁宸℃ID鏌ヨ鍏磋叮鐐�
*/
- @PreAuthorize("@ss.hasPermi('app:appPatrolplan:query')")
- @GetMapping(value = "/{patroEndTime}")
- public AjaxResult getInfo(@PathVariable("patroEndTime") String patroEndTime)
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:wellByPlanId')")
+ @GetMapping(value = "wellByPlanId/{id}")
+ @ApiOperation("鏍规嵁宸℃ID鏌ヨ鍏磋叮鐐�")
+ public Results wellByPlanId(@PathVariable String id)
{
- return success(ardAppPatrolplanService.selectArdAppPatrolplanByPatroEndTime(patroEndTime));
+ return ardAppPatrolpointService.wellByPlanId(id);
}
+
+ /**
+ * 鏍规嵁宸℃ID鏌ヨ宸℃浜�
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:userByPlanId')")
+ @GetMapping(value = "userByPlanId/{id}")
+ @ApiOperation("鏍规嵁宸℃ID鏌ヨ宸℃浜�")
+ public Results userByPlanId(@PathVariable String id)
+ {
+ return ardAppPatroluserService.userByPlanId(id);
+ }
+
+ /**
+ * 鍒犻櫎app宸℃璁″垝
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:remove')")
+ @Log(title = "app宸℃璁″垝", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{id}")
+ @ApiOperation("鍒犻櫎app宸℃璁″垝")
+ public Results remove(@PathVariable String id)
+ {
+ return ardAppPatrolplanService.deleteArdApp(id);
+ }
+
/**
* 鏂板app宸℃璁″垝
@@ -100,14 +137,4 @@
return toAjax(ardAppPatrolplanService.updateArdAppPatrolplan(ardAppPatrolplan));
}
- /**
- * 鍒犻櫎app宸℃璁″垝
- */
- @PreAuthorize("@ss.hasPermi('app:appPatrolplan:remove')")
- @Log(title = "app宸℃璁″垝", businessType = BusinessType.DELETE)
- @DeleteMapping("/{patroEndTimes}")
- public AjaxResult remove(@PathVariable String[] patroEndTimes)
- {
- return toAjax(ardAppPatrolplanService.deleteArdAppPatrolplanByPatroEndTimes(patroEndTimes));
- }
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolpointController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolpointController.java
index 3a59b66..35e5e35 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolpointController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolpointController.java
@@ -91,14 +91,4 @@
return toAjax(ardAppPatrolpointService.updateArdAppPatrolpoint(ardAppPatrolpoint));
}
- /**
- * 鍒犻櫎app宸℃璁″垝鐐逛綅
- */
- @PreAuthorize("@ss.hasPermi('app:patrolpoint:remove')")
- @Log(title = "app宸℃璁″垝鐐逛綅", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
- return toAjax(ardAppPatrolpointService.deleteArdAppPatrolpointByIds(ids));
- }
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java
index a734efa..ef1e472 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java
@@ -91,14 +91,4 @@
return toAjax(ardAppPatroluserService.updateArdAppPatroluser(ardAppPatroluser));
}
- /**
- * 鍒犻櫎app宸℃璁″垝浜哄憳
- */
- @PreAuthorize("@ss.hasPermi('app:patroluser:remove')")
- @Log(title = "app宸℃璁″垝浜哄憳", businessType = BusinessType.DELETE)
- @DeleteMapping("/{reserved1s}")
- public AjaxResult remove(@PathVariable String[] reserved1s)
- {
- return toAjax(ardAppPatroluserService.deleteArdAppPatroluserByReserved1s(reserved1s));
- }
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
index 00e9453..63b5aa8 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java
@@ -51,11 +51,4 @@
*/
public int deleteArdAppPatrolplanByPatroEndTime(String patroEndTime);
- /**
- * 鎵归噺鍒犻櫎app宸℃璁″垝
- *
- * @param patroEndTimes 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteArdAppPatrolplanByPatroEndTimes(String[] patroEndTimes);
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointMapper.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointMapper.java
index eca3c18..7675dcd 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.app.patrolplan.mapper;
import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
/**
@@ -9,7 +11,7 @@
* @author ard
* @date 2023-08-02
*/
-public interface ArdAppPatrolpointMapper
+public interface ArdAppPatrolpointMapper extends BaseMapper<ArdAppPatrolpoint>
{
/**
* 鏌ヨapp宸℃璁″垝鐐逛綅
@@ -44,18 +46,12 @@
public int updateArdAppPatrolpoint(ArdAppPatrolpoint ardAppPatrolpoint);
/**
- * 鍒犻櫎app宸℃璁″垝鐐逛綅
+ * 绾ц仈鍒犻櫎app宸℃璁″垝鐐逛綅
*
* @param id app宸℃璁″垝鐐逛綅涓婚敭
* @return 缁撴灉
*/
public int deleteArdAppPatrolpointById(String id);
- /**
- * 鎵归噺鍒犻櫎app宸℃璁″垝鐐逛綅
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteArdAppPatrolpointByIds(String[] ids);
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatroluserMapper.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatroluserMapper.java
index 76d3cc5..a94acd8 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatroluserMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatroluserMapper.java
@@ -51,11 +51,4 @@
*/
public int deleteArdAppPatroluserByReserved1(String reserved1);
- /**
- * 鎵归噺鍒犻櫎app宸℃璁″垝浜哄憳
- *
- * @param reserved1s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteArdAppPatroluserByReserved1s(String[] reserved1s);
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolplanService.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolplanService.java
index 070ffe3..a8f11da 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolplanService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolplanService.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolplan;
+import com.ruoyi.utils.result.Results;
/**
* app宸℃璁″垝Service鎺ュ彛
@@ -43,19 +44,10 @@
*/
public int updateArdAppPatrolplan(ArdAppPatrolplan ardAppPatrolplan);
- /**
- * 鎵归噺鍒犻櫎app宸℃璁″垝
- *
- * @param patroEndTimes 闇�瑕佸垹闄ょ殑app宸℃璁″垝涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteArdAppPatrolplanByPatroEndTimes(String[] patroEndTimes);
/**
* 鍒犻櫎app宸℃璁″垝淇℃伅
- *
- * @param patroEndTime app宸℃璁″垝涓婚敭
* @return 缁撴灉
*/
- public int deleteArdAppPatrolplanByPatroEndTime(String patroEndTime);
+ public Results deleteArdApp(String id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointService.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointService.java
index afe5c76..2b3a887 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointService.java
@@ -2,6 +2,8 @@
import java.util.List;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
+import com.ruoyi.utils.result.Results;
+import org.springframework.stereotype.Service;
/**
* app宸℃璁″垝鐐逛綅Service鎺ュ彛
@@ -9,6 +11,7 @@
* @author ard
* @date 2023-08-02
*/
+@Service
public interface IArdAppPatrolpointService
{
/**
@@ -43,19 +46,5 @@
*/
public int updateArdAppPatrolpoint(ArdAppPatrolpoint ardAppPatrolpoint);
- /**
- * 鎵归噺鍒犻櫎app宸℃璁″垝鐐逛綅
- *
- * @param ids 闇�瑕佸垹闄ょ殑app宸℃璁″垝鐐逛綅涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteArdAppPatrolpointByIds(String[] ids);
-
- /**
- * 鍒犻櫎app宸℃璁″垝鐐逛綅淇℃伅
- *
- * @param id app宸℃璁″垝鐐逛綅涓婚敭
- * @return 缁撴灉
- */
- public int deleteArdAppPatrolpointById(String id);
+ Results wellByPlanId(String id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatroluserService.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatroluserService.java
index 625046b..10b931b 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatroluserService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatroluserService.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser;
+import com.ruoyi.utils.result.Results;
/**
* app宸℃璁″垝浜哄憳Service鎺ュ彛
@@ -43,13 +44,6 @@
*/
public int updateArdAppPatroluser(ArdAppPatroluser ardAppPatroluser);
- /**
- * 鎵归噺鍒犻櫎app宸℃璁″垝浜哄憳
- *
- * @param reserved1s 闇�瑕佸垹闄ょ殑app宸℃璁″垝浜哄憳涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteArdAppPatroluserByReserved1s(String[] reserved1s);
/**
* 鍒犻櫎app宸℃璁″垝浜哄憳淇℃伅
@@ -58,4 +52,6 @@
* @return 缁撴灉
*/
public int deleteArdAppPatroluserByReserved1(String reserved1);
+
+ Results userByPlanId(String id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java
index 75dd75d..cd21844 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java
@@ -1,9 +1,13 @@
package com.ruoyi.app.patrolplan.service.impl;
import java.util.List;
- import com.ruoyi.common.utils.DateUtils;
+
+import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointMapper;
+import com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.utils.result.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolplanMapper;
@@ -22,6 +26,12 @@
public class ArdAppPatrolplanServiceImpl implements IArdAppPatrolplanService {
@Resource
private ArdAppPatrolplanMapper ardAppPatrolplanMapper;
+
+ @Resource
+ private ArdAppPatrolpointMapper ardAppPatrolpointMapper;
+
+ @Resource
+ private ArdAppPatroluserMapper ardAppPatroluserMapper;
/**
* 鏌ヨapp宸℃璁″垝
@@ -69,25 +79,19 @@
return ardAppPatrolplanMapper.updateArdAppPatrolplan(ardAppPatrolplan);
}
- /**
- * 鎵归噺鍒犻櫎app宸℃璁″垝
- *
- * @param patroEndTimes 闇�瑕佸垹闄ょ殑app宸℃璁″垝涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteArdAppPatrolplanByPatroEndTimes(String[] patroEndTimes) {
- return ardAppPatrolplanMapper.deleteArdAppPatrolplanByPatroEndTimes(patroEndTimes);
- }
/**
* 鍒犻櫎app宸℃璁″垝淇℃伅
- *
- * @param patroEndTime app宸℃璁″垝涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteArdAppPatrolplanByPatroEndTime(String patroEndTime) {
- return ardAppPatrolplanMapper.deleteArdAppPatrolplanByPatroEndTime(patroEndTime);
+ public Results deleteArdApp(String id) {
+ ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1(id);
+ ardAppPatrolpointMapper.deleteArdAppPatrolpointById(id);
+ if(ardAppPatrolplanMapper.deleteArdAppPatrolplanByPatroEndTime(id)>0){
+ return Results.succeed("鍒犻櫎鎴愬姛锛�");
+ }else {
+ return Results.error("鍒犻櫎澶辫触锛�");
+ }
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointServiceImpl.java
index 7504ff2..622dc33 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointServiceImpl.java
@@ -1,7 +1,12 @@
package com.ruoyi.app.patrolplan.service.impl;
+import java.util.ArrayList;
import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
+import com.ruoyi.utils.result.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointMapper;
@@ -20,6 +25,9 @@
public class ArdAppPatrolpointServiceImpl implements IArdAppPatrolpointService {
@Resource
private ArdAppPatrolpointMapper ardAppPatrolpointMapper;
+
+ @Resource
+ private ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
/**
* 鏌ヨapp宸℃璁″垝鐐逛綅
@@ -65,25 +73,8 @@
return ardAppPatrolpointMapper.updateArdAppPatrolpoint(ardAppPatrolpoint);
}
- /**
- * 鎵归噺鍒犻櫎app宸℃璁″垝鐐逛綅
- *
- * @param ids 闇�瑕佸垹闄ょ殑app宸℃璁″垝鐐逛綅涓婚敭
- * @return 缁撴灉
- */
@Override
- public int deleteArdAppPatrolpointByIds(String[] ids) {
- return ardAppPatrolpointMapper.deleteArdAppPatrolpointByIds(ids);
- }
-
- /**
- * 鍒犻櫎app宸℃璁″垝鐐逛綅淇℃伅
- *
- * @param id app宸℃璁″垝鐐逛綅涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteArdAppPatrolpointById(String id) {
- return ardAppPatrolpointMapper.deleteArdAppPatrolpointById(id);
+ public Results wellByPlanId(String id) {
+ return Results.succeed(ardAlarmpointsWellMapper.wellByPlanId(id));
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatroluserServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatroluserServiceImpl.java
index fa4f2b9..03e6a6a 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatroluserServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatroluserServiceImpl.java
@@ -2,6 +2,9 @@
import java.util.List;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.utils.result.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper;
@@ -20,6 +23,9 @@
public class ArdAppPatroluserServiceImpl implements IArdAppPatroluserService {
@Resource
private ArdAppPatroluserMapper ardAppPatroluserMapper;
+
+ @Resource
+ private SysUserMapper sysUserMapper;
/**
* 鏌ヨapp宸℃璁″垝浜哄憳
@@ -65,16 +71,6 @@
return ardAppPatroluserMapper.updateArdAppPatroluser(ardAppPatroluser);
}
- /**
- * 鎵归噺鍒犻櫎app宸℃璁″垝浜哄憳
- *
- * @param reserved1s 闇�瑕佸垹闄ょ殑app宸℃璁″垝浜哄憳涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteArdAppPatroluserByReserved1s(String[] reserved1s) {
- return ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1s(reserved1s);
- }
/**
* 鍒犻櫎app宸℃璁″垝浜哄憳淇℃伅
@@ -86,4 +82,9 @@
public int deleteArdAppPatroluserByReserved1(String reserved1) {
return ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1(reserved1);
}
+
+ @Override
+ public Results userByPlanId(String id) {
+ return Results.succeed(sysUserMapper.userByPlanId(id));
+ }
}
diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
index 8c390a1..823c329 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
@@ -197,4 +197,8 @@
FROM ard_alarmpoints_well
WHERE well_id = #{wellId}
</select>
+
+ <select id="wellByPlanId" parameterType="String" resultMap="ArdAlarmpointsWellResult">
+ select * from ard_alarmpoints_well where id in (select alarmpoints_id from ard_app_patrolpoint where patrolplan_id = #{id})
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 8741540..1e9ea58 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -91,13 +91,16 @@
</update>
<delete id="deleteArdAppPatrolplanByPatroEndTime" parameterType="String">
- delete from ard_app_patrolplan where patro_end_time = #{patroEndTime}
+ delete from ard_app_patrolplan where ard_app_patrolplan.id = #{id};
</delete>
<delete id="deleteArdAppPatrolplanByPatroEndTimes" parameterType="String">
- delete from ard_app_patrolplan where patro_end_time in
+ delete from ard_app_patrolplan
+ left join ard_app_patrolpoint as well on ard_app_patrolplan.id = well.patrolplan_id
+ left join ard_app_patroluser as users on ard_app_patrolplan.id = users.patrolplan_id
+ where ard_app_patrolplan.id in
<foreach item="patroEndTime" collection="array" open="(" separator="," close=")">
- #{patroEndTime}
+ #{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointMapper.xml
index fd5a883..f71518f 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointMapper.xml
@@ -56,7 +56,7 @@
</update>
<delete id="deleteArdAppPatrolpointById" parameterType="String">
- delete from ard_app_patrolpoint where id = #{id}
+ delete from ard_app_patrolpoint where patrolplan_id = #{id}
</delete>
<delete id="deleteArdAppPatrolpointByIds" parameterType="String">
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml
index a5d51f3..67f42cd 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml
@@ -52,7 +52,7 @@
</update>
<delete id="deleteArdAppPatroluserByReserved1" parameterType="String">
- delete from ard_app_patroluser where reserved_1 = #{reserved1}
+ delete from ard_app_patroluser where patrolplan_id = #{id}
</delete>
<delete id="deleteArdAppPatroluserByReserved1s" parameterType="String">
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index bb854de..686bafd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -138,4 +138,6 @@
*
*/
public List<SysUser> getSysUserByCarId(String carId);
+
+ List<SysUser> userByPlanId(String id);
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index dadfb99..8e1754c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -291,4 +291,8 @@
inner join sys_dept sd on asy.dept_id = sd.dept_id
where asy.car_id = #{carId})
</select>
+
+ <select id="userByPlanId" parameterType="String" resultMap="SysUserResult">
+ select nick_name from sys_user where id in (select app_user_id from ard_app_patroluser where patrolplan_id = ${id})
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3