|
@@ -59,7 +59,7 @@ public class RestUtil {
|
|
}
|
|
}
|
|
return JSONObject.toJSONString(Content, SerializerFeature.WriteMapNullValue);
|
|
return JSONObject.toJSONString(Content, SerializerFeature.WriteMapNullValue);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(),e);
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
result.put("Result", "failure");
|
|
result.put("Result", "failure");
|
|
result.put("Reason", LogUtil.GetExceptionStackTrace(e));
|
|
result.put("Reason", LogUtil.GetExceptionStackTrace(e));
|
|
}
|
|
}
|
|
@@ -92,7 +92,7 @@ public class RestUtil {
|
|
String result = RestUtil.query(JSONObject.toJSONString(query_json_new, SerializerFeature.WriteMapNullValue));
|
|
String result = RestUtil.query(JSONObject.toJSONString(query_json_new, SerializerFeature.WriteMapNullValue));
|
|
return result;
|
|
return result;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(),e);
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
String error = LogUtil.GetExceptionStackTrace(e);
|
|
String error = LogUtil.GetExceptionStackTrace(e);
|
|
return error;
|
|
return error;
|
|
}
|
|
}
|
|
@@ -303,7 +303,7 @@ public class RestUtil {
|
|
Object valueJSON = ComputeUtil.getValueJSON(valueObject, read_level);
|
|
Object valueJSON = ComputeUtil.getValueJSON(valueObject, read_level);
|
|
return JSONObject.toJSONString(valueJSON, SerializerFeature.WriteMapNullValue);
|
|
return JSONObject.toJSONString(valueJSON, SerializerFeature.WriteMapNullValue);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(),e);
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
log.error(message);
|
|
log.error(message);
|
|
return message;
|
|
return message;
|
|
@@ -323,20 +323,12 @@ public class RestUtil {
|
|
public static Object post(String[] valuePath) {
|
|
public static Object post(String[] valuePath) {
|
|
RepositoryImpl Repository = RepositoryContainer.instance;
|
|
RepositoryImpl Repository = RepositoryContainer.instance;
|
|
try {
|
|
try {
|
|
- if (valuePath[valuePath.length - 1].equals("工单")) {
|
|
|
|
- JSONObject work_order = FastJsonReaderUtil.Instance()
|
|
|
|
- .ReadJSONObject(FileUtil.file("work_order_sample.json"));
|
|
|
|
- JSONArray work_orders = new JSONArray();
|
|
|
|
- work_orders.add(work_order);
|
|
|
|
- return work_orders;
|
|
|
|
- } else {
|
|
|
|
- Object valueObject = ComputeUtil.getValueObject(Repository, valuePath);
|
|
|
|
- RecursiveUtil.refreshObject(Repository, valueObject);
|
|
|
|
- Object valueJSON = ComputeUtil.getValueJSON(valueObject);
|
|
|
|
- return valueJSON;
|
|
|
|
- }
|
|
|
|
|
|
+ Object valueObject = ComputeUtil.getValueObject(Repository, valuePath);
|
|
|
|
+ RecursiveUtil.refreshObject(Repository, valueObject);
|
|
|
|
+ Object valueJSON = ComputeUtil.getValueJSON(valueObject);
|
|
|
|
+ return valueJSON;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(),e);
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
log.error(message);
|
|
log.error(message);
|
|
return message;
|
|
return message;
|
|
@@ -389,7 +381,7 @@ public class RestUtil {
|
|
result.put("success_count", success_points.size());
|
|
result.put("success_count", success_points.size());
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(),e);
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
log.error(message);
|
|
log.error(message);
|
|
result.put("result", "failure");
|
|
result.put("result", "failure");
|
|
@@ -411,7 +403,7 @@ public class RestUtil {
|
|
result.put("Content", Content);
|
|
result.put("Content", Content);
|
|
result.put("Result", "success");
|
|
result.put("Result", "success");
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(),e);
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
log.error(message);
|
|
log.error(message);
|
|
result.put("Result", "failure");
|
|
result.put("Result", "failure");
|
|
@@ -489,7 +481,7 @@ public class RestUtil {
|
|
result.put("Content", parseArray);
|
|
result.put("Content", parseArray);
|
|
result.put("Result", "success");
|
|
result.put("Result", "success");
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(),e);
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
log.error(message);
|
|
log.error(message);
|
|
result.put("Result", "failure");
|
|
result.put("Result", "failure");
|
|
@@ -541,7 +533,7 @@ public class RestUtil {
|
|
result.put("Content", datas);
|
|
result.put("Content", datas);
|
|
result.put("Result", "success");
|
|
result.put("Result", "success");
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(),e);
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
log.error(message);
|
|
log.error(message);
|
|
result.put("Result", "failure");
|
|
result.put("Result", "failure");
|
|
@@ -695,7 +687,7 @@ public class RestUtil {
|
|
result.put("Content", datas);
|
|
result.put("Content", datas);
|
|
result.put("Result", "success");
|
|
result.put("Result", "success");
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- log.error(e.getMessage(),e);
|
|
|
|
|
|
+ log.error(e.getMessage(), e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
String message = LogUtil.GetExceptionStackTrace(e);
|
|
log.error(message);
|
|
log.error(message);
|
|
result.put("Result", "failure");
|
|
result.put("Result", "failure");
|