1、增加查询所有作物昨日蒸腾量功能； 2、增加查询一个作物一段时间内容所有蒸腾量功能。

liurunyu

2025-08-19 e33bca52d26faa836a4db7436e85eb3a0a08adff

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java

@@ -41,9 +41,6 @@
    @Autowired
    private RmLossDayLastMapper rmLossDayLastMapper;

    @Value("${rtu.batteryVolt}")
    private Double batteryVolt;

    @Value("${rtu.signalIntensity.weak}")
    private Integer weak;

@@ -141,7 +138,6 @@
     * @return
     */
    public QueryResultVo<List<VoBatteryVolt>> getUnderVoltIntakes(BatteryVoltQO qo) {
        qo.setBatteryVolt(batteryVolt);
        // 生成查询参数
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;

@@ -185,33 +181,21 @@

    /**
     * 获取从未开过阀的取水口
     * @param qo
     * @param idStart
     * @param idEnd
     * @return
     */
    public QueryResultVo<List<VoIntake>> getNeverOpenValveIntakes(CommonQO qo) {

        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null && timeStart != "") {
            timeStart = timeStart + " 00:00:00";
        } else {
            timeStart = LocalDate.now() + " 00:00:00";
        }
        qo.setTimeStart(timeStart);

        if(timeStop != null && timeStop != "") {
            timeStop = timeStop + " 23:59:59";
        }else {
            timeStop = LocalDate.now() + " 23:59:59";
        }
        qo.setTimeStop(timeStop);

    public QueryResultVo<List<VoIntakeUnOpenValve>> getNeverOpenValveIntakes(CommonQO qo, Long idStart, Long idEnd) {
        // 生成查询参数
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
        params.put("idStart", idStart) ;
        params.put("idEnd", idEnd) ;

        // 获取符合条件的记录数
        Long itemTotal = Optional.ofNullable(rmOpenCloseValveHistoryMapper.getNeverOpenValveIntakesCount(params)).orElse(0L);

        QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>() ;
        QueryResultVo<List<VoIntakeUnOpenValve>> rsVo = new QueryResultVo<>() ;

        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;