1、通信中间件本地命令处理逻辑修改； 2、参数设置软件增量开发，以处理MQTT相关配置； 3、《打包发布配置修改》文档修改。

liurunyu

2025-06-11 a021f91265139a52c7515942b4332e03ce994351

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

@@ -1,15 +1,16 @@
package com.dy.pipIrrSell.recharge;

import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSe.SeRechargeHistoryMapper;
import com.dy.pipIrrGlobal.daoSe.SeRechargeMapper;
import com.dy.pipIrrGlobal.pojoSe.VoRecharge;
import com.dy.pipIrrGlobal.pojoSe.SeRecharge;
import com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory;
import com.dy.pipIrrGlobal.voSe.VoRecharge;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
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;

@@ -26,22 +27,21 @@
    @Autowired
    private SeRechargeMapper seRechargeMapper;

    @Autowired
    private SeRechargeHistoryMapper seRechargeHistoryMapper;

    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);

@@ -50,10 +50,60 @@
        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 ;
    }

    /**
     * 根据水卡编号（主键）删除充值记录
     * @param cardId
     * @return
     */
    //public Integer deleteByPrimaryKey(Long cardId) {
    //    return seRechargeMapper.deleteByPrimaryKey(cardId);
    //}

    /**
     * 添加充值记录
     * @param po
     * @return
     */
    public Long add(SeRecharge po) {
        seRechargeMapper.insert(po);
        return po.getId();
    }

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

    /**
     * 添加充值历史表
     * @param po
     * @return
     */
    public Long addHistory(SeRechargeHistory po){
        seRechargeHistoryMapper.insert(po);
        return po.getId();
    }

    /**
     * 根据水卡id获取最近一条充值记录id
     * @param cardId
     * @return
     */
    public Long selectIdByCardId(Long cardId){
        SeRecharge seRecharge = seRechargeMapper.selectByCardId(cardId);
        return seRecharge.getId();
    }
}