Skip to content

A
amos-boot-biz
Commit 36af95df authored by tangwei's avatar tangwei
Browse files
Options

修改接口

parent 98acbefe
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 10 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java
View file @ 36af95df
...@@ -111,7 +111,27 @@ public class InputItemController extends AbstractBaseController { ...@@ -111,7 +111,27 @@ public class InputItemController extends AbstractBaseController {
InputItem bo = inputItemService.queryInputItemDetail(itemID); InputItem bo = inputItemService.queryInputItemDetail(itemID);
InputItemParam inputItemVo = new InputItemParam(); InputItemParam inputItemVo = new InputItemParam();
BeanUtils.copyProperties(bo,inputItemVo); BeanUtils.copyProperties(bo,inputItemVo);
inputItemVo.setDataJson(bo.getDataJson() != null?JSONObject.parse(bo.getDataJson()):null); if(inputItemVo.getItemType().equals("文本")){
Map<String,Object> map= JSONObject.parseObject(bo.getDataJson(),Map.class);
inputItemVo.setOkScore(Integer.valueOf(map.get("OkScore").toString()));
inputItemVo.setNoScore(Integer.valueOf(map.get("NoScore").toString()));
inputItemVo.setCheckType(map.get("CheckType").toString());
}else if(inputItemVo.getItemType().equals("数字")){
Map<String,Object> map= JSONObject.parseObject(bo.getDataJson(),Map.class);
inputItemVo.setOkScore(Integer.valueOf(map.get("OkScore").toString()));
inputItemVo.setNoScore(Integer.valueOf(map.get("NoScore").toString()));
inputItemVo.setValidUp("".equals(map.get("ValidUp").toString())?null:Integer.valueOf(map.get("ValidUp").toString()));
inputItemVo.setValidDown("".equals(map.get("ValidDown").toString())?null:Integer.valueOf(map.get("ValidDown").toString()));
inputItemVo.setOkUp("".equals(map.get("OkUp").toString())?null:Integer.valueOf(map.get("OkUp").toString()));
inputItemVo.setOkDown("".equals(map.get("OkDown").toString())?null:Integer.valueOf(map.get("OkDown").toString()));
inputItemVo.setCheckValidUp(Boolean.valueOf(map.get("CheckValidUp").toString())?"true":"false");
inputItemVo.setCheckValidDown(Boolean.valueOf(map.get("CheckValidDown").toString())?"true":"false");
inputItemVo.setCheckOkUp(Boolean.valueOf(map.get("CheckOkUp").toString())?"true":"false");
inputItemVo.setCheckOkDown(Boolean.valueOf(map.get("CheckOkDown").toString())?"true":"false");
inputItemVo.setPrecision(Integer.valueOf(map.get("Precision").toString()));
}else{
inputItemVo.setDataJson(bo.getDataJson() != null?JSONObject.parse(bo.getDataJson()):null);
}
inputItemVo.setPictureJson(bo.getPictureJson()!=null?JSONObject.parse(bo.getPictureJson()):null); inputItemVo.setPictureJson(bo.getPictureJson()!=null?JSONObject.parse(bo.getPictureJson()):null);
return CommonResponseUtil.success(inputItemVo); return CommonResponseUtil.success(inputItemVo);
} }
...@@ -453,8 +473,8 @@ public class InputItemController extends AbstractBaseController { ...@@ -453,8 +473,8 @@ public class InputItemController extends AbstractBaseController {
if(param.getItemType().equals("文本")){ if(param.getItemType().equals("文本")){
Map<String,Object> map=new HashMap<>(); Map<String,Object> map=new HashMap<>();
map.put("OkScore",param.getOkScore()); map.put("OkScore",param.getOkScore()!=null?param.getOkScore():0);
map.put("NoScore",param.getNoScore()); map.put("NoScore",param.getNoScore()!=null?param.getNoScore():0);
map.put("CheckType",param.getCheckType()); map.put("CheckType",param.getCheckType());
inputItem.setDataJson(JSONObject.toJSONString(map)); inputItem.setDataJson(JSONObject.toJSONString(map));
...@@ -469,14 +489,14 @@ public class InputItemController extends AbstractBaseController { ...@@ -469,14 +489,14 @@ public class InputItemController extends AbstractBaseController {
} }
}else{ }else{
Map<String,Object> map=new HashMap<>(); Map<String,Object> map=new HashMap<>();
map.put("OkScore",param.getOkScore()); map.put("OkScore",param.getOkScore()!=null?param.getOkScore():0);
map.put("NoScore",param.getNoScore()); map.put("NoScore",param.getNoScore()!=null?param.getNoScore():0);
map.put("ValidUp",param.getValidUp()); map.put("ValidUp",param.getValidUp()!=null?param.getNoScore():"");
map.put("ValidDown",param.getValidDown()); map.put("ValidDown",param.getValidDown()!=null?param.getNoScore():"");
map.put("OkUp",param.getOkUp()); map.put("OkUp",param.getOkUp()!=null?param.getNoScore():"");
map.put("OkDown",param.getOkDown()); map.put("OkDown",param.getOkDown()!=null?param.getNoScore():"");
map.put("CheckValidUp",param.getCheckValidUp().equals("false")?false:true); map.put("CheckValidUp",param.getCheckValidUp().equals("false")?false:true);
map.put("CheckValidDown",param.getCheckOkDown().equals("false")?false:true); map.put("CheckValidDown",param.getCheckValidDown().equals("false")?false:true);
map.put("CheckOkUp",param.getCheckOkUp().equals("false")?false:true); map.put("CheckOkUp",param.getCheckOkUp().equals("false")?false:true);
map.put("CheckOkDown",param.getCheckOkDown().equals("false")?false:true); map.put("CheckOkDown",param.getCheckOkDown().equals("false")?false:true);
map.put("Precision",param.getPrecision()); map.put("Precision",param.getPrecision());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment