|
@@ -93,13 +93,13 @@ public class DataExecutorService {
|
|
reportRwdObject.setGroupCode(keyArray[1]);
|
|
reportRwdObject.setGroupCode(keyArray[1]);
|
|
reportRwdObject.setObjType(keyArray[2]);
|
|
reportRwdObject.setObjType(keyArray[2]);
|
|
reportRwdObject.setClassCode(keyArray[3]);
|
|
reportRwdObject.setClassCode(keyArray[3]);
|
|
- reportRwdObject.setDateType(DateType.valueOf(keyArray[4]));
|
|
|
|
- reportRwdObject.setYear("".equals(keyArray[5]) ? null : keyArray[5]);
|
|
|
|
- reportRwdObject.setMonth("".equals(keyArray[6]) ? null : keyArray[6]);
|
|
|
|
- reportRwdObject.setDay("".equals(keyArray[7]) ? null : keyArray[7]);
|
|
|
|
- reportRwdObject.setHour("".equals(keyArray[8]) ? null : keyArray[8]);
|
|
|
|
- reportRwdObject.setSeason("".equals(keyArray[9]) ? null : keyArray[9]);
|
|
|
|
- reportRwdObject.setCreateTime("".equals(keyArray[10]) ? null : keyArray[10]);
|
|
|
|
|
|
+ reportRwdObject.setDateType(DateType.valueOf(keyArray[7]));
|
|
|
|
+ reportRwdObject.setYear("".equals(keyArray[8]) ? null : keyArray[8]);
|
|
|
|
+ reportRwdObject.setMonth("".equals(keyArray[9]) ? null : keyArray[9]);
|
|
|
|
+ reportRwdObject.setDay("".equals(keyArray[10]) ? null : keyArray[10]);
|
|
|
|
+ reportRwdObject.setHour("".equals(keyArray[11]) ? null : keyArray[11]);
|
|
|
|
+ reportRwdObject.setSeason("".equals(keyArray[12]) ? null : keyArray[12]);
|
|
|
|
+ reportRwdObject.setCreateTime("".equals(keyArray[13]) ? null : keyArray[13]);
|
|
reportRwdObject.setRwdObjectNum(item.getValue());
|
|
reportRwdObject.setRwdObjectNum(item.getValue());
|
|
data.add(reportRwdObject);
|
|
data.add(reportRwdObject);
|
|
});
|
|
});
|
|
@@ -164,13 +164,13 @@ public class DataExecutorService {
|
|
reportAlarmRecord.setClassCode(keyArray[4]);
|
|
reportAlarmRecord.setClassCode(keyArray[4]);
|
|
reportAlarmRecord.setLevel(keyArray[5]);
|
|
reportAlarmRecord.setLevel(keyArray[5]);
|
|
reportAlarmRecord.setAlarmState(keyArray[6]);
|
|
reportAlarmRecord.setAlarmState(keyArray[6]);
|
|
- reportAlarmRecord.setDateType(DateType.valueOf(keyArray[4]));
|
|
|
|
- reportAlarmRecord.setYear("".equals(keyArray[5]) ? null : keyArray[5]);
|
|
|
|
- reportAlarmRecord.setMonth("".equals(keyArray[6]) ? null : keyArray[6]);
|
|
|
|
- reportAlarmRecord.setDay("".equals(keyArray[7]) ? null : keyArray[7]);
|
|
|
|
- reportAlarmRecord.setHour("".equals(keyArray[8]) ? null : keyArray[8]);
|
|
|
|
- reportAlarmRecord.setSeason("".equals(keyArray[9]) ? null : keyArray[9]);
|
|
|
|
- reportAlarmRecord.setCreateTime("".equals(keyArray[10]) ? null : keyArray[10]);
|
|
|
|
|
|
+ reportAlarmRecord.setDateType(DateType.valueOf(keyArray[7]));
|
|
|
|
+ reportAlarmRecord.setYear("".equals(keyArray[8]) ? null : keyArray[8]);
|
|
|
|
+ reportAlarmRecord.setMonth("".equals(keyArray[9]) ? null : keyArray[9]);
|
|
|
|
+ reportAlarmRecord.setDay("".equals(keyArray[10]) ? null : keyArray[10]);
|
|
|
|
+ reportAlarmRecord.setHour("".equals(keyArray[11]) ? null : keyArray[11]);
|
|
|
|
+ reportAlarmRecord.setSeason("".equals(keyArray[12]) ? null : keyArray[12]);
|
|
|
|
+ reportAlarmRecord.setCreateTime("".equals(keyArray[13]) ? null : keyArray[13]);
|
|
reportAlarmRecord.setAlarmRecordNum(item.getValue());
|
|
reportAlarmRecord.setAlarmRecordNum(item.getValue());
|
|
data.add(reportAlarmRecord);
|
|
data.add(reportAlarmRecord);
|
|
});
|
|
});
|