From 07648f0083e80cc590ba8bc77a9e72be5ad66748 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 十二月 2024 16:59:45 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java | 78 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java index 9b5f884..b5e7f37 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java @@ -1,10 +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 @@ -21,4 +30,73 @@ @Autowired private OpeTrackMapper opeTrackMapper; + + /** + * 娣诲姞宸℃璁板綍 + * + * @param po + * @return + */ + public Long addInspect(OpeInspect po) { + opeInspectMapper.insert(po); + return po.getId(); + } + + /** + * 淇敼宸℃璁板綍 + * + * @param po + * @return + */ + public Integer updateInspect(OpeInspect po) { + return opeInspectMapper.updateByPrimaryKeySelective(po); + } + + /** + * 鎵归噺娣诲姞宸℃杞ㄨ抗 + * + * @param list + * @return + */ + public Integer insertTracks(List<OpeTrack> list) { + 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 + " 00:00:00"; + queryVo.setTimeStart(timeStart); + } + if (timeStop != null) { + 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; + } } -- Gitblit v1.8.0