From baff68fa55ed3212f618330e18cc5735b1caf57f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 12 十月 2024 10:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 75 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
index 252376c..5c481f2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
@@ -1,7 +1,6 @@
package com.dy.pipIrrProject.intakeController;
-import cn.hutool.core.date.DateTime;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -104,6 +103,7 @@
prController.setRtuAddr(prControllerTramp.getRtuAddr());
prController.setProtocol(prControllerTramp.getProtocol());
prController.setFindDt(prControllerTramp.getFindDt());
+ prController.setOrgTag(prControllerTramp.getOrgTag());
prController.setAddWays((byte) 1);
prController.setOperator(operator);
Date operateTime = new Date();
@@ -113,17 +113,18 @@
if (rec_addController == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
+// if (remarks != null || remarks !=""){
+// // 淇敼缁戝畾璁板綍
+// PrIntakeController prIntakeController = new PrIntakeController();
+// prIntakeController.setRemarks(remarks);
+// prIntakeController.setIntakeid(intakeId);
+//
+// Integer rec = Optional.ofNullable(intakeControllerSv.updateBindRecord(prIntakeController)).orElse(0);
+// if (rec == 0) {
+// return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
+// }
+// }
-
- // 淇敼缁戝畾璁板綍
- PrIntakeController prIntakeController = new PrIntakeController();
- prIntakeController.setRemarks(remarks);
- prIntakeController.setIntakeid(intakeId);
-
- Integer rec = Optional.ofNullable(intakeControllerSv.updateBindRecord(prIntakeController)).orElse(0);
- if (rec == 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
- }
// 鏍规嵁娴佹氮鎺у埗鍣ㄧ紪鍙峰垹闄ゆ祦娴帶鍒跺櫒璁板綍
intakeControllerSv.deleteTrampController(trampControllerId);
@@ -176,13 +177,24 @@
Date operateTime = new Date();
prIntakeController.setOperatedt(operateTime);
prIntakeController.setOperatetype((byte) 2);
+ prIntakeController.setRemarks("瑙ｇ粦");
Integer rec = Optional.ofNullable(intakeControllerSv.addRecord(prIntakeController)).orElse(0);
if (rec == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
-
- // 鍒犻櫎鎺у埗鍣ㄥ閿�
- Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteIntakeId(po.getControllerId())).orElse(0);
+ //娣诲姞鍒版祦娴帶鍒跺櫒
+ PrController ControllerList = controllerSv.getByControllerId(po.getControllerId());
+ PrControllerTramp prControllerTramp = new PrControllerTramp();
+ prControllerTramp.setRtuAddr(ControllerList.getRtuAddr());
+ prControllerTramp.setProtocol(ControllerList.getProtocol());
+ prControllerTramp.setFindDt(new Date());
+ prControllerTramp.setOrgTag(ControllerList.getOrgTag());
+ Integer rec_addControllerTramp = Optional.ofNullable(intakeControllerSv.addTrampController(prControllerTramp)).orElse(0);
+ if (rec_addControllerTramp == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
+ }
+ // 鍒犻櫎鎺у埗鍣�
+ Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteControllerByIdTwo(po.getControllerId())).orElse(0);
if (rec_deleteIntakeId == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
@@ -271,16 +283,15 @@
@GetMapping(path = "/getTrampControllers")
@SsoAop()
public BaseResponse<QueryResultVo<List<PrControllerTramp>>> getTrampControllers(TrampControllerQueryVo vo) {
-
try {
- QueryResultVo<List<PrControllerTramp>> res = intakeControllerSv.getTrampControllers(vo);
- if (res.itemTotal != null && res.itemTotal > 0) {
- return BaseResponseUtils.buildSuccess(res);
- } else {
- //璇锋眰鎴愬姛浣嗘暟鎹负绌�
- return BaseResponseUtils.buildSuccess(res);
- }
- //return BaseResponseUtils.buildSuccess(res);
+ //QueryResultVo<List<PrControllerTramp>> res = intakeControllerSv.getTrampControllers(vo);
+ //if (res.itemTotal != null && res.itemTotal > 0) {
+ // return BaseResponseUtils.buildSuccess(res);
+ //} else {
+ // //璇锋眰鎴愬姛浣嗘暟鎹负绌�
+ // return BaseResponseUtils.buildSuccess(res);
+ //}
+ return BaseResponseUtils.buildSuccess(intakeControllerSv.getTrampControllers(vo));
} catch (Exception e) {
log.error("鑾峰彇娴佹氮鎺у埗鍣ㄨ褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -326,4 +337,22 @@
}
return BaseResponseUtils.buildSuccess(true);
}
+
+ /**
+ * 娓呯┖娴佹氮鎺у埗鍣�
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("emptyTrampController")
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> emptyTrampController() {
+
+ Integer rows = intakeControllerSv.emptyTrampController();
+ if (rows == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(true);
+ }
}
--
Gitblit v1.8.0