完善代码

liurunyu

2025-08-18 9440721414f31d1c85094be1a035d9a90f9c4d5a

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilSv.java

@@ -1,9 +1,11 @@
package com.dy.pipIrrRemote.mqttSd1.soil;

import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.RmSoilDayMapper;
import com.dy.pipIrrGlobal.daoRm.RmSoilHistoryMapper;
import com.dy.pipIrrGlobal.daoRm.RmSoilLastMapper;
import com.dy.pipIrrGlobal.voRm.VoSoil;
import com.dy.pipIrrGlobal.voRm.VoSoilDay;
import com.dy.pipIrrRemote.mqttSd1.soil.SoilQo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -25,9 +27,39 @@
public class SoilSv {

    @Autowired
    private RmSoilDayMapper rmSoilDayDao ;
    @Autowired
    private RmSoilHistoryMapper rmSoilHistoryDao ;
    @Autowired
    private RmSoilLastMapper rmSoilLastDao ;

    public VoSoilDay oneDay(Long soilId, Integer yyyyMMdd) {
        List<VoSoilDay> list = this.rmSoilDayDao.selectOneBySoilId(soilId, yyyyMMdd) ;
        if(list != null && list.size() > 0) {
            return list.get(0) ;
        }
        return null ;
    }

    public List<VoSoilDay> oneDayByMonth(Long soilId, Integer yyyyMMddStart, Integer yyyyMMddEnd) {
        return this.rmSoilDayDao.selectOneMonthBySoilId(soilId, yyyyMMddStart, yyyyMMddEnd) ;
    }


    public QueryResultVo<List<VoSoilDay>> someDay(SoilQo qo) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmSoilDayDao.selectCount(params);

        QueryResultVo<List<VoSoilDay>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmSoilDayDao.selectSome(params);
        return rsVo ;
    }



    public VoSoil oneLast(Long soilId) {
        List<VoSoil> list = this.rmSoilLastDao.selectSomeBySoilId(soilId) ;
@@ -37,9 +69,7 @@
        return null ;
    }

    public QueryResultVo<List<VoSoil>> oneHistory(Long soilId) {
        SoilQo qo = new SoilQo() ;
        qo.soilId = soilId ;
    public QueryResultVo<List<VoSoil>> oneHistory(SoilQo qo) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmSoilHistoryDao.selectCount(params);