From 046a1118a456bfc9a7eca1bf06b7a6e95c94c120 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 12 十一月 2024 17:45:21 +0800
Subject: [PATCH] rtu远程升级任务中，实现删除一个和全部控制器功能
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml | 5 ++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java | 69 ++++++++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java | 19 +++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java | 7 +++
4 files changed, 100 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java
index 270dc86..a40bec4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java
@@ -24,6 +24,13 @@
* @return deleteCount
*/
int deleteByPrimaryKey(Long id);
+ /**
+ * delete by task key
+ *
+ * @param taskId task id
+ * @return deleteCount
+ */
+ int deleteByTaskId(@Param("taskId")Long taskId);
/**
* insert record to table
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
index 48a02fb..2c77f15 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
@@ -122,6 +122,11 @@
delete from ug_rtu_controller
where id = #{id,jdbcType=BIGINT}
</delete>
+ <delete id="deleteByTaskId" parameterType="java.lang.Long">
+ delete from ug_rtu_controller
+ where task_id = #{taskId,jdbcType=BIGINT}
+ </delete>
+
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
<!--@mbg.generated-->
insert into ug_rtu_controller (id, task_id, controller_id,
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java
index f2db173..c743bd7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java
@@ -74,4 +74,73 @@
}
}
+ /**
+ * 鍒犻櫎鍗囩骇浠诲姟鎵�鏈夋帶鍒跺櫒
+ * @param taskId 浠诲姟id
+ * @return 鏄惁鎴愬姛
+ */
+ @Operation(summary = "鍒犻櫎鍗囩骇浠诲姟鎵�鏈夋帶鍒跺櫒", description = "鍒犻櫎鍗囩骇浠诲姟鎵�鏈夋帶鍒跺櫒")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @GetMapping(path = "deleteAll")
+ @SsoAop()
+ public BaseResponse<Boolean> deleteAll(Long taskId){
+ if(taskId == null){
+ return BaseResponseUtils.buildFail("浠诲姟id涓嶈兘涓虹┖") ;
+ }
+ int count;
+ try {
+ count = this.sv.deleteAll(taskId);
+ } catch (Exception e) {
+ log.error("鍒犻櫎鍗囩骇鎵�鏈夊璞℃帶鍒跺櫒寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ if(count <= 0){
+ return BaseResponseUtils.buildFail("鏁版嵁搴撴搷浣滃け璐�") ;
+ }else{
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+ }
+
+
+ /**
+ * 鍗囩骇浠诲姟鎺у埗鍣ㄩ泦鍚堜腑鍒犻櫎涓�涓帶鍒跺櫒
+ * @param id 鏁版嵁璁板綍id
+ * @return 鏄惁鎴愬姛
+ */
+ @Operation(summary = "鍗囩骇浠诲姟鎺у埗鍣ㄩ泦鍚堜腑鍒犻櫎涓�涓帶鍒跺櫒", description = "鍗囩骇浠诲姟鎺у埗鍣ㄩ泦鍚堜腑鍒犻櫎涓�涓帶鍒跺櫒")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @GetMapping(path = "deleteOne")
+ @SsoAop()
+ public BaseResponse<Boolean> deleteOne(Long id){
+ if(id == null){
+ return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+ }
+ int count;
+ try {
+ count = this.sv.deleteOne(id);
+ } catch (Exception e) {
+ log.error("鍒犻櫎鍗囩骇瀵硅薄鎺у埗鍣ㄥ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ if(count <= 0){
+ return BaseResponseUtils.buildFail("鏁版嵁搴撴搷浣滃け璐�") ;
+ }else{
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+ }
+
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java
index 02ca4b5..4787a6b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java
@@ -76,4 +76,23 @@
public int save(UgRtuController po){
return this.dao.insertSelective(po) ;
}
+
+ /**
+ * 鍒犻櫎鎵�鏈�
+ * @param taskId 浠诲姟涓婚敭
+ * @return 鏁伴噺
+ */
+ @Transactional
+ public int deleteAll(Long taskId){
+ return this.dao.deleteByTaskId(taskId) ;
+ }
+ /**
+ * 鍒犻櫎
+ * @param id 涓婚敭
+ * @return 鏁伴噺
+ */
+ @Transactional
+ public int deleteOne(Long id){
+ return this.dao.deleteByPrimaryKey(id) ;
+ }
}
--
Gitblit v1.8.0