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

liurunyu

2024-07-05 f66dc30060a34526e0603f698aba0e2dfc30f206

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

@@ -85,6 +85,7 @@

    /**
     * 逻辑删除灌溉单元
     *
     * @param
     * @return
     */
@@ -119,6 +120,7 @@

    /**
     * 批量删除
     *
     * @param groupIds
     * @return
     */
@@ -147,6 +149,7 @@

    /**
     * 修改灌溉单元
     *
     * @param po
     * @param bindingResult
     * @return
@@ -163,7 +166,7 @@
    @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> update(@RequestBody @Valid IrIrrigateGroup po, BindingResult bindingResult){
    public BaseResponse<Boolean> update(@RequestBody @Valid IrIrrigateGroup po, BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
@@ -204,6 +207,7 @@

    /**
     * 分页查询
     *
     * @param vo
     * @return
     */
@@ -247,7 +251,7 @@
    @PostMapping(path = "add_unit", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> addGroupUnit(@RequestBody @Valid Map<String,Object> po, BindingResult bindingResult) {
    public BaseResponse<Boolean> addGroupUnit(@RequestBody @Valid Map<String, Object> po, BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
@@ -274,7 +278,8 @@
    }

    /**
     *  轮灌组移除灌溉单元
     * 轮灌组移除灌溉单元
     *
     * @param
     * @return
     */
@@ -290,7 +295,7 @@
    @PostMapping(path = "remove_unit")
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> deleteGroupUnit(@RequestBody @Valid Map<String,Object> po, BindingResult bindingResult) {
    public BaseResponse<Boolean> deleteGroupUnit(@RequestBody @Valid Map<String, Object> po, BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
@@ -352,7 +357,6 @@
    }



    /**
     * 修改轮灌组绑定的灌溉单元
     *
@@ -372,37 +376,37 @@
    @PostMapping(path = "updateBindUnits", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> updateBindUnits(@RequestBody @Valid Map<String,Object> po, BindingResult bindingResult){
    public BaseResponse<Boolean> updateBindUnits(@RequestBody @Valid Map<String, Object> po, BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        Long groupId = Long.parseLong(po.get("groupId").toString());
        Long operator = Long.parseLong(po.get("operator").toString());
        List<Long> newUnitIds = (List<Long>) po.get("unitIds");

        List<String> newUnitIds = (List<String>) po.get("unitIds");
        List<Long> oldUnitIds = irrigateGroupSv.getGroupBindUnits(groupId);

        IrGroupUnit irGroupUnit = new IrGroupUnit();
        irGroupUnit.setGroupId(groupId);
        irGroupUnit.setOperator(operator);
        try {
            for (int j = 0; j < oldUnitIds.size(); j++) {
                Long oldUnitId = oldUnitIds.get(j);
                IrGroupUnit irGroupUnit1 = new IrGroupUnit();
                irGroupUnit1.setGroupId(groupId);
                irGroupUnit1.setUnitId(oldUnitId);
                irGroupUnit1.setOperator(operator);
                Integer rec = Optional.ofNullable(irrigateGroupSv.deleteGroupUnit(irGroupUnit1)).orElse(0);
                if (rec == 0) {
                    return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                if (!newUnitIds.toString().contains(oldUnitId.toString())) {
                    irGroupUnit.setUnitId(oldUnitId);
                    Integer rec = Optional.ofNullable(irrigateGroupSv.deleteGroupUnit(irGroupUnit)).orElse(0);
                    if (rec == 0) {
                        return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                    }
                }
            }
            for (int i = 0; i < newUnitIds.size(); i++) {
                Long newUnitId = newUnitIds.get(i);
                IrGroupUnit irGroupUnit2 = new IrGroupUnit();
                irGroupUnit2.setGroupId(groupId);
                irGroupUnit2.setUnitId(newUnitId);
                irGroupUnit2.setOperator(operator);
                Integer rec = Optional.ofNullable(irrigateGroupSv.addGroupUnit(irGroupUnit2)).orElse(0);
                if (rec == 0) {
                    return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                Long newUnitId = Long.parseLong(newUnitIds.get(i));
                if (!oldUnitIds.toString().contains(newUnitId.toString())) {
                    irGroupUnit.setUnitId(newUnitId);
                    Integer rec = Optional.ofNullable(irrigateGroupSv.addGroupUnit(irGroupUnit)).orElse(0);
                    if (rec == 0) {
                        return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                    }
                }
            }
        } catch (Exception e) {