Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

Administrator

2024-07-22 759160807674a36ad8b04ea516da258a8d0cfef5

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/crop/CropCtrl.java

@@ -74,7 +74,7 @@
        try {
            Integer rec = Optional.ofNullable(cropSv.addCrop(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_CROP_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("添加作物异常", e);
@@ -102,13 +102,13 @@
    @SsoAop()
    public BaseResponse<Boolean> delete(@RequestBody Map map) {
        if (map == null || map.size() <= 0) {
            BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage());
            BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_CROP_ID.getMessage());
        }
        Long cropId = Long.parseLong(map.get("id").toString());
        try {
            Integer rows = cropSv.deleteCrop(cropId);
            if (rows == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_CROP_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("删除作物异常", e);
@@ -142,7 +142,7 @@
        try {
            Integer rec = Optional.ofNullable(cropSv.updateCrop(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_CROP_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("修改作物异常", e);

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java

@@ -71,7 +71,7 @@
        try {
            Integer rec = Optional.ofNullable(irrigateGroupSv.addIrrigateGroup(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_GROUP_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("创建轮灌组异常", e);
@@ -100,13 +100,13 @@
    @SsoAop()
    public BaseResponse<Boolean> delete(@RequestBody Map map) {
        if (map == null || map.size() <= 0) {
            BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage());
            BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_GROUP_ID.getMessage());
        }
        Long groupId = Long.parseLong(map.get("id").toString());
        try {
            Integer rows = irrigateGroupSv.deleteIrrigateGroup(groupId);
            if (rows == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_GROUP_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("删除轮灌组异常", e);
@@ -134,7 +134,7 @@
            try {
                Integer rows = irrigateGroupSv.deleteIrrigateGroup(groupId);
                if (rows == 0) {
                    return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
                    return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_GROUP_FAIL.getMessage());
                }
            } catch (Exception e) {
                log.error("删除轮灌组异常", e);
@@ -170,7 +170,7 @@
        try {
            Integer rec = Optional.ofNullable(irrigateGroupSv.updateIrrigateGroup(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_GROUP_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("修改轮灌组异常", e);
@@ -264,7 +264,7 @@
                irGroupUnit.setOperator(operator);
                Integer rec = Optional.ofNullable(irrigateGroupSv.addGroupUnit(irGroupUnit)).orElse(0);
                if (rec == 0) {
                    return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                    return BaseResponseUtils.buildFail(IrrigateResultCode.GROUP_ADD_UNIT_FAIL.getMessage());
                }
            }
        } catch (Exception e) {

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateScheduling/IrrigateSchedulingCtrl.java

@@ -71,7 +71,7 @@
        try {
            Integer rec = Optional.ofNullable(irIrrigateSchedulingSv.addScheduling(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_SCHEDULING_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("添加作物灌溉制度异常", e);
@@ -98,13 +98,13 @@
    @SsoAop()
    public BaseResponse<Boolean> delete(@RequestBody Map map) {
        if (map == null || map.size() <= 0) {
            BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage());
            BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_SCHEDULING_ID.getMessage());
        }
        Long schedulingId = Long.parseLong(map.get("id").toString());
        try {
            Integer rows = irIrrigateSchedulingSv.deleteScheduling(schedulingId);
            if (rows == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_SCHEDULING_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("删除作物灌溉制度异常", e);
@@ -138,7 +138,7 @@
        try {
            Integer rec = Optional.ofNullable(irIrrigateSchedulingSv.updateScheduling(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_SCHEDULING_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("修改作物灌溉制度异常", e);

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitCtrl.java

@@ -71,7 +71,7 @@
        try {
            Integer rec = Optional.ofNullable(irrigateUnitSv.addIrrigateUnit(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_UNIT_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("创建灌溉单元异常", e);
@@ -99,13 +99,13 @@
    @SsoAop()
    public BaseResponse<Boolean> delete(@RequestBody Map map) {
        if (map == null || map.size() <= 0) {
            BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_PROJECT_ID.getMessage());
            BaseResponseUtils.buildFail(IrrigateResultCode.PLEASE_INPUT_UNIT_ID.getMessage());
        }
        Long unitId = Long.parseLong(map.get("id").toString());
        try {
            Integer rows = irrigateUnitSv.deleteUnit(unitId);
            if (rows == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_UNIT_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("删除灌溉单元异常", e);
@@ -132,7 +132,7 @@
            try {
                Integer rows = irrigateUnitSv.deleteUnit(unitId);
                if (rows == 0) {
                    return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
                    return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_UNIT_FAIL.getMessage());
                }
            } catch (Exception e) {
                log.error("删除灌溉单元异常", e);
@@ -167,7 +167,7 @@
        try {
            Integer rec = Optional.ofNullable(irrigateUnitSv.updateUnit(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_PROJECT_FAIL.getMessage());
                return BaseResponseUtils.buildFail(IrrigateResultCode.UPDATE_UNIT_FAIL.getMessage());
            }
        } catch (Exception e) {
            log.error("修改灌溉单元异常", e);

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/result/IrrigateResultCode.java

@@ -26,13 +26,40 @@
     * 灌溉单元
     */
    UNIT_ASSOCIATE_CLIENT_FAIL(20001, "灌溉单元分配失败"),
    ADD_UNIT_FAIL(20002, "灌溉单元添加失败"),
    PLEASE_INPUT_UNIT_ID(20003, "请输入灌溉单元ID"),
    DELETE_UNIT_FAIL(20004, "灌溉单元删除失败"),
    UPDATE_UNIT_FAIL(20005, "灌溉单元修改失败"),

    /**
     * 轮灌组
     */
    GRPUP_ASSOCIATE_CLIENT_FAIL(30001, "轮灌组关联农户失败");
    GRPUP_ASSOCIATE_CLIENT_FAIL(30001, "轮灌组关联农户失败"),
    ADD_GROUP_FAIL(30002, "轮灌组添加失败"),
    PLEASE_INPUT_GROUP_ID(30003, "请输入轮灌组ID"),
    DELETE_GROUP_FAIL(30004, "轮灌组删除失败"),
    UPDATE_GROUP_FAIL(30005, "轮灌组修改失败"),
    GROUP_ADD_UNIT_FAIL(30006, "轮灌组添加灌溉单元失败"),
    GROUP_DELETE_UNIT_FAIL(30007, "轮灌组移除灌溉单元失败"),
    UPDATE_GROUP_BIND_UNIT_FAIL(30008, "修改轮灌组绑定的灌溉单元失败"),

//    ADD_IRRIGATE_UNIT_FAIL(20001, "创建灌溉单元失败"),
    /**
     * 作物
     */
    ADD_CROP_FAIL(40001, "作物添加失败"),
    PLEASE_INPUT_CROP_ID(40002, "请输入作物ID"),
    DELETE_CROP_FAIL(40003, "作物删除失败"),
    UPDATE_CROP_FAIL(40004, "作物修改失败"),

    /**
     * 作物灌溉制度
     */
    ADD_SCHEDULING_FAIL(50001, "作物灌溉制度添加失败"),
    PLEASE_INPUT_SCHEDULING_ID(50002, "请输入作物灌溉制度ID"),
    DELETE_SCHEDULING_FAIL(50003, "作物灌溉制度删除失败"),
    UPDATE_SCHEDULING_FAIL(50004, "作物灌溉制度修改失败");



    private final Integer code;
    private final String message;