电表逻辑修改

ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml

@@ -151,9 +151,11 @@
         where device_id in  (select distinct eb.device_id from ems_battery_cluster eb where eb.stack_device_id = #{stackDeviceId})
     </select>
 
-    <select id="getDeviceStatus" parameterType="String" resultType="java.util.Map">
-        select device_id as id,communication_status
-        from ems_devices_setting
-        where device_id = #{deviceId}
+    <select id="getAllBatteryDeviceBySiteId" parameterType="String" resultType="com.xzzn.ems.domain.EmsDevicesSetting">
+        select distinct e.device_id as deviceId,
+                        t.device_name as deviceName,
+                        t.communication_status as communicationStatus
+        from ems_devices_setting t INNER JOIN ems_ammeter_data e on t.site_id = e.site_id and t.device_id = e.device_id
+        where t.site_id = #{siteId}
     </select>
 </mapper>