|
@@ -2,7 +2,6 @@ package com.persagy.dmp.report.service;
|
|
|
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.common.criteria.JacksonCriteria;
|
|
|
-import com.persagy.common.criteria.JpaUtils;
|
|
|
import com.persagy.common.date.DateUtils;
|
|
|
import com.persagy.common.web.PagedResponse;
|
|
|
import com.persagy.dmp.config.DmpParameterStorage;
|
|
@@ -16,7 +15,6 @@ import com.persagy.dmp.report.repository.ReportAlarmRecordRepository;
|
|
|
import com.persagy.dmp.report.repository.ReportObjectRepository;
|
|
|
import com.querydsl.core.types.dsl.BooleanExpression;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.commons.collections4.MapUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -93,13 +91,13 @@ public class DataExecutorService {
|
|
|
reportRwdObject.setGroupCode(keyArray[1]);
|
|
|
reportRwdObject.setObjType(keyArray[2]);
|
|
|
reportRwdObject.setClassCode(keyArray[3]);
|
|
|
- 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.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.setRwdObjectNum(item.getValue());
|
|
|
data.add(reportRwdObject);
|
|
|
});
|