1、通信中间件重构MQTT相关下行命令的逻辑； 2、remote模块完善MQTT相关下行命令解除报警、搅拌启停、注肥启停、灌溉启停功能类；

liurunyu

2025-06-21 0c870ae5b2af348e19b10cc1a99f103f95c5a1cc

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/IcCardSv.java

@@ -14,8 +14,10 @@

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
 * @author ZhuBaoMin
@@ -165,7 +167,7 @@
        if (timeStart != null && timeStart != ""){
            timeStart = timeStart + " 00:00:00";
        }else {
            timeStart = LocalDate.now() + " 00:00:00";
            timeStart = LocalDateTime.now().minusYears(1).toString();
        }
        if (timeStop != null && timeStop != ""){
            timeStop = timeStop + " 23:59:59";
@@ -192,4 +194,33 @@
        rsVo.obj = seClientCardMapper.getCardUsages(params);
        return rsVo ;
    }

    /**
     * 获取售水总计信息：充值金额总计、水表消费金额总计
     * @param qo
     * @return
     */
    public Map getTotalWaterUse(CardUsageQO 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";
        }
        if (timeStop != null && timeStop != ""){
            timeStop = timeStop + " 23:59:59";
        }else {
            timeStop = LocalDateTime.now().toString();
        }

        Float totalRecharge = Optional.ofNullable(seClientCardMapper.getTotalRecharge(timeStart, timeStop)).orElse(0f);
        Float totalConsumption = Optional.ofNullable(seClientCardMapper.getTotalConsumption(timeStart, timeStop)).orElse(0f);
        Map mat_total = new HashMap();
        mat_total.put("totalRecharge", totalRecharge);
        mat_total.put("totalConsumption", totalConsumption);
        return mat_total;
    }
}