钟来 / Luhui · 提交

转到一个项目

作者 钟来
提交 bee6879ead33f5f146db99e48f5038505acbf023 1 个父辈 61a334e9

修改bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 11 行增加 和 7 行删除
@@ -18,7 +18,11 @@ public class IntegerModelOutput extends ThingsModelItemBase<Integer> @@ -18,7 +18,11 @@ public class IntegerModelOutput extends ThingsModelItemBase<Integer>
18 18
19 @Override 19 @Override
20 public void addValue(Object object) { 20 public void addValue(Object object) {
21 - setValue((Integer) object); 21 + if(null == object)
  22 + {
  23 + return;
  24 + }
  25 + setValue(new Double(String.valueOf(object)).intValue());
22 } 26 }
23 27
24 @Override 28 @Override
@@ -359,14 +359,14 @@ public class DeviceService { @@ -359,14 +359,14 @@ public class DeviceService {
359 ThingsModelBase thingsModelBase = JSON.parseObject(thingsModel.getSpecs(),aClass); 359 ThingsModelBase thingsModelBase = JSON.parseObject(thingsModel.getSpecs(),aClass);
360 thingsModelBase.conversionThingsModel(thingsModel); 360 thingsModelBase.conversionThingsModel(thingsModel);
361 Object object = jsonObject.get(skey); 361 Object object = jsonObject.get(skey);
362 - Type clas = ((ParameterizedType)aClass.getGenericSuperclass()).getActualTypeArguments()[0];  
363 - if(null != object && object.getClass()!=clas)  
364 - {  
365 - return new Message(MessageCode.DEFAULT_FAIL_CODE,skey+" 参数数据类型和模型数据类型（"+clas+"）不一致");  
366 - }  
367 - thingsModelBase.addValue(object); 362 +// Type clas = ((ParameterizedType)aClass.getGenericSuperclass()).getActualTypeArguments()[0];
  363 +// if(null != object && object.getClass()!=clas)
  364 +// {
  365 +// return new Message(MessageCode.DEFAULT_FAIL_CODE,skey+" 参数数据类型和模型数据类型（"+clas+"）不一致");
  366 +// }
368 ThingsModelItemBase thingsModelItemBase = (ThingsModelItemBase) thingsModelBase; 367 ThingsModelItemBase thingsModelItemBase = (ThingsModelItemBase) thingsModelBase;
369 jsonObject.put(skey,thingsModelItemBase.getCmdView(object)); 368 jsonObject.put(skey,thingsModelItemBase.getCmdView(object));
  369 + thingsModelBase.addValue(thingsModelItemBase.getCmdView(object));
370 String id = clienid+"_"+key; 370 String id = clienid+"_"+key;
371 logDeviceOperationList.add(dviceLogService.newLogDeviceOperation(id,thingsModelItemBase.getSaveView(),null,"远程控制"+thingsModelItemBase.getName()+"为"+thingsModelItemBase.getView(),null)); 371 logDeviceOperationList.add(dviceLogService.newLogDeviceOperation(id,thingsModelItemBase.getSaveView(),null,"远程控制"+thingsModelItemBase.getName()+"为"+thingsModelItemBase.getView(),null));
372 } 372 }