From 7ee6e3feeda334e40da912f0e31898e08b59de46 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 04 八月 2023 17:28:48 +0800
Subject: [PATCH] 修复雷达引导相机为null的bug
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
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("鍒犻櫎澶辫触锛�");
+ }
}
}
--
Gitblit v1.9.3