| 
															
																@ -34,8 +34,8 @@ public class DeviceManageService extends BaseJpaService<DeviceDetail,DeviceDetai 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    private DeviceDao deviceDao; 
															 | 
															
															 | 
															
																    private DeviceDao deviceDao; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    public JSONObject findDmDeviceDictName() { 
															 | 
															
															 | 
															
																    public JSONObject findDmDeviceDictName() { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        String deviceNameSql = "select name, category_code from dm_device"; 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        String deviceModelSql = "select model, category_code from dm_device"; 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        String deviceNameSql = "select name, id from dm_device"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        String deviceModelSql = "select model, id from dm_device"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        List<Map<String, Object>> deviceName = jdbcTemplate.queryForList(deviceNameSql); 
															 | 
															
															 | 
															
																        List<Map<String, Object>> deviceName = jdbcTemplate.queryForList(deviceNameSql); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        List<Map<String, Object>> deviceModel = jdbcTemplate.queryForList(deviceModelSql); 
															 | 
															
															 | 
															
																        List<Map<String, Object>> deviceModel = jdbcTemplate.queryForList(deviceModelSql); 
															 |