修改bug

liurunyu

2025-08-20 be69901c0ad8ffacaf5b948ccca11b350a9d11c5

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java

@@ -1,13 +1,11 @@
package com.dy.rtuMw.server.rtuData.dbSv;

import com.dy.common.util.NumUtil;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
import com.dy.pipIrrGlobal.daoPr.*;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.pipIrrGlobal.pojoPr.*;
import com.dy.pipIrrGlobal.pojoRm.*;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.pipIrrGlobal.voSe.VoCardInfo1;
@@ -72,6 +70,27 @@
    @Autowired
    private RmOnHourReportLastMapper rmOnHourReportLastDao; // 定点上报最新数据DAO

    @Autowired
    private PrStManureMapper prStManureDao; //水肥机DAO
    @Autowired
    private PrStSoilMapper prStSoilDao; //墒情站DAO
    @Autowired
    private PrStWeatherMapper prStWeatherDao; //气象站DAO
    @Autowired
    private RmManureLastMapper rmManureLastDao; //水肥DAO
    @Autowired
    private RmManureHistoryMapper rmManureHistoryDao; //水肥DAO
    @Autowired
    private RmSoilLastMapper rmSoilLastDao; //墒情DAO
    @Autowired
    private RmSoilHistoryMapper rmSoilHistoryDao; //墒情DAO
    @Autowired
    private RmSoilDayMapper rmSoilDayDao; //墒情DAO
    @Autowired
    private RmWeatherLastMapper rmWeatherLastDao; //气象DAO
    @Autowired
    private RmWeatherHistoryMapper rmWeatherHistoryDao; //气象DAO


    //@Autowired
    //@Lazy
@@ -98,6 +117,7 @@
                vo = new SeClient() ;
                vo.setId(Long.parseLong(map.get("clientId").toString()));
                vo.setName(map.get("clientName").toString());
                vo.setAddress(map.get("clientAddress").toString());
            }
        }
        return vo ;
@@ -116,6 +136,7 @@
                vo = new SeClient() ;
                vo.setId(Long.parseLong(map.get("clientId").toString()));
                vo.setName(map.get("clientName").toString());
                vo.setAddress(map.get("clientAddress").toString());
            }
        }
        return vo ;
@@ -214,8 +235,8 @@
     * @param intakeId
     */
    @Transactional(rollbackFor = Exception.class)
    public void updateVirCardNoUseState(Long intakeId){
        this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId); ;
    public void updateVirCardNoUseState(Long intakeId, Date now){
        this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId, now) ;
    }


