From 16900a8d681aed70bca5b3fea8dc28715dde9712 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 17 七月 2024 09:53:13 +0800
Subject: [PATCH] 2024-07-17 朱宝民 重构了获取取水口两个接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 9bbdea9..455015f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -147,15 +147,11 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- List<String> intakeNameList = intakeSv.getIntakeName();
- for (int i = 0; i < intakeNameList.size(); i++) {
- String intakeName = intakeNameList.get(i);
- if (intakeName.equals(po.getName())) {
- return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
- }
+ List<Long> ids = intakeSv.getIntakeIdsByName(po.getName());
+ if (ids.size() > 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
}
- Date operateTime = new Date();
- po.setOperateDt(operateTime);
+ po.setOperateDt(new Date());
po.setDeleted((byte)0);
Integer rec = Optional.ofNullable(intakeSv.addIntake(po)).orElse(0);
if (rec == 0) {
@@ -185,16 +181,12 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- List<String> intakeNameList = intakeSv.getIntakeName();
- for (int i = 0; i < intakeNameList.size(); i++) {
- String intakeName = intakeNameList.get(i);
- if (intakeName.equals(po.getName())) {
- return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
- }
+ List<Long> ids = intakeSv.getIntakeIdByNameExcludeId(po.getId(), po.getName());
+ if (ids.size() > 0){
+ return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
}
int count;
- Date operateTime = new Date();
- po.setOperateDt(operateTime);
+ po.setOperateDt( new Date());
try {
count = this.intakeSv.update(po);
} catch (Exception e) {
--
Gitblit v1.8.0