食堂-设备接口修改
This commit is contained in:
		
							parent
							
								
									4fa2b84b3e
								
							
						
					
					
						commit
						e1e8188562
					
				| 
						 | 
				
			
			@ -56,17 +56,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
			
		|||
    </resultMap>
 | 
			
		||||
 | 
			
		||||
    <sql id="selectDeviceInfoVo">
 | 
			
		||||
        select di.device_id, device_name, di.parent_id, parent_type, tenant_id, online_state, version_code,
 | 
			
		||||
        select di.device_id, device_name, di.parent_id, parent_type, tenant_id, version_code,
 | 
			
		||||
               version_name, consume_mode, communicate_mode, device_ip, device_mask, device_mac,
 | 
			
		||||
               device_gateway, dns_primary, dns_backup, device_sn, device_number, device_model,
 | 
			
		||||
               device_type, device_pwd, device_addr, device_key, device_service_ip, device_service_port,
 | 
			
		||||
               if_quota_limit, if_discount, if_time_limit, if_use_call_num, if_off_line_pay, if_use,
 | 
			
		||||
               di.img_url, data_transfer_status, print_status, print_key, device_state, device_protocol,
 | 
			
		||||
               heart_beat_time, last_update_time, di.create_by, di.create_time, di.update_by, di.update_time,
 | 
			
		||||
               db.area_id, ba.area_name, db.canteen_id, bc.canteen_name, db.stall_id, bs.stall_name
 | 
			
		||||
               db.area_id, db.canteen_id, bc.canteen_name, db.stall_id, bs.stall_name,
 | 
			
		||||
               if((UNIX_TIMESTAMP() - di.last_update_time) > 120, '2','1' ) AS online_state,
 | 
			
		||||
               CONCAT(aaa.area_name, '/', ba.area_name) AS area_name
 | 
			
		||||
        from device_info di
 | 
			
		||||
        left join device_bind db on di.device_id = db.device_id
 | 
			
		||||
        left join basic_area ba on db.area_id = ba.area_id
 | 
			
		||||
        left join basic_area aaa on ba.parent_id = aaa.area_id
 | 
			
		||||
        left join basic_canteen bc on db.canteen_id = bc.canteen_id
 | 
			
		||||
        left join basic_stall bs on db.stall_id = bs.stall_id
 | 
			
		||||
    </sql>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue