获取已完成灌溉计划接口增加分页功能

zhubaomin

2025-04-11 9f3c4a33279f10ed420d604765487558ab0744f0

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java

@@ -6,14 +6,13 @@
import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.mw.protocol.Command;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.config.DingTalk;
import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrProject.intake.qo.OnLineIntakesQO;
import com.dy.pipIrrGlobal.voPr.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +26,9 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;

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

/**
 * @author wuzeyu
@@ -115,14 +116,14 @@
     */

    public int update(PrIntake po) {
        if (po.getTownId() == null || po.getTownId() == 0) {
            Long townId = getSupperByVillageId(po.getVillageId());
            po.setTownId(townId);
        }
        if (po.getCountyId() == null || po.getCountyId() == 0) {
            Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
            po.setCountyId(countyId);
        }
//        if (po.getTownId() == null || po.getTownId() == 0) {
//            Long townId = getSupperByVillageId(po.getVillageId());
//            po.setTownId(townId);
//        }
//        if (po.getCountyId() == null || po.getCountyId() == 0) {
//            Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
//            po.setCountyId(countyId);
//        }
        return this.prIntakeMapper.updateByPrimaryKeySelective(po);
//        return this.prIntakeMapper.updateByPrimaryKey(po);
    }
@@ -162,8 +163,8 @@
     *
     * @return 所有取水口集合
     */
    public QueryResultVo<List<PrIntake>> selectAll() {
        QueryResultVo<List<PrIntake>> rsVo = new QueryResultVo<>();
    public QueryResultVo<List<VoAllIntake>> selectAll() {
        QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
        rsVo.obj = this.prIntakeMapper.selectAll();
        return rsVo;
    }
@@ -174,7 +175,7 @@
     * @param id 取水口ID
     * @return 取水口实体
     */
    public PrIntake selectById(Long id) {
    public VoAllIntake selectById(Long id) {
        return this.prIntakeMapper.selectByPrimaryKey(id);
    }

@@ -274,21 +275,21 @@
        com.type = "innerCommand";
        JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));

        JSONArray jsonArray = new JSONArray();
        if (response != null && response.getString("code").equals("0001")) {
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
            HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);

            JSONArray jsonArray = new JSONArray();
            for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
                JSONObject jsonObject = new JSONObject();
                jsonObject.put("rtuAddr", entry.getKey());
                jsonObject.put("isOnLine", entry.getValue());
                jsonArray.add(jsonObject);
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
            if(attachment != null) {
                attachment.forEach((key, value) -> {
                    JSONObject jsonObject = new JSONObject();
                    jsonObject.put("rtuAddr", key);
                    jsonObject.put("isOnLine", value);
                    jsonArray.add(jsonObject);
                });
            }
            return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator);
        } else {
            return new ArrayList<>();
        //} else {
        //    return new ArrayList<>();
        }
        return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator);
    }

    /**
@@ -309,6 +310,11 @@
        } catch (Exception e) {
            e.printStackTrace();
        }

        if(response == null) {
            return BaseResponseUtils.buildErrorMsg("中间件调用失败");
        }

        return response.getBody();
    }

@@ -334,4 +340,22 @@
    }


    /**
     * app修改取水口经纬度
     * @param po
     * @return
     */
    public int updateIntakeLngLat(IntakeUpdateLngLat po) {
        return prIntakeMapper.updateByPrimaryKeySelective1(po);
    }

    /**
     * 获取未绑定到轮灌组的取水口列表
     * @return
     */
    public QueryResultVo<List<VoIntakeSimple>> getFreeIntakes() {
        QueryResultVo<List<VoIntakeSimple>> rsVo = new QueryResultVo<>();
        rsVo.obj = prIntakeMapper.getFreeIntakes();
        return rsVo;
    }
}