Преглед изворни кода

历史报警增加分页信息

menglu пре 3 година
родитељ
комит
9aa68997c4

+ 28 - 15
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -78,20 +78,20 @@ public class RWDAlarmUtil {
 					sb.append("&startTime=" + URLEncoder.encode(params.getString("startTime"), "utf-8"));
 					sb.append("&endTime=" + URLEncoder.encode(params.getString("endTime"), "utf-8"));
 				}
-				if (params.containsKey("page")) {
-					boolean page = params.getBoolean("page");
+				if (paramObject.containsKey("page")) {
+					boolean page = paramObject.getBoolean("page");
 					if (page) {
-						int pageSize = params.getInteger("pageSize");
-						int pageIndex = params.getInteger("pageIndex");
+						int pageSize = paramObject.getInteger("pageSize");
+						int pageIndex = paramObject.getInteger("pageIndex");
 						sb.append("&size=" + pageSize);
-						sb.append("&current=" + pageIndex + 1);
+						sb.append("&current=" + (pageIndex + 1));
 					}
 				}
 
 				String getResultString = HttpClientUtil.get(get_url + sb.toString(), null);
 				JSONObject getResult = JSON.parseObject(getResultString);
-				result.put("count", getResult.get("Count"));
 				Content = getResult.getJSONArray("Content");
+				result.put("count", getResult.get("Count"));
 			} else {
 				String post_url = Constant.alarm_rest + "alarm/queryAlarmList";
 				JSONObject postParam = new JSONObject();
@@ -122,11 +122,11 @@ public class RWDAlarmUtil {
 					triggerTime.put("$lte", params.get("endTime"));
 					postParam.put("triggerTime", triggerTime);
 				}
-				if (params.containsKey("page")) {
-					boolean page = params.getBoolean("page");
+				if (paramObject.containsKey("page")) {
+					boolean page = paramObject.getBoolean("page");
 					if (page) {
-						int pageSize = params.getInteger("pageSize");
-						int pageIndex = params.getInteger("pageIndex");
+						int pageSize = paramObject.getInteger("pageSize");
+						int pageIndex = paramObject.getInteger("pageIndex");
 						postParam.put("size", pageSize);
 						postParam.put("page", pageIndex + 1);
 					}
@@ -136,12 +136,25 @@ public class RWDAlarmUtil {
 				Content = (JSONArray) postResult.get("Content");
 				result.put("count", postResult.get("Count"));
 			}
+			result.put("contentCount", Content.size());
+			if (paramObject.containsKey("page")) {
+				boolean page = paramObject.getBoolean("page");
+				if (page) {
+					int pageSize = paramObject.getInteger("pageSize");
+					int pageIndex = paramObject.getInteger("pageIndex");
+					result.put("pageSize", pageSize);
+					result.put("pageIndex", pageIndex);
+					int count = result.getInteger("count");
+					int pageCount = (count + pageSize - 1) / pageSize;
+					result.put("pageCount", pageCount);
+				}
+			}
 			for (int i = 0; i < Content.size(); i++) {
 				JSONObject alarm = Content.getJSONObject(i);
 				try {
 					RWDAlarmUtil.modify_alarm(alarm);
 				} catch (Exception e) {
-					log.error(e.getMessage(),e);
+					log.error(e.getMessage(), e);
 					log.error(LogUtil.GetExceptionStackTrace(e));
 				}
 			}
@@ -149,7 +162,7 @@ public class RWDAlarmUtil {
 
 			result.put("result", "success");
 		} catch (Exception e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 			String message = LogUtil.GetExceptionStackTrace(e);
 			log.error(message);
 			result.put("result", "failure");
@@ -388,7 +401,7 @@ public class RWDAlarmUtil {
 			try {
 				RWDAlarmUtil.modify_alarm(alarm);
 			} catch (Exception e) {
-				log.error(e.getMessage(),e);
+				log.error(e.getMessage(), e);
 				log.error(LogUtil.GetExceptionStackTrace(e));
 			}
 			RWDAlarmUtil.ProcessAlarm(alarm);
@@ -430,7 +443,7 @@ public class RWDAlarmUtil {
 			Date endDate = sdf.parse(endTimestamp);
 			return endDate.getTime() - startDate.getTime();
 		} catch (ParseException e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 		}
 		return 0;
 	}
@@ -441,7 +454,7 @@ public class RWDAlarmUtil {
 			Date endDate = sdf.parse(endTimestamp);
 			return getTimeDiff(startDate, endDate);
 		} catch (ParseException e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 		}
 		return "0";
 	}