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-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java index 4c79d6e..964209e 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/delSome/DelSomeIntakeAmountSv.java @@ -1,6 +1,7 @@ package com.dy.pipIrrTemp.delSome; import com.dy.pipIrrGlobal.daoTmp.DeleteMapper; +import com.dy.pipIrrGlobal.voTmp.VoStIntakeAmountDay; import com.dy.pipIrrGlobal.voTmp.VoStIntakeAmountMonth; import com.dy.pipIrrGlobal.voTmp.VoStIntakeAmountYear; import lombok.extern.slf4j.Slf4j; @@ -25,6 +26,31 @@ @Autowired private void setDao(DeleteMapper dao){ this.dao = dao; + } + + public void delStIntakeDay(){ + VoStIntakeAmountDay first = null ; + List<VoStIntakeAmountDay> list = dao.selectAllStIntakeDay() ; + if(list != null && list.size() > 0){ + for(VoStIntakeAmountDay vo : list){ + if(first == null){ + first = vo ; + }else{ + if(first.intakeId.longValue() != vo.intakeId.longValue()){ + //鍙栨按鍙e彉浜� + first = vo ; + }else{ + if(!first.dt.equals(vo.dt)) { + //鏃ユ湡鍙樹簡 + first = vo ; + }else{ + //鍚屼竴涓彇姘村彛鍚屾棩鏈� + doDelStIntakeDay(vo.id) ; + } + } + } + } + } } public void delStIntakeMonth(){ @@ -82,6 +108,12 @@ } } } + + @Transactional + int doDelStIntakeDay(Long id){ + return dao.deleteStIntakeDayById(id) ; + } + @Transactional int doDelStIntakeMonth(Long id){ return dao.deleteStIntakeMonthById(id) ; -- Gitblit v1.8.0