添加取水口和更改取水口时判断取水口是否重名 重新优化

wuzeyu

2024-07-05 79e481b7da2a83c769f9709eeec0e7130359be1b

添加取水口和更改取水口时判断取水口是否重名 重新优化

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java

@@ -145,4 +145,11 @@
     * @return
     */
    List<String> getIntakeName();

    /**
     * 取水口名称换取水口ID，验证是否重复名称使用
     * @param intakeName
     * @return
     */
    List<Long> getIntakeIdByName1(String intakeName);
}

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml

@@ -447,4 +447,9 @@
  <select id="getIntakeName" resultType="java.lang.String">
    SELECT `name`  FROM pr_intake WHERE deleted = 0
  </select>

  <!--取水口名称换取水口ID，验证是否重复名称使用-->
  <select id="getIntakeIdByName1" resultType="java.lang.Long">
    SELECT id AS intakeId FROM pr_intake WHERE `name` = #{intakeName}
  </select>
</mapper>

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java

@@ -147,12 +147,9 @@
        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.getIntakeIdByName1(po.getName());
        if (ids.size() > 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
        }
        Date operateTime = new Date();
        po.setOperateDt(operateTime);
@@ -185,10 +182,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())) {
        List<Long> ids = intakeSv.getIntakeIdByName1(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());
            }
        }

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java

@@ -294,4 +294,13 @@
    public List<String> getIntakeName() {
        return prIntakeMapper.getIntakeName();
    }

    /**
     * 取水口名称换取水口ID，验证是否重复名称使用
     * @param intakeName
     * @return
     */
    public List<Long> getIntakeIdByName1(String intakeName) {
        return prIntakeMapper.getIntakeIdByName1(intakeName);
    }
}