From 78f3453d990ef8e95722f7932dca72d62139490f Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Thu, 11 May 2023 10:29:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?2023-05-11=2010:28:06=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=9B=91=E6=B5=8B=E7=94=B5=E7=A3=81=E9=94=85?= =?UTF-8?q?=E7=82=89=E3=80=81=E8=93=84=E7=83=AD=E9=94=85=E7=82=89=E3=80=81?= =?UTF-8?q?=E7=A9=BA=E6=B0=94=E6=BA=90=E7=83=AD=E6=B3=B5=E3=80=81=E5=8F=91?= =?UTF-8?q?=E7=83=AD=E7=94=B5=E7=BC=86=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IPsdcElectricHtdataService.java | 6 +-- .../service/IPsdcElectricRtdataService.java | 2 +- .../IPsdcThermometerHtdataService.java | 4 +- .../impl/PsdcElectricHtdataServiceImpl.java | 12 ++--- .../impl/PsdcElectricRtdataServiceImpl.java | 6 +-- .../PsdcThermometerHtdataServiceImpl.java | 25 ++++++---- .../business/PsdcElectricRtdataMapper.xml | 2 +- .../java/com/psdc/controller/index/Index.java | 7 ++- .../monitor/AirSourcePumpController.java | 48 +++++++++++++++++++ .../ElectromagneticBoilerController.java | 17 +++---- .../monitor/HeatingCableController.java | 48 +++++++++++++++++++ .../monitor/StorageBoilerController.java | 48 +++++++++++++++++++ .../monitor/TotalElectricMeterController.java | 13 ++--- 13 files changed, 198 insertions(+), 40 deletions(-) create mode 100644 psdc-web/src/main/java/com/psdc/controller/monitor/AirSourcePumpController.java create mode 100644 psdc-web/src/main/java/com/psdc/controller/monitor/HeatingCableController.java create mode 100644 psdc-web/src/main/java/com/psdc/controller/monitor/StorageBoilerController.java diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcElectricHtdataService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcElectricHtdataService.java index ef456fd..855874f 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcElectricHtdataService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcElectricHtdataService.java @@ -15,10 +15,10 @@ public interface IPsdcElectricHtdataService { Map selTotalElectricityInfo(); - List selThisHourUseElectric(); + List selThisHourUseElectric(Integer deviceId); - List selDcglThisHourUseElectric(); + List selDcglThisHourUseElectric(Integer deviceId); - List selDcglThisDayUseElectric(); + List selDcglThisDayUseElectric(Integer deviceId); } diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcElectricRtdataService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcElectricRtdataService.java index c754fc7..8a0f224 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcElectricRtdataService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcElectricRtdataService.java @@ -12,6 +12,6 @@ import com.psdc.entity.res.PsdcDevicePowerRes; */ public interface IPsdcElectricRtdataService { - PsdcDevicePowerRes queryById(); + PsdcDevicePowerRes queryById(Integer deviceId); } 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 9f9ee84..5abcd91 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java @@ -19,8 +19,8 @@ public interface IPsdcThermometerHtdataService { AjaxResult sel8WnDu(); - PsdcDevicePowerRes selTotalElectricityInfo(); + PsdcDevicePowerRes selTotalElectricityInfo(Integer deviceId); - AjaxResult selDzglWenDu(); + AjaxResult selDzglWenDu(Integer deviceId); } diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java index 7b2ca77..083ca21 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java @@ -47,8 +47,8 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService * @return */ @Override - public List selThisHourUseElectric() { - return electricHtdataMapper.selThisHourUseElectric(13, df.format(new Date())); + public List selThisHourUseElectric(Integer deviceId) { + return electricHtdataMapper.selThisHourUseElectric(deviceId, df.format(new Date())); } /** @@ -56,16 +56,16 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService * @return */ @Override - public List selDcglThisHourUseElectric() { - return electricHtdataMapper.selThisHourUseElectric(1, df.format(new Date())); + public List selDcglThisHourUseElectric(Integer deviceId) { + return electricHtdataMapper.selThisHourUseElectric(deviceId, df.format(new Date())); } /** * 电磁锅炉查询月用电量 * @return */ @Override - public List selDcglThisDayUseElectric() { - return electricHtdataMapper.selThisDayUseElectric(1, df.format(new Date()).substring(0,7)); + public List selDcglThisDayUseElectric(Integer deviceId) { + return electricHtdataMapper.selThisDayUseElectric(deviceId, df.format(new Date()).substring(0,7)); } diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java index 45cadce..0e8bb6a 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java @@ -36,11 +36,11 @@ public class PsdcElectricRtdataServiceImpl implements IPsdcElectricRtdataService * @return */ @Override - public PsdcDevicePowerRes queryById() { + public PsdcDevicePowerRes queryById(Integer deviceId) { long userId = SecurityUtils.getUserId(); Date date = new Date(); - PsdcDevicePowerRes devicePowerRes = electricRtdataMapper.queryById(1, sdf.format(date)); - PsdcDevicePowerHdata96 hdata96 = devicePowerHdata96Mapper.queryById(userId, 13, sdf2.format(date)); + PsdcDevicePowerRes devicePowerRes = electricRtdataMapper.queryById(deviceId, sdf.format(date)); + PsdcDevicePowerHdata96 hdata96 = devicePowerHdata96Mapper.queryById(userId, deviceId, sdf2.format(date)); devicePowerRes.setTodayUsePowers(hdata96); return devicePowerRes; } 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 6041a52..a5c87ec 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 @@ -95,12 +95,17 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS } @Override - public PsdcDevicePowerRes selTotalElectricityInfo() { + public PsdcDevicePowerRes selTotalElectricityInfo(Integer deviceId) { long userId = SecurityUtils.getUserId(); - PsdcDevicePowerHdata96 hdata96 = psdcDevicePowerHdata96Mapper.queryById(userId, 13, sdf2.format(new Date())); - PsdcDevicePowerRes rtdata = psdcElectricRtdataMapper.queryById(13, sdf.format(new Date())); - rtdata.setTodayUsePowers(hdata96); - return rtdata; + PsdcDevicePowerHdata96 hdata96 = psdcDevicePowerHdata96Mapper.queryById(userId, deviceId, sdf2.format(new Date())); + PsdcDevicePowerRes rtdata = psdcElectricRtdataMapper.queryById(deviceId, sdf.format(new Date())); + + if (null != hdata96 && null != rtdata){ + rtdata.setTodayUsePowers(hdata96); + return rtdata; + } else { + return null; + } } /** @@ -108,15 +113,16 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS * @return */ @Override - public AjaxResult selDzglWenDu() { + public AjaxResult selDzglWenDu(Integer deviceId) { Date date = new Date(); String tb = sdf.format(date) + " 00:00:00"; // 今天开始检索时间 String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间 List listIn = new ArrayList(); // 今天历史进水温度集合 List listOut = new ArrayList(); // 今天历史出水温度集合 + List listTemps = new ArrayList(); // 今天历史温度集合 List times = new ArrayList(); // 时间轴 // 循环遍历今天历史数据对象集合 - List htdata = psdcThermometerHtdataMapper.selTodayThermometer(1, tb, te); + List htdata = psdcThermometerHtdataMapper.selTodayThermometer(deviceId, tb, te); for (PsdcThermometerHtdata h : htdata){ if (null != h.getThermometerValueIn()){ listIn.add(h.getThermometerValueIn()); @@ -124,10 +130,13 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS if (null != h.getThermometerValueOut()){ listOut.add(h.getThermometerValueOut()); } + if (null != h.getThermometerValue()){ + listTemps.add(h.getThermometerValue()); + } String t = h.getUpdateTime().split(" ")[1].substring(0,5); times.add(t); } - AjaxResult ajax = AjaxResult.success().put("tempIn", listIn).put("tempOut", listOut).put("times", times); + AjaxResult ajax = AjaxResult.success().put("tempIn", listIn).put("tempOut", listOut).put("temps", listTemps).put("times", times); return ajax; } diff --git a/psdc-business/src/main/resources/mapper/business/PsdcElectricRtdataMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcElectricRtdataMapper.xml index 1a59394..9ff0c36 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcElectricRtdataMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcElectricRtdataMapper.xml @@ -66,7 +66,7 @@ And DATE_FORMAT(per.update_time,'%Y-%m-%d') = #{upDate} - And DATE_FORMAT(per.update_time,'%Y-%m-%d') = #{upDate} + And DATE_FORMAT(ptr.update_time,'%Y-%m-%d') = #{upDate} 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 7a17d7f..1ffa742 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 @@ -27,8 +27,11 @@ public class Index { @RequestMapping(value = "/zdb", method = RequestMethod.GET) public AjaxResult selzdb() { - AjaxResult ajax = AjaxResult.success(psdcThermometerHtdataService.selTotalElectricityInfo()); - return ajax; + // 查询总电表日常用电信息 + if (null == psdcThermometerHtdataService.selTotalElectricityInfo(13)){ + return AjaxResult.success("今日暂无数据！"); + } + return AjaxResult.success(psdcThermometerHtdataService.selTotalElectricityInfo(13)); } } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/AirSourcePumpController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/AirSourcePumpController.java new file mode 100644 index 0000000..bfaaed5 --- /dev/null +++ b/psdc-web/src/main/java/com/psdc/controller/monitor/AirSourcePumpController.java @@ -0,0 +1,48 @@ +package com.psdc.controller.monitor; + +import com.psdc.core.domain.AjaxResult; +import com.psdc.service.IPsdcElectricHtdataService; +import com.psdc.service.IPsdcElectricRtdataService; +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; + +/** + * @Author：戴仕崑 + * @Project：psdc + * @Filename：AirSourcePumpController + * @Date：2023/5/11 9:49 + * @Version 1.0 + */ +@RestController +@RequestMapping("/api/monitor/kqyrb/index") +public class AirSourcePumpController { + + @Autowired + IPsdcElectricRtdataService psdcElectricRtdataService; + @Autowired + IPsdcThermometerHtdataService psdcThermometerHtdataService; + @Autowired + IPsdcElectricHtdataService psdcElectricHtdataService; + + @PreAuthorize("@ss.hasPermi('emonitor:kqyrb')") + @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET) + public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){ + AjaxResult ajax = AjaxResult.success(psdcElectricRtdataService.queryById(deviceId)); + return ajax; + } + + @PreAuthorize("@ss.hasPermi('emonitor:kqyrb')") + @RequestMapping(value = "/sel2/{deviceId}", method = RequestMethod.GET) + public AjaxResult seldrgl2(@PathVariable(value = "deviceId", required = false) Integer deviceId) { + AjaxResult ajax = psdcThermometerHtdataService.selDzglWenDu(deviceId); + ajax.put("kqyrbqhour", psdcElectricHtdataService.selDcglThisHourUseElectric(deviceId)); + ajax.put("kqyrbqday", psdcElectricHtdataService.selDcglThisDayUseElectric(deviceId)); + return ajax; + } + +} diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/ElectromagneticBoilerController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/ElectromagneticBoilerController.java index da45cda..e44d1b9 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/ElectromagneticBoilerController.java +++ b/psdc-web/src/main/java/com/psdc/controller/monitor/ElectromagneticBoilerController.java @@ -6,6 +6,7 @@ import com.psdc.service.IPsdcElectricRtdataService; 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; @@ -29,18 +30,18 @@ public class ElectromagneticBoilerController { IPsdcElectricHtdataService psdcElectricHtdataService; @PreAuthorize("@ss.hasPermi('emonitor:drgl')") - @RequestMapping(value = "/sel1", method = RequestMethod.GET) - public AjaxResult seldrgl1() { - AjaxResult ajax = AjaxResult.success(psdcElectricRtdataService.queryById()); + @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET) + public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){ + AjaxResult ajax = AjaxResult.success(psdcElectricRtdataService.queryById(deviceId)); return ajax; } @PreAuthorize("@ss.hasPermi('emonitor:drgl')") - @RequestMapping(value = "/sel2", method = RequestMethod.GET) - public AjaxResult seldrgl2() { - AjaxResult ajax = psdcThermometerHtdataService.selDzglWenDu(); - ajax.put("dcglqhour", psdcElectricHtdataService.selDcglThisHourUseElectric()); - ajax.put("dcglqday", psdcElectricHtdataService.selDcglThisDayUseElectric()); + @RequestMapping(value = "/sel2/{deviceId}", method = RequestMethod.GET) + public AjaxResult seldrgl2(@PathVariable(value = "deviceId", required = false) Integer deviceId) { + AjaxResult ajax = psdcThermometerHtdataService.selDzglWenDu(deviceId); + ajax.put("dcglqhour", psdcElectricHtdataService.selDcglThisHourUseElectric(deviceId)); + ajax.put("dcglqday", psdcElectricHtdataService.selDcglThisDayUseElectric(deviceId)); return ajax; } } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/HeatingCableController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/HeatingCableController.java new file mode 100644 index 0000000..fd11ad1 --- /dev/null +++ b/psdc-web/src/main/java/com/psdc/controller/monitor/HeatingCableController.java @@ -0,0 +1,48 @@ +package com.psdc.controller.monitor; + +import com.psdc.core.domain.AjaxResult; +import com.psdc.service.IPsdcElectricHtdataService; +import com.psdc.service.IPsdcElectricRtdataService; +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; + +/** + * @Author：戴仕崑 + * @Project：psdc + * @Filename：HeatingCableController + * @Date：2023/5/11 9:48 + * @Version 1.0 + */ +@RestController +@RequestMapping("/api/monitor/frdl/index") +public class HeatingCableController { + + @Autowired + IPsdcElectricRtdataService psdcElectricRtdataService; + @Autowired + IPsdcThermometerHtdataService psdcThermometerHtdataService; + @Autowired + IPsdcElectricHtdataService psdcElectricHtdataService; + + @PreAuthorize("@ss.hasPermi('emonitor:frdl')") + @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET) + public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){ + AjaxResult ajax = AjaxResult.success(psdcElectricRtdataService.queryById(deviceId)); + return ajax; + } + + @PreAuthorize("@ss.hasPermi('emonitor:frdl')") + @RequestMapping(value = "/sel2/{deviceId}", method = RequestMethod.GET) + public AjaxResult seldrgl2(@PathVariable(value = "deviceId", required = false) Integer deviceId) { + AjaxResult ajax = psdcThermometerHtdataService.selDzglWenDu(deviceId); + ajax.put("frdlqhour", psdcElectricHtdataService.selDcglThisHourUseElectric(deviceId)); + ajax.put("frdlqday", psdcElectricHtdataService.selDcglThisDayUseElectric(deviceId)); + return ajax; + } + +} diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/StorageBoilerController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/StorageBoilerController.java new file mode 100644 index 0000000..077c547 --- /dev/null +++ b/psdc-web/src/main/java/com/psdc/controller/monitor/StorageBoilerController.java @@ -0,0 +1,48 @@ +package com.psdc.controller.monitor; + +import com.psdc.core.domain.AjaxResult; +import com.psdc.service.IPsdcElectricHtdataService; +import com.psdc.service.IPsdcElectricRtdataService; +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; + +/** + * @Author：戴仕崑 + * @Project：psdc + * @Filename：StrorageBoilerController + * @Date：2023/5/11 9:49 + * @Version 1.0 + */ +@RestController +@RequestMapping("/api/monitor/xrgl/index") +public class StorageBoilerController { + + @Autowired + IPsdcElectricRtdataService psdcElectricRtdataService; + @Autowired + IPsdcThermometerHtdataService psdcThermometerHtdataService; + @Autowired + IPsdcElectricHtdataService psdcElectricHtdataService; + + @PreAuthorize("@ss.hasPermi('emonitor:xrgl')") + @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET) + public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){ + AjaxResult ajax = AjaxResult.success(psdcElectricRtdataService.queryById(deviceId)); + return ajax; + } + + @PreAuthorize("@ss.hasPermi('emonitor:xrgl')") + @RequestMapping(value = "/sel2/{deviceId}", method = RequestMethod.GET) + public AjaxResult seldrgl2(@PathVariable(value = "deviceId", required = false) Integer deviceId) { + AjaxResult ajax = psdcThermometerHtdataService.selDzglWenDu(deviceId); + ajax.put("xrglqhour", psdcElectricHtdataService.selDcglThisHourUseElectric(deviceId)); + ajax.put("xrglqday", psdcElectricHtdataService.selDcglThisDayUseElectric(deviceId)); + return ajax; + } + +} 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 f1906da..ee1e195 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 @@ -6,6 +6,7 @@ import com.psdc.service.IPsdcElectricHtdataService; 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; @@ -31,9 +32,9 @@ public class TotalElectricMeterController { IPsdcElectricHtdataService psdcElectricHtdataService; @PreAuthorize("@ss.hasPermi('emonitor:db')") - @RequestMapping(value = "/sel1", method = RequestMethod.GET) - public AjaxResult selzdb1() { - PsdcDevicePowerRes devicePowerRes = psdcThermometerHtdataService.selTotalElectricityInfo(); + @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET) + public AjaxResult selzdb1(@PathVariable(value = "deviceId", required = false) Integer deviceId) { + PsdcDevicePowerRes devicePowerRes = psdcThermometerHtdataService.selTotalElectricityInfo(deviceId); Map map = psdcElectricHtdataService.selTotalElectricityInfo(); devicePowerRes.setEDay((Double) map.get("eday")); devicePowerRes.setEMonth((Double) map.get("emonth")); @@ -42,9 +43,9 @@ public class TotalElectricMeterController { } @PreAuthorize("@ss.hasPermi('emonitor:db')") - @RequestMapping(value = "/sel2", method = RequestMethod.GET) - public AjaxResult selzdb2() { - List list = psdcElectricHtdataService.selThisHourUseElectric(); + @RequestMapping(value = "/sel2/{deviceId}", method = RequestMethod.GET) + public AjaxResult selzdb2(@PathVariable(value = "deviceId", required = false) Integer deviceId) { + List list = psdcElectricHtdataService.selThisHourUseElectric(deviceId); AjaxResult ajax = AjaxResult.success(list); return ajax; } From a371b2163c1ecbffe495e0786a90220372c68dd0 Mon Sep 17 00:00:00 2001 From: jiminglei <836545853@qq.com> Date: Thu, 11 May 2023 11:21:08 +0800 Subject: [PATCH 2/4] 11 --- psdc-ui/src/views/emonitor/drgl/index.vue | 184 ++++++++++++++++++++-- 1 file changed, 168 insertions(+), 16 deletions(-) diff --git a/psdc-ui/src/views/emonitor/drgl/index.vue b/psdc-ui/src/views/emonitor/drgl/index.vue index f48f08b..a660c78 100644 --- a/psdc-ui/src/views/emonitor/drgl/index.vue +++ b/psdc-ui/src/views/emonitor/drgl/index.vue @@ -42,33 +42,25 @@
日用电量
-
- pic -
+
月用电量
-
- pic -
+
当前功率
-
- pic -
+
当前温度
-
- pic -
+
@@ -82,33 +74,193 @@ export default { setup() { onMounted(() => {//需要获取到element,所以是onMounted的Hook let myChart = echarts.init(document.getElementById("myEcharts")); + let myChart2 = echarts.init(document.getElementById("myEcharts2")); + let myChart3 = echarts.init(document.getElementById("myEcharts3")); + let myChart4 = echarts.init(document.getElementById("myEcharts4")); // 绘制图表 myChart.setOption({ title: {}, tooltip: {}, + textStyle:{ + color:'#BEC3DA' + }, xAxis: { data: ["12-3", "12-4", "12-5", "12-6", "12-7", "12-8"], + axisLine:{ + lineStyle:{ + color:'#BEC3DA', + type:'dashed' + } + } }, yAxis: { - nameTextStyle: { - color: 'white' + type: 'value', + splitLine:{ + show:true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } }, + axisLine: { show: true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, + }, + series: [ + { + name: "用户量", + type: "bar", + data: [5, 20, 36, 10, 10, 20], + itemStyle:{ + color:'#2F8EE0' + }, + }, + ], + }); + window.onresize = function () {//自适应大小 + myChart.resize(); + }; + myChart2.setOption({ + title: {}, + tooltip: {}, + textStyle:{ + color:'#BEC3DA' + }, + xAxis: { + data: ["12-3", "12-4", "12-5", "12-6", "12-7", "12-8"], + axisLine:{ + lineStyle:{ + color:'#BEC3DA', + type:'dashed' + } + } + }, + yAxis: { type: 'value', + splitLine:{ + show:true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, axisLine: { show: true, - } + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } }, + }, series: [ { name: "用户量", type: "bar", data: [5, 20, 36, 10, 10, 20], + itemStyle:{ + color:'#2F8EE0' + }, }, ], }); window.onresize = function () {//自适应大小 - myChart.resize(); + myChart2.resize(); + }; + myChart3.setOption({ + title: {}, + tooltip: {}, + textStyle:{ + color:'#BEC3DA' + }, + xAxis: { + data: ["12-3", "12-4", "12-5", "12-6", "12-7", "12-8"], + axisLine:{ + lineStyle:{ + color:'#BEC3DA', + type:'dashed' + } + } + }, + yAxis: { + type: 'value', + splitLine:{ + show:true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, + axisLine: { + show: true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, + }, + series: [ + { + name: "用户量", + type: "line", + data: [5, 20, 36, 10, 10, 20], + itemStyle:{ + color:'#2F8EE0' + }, + }, + ], + }); + window.onresize = function () {//自适应大小 + myChart3.resize(); + }; + myChart4.setOption({ + title: {}, + tooltip: {}, + textStyle:{ + color:'#BEC3DA' + }, + xAxis: { + data: ["12-3", "12-4", "12-5", "12-6", "12-7", "12-8"], + axisLine:{ + lineStyle:{ + color:'#BEC3DA', + type:'dashed' + } + } + }, + yAxis: { + type: 'value', + splitLine:{ + show:true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, + axisLine: { + show: true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, + }, + series: [ + { + name: "用户量", + type: "line", + data: [5, 20, 36, 10, 10, 20], + itemStyle:{ + color:'#2F8EE0' + }, + }, + ], + }); + window.onresize = function () {//自适应大小 + myChart4.resize(); }; }); }, From 5f350b53f449aa3534e4ea8bb57b41b8f3cb1a7a Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Thu, 11 May 2023 14:03:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?2023-05-11=2014:03:26=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=89=80=E5=B1=9E=E8=AE=BE=E5=A4=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87Id=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AE=BE=E5=A4=87=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/psdc/mapper/PsdcDeviceMapper.java | 3 ++ .../com/psdc/service/IPsdcDeviceService.java | 4 +++ .../service/impl/PsdcDeviceServiceImpl.java | 7 ++++ .../mapper/business/PsdcDeviceMapper.xml | 14 ++++++++ .../monitor/SandTableController.java | 33 +++++++++++++++++++ .../monitor/TotalElectricMeterController.java | 21 ++++++++++++ 6 files changed, 82 insertions(+) create mode 100644 psdc-web/src/main/java/com/psdc/controller/monitor/SandTableController.java 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 c19c151..2ed5229 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java @@ -3,6 +3,7 @@ package com.psdc.mapper; import java.util.List; import com.psdc.entity.PsdcDevice; +import com.psdc.entity.vo.DeviceStatusVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; @@ -24,6 +25,8 @@ public interface PsdcDeviceMapper{ */ PsdcDevice queryById(Integer deviceId); + DeviceStatusVo queryDeviceStatusById(@Param(value = "deviceId") Integer deviceId); + List selMyWorkDevices(@Param(value = "devType") Integer devType, @Param(value = "userId") Long userId); diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java index 31d39ce..ad19a0e 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java @@ -27,6 +27,10 @@ public interface IPsdcDeviceService { */ List queryDeviceStatus(); + + DeviceStatusVo queryDeviceStatusById(Integer deviceId); + + /** * 新增数据 * 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 7eecc1c..4691387 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 @@ -36,6 +36,8 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService{ return psdcDeviceMapper.queryById(deviceId); } + + /** * 根据用户id查询设备列表 * @return @@ -53,6 +55,11 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService{ }).collect(Collectors.toList()); } + @Override + public DeviceStatusVo queryDeviceStatusById(Integer deviceId) { + return psdcDeviceMapper.queryDeviceStatusById(deviceId); + } + /** * 新增数据 * diff --git a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml index aae305e..2ed7128 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml @@ -21,6 +21,20 @@ + + + + + + + + + + +