From 30d0a4afa4a1730cf3e9aebf53cae5914a9af53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 3 Mar 2022 14:54:40 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2879512b9878935388331466d3aa7fbb71cd1d1b. --- .../ScreenGridManagerController.java | 4 +- .../screen/dao/ScreenGridManagerDao.java | 3 +- .../service/ScreenGridManagerService.java | 3 +- .../impl/ScreenGridManagerServiceImpl.java | 78 +++---------------- .../mapper/screen/ScreenGridManagerDao.xml | 27 +------ 5 files changed, 15 insertions(+), 100 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java index 719ad87..bc65e98 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java @@ -40,7 +40,7 @@ public class ScreenGridManagerController { * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ @PostMapping("gridManagerUploadEvent") - public Result selectGridManagerUploadEvent(@RequestBody ScreenJobFormDTO paramDto) { - return screenGridManagerService.selectGridManagerUploadEvent(paramDto); + public Result selectGridManagerUploadEvent(@RequestBody ScreenJobFormDTO formDto) { + return screenGridManagerService.selectGridManagerUploadEvent(formDto.getYearMonth()); } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java index f4e565e..fdb5ef5 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java @@ -1,7 +1,6 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadDataResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadEventResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenBaseReportResultDTO; @@ -33,7 +32,7 @@ public interface ScreenGridManagerDao extends BaseDao * @Param [customId] * @return java.util.List **/ - List selectGridManagerUploadEvent(ScreenJobFormDTO paramDto); + List selectGridManagerUploadEvent(@Param("customId")String customId, @Param("yearMonthDay") String yearMonthDay); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGridManagerService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGridManagerService.java index 6945228..97537a4 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGridManagerService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGridManagerService.java @@ -1,7 +1,6 @@ package com.elink.esua.epdc.modules.screen.service; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO; /** * 网格管理 @@ -26,7 +25,7 @@ public interface ScreenGridManagerService { * @Param [customId] * @return java.util.List **/ - Result selectGridManagerUploadEvent(ScreenJobFormDTO paramDto); + Result selectGridManagerUploadEvent(String yearMonthDay); diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java index a3ea494..cf1a021 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java @@ -4,7 +4,6 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.EpmetConstant; import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadDataResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.GridManagerUploadEventResultDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenBaseReportResultDTO; @@ -19,9 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.List; @@ -60,71 +56,15 @@ public class ScreenGridManagerServiceImpl extends BaseServiceImpl gridManagerUploadEventResultDTOS = baseDao.selectGridManagerUploadEvent(paramDto); - if(gridManagerUploadEventResultDTOS.size()>0){ - String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadEventResultDTOS,true); - // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_EVENT, dataJson); - } - - - } else { - // 推送所有日期 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Calendar ca = Calendar.getInstance(); - Date curDate = null; - Date endDate = null; - try { - curDate = sdf.parse(paramDto.getStartTime()); - endDate = sdf.parse(paramDto.getEndTime()); - } catch (ParseException e) { - e.printStackTrace(); - } - int i =curDate.compareTo(endDate); - while (curDate.compareTo(endDate) <= 0) { - ca.setTime(curDate); - paramDto.setEndTime(sdf.format(curDate)); - ca.add(Calendar.DAY_OF_MONTH, 1); - curDate = ca.getTime(); - - // 如果统计年月日为空，则统计当前天的数据 - String yearMonthDay = paramDto.getYearMonth(); - yearMonthDay = StringUtils.isEmpty(yearMonthDay) ? DateUtils.format(new Date()) : yearMonthDay; - paramDto.setYearMonthDay(yearMonthDay); - List gridManagerUploadEventResultDTOS = baseDao.selectGridManagerUploadEvent(paramDto); - if(gridManagerUploadEventResultDTOS.size()>0){ - String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadEventResultDTOS,true); - // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_EVENT, dataJson); - } - - } + public Result selectGridManagerUploadEvent(String yearMonthDay) { + // 如果统计年月日为空，则统计当前天的数据 + yearMonthDay = StringUtils.isEmpty(yearMonthDay) ? DateUtils.format(new Date()) : yearMonthDay; + List gridManagerUploadEventResultDTOS = baseDao.selectGridManagerUploadEvent(customerId, yearMonthDay); + if(gridManagerUploadEventResultDTOS.size()>0){ + String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadEventResultDTOS,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_EVENT, dataJson); } - return new Result(); - - - - - -// // 如果统计年月日为空，则统计当前天的数据 -// String yearMonthDay = paramDto.getYearMonth(); -// yearMonthDay = StringUtils.isEmpty(yearMonthDay) ? DateUtils.format(new Date()) : yearMonthDay; -// List gridManagerUploadEventResultDTOS = baseDao.selectGridManagerUploadEvent(customerId, yearMonthDay); -// if(gridManagerUploadEventResultDTOS.size()>0){ -// String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadEventResultDTOS,true); -// // 数据上报 -// epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_EVENT, dataJson); -// } -// return new Result<>(); + return new Result<>(); } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGridManagerDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGridManagerDao.xml index 0e9eb07..30d6601 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGridManagerDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGridManagerDao.xml @@ -160,24 +160,10 @@ -