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

Administrator

2024-05-27 42f5453644c41d3b6ac9e381f931efdfc9da8178

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

@@ -250,14 +250,24 @@
    @PostMapping(path = "add_unit", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> addGroupUnit(@RequestBody @Valid IrGroupUnit 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());
        }
        Long groupId = Long.parseLong(po.get("groupId").toString());
        Long operator = Long.parseLong(po.get("operator").toString());
        List<Long> unitIds = (List<Long>) po.get("unitIds");
        try {
            Integer rec = Optional.ofNullable(irrigateGroupSv.addGroupUnit(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
            for (int i = 0; i < unitIds.size(); i++) {
                Long unitId = unitIds.get(i);
                IrGroupUnit irGroupUnit = new IrGroupUnit();
                irGroupUnit.setGroupId(groupId);
                irGroupUnit.setUnitId(unitId);
                irGroupUnit.setOperator(operator);
                Integer rec = Optional.ofNullable(irrigateGroupSv.addGroupUnit(irGroupUnit)).orElse(0);
                if (rec == 0) {
                    return BaseResponseUtils.buildFail(IrrigateResultCode.ADD_PROJECT_FAIL.getMessage());
                }
            }
        } catch (Exception e) {
            log.error("轮灌组添加灌溉单元异常", e);
@@ -267,7 +277,7 @@
    }

    /**
     * 逻辑删除 轮灌组移除灌溉单元
     *  轮灌组移除灌溉单元
     * @param
     * @return
     */
@@ -283,15 +293,26 @@
    @PostMapping(path = "remove_unit")
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> deleteGroupUnit(@RequestBody @Valid IrGroupUnit 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());
        }
        Long groupId = Long.parseLong(po.get("groupId").toString());
        Long operator = Long.parseLong(po.get("operator").toString());
        List<Long> unitIds = (List<Long>) po.get("unitIds");
        try {
            Integer rec = Optional.ofNullable(irrigateGroupSv.deleteGroupUnit(po)).orElse(0);
            if (rec == 0) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
            for (int i = 0; i < unitIds.size(); i++) {
                Long unitId = unitIds.get(i);
                IrGroupUnit irGroupUnit = new IrGroupUnit();
                irGroupUnit.setGroupId(groupId);
                irGroupUnit.setUnitId(unitId);
                irGroupUnit.setOperator(operator);
                Integer rec = Optional.ofNullable(irrigateGroupSv.deleteGroupUnit(irGroupUnit)).orElse(0);
                if (rec == 0) {
                    return BaseResponseUtils.buildFail(IrrigateResultCode.DELETE_PROJECT_FAIL.getMessage());
                }
            }

        } catch (Exception e) {
            log.error("轮灌组移除灌溉单元异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
@@ -310,4 +331,16 @@
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

    @GetMapping(path = "notBind_units")
    @SsoAop()
    public BaseResponse<List<Long>> getNotBindUnits() {
        try {
            List<Long> res = irrigateGroupSv.getNotBindUnits();
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取未绑定轮灌组的灌溉单元id记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }
}