From 955ec151b467016c24235e28b9ea09d324db7139 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 24 九月 2024 14:26:02 +0800
Subject: [PATCH] 2024-09-24 朱宝民 修改付款方式
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 fe3ca1a..7fbc6bf 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();
@@ -188,6 +188,7 @@
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());
@@ -282,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());
--
Gitblit v1.8.0