liurunyu
2024-07-05 f66dc30060a34526e0603f698aba0e2dfc30f206
Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
5个文件已修改
37 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java
@@ -139,4 +139,10 @@
     * @return
     */
    Long getIntakeIdByName(String intakeName);
    /**
     * 得到所有的取水口名称
     * @return
     */
    List<String> getIntakeName();
}
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -442,4 +442,9 @@
  <select id="getIntakeIdByName" resultType="java.lang.Long">
    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
  </select>
</mapper>
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -147,7 +147,13 @@
        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());
            }
        }
        Date operateTime = new Date();
        po.setOperateDt(operateTime);
        po.setDeleted((byte)0);
@@ -179,13 +185,20 @@
        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());
            }
        }
        int count;
        Date operateTime = new Date();
        po.setOperateDt(operateTime);
        try {
            count = this.intakeSv.update(po);
        } catch (Exception e) {
            log.error("保存分水口异常", e);
            log.error("保存取水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
        if (count <= 0) {
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -286,4 +286,12 @@
        }
        return response.getBody();
    }
    /**
     * 得到所有取水口名称
     * @return
     */
    public List<String> getIntakeName() {
        return prIntakeMapper.getIntakeName();
    }
}
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
@@ -29,6 +29,7 @@
    PLEASE_INPUT_INTAKE_ID(20004, "取水口编号不为空"),
    DELETE_INTAKE_FAIL(20005, "取水口删除失败"),
    NO_BINDING_INTAKE(20006, "没有未绑定的取水口"),
    INTAKE_NAME_EXIST(20006, "取水口名称已存在"),
    /**
     * 控制器