From 099869008d9c5cd1bc38afbf16f722aa9d3d3df2 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Mon, 22 May 2023 17:06:24 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-22=2017:20:16=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B8=A9=E5=BA=A6=E4=BC=A0=E6=84=9F=E5=99=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/psdc/mapper/PsdcThermometerRtdataMapper.java | 3 ++- .../com/psdc/service/IPsdcThermometerHtdataService.java | 4 ++-- .../service/impl/PsdcThermometerHtdataServiceImpl.java | 8 ++++---- .../mapper/business/PsdcThermometerRtdataMapper.xml | 3 +++ .../src/main/java/com/psdc/controller/index/Index.java | 7 ++++--- .../controller/monitor/TotalElectricMeterController.java | 1 + .../java/com/psdc/controller/monitor/WenDuController.java | 6 +++--- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java index 32f71c4..80bde91 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java @@ -27,7 +27,8 @@ public interface PsdcThermometerRtdataMapper{ @Param("today") String today); List selWenDu(@Param("userId") Long userId, - @Param("parentId") Integer parentId); + @Param("parentId") Integer parentId, + @Param("today") String today); /** * 分页查询指定行数据 diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java index 736461a..e4f536a 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java @@ -20,11 +20,11 @@ public interface IPsdcThermometerHtdataService { AjaxResult selTodayThermometer(); - AjaxResult sel8WnDu(); + AjaxResult sel8WnDu(Integer modelId); PsdcDevicePowerRes selTotalElectricityInfo(Integer deviceId); - List selTodayThermometerById(); + List selTodayThermometerById(Integer modelId); AjaxResult selDzglWenDu(Integer deviceId); diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java index d3a804f..303d8ff 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java @@ -94,8 +94,8 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS } @Override - public AjaxResult sel8WnDu() { - List dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), 16); + public AjaxResult sel8WnDu(Integer modelId) { + List dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), modelId, sdf.format(new Date())); return AjaxResult.success(dataResList); } @@ -114,12 +114,12 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS } @Override - public List selTodayThermometerById() { + public List selTodayThermometerById(Integer modelId) { Date date = new Date(); String tb = sdf.format(date) + " 00:00:00"; // 今天开始检索时间 String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间 List ary = new ArrayList<>(); - List dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), 16); + List dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), modelId, sdf.format(new Date())); for (PsdcThermometerDataRes dec : dataResList ){ PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(dec.getDeviceId(), sdf.format(date)); if (null != dataRes){ diff --git a/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml index 9ea382a..285e226 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml @@ -39,6 +39,9 @@ From psdc_thermometer_rtdata ptr Left Join psdc_device pd On pd.device_id = ptr.device_id Where pd.user_id = ${userId} And pd.parent_id = ${parentId} + + And DATE_FORMAT(ptr.update_time,'%Y-%m-%d') = #{today} + diff --git a/psdc-web/src/main/java/com/psdc/controller/index/Index.java b/psdc-web/src/main/java/com/psdc/controller/index/Index.java index fbabfcd..97a7502 100644 --- a/psdc-web/src/main/java/com/psdc/controller/index/Index.java +++ b/psdc-web/src/main/java/com/psdc/controller/index/Index.java @@ -3,6 +3,7 @@ package com.psdc.controller.index; import com.psdc.core.domain.AjaxResult; import com.psdc.service.IPsdcThermometerHtdataService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -20,9 +21,9 @@ public class Index { return psdcThermometerHtdataService.selTodayThermometer(); } - @RequestMapping(value = "/8wd", method = RequestMethod.GET) - public AjaxResult sel8WenDu() { - return psdcThermometerHtdataService.sel8WnDu(); + @RequestMapping(value = "/8wd/{modelId}", method = RequestMethod.GET) + public AjaxResult sel8WenDu(@PathVariable(value = "modelId", required = false) Integer modelId) { + return psdcThermometerHtdataService.sel8WnDu(modelId); } @RequestMapping(value = "/zdb", method = RequestMethod.GET) diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java index 307920e..833b298 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java +++ b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java @@ -46,6 +46,7 @@ public class TotalElectricMeterController { for (PsdcDevice dd : list){ Map map = new HashMap<>(); map.put("modelName", dd.getDeviceModel()); + map.put("modelId", dd.getDeviceId()); List maps2 = new ArrayList<>(); List list2 = psdcDeviceService.queryByUserId(dd.getDeviceId()); if (list2.size() > 0){ diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/WenDuController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/WenDuController.java index 0ffcaa5..4054b01 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/WenDuController.java +++ b/psdc-web/src/main/java/com/psdc/controller/monitor/WenDuController.java @@ -24,9 +24,9 @@ public class WenDuController { IPsdcThermometerHtdataService psdcThermometerHtdataService; @PreAuthorize("@ss.hasPermi('emonitor:wdcgq')") - @RequestMapping(value = "/sel1", method = RequestMethod.GET) - public AjaxResult selwd(){ - return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById()); + @RequestMapping(value = "/sel1/{modelId}", method = RequestMethod.GET) + public AjaxResult selwd(@PathVariable(value = "modelId", required = false) Integer modelId){ + return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById(modelId)); } }