作者 钟来

修改bug

... ... @@ -18,7 +18,11 @@ public class IntegerModelOutput extends ThingsModelItemBase<Integer>
@Override
public void addValue(Object object) {
setValue((Integer) object);
if(null == object)
{
return;
}
setValue(new Double(String.valueOf(object)).intValue());
}
@Override
... ...
... ... @@ -359,14 +359,14 @@ public class DeviceService {
ThingsModelBase thingsModelBase = JSON.parseObject(thingsModel.getSpecs(),aClass);
thingsModelBase.conversionThingsModel(thingsModel);
Object object = jsonObject.get(skey);
Type clas = ((ParameterizedType)aClass.getGenericSuperclass()).getActualTypeArguments()[0];
if(null != object && object.getClass()!=clas)
{
return new Message(MessageCode.DEFAULT_FAIL_CODE,skey+" 参数数据类型和模型数据类型("+clas+")不一致");
}
thingsModelBase.addValue(object);
// Type clas = ((ParameterizedType)aClass.getGenericSuperclass()).getActualTypeArguments()[0];
// if(null != object && object.getClass()!=clas)
// {
// return new Message(MessageCode.DEFAULT_FAIL_CODE,skey+" 参数数据类型和模型数据类型("+clas+")不一致");
// }
ThingsModelItemBase thingsModelItemBase = (ThingsModelItemBase) thingsModelBase;
jsonObject.put(skey,thingsModelItemBase.getCmdView(object));
thingsModelBase.addValue(thingsModelItemBase.getCmdView(object));
String id = clienid+"_"+key;
logDeviceOperationList.add(dviceLogService.newLogDeviceOperation(id,thingsModelItemBase.getSaveView(),null,"远程控制"+thingsModelItemBase.getName()+"为"+thingsModelItemBase.getView(),null));
}
... ...