From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 21 二月 2025 09:52:14 +0800 Subject: [PATCH] 针对王江海制定的协议: 1、优化相关注释; 2、优化代码; 3、协议中报警信息有变化:外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java index ea00e34..edd844a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java @@ -2,14 +2,13 @@ import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.daoSe.SeLossMapper; -import com.dy.pipIrrGlobal.pojoSe.VoLoss; +import com.dy.pipIrrGlobal.pojoSe.SeLoss; +import com.dy.pipIrrGlobal.voSe.VoLoss; 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; @@ -27,18 +26,15 @@ private SeLossMapper seLossMapper; public QueryResultVo<List<VoLoss>> getLosses(QueryVo queryVo) { - //瀹屽杽鏌ヨ鎸傚け璁板綍鐨勮捣姝㈡椂闂� - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - - LocalDateTime lossTimeStart = queryVo.lossTimeStart; - LocalDateTime lossTimeStop = queryVo.lossTimeStop; + String lossTimeStart = queryVo.lossTimeStart; + String lossTimeStop = queryVo.lossTimeStop; if(lossTimeStart != null) { - lossTimeStart = LocalDateTime.parse(df.format(lossTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + lossTimeStart = lossTimeStart + " 00:00:00"; queryVo.setLossTimeStart(lossTimeStart); } if(lossTimeStop != null) { - lossTimeStop = LocalDateTime.parse(df.format(lossTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + lossTimeStop = lossTimeStop + " 23:59:59"; queryVo.setLossTimeStop(lossTimeStop); } @@ -49,8 +45,20 @@ QueryResultVo<List<VoLoss>> rsVo = new QueryResultVo<>() ; rsVo.pageSize = queryVo.pageSize ; rsVo.pageCurr = queryVo.pageCurr ; + rsVo.calculateAndSet(itemTotal, params); rsVo.obj = seLossMapper.getLosses(params); return rsVo ; } + + /** + * 娣诲姞鎸傚け璁板綍 + * @param po + * @return + */ + public Long add(SeLoss po) { + seLossMapper.insert(po); + return po.getId(); + } + } -- Gitblit v1.8.0