From 7241169f4a519f4cb6c8cfc4f221231c42ed486d Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 28 十月 2024 19:16:08 +0800 Subject: [PATCH] 优化代码 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java | 50 ++++++++++++++++ pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OnHourQO.java | 10 +++ pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 120 ++------------------------------------- 3 files changed, 68 insertions(+), 112 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java index 8a0af3b..54f2dde 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java @@ -52,16 +52,7 @@ * @return */ public QueryResultVo<List<VoOnHour>> getOnHourReportsHistory(OnHourQO qo) { - String timeStart = qo.getTimeStart(); - String timeStop = qo.getTimeStop(); - if(timeStart != null) { - timeStart = timeStart + " 00:00:00"; - qo.setTimeStart(timeStart); - } - if(timeStop != null) { - timeStop = timeStop + " 23:59:59"; - qo.setTimeStop(timeStop); - } + qo.completionTime(); Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); Long itemTotal = rmOnHourReportHistoryMapper.getOnHourReportsCount_history(params); @@ -81,16 +72,7 @@ * @return */ public QueryResultVo<List<VoOnHour>> getOnHourReportsLast(OnHourQO qo) { - String timeStart = qo.getTimeStart(); - String timeStop = qo.getTimeStop(); - if(timeStart != null) { - timeStart = timeStart + " 00:00:00"; - qo.setTimeStart(timeStart); - } - if(timeStop != null) { - timeStop = timeStop + " 23:59:59"; - qo.setTimeStop(timeStop); - } + qo.completionTime(); Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); Long itemTotal = rmOnHourReportLastMapper.getOnHourReportsCount_last(params); @@ -110,37 +92,7 @@ * @return */ public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) { - String timeStart_open = qo.getTimeStart_open(); - String timeStop_open = qo.getTimeStop_open(); - if(timeStart_open != null && timeStart_open != "") { - timeStart_open = timeStart_open + " 00:00:00"; - } else { - timeStart_open = LocalDateTime.now().minusDays(30) + " 00:00:00"; - } - qo.setTimeStart_open(timeStart_open); - - if(timeStop_open != null && timeStop_open != "") { - timeStop_open = timeStop_open + " 23:59:59"; - }else { - timeStop_open = LocalDate.now() + " 23:59:59"; - } - qo.setTimeStop_open(timeStop_open); - - String timeStart_close = qo.getTimeStart_close(); - String timeStop_close = qo.getTimeStop_close(); - if(timeStart_close != null && timeStart_close != "") { - timeStart_close = timeStart_close + " 00:00:00"; - } else { - timeStart_close = LocalDate.now().minusDays(30) + " 00:00:00"; - } - qo.setTimeStart_close(timeStart_close); - - if(timeStop_close != null && timeStop_close != "") { - timeStop_close = timeStop_close + " 23:59:59"; - }else { - timeStop_close = LocalDate.now() + " 23:59:59"; - } - qo.setTimeStop_close(timeStop_close); + qo.completionTimeNoEmpty() ; Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params); @@ -167,27 +119,7 @@ * @return */ public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_last(OpenCloseValveQO qo) { - String timeStart_open = qo.getTimeStart_open(); - String timeStop_open = qo.getTimeStop_open(); - if(timeStart_open != null) { - timeStart_open = timeStart_open + " 00:00:00"; - qo.setTimeStart_open(timeStart_open); - } - if(timeStop_open != null) { - timeStop_open = timeStop_open + " 23:59:59"; - qo.setTimeStop_open(timeStop_open); - } - - String timeStart_close = qo.getTimeStart_close(); - String timeStop_close = qo.getTimeStop_close(); - if(timeStart_close != null) { - timeStart_close = timeStart_close + " 00:00:00"; - qo.setTimeStart_close(timeStart_close); - } - if(timeStop_close != null) { - timeStop_close = timeStop_close + " 23:59:59"; - qo.setTimeStop_close(timeStop_close); - } + qo.completionTime() ; Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); Long itemTotal = rmOpenCloseValveLastMapper.getOpenCloseValveReportsCount_last(params); @@ -214,16 +146,7 @@ * @return */ public QueryResultVo<List<VoTiming>> getTimingReportsHistory(OnHourQO qo) { - String timeStart = qo.getTimeStart(); - String timeStop = qo.getTimeStop(); - if(timeStart != null) { - timeStart = timeStart + " 00:00:00"; - qo.setTimeStart(timeStart); - } - if(timeStop != null) { - timeStop = timeStop + " 23:59:59"; - qo.setTimeStop(timeStop); - } + qo.completionTime() ; Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); Long itemTotal = rmTimingReportHistoryMapper.getTimingReportsCount_history(params); @@ -243,16 +166,7 @@ * @return */ public QueryResultVo<List<VoTiming>> getTimingReportsLast(OnHourQO qo) { - String timeStart = qo.getTimeStart(); - String timeStop = qo.getTimeStop(); - if(timeStart != null) { - timeStart = timeStart + " 00:00:00"; - qo.setTimeStart(timeStart); - } - if(timeStop != null) { - timeStop = timeStop + " 23:59:59"; - qo.setTimeStop(timeStop); - } + qo.completionTime() ; Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); Long itemTotal = rmTimingReportLastMapper.getTimingReportsCount_last(params); @@ -272,16 +186,7 @@ * @return */ public QueryResultVo<List<VoWork>> getWorkReportsHistory(OnHourQO qo) { - String timeStart = qo.getTimeStart(); - String timeStop = qo.getTimeStop(); - if(timeStart != null) { - timeStart = timeStart + " 00:00:00"; - qo.setTimeStart(timeStart); - } - if(timeStop != null) { - timeStop = timeStop + " 23:59:59"; - qo.setTimeStop(timeStop); - } + qo.completionTime() ; Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); Long itemTotal = rmWorkReportHistoryMapper.getWorkReportsCount_history(params); @@ -301,16 +206,7 @@ * @return */ public QueryResultVo<List<VoWork>> getWorkReportsLast(OnHourQO qo) { - String timeStart = qo.getTimeStart(); - String timeStop = qo.getTimeStop(); - if(timeStart != null) { - timeStart = timeStart + " 00:00:00"; - qo.setTimeStart(timeStart); - } - if(timeStop != null) { - timeStop = timeStop + " 23:59:59"; - qo.setTimeStop(timeStop); - } + qo.completionTime() ; Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); Long itemTotal = rmWorkReportLastMapper.getWorkReportsCount_last(params); diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OnHourQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OnHourQO.java index 2f1a65b..afd8f9e 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OnHourQO.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OnHourQO.java @@ -42,4 +42,14 @@ * 鏌ヨ缁撴潫鏃ユ湡 */ private String timeStop; + + + public void completionTime(){ + if(this.timeStart != null && !this.timeStart.trim().equals("")) { + this.timeStart = timeStart + " 00:00:00"; + } + if(this.timeStop != null && !this.timeStart.trim().equals("")) { + this.timeStop = timeStop + " 23:59:59"; + } + } } diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java index f9c2ad9..41739a8 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java @@ -3,6 +3,9 @@ import com.dy.common.webUtil.QueryConditionVo; import lombok.*; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * @author ZhuBaoMin * @date 2024-07-24 16:25 @@ -56,4 +59,51 @@ * 鏌ヨ缁撴潫鏃ユ湡_鍏抽榾 */ private String timeStop_close; + + + public void completionTime(){ + if(timeStart_open != null && timeStart_open.trim().equals("")) { + timeStart_open = timeStart_open + " 00:00:00"; + } + if(timeStop_open != null && timeStop_open.trim().equals("")) { + timeStop_open = timeStop_open + " 23:59:59"; + } + + if(timeStart_close != null && timeStart_close.trim().equals("")) { + timeStart_close = timeStart_close + " 00:00:00"; + } + if(timeStop_close != null && timeStop_close.trim().equals("")) { + timeStop_close = timeStop_close + " 23:59:59"; + } + } + + + public void completionTimeNoEmpty(){ + if(timeStart_open != null && !timeStart_open.trim().equals("")) { + timeStart_open = timeStart_open + " 00:00:00"; + } else { + timeStart_open = LocalDateTime.now().minusDays(30) + " 00:00:00"; + } + + if(timeStop_open != null && !timeStop_open.trim().equals("")) { + timeStop_open = timeStop_open + " 23:59:59"; + }else { + timeStop_open = LocalDate.now() + " 23:59:59"; + } + + if(timeStart_close != null && !timeStart_close.trim().equals("")) { + timeStart_close = timeStart_close + " 00:00:00"; + } else { + timeStart_close = LocalDate.now().minusDays(30) + " 00:00:00"; + } + + if(timeStop_close != null && !timeStop_close.trim().equals("")) { + timeStop_close = timeStop_close + " 23:59:59"; + }else { + timeStop_close = LocalDate.now() + " 23:59:59"; + } + + } + + } -- Gitblit v1.8.0