1.用能系统空调关机策略

2.终端模块对外接口

pqs-energy/energy-boot/src/main/java/com/njcn/energy/mapper/mapping/LogicDeviceLineMapper.xml

@@ -12,7 +12,7 @@
     </select>
 
     <select id="getEleLineList" resultType="EnergyDeviceTreeVO">
-        select id,pid,name,line_id,3 as level from ele_line
+        select id,pid,name,line_id as lineId,3 as level from ele_line
         where state = 1
         order by ele_line.idx
     </select>
@@ -178,7 +178,7 @@ WHERE
         inner join ele_logic_dev b on a.pid = b.id
         inner join ele_net_dev c on b.pid = c.id
         where a.state = 1
-        and a.id in
+        and a.line_id in
         <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>