修改sql

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/device/DeviceManageEndpoint.java

@@ -379,7 +379,11 @@ public class DeviceManageEndpoint extends EnvelopRestEndpoint {
    @ApiOperation("查询设备名称以及型号")
    public ObjEnvelop findDmDeviceDictName(){
            return ObjEnvelop.getSuccess("查询成功",deviceManageService.findDmDeviceDictName()) ;
            try{
                return ObjEnvelop.getSuccess("查询成功",deviceManageService.findDmDeviceDictName()) ;
            }catch (Exception e) {
                return failedObjEnvelopException2(e);
            }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/device/DeviceManageService.java

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