Authored by wangnan

fix

... ... @@ -135,16 +135,12 @@ public class IndexController implements ApplicationEventPublisherAware {
String indexName = paramMap.get("indexName");
String action = paramMap.get("action");
String id = paramMap.get("id");
if (StringUtils.isBlank(indexName) || StringUtils.isBlank(action) || StringUtils.isBlank(id)) {
Map<String, Object> rtnMap = new HashMap<String, Object>();
rtnMap.put("code", 400);
jsonMap.put("status", 0);
rtnMap.put("error", "参数错误");
return rtnMap;
} else if (indexName.equals(ISearchConstans.INDEX_NAME_BIZAREA) || indexName.equals(ISearchConstans.INDEX_NAME_STORE) || indexName.equals(ISearchConstans.INDEX_NAME_LINE) || indexName.equals(ISearchConstans.INDEX_NAME_TOPIC) || indexName.equals(ISearchConstans.INDEX_NAME_COMMENT)) {
updateorDeleteIndex(indexName, action, paramMap);
String data = paramMap.get("data");
if (StringUtils.isBlank(indexName) || StringUtils.isBlank(action) || StringUtils.isBlank(id) ||StringUtils.isBlank(data)) {
return ReturnMessage("400","1","参数为空");
} else (indexName.equals(ISearchConstans.INDEX_NAME_BIZAREA) || indexName.equals(ISearchConstans.INDEX_NAME_STORE) || indexName.equals(ISearchConstans.INDEX_NAME_LINE) || indexName.equals(ISearchConstans.INDEX_NAME_TOPIC) || indexName.equals(ISearchConstans.INDEX_NAME_COMMENT)) {
return updateorDeleteIndex(indexName, action, paramMap);
}
return null;
} catch (Exception e) {
return errorReturn("updateIndex", paramMap, e);
}
... ... @@ -166,21 +162,13 @@ public class IndexController implements ApplicationEventPublisherAware {
String data = paramMap.get("data");
String[] fields = data.split(",");
if(fields==null){
Map<String, Object> jsonMap = new LinkedHashMap<String, Object>();
jsonMap.put("code", 400);
jsonMap.put("status", 1);
jsonMap.put("message", "data参数为空");
return jsonMap;
return ReturnMessage("400","1","data为空");
}
for (int i = 0; i < fields.length; i++) {
String field = fields[i];
String[] maps = field.split(":");
if(maps.length!=2){
Map<String, Object> jsonMap = new LinkedHashMap<String, Object>();
jsonMap.put("code", 400);
jsonMap.put("status", 1);
jsonMap.put("message", "参数格式不合法");
return jsonMap;
return ReturnMessage("400","1","参数格式不合法");
}
indexData.put(maps[0], maps[1]);
}
... ... @@ -225,4 +213,15 @@ public class IndexController implements ApplicationEventPublisherAware {
rtnMap.put("error", e.getMessage());
return rtnMap;
}
/**
* 错误信息返回
*/
private Map<String, Object> ReturnMessage(String code,String status,String message) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("code", code);
map.put("status", status);
map.put("error", message);
return map;
}
}
... ...