2024-05-27 朱宝民 远程开关阀、RTU在线情况

Administrator

2024-05-27 f5a7f6c30bc5fb13eb538b5856a663b1ba0667b6

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java

@@ -11,8 +11,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;

@@ -34,20 +32,16 @@

    public QueryResultVo<List<VoRecharge>> getRecharges(QueryVo queryVo) {
        //完善查询充值记录的起止时间
        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");

        LocalDateTime rechargeTimeStart = queryVo.rechargeTimeStart;
        LocalDateTime rechargeTimeStop = queryVo.rechargeTimeStop;
        String rechargeTimeStart = queryVo.rechargeTimeStart;
        String rechargeTimeStop = queryVo.rechargeTimeStop;
        if(rechargeTimeStart != null) {
            rechargeTimeStart = LocalDateTime.parse(df.format(rechargeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
            rechargeTimeStart = rechargeTimeStart + " 00:00:00";
            queryVo.setRechargeTimeStart(rechargeTimeStart);
        }

        if(rechargeTimeStop != null) {
            rechargeTimeStop = LocalDateTime.parse(df.format(rechargeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
            rechargeTimeStop = rechargeTimeStop + " 23:59:59";
            queryVo.setRechargeTimeStop(rechargeTimeStop);
        }


        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);

@@ -56,6 +50,7 @@
        QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = queryVo.pageSize ;
        rsVo.pageCurr = queryVo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = seRechargeMapper.getRecharges(params);
        return rsVo ;
@@ -82,15 +77,15 @@

    /**
     * 根据水卡编号删除充值记录
     * @param cardNum
     * @param cardId
     * @return
     */
    //public Integer deleteByCardId(Long cardId) {
    //    return seRechargeMapper.deleteByCardId(cardId);
    //}
    public Integer deleteByCardNum(String cardNum) {
        return seRechargeMapper.deleteByCardNum(cardNum);
    public Integer deleteByCardId(Long cardId) {
        return seRechargeMapper.deleteByCardId(cardId);
    }
    //public Integer deleteByCardNum(String cardNum) {
    //    return seRechargeMapper.deleteByCardNum(cardNum);
    //}

    /**
     * 添加充值历史表