~huangxinlei/MES_Test_Project.git

			@@ -58,12 +58,12 @@
			*/
			@Select("SELECT d.id, d.device_name as deviceName, d.device_code as deviceCode, " +
			"d.device_type as deviceType, d.plc_ip as plcIp, dgr.role, d.status, " +
			"ds.last_heartbeat as lastHeartbeat, " +
			"ds.last_heartbeat as lastHeartbeat, d.enabled, " +
			"CASE WHEN ds.status = 'ONLINE' THEN TRUE ELSE FALSE END as isOnline " +
			"FROM device_config d " +
			"INNER JOIN device_group_relation dgr ON d.id = dgr.device_id " +
			"LEFT JOIN device_status ds ON d.device_id = ds.device_id " +
			" AND ds.id = (SELECT MAX(id) FROM device_status WHERE device_id = d.device_id) " +
			"LEFT JOIN device_status ds ON CAST(d.id AS CHAR) = ds.device_id " +
			" AND ds.id = (SELECT MAX(id) FROM device_status WHERE device_id = CAST(d.id AS CHAR)) " +
			"WHERE dgr.group_id = #{groupId} AND dgr.is_deleted = 0 AND d.is_deleted = 0 " +
			"ORDER BY dgr.connection_order ASC")
			List<DeviceGroupVO.DeviceInfo> getGroupDevices(@Param("groupId") Long groupId);
			@@ -107,8 +107,8 @@
			@Select("SELECT COUNT(DISTINCT d.id) " +
			"FROM device_config d " +
			"INNER JOIN device_group_relation dgr ON d.id = dgr.device_id " +
			"LEFT JOIN device_status ds ON d.device_id = ds.device_id " +
			" AND ds.id = (SELECT MAX(id) FROM device_status WHERE device_id = d.device_id) " +
			"LEFT JOIN device_status ds ON CAST(d.id AS CHAR) = ds.device_id " +
			" AND ds.id = (SELECT MAX(id) FROM device_status WHERE device_id = CAST(d.id AS CHAR)) " +
			"WHERE dgr.group_id = #{groupId} " +
			" AND dgr.is_deleted = 0 " +
			" AND d.is_deleted = 0 " +