@@ -692,6 +713,209 @@
        seVirtualCardDao.updateMoney(id,remainMoney);
    }


    //////////////////////////////////////////////////////
    //
    // 水肥数据相关
    //
    //////////////////////////////////////////////////////
    /**
     * 通过FBox序列号得到水肥机实体
     * @param fboxId FBox序列号
     * @param no 编号
     * @return 水肥机实体
     */
    public PrStManure getStManureByFBoxIdAndNo(String fboxId, Integer no){
        List<PrStManure> list = this.prStManureDao.selectStPoByFBoxIdAndNo(fboxId, no) ;
        if(list != null && list.size() > 0){
            return list.get(0) ;
        }
        return null ;
    }
    /**
     * 查询上报最新数据
     * @param stManureId
     * @return
     */
    public RmManureLast getRmManureLast(Long stManureId) {
        List<RmManureLast> list = this.rmManureLastDao.selectRmManureLast(stManureId) ;
        if(list != null && list.size() > 0){
            return list.get(0) ;
        }
        return null ;
    }
    /**
     * 保存最新记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void saveRmManureHistory(RmManureHistory po) {
        this.rmManureHistoryDao.insert(po);
    }

    /**
     * 保存最新记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void saveRmManureLast(RmManureLast po) {
        this.rmManureLastDao.insert(po);
    }
    /**
     * 更新最新记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void updateRmManureLast(RmManureLast po){
        this.rmManureLastDao.updateByPrimaryKey(po) ;
    }


    //////////////////////////////////////////////////////
    //
    // 墒情数据相关
    //
    //////////////////////////////////////////////////////
    /**
     * 通过FBox序列号得到墒情站实体
     * @param fboxId FBox序列号
     * @param no 编号
     * @return 水肥机实体
     */
    public PrStSoil getStSoilByFBoxIdAndNo(String fboxId, Integer no){
        List<PrStSoil> list = this.prStSoilDao.selectStPoByFBoxIdAndNo(fboxId, no) ;
        if(list != null && list.size() > 0){
            return list.get(0) ;
        }
        return null ;
    }
    /**
     * 查询上报最新数据
     * @param stSoilId
     * @return
     */
    public RmSoilLast getRmSoilLast(Long stSoilId) {
        List<RmSoilLast> list = this.rmSoilLastDao.selectRmSoilLast(stSoilId) ;
        if(list != null && list.size() > 0){
            return list.get(0) ;
        }
        return null ;
    }
    /**
     * 保存最新记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void saveRmSoilHistory(RmSoilHistory po) {
        this.rmSoilHistoryDao.insert(po);
    }

    /**
     * 保存最新记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void saveRmSoilLast(RmSoilLast po) {
        this.rmSoilLastDao.insert(po);
    }
    /**
     * 更新最新记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void updateRmSoilLast(RmSoilLast po){
        this.rmSoilLastDao.updateByPrimaryKey(po) ;
    }

    /**
     * 查询上报日数据
     * @param stSoilId
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public RmSoilDay getRmSoilDay(Long stSoilId, Integer nowYmd) {
        List<RmSoilDay> list = this.rmSoilDayDao.selectRmSoilDay(stSoilId, nowYmd) ;
        if(list != null && list.size() > 0){
            return list.get(0) ;
        }
        return null ;
    }
    /**
     * 保存日记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void saveRmSoilDay(RmSoilDay po) {
        this.rmSoilDayDao.insert(po);
    }
    /**
     * 更新日记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void updateRmSoilDay(RmSoilDay po){
        this.rmSoilDayDao.updateByPrimaryKey(po) ;
    }



    //////////////////////////////////////////////////////
    //
    // 气象数据相关
    //
    //////////////////////////////////////////////////////
    /**
     * 通过FBox序列号得到气象站实体
     * @param fboxId FBox序列号
     * @param no 编号
     * @return 水肥机实体
     */
    public PrStWeather getStWeatherByFBoxIdAndNo(String fboxId, Integer no){
        List<PrStWeather> list = this.prStWeatherDao.selectStPoByFBoxIdAndNo(fboxId, no) ;
        if(list != null && list.size() > 0){
            return list.get(0) ;
        }
        return null ;
    }

    /**
     * 查询上报最新数据
     * @param stWeatherId
     * @return
     */
    public RmWeatherLast getRmWeatherLast(Long stWeatherId) {
        List<RmWeatherLast> list = this.rmWeatherLastDao.selectRmWeatherLast(stWeatherId) ;
        if(list != null && list.size() > 0){
            return list.get(0) ;
        }
        return null ;
    }
    /**
     * 保存最新记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void saveRmWeatherHistory(RmWeatherHistory po) {
        this.rmWeatherHistoryDao.insert(po);
    }

    /**
     * 保存最新记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void saveRmWeatherLast(RmWeatherLast po) {
        this.rmWeatherLastDao.insert(po);
    }
    /**
     * 更新最新记录
     * @param po
     */
    @Transactional(rollbackFor = Exception.class)
    public void updateRmWeatherLast(RmWeatherLast po){
        this.rmWeatherLastDao.updateByPrimaryKey(po) ;
    }

    //////////////////////////////////////////////////////
    //
    // 命令日志相关