Authored by qinchao

任务显示不出

@@ -121,7 +121,8 @@ public class TaskConfigureCtrl { @@ -121,7 +121,8 @@ public class TaskConfigureCtrl {
121 121
122 @RequestMapping("/getGatewayEvents") 122 @RequestMapping("/getGatewayEvents")
123 @ResponseBody 123 @ResponseBody
124 - private String getGatewayEvents() { 124 + private BaseResponse getGatewayEvents() {
  125 + BaseResponse res=new BaseResponse();
125 List<String> rtnEvents=new ArrayList<String>(); 126 List<String> rtnEvents=new ArrayList<String>();
126 QueryResult queryResult = gatewayAccessEventsMapper.selectTagValuesType(InfluxDBContants.AWS); 127 QueryResult queryResult = gatewayAccessEventsMapper.selectTagValuesType(InfluxDBContants.AWS);
127 List<List<Object>> valuesList=QueryResultUtil.getValues(queryResult); 128 List<List<Object>> valuesList=QueryResultUtil.getValues(queryResult);
@@ -151,7 +152,8 @@ public class TaskConfigureCtrl { @@ -151,7 +152,8 @@ public class TaskConfigureCtrl {
151 map.put("text",str); 152 map.put("text",str);
152 comboMapList.add(map); 153 comboMapList.add(map);
153 } 154 }
154 - return JSON.toJSONString(comboMapList); 155 + res.setData(comboMapList);
  156 + return res;
155 } 157 }
156 158
157 //gateWay access事件检测----后续新增功能--MEBU_GATEWAY_ADDSOURCE区分数据源 159 //gateWay access事件检测----后续新增功能--MEBU_GATEWAY_ADDSOURCE区分数据源