增加巡检轨迹接口 返回值inspectid、inspectorid由Long类型改为String

wuzeyu

2024-12-19 e86db806e1dcde94b1aa38230138a3fa3895572a

 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java

@@ -1,14 +1,19 @@
package com.dy.pipIrrApp.inspect;

import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.inspect.qo.QoInspect;
import com.dy.pipIrrGlobal.daoOp.OpeInspectMapper;
import com.dy.pipIrrGlobal.daoOp.OpeTrackMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeInspect;
import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
import com.dy.pipIrrGlobal.voOp.VoInspect;
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.util.List;
import java.util.Map;

/**
 * @author ZhuBaoMin
@@ -28,6 +33,7 @@

    /**
     * 添加巡检记录
     *
     * @param po
     * @return
     */
@@ -37,7 +43,18 @@
    }

    /**
     * 修改巡检记录
     *
     * @param po
     * @return
     */
    public Integer updateInspect(OpeInspect po) {
        return opeInspectMapper.updateByPrimaryKeySelective(po);
    }

    /**
     * 批量添加巡检轨迹
     *
     * @param list
     * @return
     */
@@ -45,5 +62,41 @@
        return opeTrackMapper.insertTracks(list);
    }

    /**
     * 巡检查询
     *
     * @param queryVo
     * @return
     */
    public QueryResultVo<List<VoInspect>> getInspects(QoInspect queryVo) {
        //完善查询充值记录的起止时间
        String timeStart = queryVo.getTimeStart();
        String timeStop = queryVo.getTimeStop();
        if (timeStart != null || timeStart != "") {
            timeStart = timeStart + " 00:00:00";
            queryVo.setTimeStart(timeStart);
        }
        if (timeStop != null || timeStop != "") {
            timeStop = timeStop + " 23:59:59";
            queryVo.setTimeStop(timeStop);
        }

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

        Long itemTotal = opeInspectMapper.getInspectsCount(params);
        QueryResultVo<List<VoInspect>> rsVo = new QueryResultVo<>();

        rsVo.pageSize = queryVo.pageSize;
        rsVo.pageCurr = queryVo.pageCurr;

        rsVo.calculateAndSet(itemTotal, params);

        List<VoInspect> inspects = opeInspectMapper.getInspects(params);
        for (int i = 0; i < inspects.size(); i++) {
            List<OpeTrack> tracks = opeTrackMapper.selectByInspectId(inspects.get(i).getInspectId());
            inspects.get(i).setTracks(tracks);
        }
        rsVo.obj = inspects;
        return rsVo;
    }
}