From 2341398abecdc408910a900534b86201457fee43 Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Thu, 25 May 2023 15:50:41 +0800
Subject: [PATCH] =?UTF-8?q?2023-05-25=2015:50:18=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/psdc/entity/res/PsdcDeviceInfoRes.java   | 2 ++
 .../src/main/resources/mapper/business/PsdcDeviceMapper.xml    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/psdc-business/src/main/java/com/psdc/entity/res/PsdcDeviceInfoRes.java b/psdc-business/src/main/java/com/psdc/entity/res/PsdcDeviceInfoRes.java
index f4be2eb..f754b6b 100644
--- a/psdc-business/src/main/java/com/psdc/entity/res/PsdcDeviceInfoRes.java
+++ b/psdc-business/src/main/java/com/psdc/entity/res/PsdcDeviceInfoRes.java
@@ -58,6 +58,8 @@ public class PsdcDeviceInfoRes {
     /** 当前总有功电能 */
     @Excel(name = "总用电量")
     private Double totWh;
+    /** 1不可控，2可控 */
+    private Integer isControl;
 
     /** 设备状态：1-未激活，2-禁用，3-在线，4-离线 */
     private Integer deviceStatus ;
diff --git a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
index ace3198..85e6021 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
@@ -46,6 +46,7 @@
         <result property="tempIn" column="thermometer_value_in" />
         <result property="tempOut" column="thermometer_value_out" />
         <result property="totWh" column="TotWh" />
+        <result property="isControl" column="is_control" />
         <result property="deviceAddress" column="device_address" />
         <result property="startTime" column="start_time" />
         <result property="deviceStatus" column="device_status" />
@@ -119,7 +120,7 @@
     <!--分页查询指定行数据-->
     <select id="queryAllByLimit" resultMap="PsdcDeviceMap3">
         Select
-        pd.device_id, device_name, device_address, device_status, device_runstatus, parent_id, device_model, su.user_id, su.user_name,
+        pd.device_id, device_name, device_address, device_status, device_runstatus, parent_id, device_model, su.user_id, su.user_name, is_control
         device_sn, per.TotP, per.TotWh, start_time, ptr.thermometer_value, ptr.thermometer_value_in, ptr.thermometer_value_out
         From psdc_device pd
         Left Join sys_user su On su.user_id = pd.user_id