田间灌溉项目管理 灌溉制度模块 修改查询流浪灌溉单元和已绑定灌溉单元接口返回id类型 作物分页查...

wuzeyu

2024-05-27 12e9ce64c364deb7ea08ba82f8d72abf6e561fc2

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

@@ -31,10 +31,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.*;

/**
 * @author :WuZeYu
@@ -293,15 +290,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());
@@ -311,10 +319,15 @@

    @GetMapping(path = "bind_units")
    @SsoAop()
    public BaseResponse<List<Long>> getGroupBindUnits(Long id) {
    public BaseResponse<List<String>> getGroupBindUnits(Long id) {
        try {
            List<Long> res = irrigateGroupSv.getGroupBindUnits(id);
            return BaseResponseUtils.buildSuccess(res);
            ArrayList<Object> list = new ArrayList<>();
            for (int i = 0; i < res.size(); i++) {
                String aLong = res.get(i).toString();
                list.add(aLong);
            }
            return BaseResponseUtils.buildSuccess(list);
        } catch (Exception e) {
            log.error("获取一个轮灌组绑定灌溉单元记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
@@ -323,10 +336,15 @@

    @GetMapping(path = "notBind_units")
    @SsoAop()
    public BaseResponse<List<Long>> getNotBindUnits() {
    public BaseResponse<List<String>> getNotBindUnits() {
        try {
            List<Long> res = irrigateGroupSv.getNotBindUnits();
            return BaseResponseUtils.buildSuccess(res);
            ArrayList<Object> list = new ArrayList<>();
            for (int i = 0; i < res.size(); i++) {
                String aLong = res.get(i).toString();
                list.add(aLong);
            }
            return BaseResponseUtils.buildSuccess(list);
        } catch (Exception e) {
            log.error("获取未绑定轮灌组的灌溉单元id记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());