Browse Source

日历改成当天的

menglu 3 years ago
parent
commit
fbde421be5

+ 16 - 10
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -2,6 +2,7 @@ package com.persagy.ibms.data.sdk.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -846,8 +847,11 @@ public class RWDLoadUtil {
 	}
 
 	public static void LoadCalendar(RepositoryImpl Repository) throws Exception {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		Date currDate = new Date();
+		String dateString = sdf.format(currDate);
 		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(new Date());
+		calendar.setTime(currDate);
 		int year = calendar.get(Calendar.YEAR);
 		String projectId = RepositoryContainer.RepositoryBase.projectId;
 		Map<String, String> modelMap = new HashMap<String, String>();
@@ -886,23 +890,25 @@ public class RWDLoadUtil {
 			String post_result = HttpClientUtil.post(Constant.zkt_control_url + "calendar/binding/query", param.toJSONString());
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			JSONObject Item = (JSONObject) resultJSON.get("Item");
-			JSONArray array = new JSONArray();
+			JSONArray arrayToday = new JSONArray();
 			for (Object value : Item.values()) {
 				JSONArray dayArray = (JSONArray) value;
 				for (int i = 0; i < dayArray.size(); i++) {
 					JSONObject dayItem = dayArray.getJSONObject(i);
 					String date = dayItem.getString("date");
-					JSONArray controlModel = dayItem.getJSONArray("controlModel");
-					for (int ii = 0; ii < controlModel.size(); ii++) {
-						JSONObject controlItem = controlModel.getJSONObject(ii);
-						controlItem.put("date", date);
-						String modelId = controlItem.getString("modelId");
-						controlItem.put("modelName", modelMap.get(modelId));
-						array.add(controlItem);
+					if (date.equals(dateString)) {
+						JSONArray controlModel = dayItem.getJSONArray("controlModel");
+						for (int ii = 0; ii < controlModel.size(); ii++) {
+							JSONObject controlItem = controlModel.getJSONObject(ii);
+							controlItem.put("date", date);
+							String modelId = controlItem.getString("modelId");
+							controlItem.put("modelName", modelMap.get(modelId));
+							arrayToday.add(controlItem);
+						}
 					}
 				}
 			}
-			Repository.IBMSCalendarBinding.set = RWDUtil.array2SDOList(array);
+			Repository.IBMSCalendarBinding.set = RWDUtil.array2SDOList(arrayToday);
 		}
 	}
 }