From 76d4ed516122db433859648d58bc971c7b0ce581 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 17:23:55 +0800
Subject: [PATCH] 修改取水口名称（编号）重复验证
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 17 ++------
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 14 ++++--
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 16 ++++---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java | 17 +++++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 13 ++++--
6 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
index 3cea409..bbdc3d0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
@@ -141,15 +141,17 @@
Long getIntakeIdByName(String intakeName);
/**
- * 寰楀埌鎵�鏈夌殑鍙栨按鍙ｅ悕绉�
- * @return
- */
- List<String> getIntakeName();
-
- /**
* 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
* @param intakeName
* @return
*/
- List<Long> getIntakeIdByName1(String intakeName);
+ List<Long> getIntakeIdsByName(String intakeName);
+
+ /**
+ * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+ * @param id
+ * @param intakeName
+ * @return
+ */
+ List<Long> getIntakeIdByNameExcludeId(@Param("id")Long id, @Param("intakeName")String intakeName);
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java
index c2ec2de..e9ef13e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java
@@ -43,6 +43,13 @@
public Long intakeid;
/**
+ * 缁熻鏃ユ湡
+ */
+ @Schema(description = "鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ public Date dt;
+
+ /**
* 绱鍙栨按閲忥紙涓嶅寘鎷紡鎹熸按閲忥級
*/
@Schema(description = "绱鍙栨按閲忥紙涓嶅寘鎷紡鎹熸按閲忥級", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -55,6 +62,12 @@
public Double loss;
/**
+ * 鏈�鍚庤姘撮噺鐨勬帶鍒跺櫒鍦板潃
+ */
+ @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String rtuAddrLast;
+
+ /**
* 鏈�鍚庤姘撮噺鐨勬帶鍒跺櫒ID锛堝閿級
*/
@Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -62,9 +75,9 @@
public Long controlleridlast;
/**
- * 鏈�鍚庤姘撮噺鏃ユ湡
+ * 鏈�鍚庤姘撮噺涓婃姤鏁版嵁鎺ユ敹鏃堕棿
*/
- @Schema(description = "鏈�鍚庤姘撮噺鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鏁版嵁鎺ユ敹鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date dtlast;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 0c1ea74..2d7461b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -443,13 +443,16 @@
SELECT id AS intakeId FROM pr_intake WHERE `name` = #{intakeName}
</select>
- <!--寰楀埌鎵�鏈夌殑鍙栨按鍙ｅ悕绉�-->
- <select id="getIntakeName" resultType="java.lang.String">
- SELECT `name` FROM pr_intake WHERE deleted = 0
+ <!--鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�-->
+ <select id="getIntakeIdsByName" resultType="java.lang.Long">
+ SELECT id AS intakeId FROM pr_intake WHERE `name` = #{intakeName}
</select>
<!--鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�-->
- <select id="getIntakeIdByName1" resultType="java.lang.Long">
- SELECT id AS intakeId FROM pr_intake WHERE `name` = #{intakeName}
+ <select id="getIntakeIdByNameExcludeId" resultType="java.lang.Long">
+ SELECT id AS intakeId FROM pr_intake WHERE id != #{id} and `name` = #{intakeName}
</select>
+
+
+
</mapper>
\ No newline at end of file
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 2d966ea..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,12 +147,11 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- List<Long> ids = intakeSv.getIntakeIdByName1(po.getName());
+ 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) {
@@ -182,18 +181,12 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- List<Long> ids = intakeSv.getIntakeIdByName1(po.getName());
+ List<Long> ids = intakeSv.getIntakeIdByNameExcludeId(po.getId(), po.getName());
if (ids.size() > 0){
- if (!ids.contains(po.getId())){
- return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
- }
- if (ids.size() > 1){
- return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
- }
+ 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) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index 1c61f81..e3080e5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -287,12 +287,14 @@
return response.getBody();
}
+
/**
- * 寰楀埌鎵�鏈夊彇姘村彛鍚嶇О
+ * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+ * @param intakeName
* @return
*/
- public List<String> getIntakeName() {
- return prIntakeMapper.getIntakeName();
+ public List<Long> getIntakeIdsByName(String intakeName) {
+ return prIntakeMapper.getIntakeIdsByName(intakeName);
}
/**
@@ -300,7 +302,9 @@
* @param intakeName
* @return
*/
- public List<Long> getIntakeIdByName1(String intakeName) {
- return prIntakeMapper.getIntakeIdByName1(intakeName);
+ public List<Long> getIntakeIdByNameExcludeId(Long id, String intakeName) {
+ return prIntakeMapper.getIntakeIdByNameExcludeId(id, intakeName);
}
+
+
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
index a2d188a..6cd64b9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
@@ -29,7 +29,7 @@
PLEASE_INPUT_INTAKE_ID(20004, "鍙栨按鍙ｇ紪鍙蜂笉涓虹┖"),
DELETE_INTAKE_FAIL(20005, "鍙栨按鍙ｅ垹闄ゅけ璐�"),
NO_BINDING_INTAKE(20006, "娌℃湁鏈粦瀹氱殑鍙栨按鍙�"),
- INTAKE_NAME_EXIST(20006, "鍙栨按鍙ｅ悕绉板凡瀛樺湪"),
+ INTAKE_NAME_EXIST(20007, "鍙栨按鍙ｅ悕绉板凡瀛樺湪"),
/**
* 鎺у埗鍣�
--
Gitblit v1.8.0