2023-05-11 10:28:06 完成能源监测电磁锅炉、蓄热锅炉、空气源热泵、发热电缆的查询接口!

2 years ago · 78f3453d99
parent 63dd6e5fe6
commit 78f3453d99
13 changed files with 198 additions and 40 deletions
--- 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);

 }
--- 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);

 }
--- 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);

 }
--- 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));
    }


--- 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;
    }
--- 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<Double> listIn = new ArrayList(); // 今天历史进水温度集合
        List<Double> listOut = new ArrayList(); // 今天历史出水温度集合
+        List<Double> listTemps = new ArrayList(); // 今天历史温度集合
        List<String> times = new ArrayList(); // 时间轴
        // 循环遍历今天历史数据对象集合
-        List<PsdcThermometerHtdata> htdata = psdcThermometerHtdataMapper.selTodayThermometer(1, tb, te);
+        List<PsdcThermometerHtdata> 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;
    }

--- 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}
        </if>
        <if test="upDate != null and upDate != ''">
-            And DATE_FORMAT(per.update_time,'%Y-%m-%d') = #{upDate}
+            And DATE_FORMAT(ptr.update_time,'%Y-%m-%d') = #{upDate}
        </if>
    </select>

--- 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));
    }

 }
--- a/psdc-web/src/main/java/com/psdc/controller/monitor/AirSourcePumpController.java
+++ 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;
+    }
+
+}
--- 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;
    }
 }
--- a/psdc-web/src/main/java/com/psdc/controller/monitor/HeatingCableController.java
+++ 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;
+    }
+
+}
--- a/psdc-web/src/main/java/com/psdc/controller/monitor/StorageBoilerController.java
+++ 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;
+    }
+
+}
--- 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;
    }