|
@@ -331,7 +331,7 @@ public class RestUtil {
|
|
|
log.error(message);
|
|
|
result.put("result", "failure");
|
|
|
}
|
|
|
- return result.toJSONString();
|
|
|
+ return JSONObject.toJSONString(result, SerializerFeature.WriteMapNullValue);
|
|
|
}
|
|
|
|
|
|
public static String get_control_value(String param) {
|
|
@@ -355,7 +355,7 @@ public class RestUtil {
|
|
|
result.put("ResultMsg", message);
|
|
|
result.put("ResultCode", 250);
|
|
|
}
|
|
|
- return result.toJSONString();
|
|
|
+ return JSONObject.toJSONString(result, SerializerFeature.WriteMapNullValue);
|
|
|
}
|
|
|
|
|
|
public static String getIp(HttpServletRequest request) {
|
|
@@ -433,7 +433,7 @@ public class RestUtil {
|
|
|
result.put("ResultMsg", message);
|
|
|
result.put("ResultCode", 250);
|
|
|
}
|
|
|
- return result.toJSONString();
|
|
|
+ return JSONObject.toJSONString(result, SerializerFeature.WriteMapNullValue);
|
|
|
}
|
|
|
|
|
|
public static ResponseEntity<FileSystemResource> fjd_query_history_batch_export(String param) throws Exception {
|
|
@@ -485,7 +485,7 @@ public class RestUtil {
|
|
|
result.put("ResultMsg", message);
|
|
|
result.put("ResultCode", 250);
|
|
|
}
|
|
|
- return result.toJSONString();
|
|
|
+ return JSONObject.toJSONString(result, SerializerFeature.WriteMapNullValue);
|
|
|
}
|
|
|
|
|
|
public static String path_array_history_fjd_query(String param) {
|
|
@@ -556,7 +556,7 @@ public class RestUtil {
|
|
|
} catch (ParseException e) {
|
|
|
// log.error(e.getMessage(),e);
|
|
|
}
|
|
|
- return result.toJSONString();
|
|
|
+ return JSONObject.toJSONString(result, SerializerFeature.WriteMapNullValue);
|
|
|
}
|
|
|
|
|
|
private static void fjd_query_result_process(JSONArray points, Map<String, JSONArray> Point2datas, Map<String, IntWrapper> Point2index) {
|