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] =?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<Integer> 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<DeviceStatusVo> 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 @@
         <result property="updateTime" column="update_time" />
     </resultMap>
 
+    <resultMap id="PsdcDeviceMap2" type="com.psdc.entity.vo.DeviceStatusVo">
+        <result property="deviceId" column="device_id" />
+        <result property="deviceType" column="device_type" />
+        <result property="deviceSn" column="device_sn" />
+        <result property="deviceName" column="device_name" />
+        <result property="photoUrl" column="photo_url" />
+        <result property="deviceRunstatus" column="device_runstatus" />
+    </resultMap>
+
+    <select id="queryDeviceStatusById" resultMap="PsdcDeviceMap2">
+        Select device_id, device_type, device_sn, device_name, device_runstatus, photo_url From psdc_device
+        Where device_id = #{deviceId}
+    </select>
+
     <!-- 通过ID查询单条数据 -->
     <select id="queryById" resultMap="PsdcDeviceMap">
         select device_id,
diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/SandTableController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/SandTableController.java
new file mode 100644
index 0000000..526f6cb
--- /dev/null
+++ b/psdc-web/src/main/java/com/psdc/controller/monitor/SandTableController.java
@@ -0,0 +1,33 @@
+package com.psdc.controller.monitor;
+
+import com.psdc.core.domain.AjaxResult;
+import com.psdc.service.IPsdcDeviceService;
+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：SandTableController
+ * @Date：2023/5/11 13:40
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/api/monitor/sp/index")
+public class SandTableController {
+
+    @Autowired
+    IPsdcDeviceService psdcDeviceService;
+
+    @PreAuthorize("@ss.hasPermi('emonitor:sp')")
+    @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET)
+    public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){
+        AjaxResult ajax = AjaxResult.success(psdcDeviceService.queryDeviceStatusById(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 ee1e195..3b884c9 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
@@ -1,7 +1,9 @@
 package com.psdc.controller.monitor;
 
 import com.psdc.core.domain.AjaxResult;
+import com.psdc.entity.PsdcDevice;
 import com.psdc.entity.res.PsdcDevicePowerRes;
+import com.psdc.service.IPsdcDeviceService;
 import com.psdc.service.IPsdcElectricHtdataService;
 import com.psdc.service.IPsdcThermometerHtdataService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -31,6 +35,23 @@ public class TotalElectricMeterController {
     @Autowired
     IPsdcElectricHtdataService psdcElectricHtdataService;
 
+    @Autowired
+    IPsdcDeviceService psdcDeviceService;
+
+    @PreAuthorize("@ss.hasPermi('emonitor:db')")
+    @RequestMapping(value = "/selMydevices", method = RequestMethod.GET)
+    public AjaxResult selMydevices()  {
+        List<Map> maps = new ArrayList<>();
+        List<PsdcDevice> list = psdcDeviceService.queryByUserId();
+        for (PsdcDevice dd : list){
+            Map<String, Object> map = new HashMap<>();
+            map.put("label", dd.getDeviceName());
+            map.put("value", dd.getDeviceId());
+            maps.add(map);
+        }
+        return AjaxResult.success("用户所属设备列表", maps);
+    }
+
     @PreAuthorize("@ss.hasPermi('emonitor:db')")
     @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET)
     public AjaxResult selzdb1(@PathVariable(value = "deviceId", required = false) Integer deviceId)  {