2023-05-25 15:50:18 优化完善设备管理查询接口!

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 ;

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