From 58585ea33f132a139621b7e68fe5ba9d993e362d Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 20 九月 2022 13:42:56 +0800
Subject: [PATCH] 删除台站
---
src/main/java/com/whyc/service/StationInfoService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/StationInfoService.java b/src/main/java/com/whyc/service/StationInfoService.java
index 4806d78..6a18e73 100644
--- a/src/main/java/com/whyc/service/StationInfoService.java
+++ b/src/main/java/com/whyc/service/StationInfoService.java
@@ -230,26 +230,31 @@
wrapper.eq("station_name",stationName);
//1.鍏堟煡鍑烘満鎴跨殑id
Integer stationId=mapper.selectIdByName(stationName);
- if(stationId==null||stationId==0){
+ if(stationId==null){
return new Response().set(1,false,"鏈烘埧涓嶅瓨鍦�");
+ }else if(stationId==0){
+ //鏈�缁堝垹闄ゅ熀绔�
+ mapper.delete(wrapper);
}else {
//3.鍒犻櫎鎵�鏈夋枃浠舵暟鎹�
dataMapper.deleteDataAndInfoByStationId(stationId);
//4.鍒犻櫎鎵�鏈夋枃浠跺弬鏁�
paramMapper.deleteParamByStationId(stationId);
+ //鏈�缁堝垹闄ゅ熀绔�
+ mapper.delete(wrapper);
}
- //鏈�缁堝垹闄ゅ熀绔�
- int flag=mapper.delete(wrapper);
- return new Response().set(1,flag>0,"鍒犻櫎鎴愬姛");
+ return new Response().set(1,true,"鍒犻櫎鎴愬姛");
}
//绉婚櫎鍙扮珯涓嬫枃浠讹紙鍗曚釜鏂囦欢锛�
@Transactional
public Response delFileFromStation(String stationName, String filePath) {
//1.鍏堟煡鍑烘満鎴跨殑id
Integer stationId=mapper.selectIdByName(stationName);
- if(stationId==null||stationId==0){
+ if(stationId==null){
return new Response().set(1,false,"鏈烘埧涓嶅瓨鍦�");
- }else{
+ }else if(stationId==0){
+ return new Response().set(1,false,"鏈烘埧涓嬩笉瀛樺湪鏂囦欢");
+ }else {
//2.鏌ュ嚭鏂囦欢瀵瑰簲鐨勬枃浠秈d
Integer fileId=infoMapper.selectFileId(stationId,filePath);
if(fileId==null||fileId==0){
--
Gitblit v1.9.1