|
@@ -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;
|
|
@@ -504,13 +505,12 @@ public class RWDLoadUtil {
|
|
|
objectItem.put("报警数量", alarmCount);
|
|
|
if (use_sample) {
|
|
|
if (BKDRHash.getHashCode(objId) % 3 == 0) {
|
|
|
- JSONObject alarm = FastJsonReaderUtil.Instance()
|
|
|
- .ReadJSONObject(FileUtil.file("alarm_sample.json"));
|
|
|
+ JSONObject alarm = FastJsonReaderUtil.Instance().ReadJSONObject(FileUtil.file("alarm_sample.json"));
|
|
|
alarm.put("objId", objId);
|
|
|
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);
|
|
@@ -756,21 +756,21 @@ public class RWDLoadUtil {
|
|
|
itemInner.put("二级编组名称", level2_name);
|
|
|
SceneDataObject SELTCC = Repository.id2sdv.get(objId);
|
|
|
SceneDataValue SELTCUArray = SELTCC.get("被设备控制");
|
|
|
- if (SELTCUArray.value_array.set.size() == 1) {
|
|
|
+ if (SELTCUArray.value_array.set.size() > 0) {
|
|
|
SceneDataObject SELTCU = SELTCUArray.value_array.set.get(0);
|
|
|
String SELTCU_id = (String) SELTCU.get("id").value_prim.value;
|
|
|
String SELTCU_name = getValidName(SELTCU);
|
|
|
itemInner.put("模块编号", SELTCU_id);
|
|
|
itemInner.put("模块名称", SELTCU_name);
|
|
|
SceneDataValue SETDLSArray = SELTCU.get("被设备供电");
|
|
|
- if (SETDLSArray.value_array.set.size() == 1) {
|
|
|
+ if (SETDLSArray.value_array.set.size() > 0) {
|
|
|
SceneDataObject SETDLS = SETDLSArray.value_array.set.get(0);
|
|
|
String SETDLS_id = (String) SETDLS.get("id").value_prim.value;
|
|
|
String SETDLS_name = getValidName(SETDLS);
|
|
|
itemInner.put("配电箱编号", SETDLS_id);
|
|
|
itemInner.put("配电箱名称", SETDLS_name);
|
|
|
SceneDataValue GeneralZoneArray = SETDLS.get("所在物业空间");
|
|
|
- if (GeneralZoneArray.value_array.set.size() == 1) {
|
|
|
+ if (GeneralZoneArray.value_array.set.size() > 0) {
|
|
|
SceneDataObject GeneralZone = GeneralZoneArray.value_array.set.get(0);
|
|
|
String GeneralZone_id = (String) GeneralZone.get("id").value_prim.value;
|
|
|
String GeneralZone_name = getValidName(GeneralZone);
|
|
@@ -847,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>();
|
|
@@ -887,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);
|
|
|
}
|
|
|
}
|
|
|
}
|