From f843994e7eb357e30a15955bc2e0355739b980ec Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Thu, 25 May 2023 09:40:34 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-25=2009:39:36=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E6=89=80=E5=B1=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/psdc/mapper/PsdcDeviceMapper.java | 3 +++ .../psdc/mapper/PsdcThermometerRtdataMapper.java | 2 +- .../psdc/service/impl/PsdcDeviceServiceImpl.java | 5 +++++ .../impl/PsdcThermometerHtdataServiceImpl.java | 4 ++-- .../resources/mapper/business/PsdcDeviceMapper.xml | 13 +++++++++++++ .../mapper/business/PsdcThermometerRtdataMapper.xml | 2 +- .../monitor/TotalElectricMeterController.java | 3 +-- .../psdc/controller/monitor/WenDuController.java | 11 ++++------- 8 files changed, 30 insertions(+), 13 deletions(-) diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java index c65e6c8..028ff3d 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java @@ -86,6 +86,9 @@ public interface PsdcDeviceMapper{ List queryByUserId(@Param(value = "userId") Long userId, @Param(value = "parentId") Integer parentId); + List queryByModel(@Param(value = "userId") Long userId, + @Param(value = "devModel") String devModel); + /** * 根据设备id修改设备状态 * @param deviceId 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 80bde91..4c6d085 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,7 @@ public interface PsdcThermometerRtdataMapper{ @Param("today") String today); List selWenDu(@Param("userId") Long userId, - @Param("parentId") Integer parentId, + @Param("modelTypeName") String parentId, @Param("today") String today); /** diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java index 5ac56f6..e7495c8 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java @@ -64,6 +64,11 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService { return psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId(), parent); } + @Override + public List queryByModel(String model) { + return psdcDeviceMapper.queryByModel(SecurityUtils.getUserId(), model); + } + public List queryDeviceStatus() { List psdcDevices = psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId(), 0); return psdcDevices.stream().map(psdcDevice -> { 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 3db1f74..6702874 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 @@ -96,7 +96,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS } @Override - public AjaxResult sel8WnDu(Integer modelId) { + public AjaxResult sel8WnDu(String modelId) { List dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), modelId, sdf.format(new Date())); return AjaxResult.success(dataResList); } @@ -116,7 +116,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS } @Override - public List selTodayThermometerById(Integer modelId) { + public List selTodayThermometerById(String modelId) { Date date = new Date(); String tb = sdf.format(date) + " 00:00:00"; // 今天开始检索时间 String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间 diff --git a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml index 609e06e..ace3198 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml @@ -101,6 +101,19 @@ And parent_id = #{parentId} + GROUP BY device_model + + + diff --git a/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml index 008a7b6..1398471 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml @@ -40,7 +40,7 @@ From psdc_device pd LEFT join psdc_thermometer_rtdata ptr on pd.device_id = ptr.device_id And DATE_FORMAT(ptr.update_time,'%Y-%m-%d %H') = #{today} - Where pd.user_id = ${userId} And pd.parent_id = ${parentId} + Where pd.user_id = ${userId} And pd.device_model = #{modelTypeName} 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 f40f559..ae8cb66 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,9 +46,8 @@ 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()); + List list2 = psdcDeviceService.queryByModel(dd.getDeviceModel()); if (list2.size() > 0){ for (PsdcDevice dev : list2){ Map map2 = new HashMap<>(); 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 4054b01..021630a 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 @@ -4,10 +4,7 @@ import com.psdc.core.domain.AjaxResult; import com.psdc.service.IPsdcThermometerHtdataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -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; +import org.springframework.web.bind.annotation.*; /** * @Author：戴仕崑 @@ -24,9 +21,9 @@ public class WenDuController { IPsdcThermometerHtdataService psdcThermometerHtdataService; @PreAuthorize("@ss.hasPermi('emonitor:wdcgq')") - @RequestMapping(value = "/sel1/{modelId}", method = RequestMethod.GET) - public AjaxResult selwd(@PathVariable(value = "modelId", required = false) Integer modelId){ - return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById(modelId)); + @RequestMapping(value = "/sel1", method = RequestMethod.POST) + public AjaxResult selwd(@RequestParam(value="modelTypeName", defaultValue="") String modelname){ + return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById(modelname)); } }