From 24d66c8d82b628a06e93dbb1abfea2049b3d45ab Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 05 八月 2023 08:28:11 +0800
Subject: [PATCH] 删除app巡检计划提交
---
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 4
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointMapper.java | 13 ++
ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml | 37 ++++--
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatroluserServiceImpl.java | 39 +++----
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatroluser.java | 15 +-
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java | 6 +
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java | 65 ++++++++++++
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatroluserService.java | 20 ++-
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java | 18 ++
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatroluserMapper.java | 30 +++++-
ard-work/src/main/resources/mapper/app/ArdAppPatrolpointMapper.xml | 11 ++
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 22 +++
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolplanService.java | 9 +
13 files changed, 221 insertions(+), 68 deletions(-)
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 c9054d5..1cc805a 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,6 +1,7 @@
package com.ruoyi.app.patrolplan.controller;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -94,13 +95,13 @@
/**
* 鏍规嵁宸℃ID鏌ヨ宸℃浜�
*/
- @PreAuthorize("@ss.hasPermi('app:appPatrolplan:userByPlanId')")
+ /*@PreAuthorize("@ss.hasPermi('app:appPatrolplan:userByPlanId')")
@GetMapping(value = "userByPlanId/{id}")
@ApiOperation("鏍规嵁宸℃ID鏌ヨ宸℃浜�")
public Results userByPlanId(@PathVariable String id)
{
return ardAppPatroluserService.userByPlanId(id);
- }
+ }*/
/**
* 鍒犻櫎app宸℃璁″垝
@@ -109,9 +110,11 @@
@Log(title = "app宸℃璁″垝", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
@ApiOperation("鍒犻櫎app宸℃璁″垝")
- public Results remove(@PathVariable String id)
+ //public Results remove(@PathVariable String id)
+ public AjaxResult remove(@PathVariable String id)
{
- return ardAppPatrolplanService.deleteArdApp(id);
+ //return ardAppPatrolplanService.deleteArdApp(id);
+ return toAjax(ardAppPatrolplanService.deleteArdApp(id));
}
@@ -137,4 +140,15 @@
return toAjax(ardAppPatrolplanService.updateArdAppPatrolplan(ardAppPatrolplan));
}
+ /**
+ * 鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:insertArdAppPatrolplan')")
+ @Log(title = "app宸℃璁″垝", businessType = BusinessType.INSERT)
+ @PostMapping("/insertArdAppPatrolplan")
+ @ApiOperation("鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�")
+ public AjaxResult addArdAppPatrolplan(@RequestBody Map<String,Object> para)
+ {
+ return toAjax(ardAppPatrolplanService.insertArdAppPatrolplan(para));
+ }
}
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 ef1e472..071fa1b 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
@@ -25,7 +25,7 @@
* app宸℃璁″垝浜哄憳Controller
*
* @author ard
- * @date 2023-08-02
+ * @date 2023-08-04
*/
@RestController
@RequestMapping("/app/patroluser")
@@ -63,10 +63,10 @@
* 鑾峰彇app宸℃璁″垝浜哄憳璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('app:patroluser:query')")
- @GetMapping(value = "/{reserved1}")
- public AjaxResult getInfo(@PathVariable("reserved1") String reserved1)
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
{
- return success(ardAppPatroluserService.selectArdAppPatroluserByReserved1(reserved1));
+ return success(ardAppPatroluserService.selectArdAppPatroluserById(id));
}
/**
@@ -91,4 +91,14 @@
return toAjax(ardAppPatroluserService.updateArdAppPatroluser(ardAppPatroluser));
}
+ /**
+ * 鍒犻櫎app宸℃璁″垝浜哄憳
+ */
+ @PreAuthorize("@ss.hasPermi('app:patroluser:remove')")
+ @Log(title = "app宸℃璁″垝浜哄憳", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
+ {
+ return toAjax(ardAppPatroluserService.deleteArdAppPatroluserByIds(ids));
+ }
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatroluser.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatroluser.java
index ef53eaf..fefac41 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatroluser.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatroluser.java
@@ -9,15 +9,14 @@
* app宸℃璁″垝浜哄憳瀵硅薄 ard_app_patroluser
*
* @author ard
- * @date 2023-08-02
+ * @date 2023-08-04
*/
public class ArdAppPatroluser extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 涓婚敭 */
- @Excel(name = "涓婚敭")
- private String reserved1;
+ private String id;
/** 宸℃涓婚敭 */
@Excel(name = "宸℃涓婚敭")
@@ -27,14 +26,14 @@
@Excel(name = "app鍗曞叺绔敤鎴蜂富閿�")
private String appUserId;
- public void setReserved1(String reserved1)
+ public void setId(String id)
{
- this.reserved1 = reserved1;
+ this.id = id;
}
- public String getReserved1()
+ public String getId()
{
- return reserved1;
+ return id;
}
public void setPatrolplanId(String patrolplanId)
{
@@ -58,7 +57,7 @@
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("reserved1", getReserved1())
+ .append("id", getId())
.append("patrolplanId", getPatrolplanId())
.append("appUserId", getAppUserId())
.toString();
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 63b5aa8..5c5274d 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,4 +51,10 @@
*/
public int deleteArdAppPatrolplanByPatroEndTime(String patroEndTime);
+ /**
+ * 鏍规嵁涓婚敭鍒犻櫎app宸℃璁″垝
+ *
+ */
+ public int deleteArdAppPatrolplanById(String id);
+
}
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 7675dcd..89e16ca 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
+import org.apache.ibatis.annotations.Param;
/**
* app宸℃璁″垝鐐逛綅Mapper鎺ュ彛
@@ -53,5 +54,17 @@
*/
public int deleteArdAppPatrolpointById(String id);
+ /**
+ * 鎵归噺鏂板app宸℃璁″垝鐐逛綅
+ *
+ * @param ardAppPatrolpoint app宸℃璁″垝鐐逛綅
+ * @return 缁撴灉
+ */
+ public int insertArdAppPatrolpointList(@Param("ardAppPatrolpointList")List<ArdAppPatrolpoint> ardAppPatrolpointList);
+ /**
+ * 鏍规嵁宸℃涓婚敭鍒犻櫎app宸℃璁″垝鐐逛綅
+ *
+ */
+ public int deleteArdAppPatrolpointByPlanId(String id);
}
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 a94acd8..43a3980 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
@@ -2,22 +2,23 @@
import java.util.List;
import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser;
+import org.apache.ibatis.annotations.Param;
/**
* app宸℃璁″垝浜哄憳Mapper鎺ュ彛
*
* @author ard
- * @date 2023-08-02
+ * @date 2023-08-04
*/
public interface ArdAppPatroluserMapper
{
/**
* 鏌ヨapp宸℃璁″垝浜哄憳
*
- * @param reserved1 app宸℃璁″垝浜哄憳涓婚敭
+ * @param id app宸℃璁″垝浜哄憳涓婚敭
* @return app宸℃璁″垝浜哄憳
*/
- public ArdAppPatroluser selectArdAppPatroluserByReserved1(String reserved1);
+ public ArdAppPatroluser selectArdAppPatroluserById(String id);
/**
* 鏌ヨapp宸℃璁″垝浜哄憳鍒楄〃
@@ -46,9 +47,28 @@
/**
* 鍒犻櫎app宸℃璁″垝浜哄憳
*
- * @param reserved1 app宸℃璁″垝浜哄憳涓婚敭
+ * @param id app宸℃璁″垝浜哄憳涓婚敭
* @return 缁撴灉
*/
- public int deleteArdAppPatroluserByReserved1(String reserved1);
+ public int deleteArdAppPatroluserById(String id);
+ /**
+ * 鎵归噺鍒犻櫎app宸℃璁″垝浜哄憳
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdAppPatroluserByIds(String[] ids);
+
+ /**
+ * 鎵归噺鏂板app宸℃璁″垝浜哄憳
+ *
+ */
+ public int insertArdAppPatroluserList(@Param("ardAppPatroluserList") List<ArdAppPatroluser> ardAppPatroluserList);
+
+ /**
+ * 鏍规嵁宸℃璁″垝涓婚敭鍒犻櫎app宸℃璁″垝浜哄憳
+ *
+ */
+ public int deleteArdAppPatroluserByPlanId(String id);
}
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 a8f11da..cf72771 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
@@ -1,6 +1,8 @@
package com.ruoyi.app.patrolplan.service;
import java.util.List;
+import java.util.Map;
+
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolplan;
import com.ruoyi.utils.result.Results;
@@ -49,5 +51,10 @@
* 鍒犻櫎app宸℃璁″垝淇℃伅
* @return 缁撴灉
*/
- public Results deleteArdApp(String id);
+ public int deleteArdApp(String id);
+
+ /**
+ * 鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�
+ */
+ public int insertArdAppPatrolplan(Map<String,Object> para);
}
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 10b931b..68ce675 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,23 +2,22 @@
import java.util.List;
import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser;
-import com.ruoyi.utils.result.Results;
/**
* app宸℃璁″垝浜哄憳Service鎺ュ彛
*
* @author ard
- * @date 2023-08-02
+ * @date 2023-08-04
*/
public interface IArdAppPatroluserService
{
/**
* 鏌ヨapp宸℃璁″垝浜哄憳
*
- * @param reserved1 app宸℃璁″垝浜哄憳涓婚敭
+ * @param id app宸℃璁″垝浜哄憳涓婚敭
* @return app宸℃璁″垝浜哄憳
*/
- public ArdAppPatroluser selectArdAppPatroluserByReserved1(String reserved1);
+ public ArdAppPatroluser selectArdAppPatroluserById(String id);
/**
* 鏌ヨapp宸℃璁″垝浜哄憳鍒楄〃
@@ -44,14 +43,19 @@
*/
public int updateArdAppPatroluser(ArdAppPatroluser ardAppPatroluser);
+ /**
+ * 鎵归噺鍒犻櫎app宸℃璁″垝浜哄憳
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑app宸℃璁″垝浜哄憳涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdAppPatroluserByIds(String[] ids);
/**
* 鍒犻櫎app宸℃璁″垝浜哄憳淇℃伅
*
- * @param reserved1 app宸℃璁″垝浜哄憳涓婚敭
+ * @param id app宸℃璁″垝浜哄憳涓婚敭
* @return 缁撴灉
*/
- public int deleteArdAppPatroluserByReserved1(String reserved1);
-
- Results userByPlanId(String id);
+ public int deleteArdAppPatroluserById(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 cd21844..a34c489 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,18 +1,27 @@
package com.ruoyi.app.patrolplan.service.impl;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
+import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
+import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointMapper;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
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;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolplan;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolplanService;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -85,13 +94,63 @@
* @return 缁撴灉
*/
@Override
- public Results deleteArdApp(String id) {
- ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1(id);
- ardAppPatrolpointMapper.deleteArdAppPatrolpointById(id);
+ @Transactional
+ public int deleteArdApp(String id) {
+ //ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1(id);
+ /*ardAppPatrolpointMapper.deleteArdAppPatrolpointById(id);
if(ardAppPatrolplanMapper.deleteArdAppPatrolplanByPatroEndTime(id)>0){
return Results.succeed("鍒犻櫎鎴愬姛锛�");
}else {
return Results.error("鍒犻櫎澶辫触锛�");
+ }*/
+ try {
+ int result = ardAppPatrolplanMapper.deleteArdAppPatrolplanById(id);//鍒犻櫎宸℃璁″垝
+ ardAppPatrolpointMapper.deleteArdAppPatrolpointByPlanId(id);//鍒犻櫎宸℃璁″垝涓嬫寕鐐逛綅
+ ardAppPatroluserMapper.deleteArdAppPatroluserByPlanId(id);//鍒犻櫎宸℃璁″垝涓嬫寕鐢ㄦ埛
+ return result;
+ } catch (Exception e){
+ e.printStackTrace();
+ return 0;
}
}
+
+ @Override
+ @Transactional
+ public int insertArdAppPatrolplan(Map<String, Object> para) {
+ String id = IdUtils.simpleUUID();
+ ArdAppPatrolplan ardAppPatrolplan = new ArdAppPatrolplan();
+ ardAppPatrolplan.setId(id);
+ ardAppPatrolplan.setPlanName((String) para.get("planName"));
+ ardAppPatrolplan.setPatroBeginTime((String) para.get("patroBeginTime"));
+ ardAppPatrolplan.setPatroEndTime((String) para.get("patroEndTime"));
+ String userId = SecurityUtils.getUserId();
+ ardAppPatrolplan.setUserId(userId);
+ ardAppPatrolplan.setCycle((String) para.get("cycle"));
+ ardAppPatrolplan.setCreateTime(new Date());
+ int result = ardAppPatrolplanMapper.insertArdAppPatrolplan(ardAppPatrolplan);//鏂板涓昏〃
+ List<String> alarmpointIdList = (List<String>) para.get("alarmpointIdList");
+ List<ArdAppPatrolpoint> ardAppPatrolpointList = new ArrayList();
+ for(String alarmpointId : alarmpointIdList){
+ String patrolpointId = IdUtils.simpleUUID();
+ ArdAppPatrolpoint ardAppPatrolpoint = new ArdAppPatrolpoint();
+ ardAppPatrolpoint.setId(patrolpointId);
+ ardAppPatrolpoint.setPatrolplanId(id);
+ ardAppPatrolpoint.setAlarmpointsId(alarmpointId);
+ ardAppPatrolpoint.setType((String) para.get("type"));
+ ardAppPatrolpointList.add(ardAppPatrolpoint);
+ }
+ ardAppPatrolpointMapper.insertArdAppPatrolpointList(ardAppPatrolpointList);//鏂板鍏宠仈鍏磋叮鐐�
+ List<String> appUserIdList = (List<String>) para.get("appUserIdList");
+ List<ArdAppPatroluser> ardAppPatroluserList = new ArrayList();
+ for(String appUserId : appUserIdList){
+ String patroluserId = IdUtils.simpleUUID();
+ ArdAppPatroluser ardAppPatroluser = new ArdAppPatroluser();
+ ardAppPatroluser.setId(patroluserId);
+ ardAppPatroluser.setPatrolplanId(id);
+ ardAppPatroluser.setAppUserId(appUserId);
+ ardAppPatroluserList.add(ardAppPatroluser);
+ }
+ ardAppPatroluserMapper.insertArdAppPatroluserList(ardAppPatroluserList);//鏂板鍏宠仈浜哄憳
+ return result;
+ }
}
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 03e6a6a..bd7c0da 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,40 +2,32 @@
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;
import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
-import javax.annotation.Resource;
-
/**
* app宸℃璁″垝浜哄憳Service涓氬姟灞傚鐞�
*
* @author ard
- * @date 2023-08-02
+ * @date 2023-08-04
*/
@Service
public class ArdAppPatroluserServiceImpl implements IArdAppPatroluserService {
- @Resource
+ @Autowired
private ArdAppPatroluserMapper ardAppPatroluserMapper;
-
- @Resource
- private SysUserMapper sysUserMapper;
/**
* 鏌ヨapp宸℃璁″垝浜哄憳
*
- * @param reserved1 app宸℃璁″垝浜哄憳涓婚敭
+ * @param id app宸℃璁″垝浜哄憳涓婚敭
* @return app宸℃璁″垝浜哄憳
*/
@Override
- public ArdAppPatroluser selectArdAppPatroluserByReserved1(String reserved1) {
- return ardAppPatroluserMapper.selectArdAppPatroluserByReserved1(reserved1);
+ public ArdAppPatroluser selectArdAppPatroluserById(String id) {
+ return ardAppPatroluserMapper.selectArdAppPatroluserById(id);
}
/**
@@ -71,20 +63,25 @@
return ardAppPatroluserMapper.updateArdAppPatroluser(ardAppPatroluser);
}
+ /**
+ * 鎵归噺鍒犻櫎app宸℃璁″垝浜哄憳
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑app宸℃璁″垝浜哄憳涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdAppPatroluserByIds(String[] ids) {
+ return ardAppPatroluserMapper.deleteArdAppPatroluserByIds(ids);
+ }
/**
* 鍒犻櫎app宸℃璁″垝浜哄憳淇℃伅
*
- * @param reserved1 app宸℃璁″垝浜哄憳涓婚敭
+ * @param id app宸℃璁″垝浜哄憳涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteArdAppPatroluserByReserved1(String reserved1) {
- return ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1(reserved1);
- }
-
- @Override
- public Results userByPlanId(String id) {
- return Results.succeed(sysUserMapper.userByPlanId(id));
+ public int deleteArdAppPatroluserById(String id) {
+ return ardAppPatroluserMapper.deleteArdAppPatroluserById(id);
}
}
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 1e9ea58..4646180 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -103,4 +103,8 @@
#{id}
</foreach>
</delete>
+
+ <delete id="deleteArdAppPatrolplanById" parameterType="String">
+ delete from ard_app_patrolplan aap where aap.id = #{id};
+ </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 f71518f..a59d641 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolpointMapper.xml
@@ -65,4 +65,15 @@
#{id}
</foreach>
</delete>
+
+ <insert id="insertArdAppPatrolpointList" parameterType="ArdAppPatrolpoint">
+ insert into ard_app_patrolpoint (id,patrolplan_id,alarmpoints_id,type) values
+ <foreach collection="ardAppPatrolpointList" separator="," item="ardAppPatrolpoint">
+ (#{ardAppPatrolpoint.id},#{ardAppPatrolpoint.patrolplanId},
+ #{ardAppPatrolpoint.alarmpointsId},#{ardAppPatrolpoint.type})
+ </foreach>
+ </insert>
+ <delete id="deleteArdAppPatrolpointByPlanId" parameterType="String">
+ delete from ard_app_patrolpoint aap where aap.patrolplan_id = #{id}
+ </delete>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml
index 67f42cd..205e865 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml
@@ -5,38 +5,37 @@
<mapper namespace="com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper">
<resultMap type="ArdAppPatroluser" id="ArdAppPatroluserResult">
- <result property="reserved1" column="reserved_1" />
+ <result property="id" column="id" />
<result property="patrolplanId" column="patrolplan_id" />
<result property="appUserId" column="app_user_id" />
</resultMap>
<sql id="selectArdAppPatroluserVo">
- select reserved_1, patrolplan_id, app_user_id from ard_app_patroluser
+ select id, patrolplan_id, app_user_id from ard_app_patroluser
</sql>
<select id="selectArdAppPatroluserList" parameterType="ArdAppPatroluser" resultMap="ArdAppPatroluserResult">
<include refid="selectArdAppPatroluserVo"/>
<where>
- <if test="reserved1 != null and reserved1 != ''"> and reserved_1 = #{reserved1}</if>
<if test="patrolplanId != null and patrolplanId != ''"> and patrolplan_id = #{patrolplanId}</if>
<if test="appUserId != null and appUserId != ''"> and app_user_id = #{appUserId}</if>
</where>
</select>
- <select id="selectArdAppPatroluserByReserved1" parameterType="String" resultMap="ArdAppPatroluserResult">
+ <select id="selectArdAppPatroluserById" parameterType="String" resultMap="ArdAppPatroluserResult">
<include refid="selectArdAppPatroluserVo"/>
- where reserved_1 = #{reserved1}
+ where id = #{id}
</select>
<insert id="insertArdAppPatroluser" parameterType="ArdAppPatroluser">
insert into ard_app_patroluser
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="reserved1 != null">reserved_1,</if>
+ <if test="id != null">id,</if>
<if test="patrolplanId != null">patrolplan_id,</if>
<if test="appUserId != null">app_user_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="reserved1 != null">#{reserved1},</if>
+ <if test="id != null">#{id},</if>
<if test="patrolplanId != null">#{patrolplanId},</if>
<if test="appUserId != null">#{appUserId},</if>
</trim>
@@ -48,17 +47,27 @@
<if test="patrolplanId != null">patrolplan_id = #{patrolplanId},</if>
<if test="appUserId != null">app_user_id = #{appUserId},</if>
</trim>
- where reserved_1 = #{reserved1}
+ where id = #{id}
</update>
- <delete id="deleteArdAppPatroluserByReserved1" parameterType="String">
- delete from ard_app_patroluser where patrolplan_id = #{id}
+ <delete id="deleteArdAppPatroluserById" parameterType="String">
+ delete from ard_app_patroluser where id = #{id}
</delete>
- <delete id="deleteArdAppPatroluserByReserved1s" parameterType="String">
- delete from ard_app_patroluser where reserved_1 in
- <foreach item="reserved1" collection="array" open="(" separator="," close=")">
- #{reserved1}
+ <delete id="deleteArdAppPatroluserByIds" parameterType="String">
+ delete from ard_app_patroluser where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
</foreach>
</delete>
+
+ <insert id="insertArdAppPatroluserList" parameterType="ArdAppPatroluser">
+ insert into ard_app_patroluser (id,patrolplan_id,app_user_id) values
+ <foreach collection="ardAppPatroluserList" separator="," item="ardAppPatroluser">
+ (#{ardAppPatroluser.id},#{ardAppPatroluser.patrolplanId},#{ardAppPatroluser.appUserId})
+ </foreach>
+ </insert>
+ <delete id="deleteArdAppPatroluserByPlanId" parameterType="String">
+ delete from ard_app_patroluser aap where aap.patrolplan_id = #{id}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3