|
@@ -7,6 +7,7 @@ import com.persagy.dmp.report.entity.*;
|
|
|
import com.persagy.dmp.report.enumeration.DateType;
|
|
|
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;
|
|
@@ -45,7 +46,7 @@ public class DataExecutorService {
|
|
|
StringBuilder sqlBuilder = new StringBuilder();
|
|
|
sqlBuilder.append(" select project_id,group_code,obj_type,class_code,'" + dateType + "' as date_type, \n");
|
|
|
reportUtils.appendSql(sqlBuilder, dateType);
|
|
|
- sqlBuilder.append(" count(0) rwd_object_num from dmp_rwd." + tableName + "_" + groupCode + "_" + projectId + " \n");
|
|
|
+ sqlBuilder.append(" count(0) rwd_object_num from dmp_rwd." + tableName + "_" + groupCode.toLowerCase() + "_" + projectId.toLowerCase() + " \n");
|
|
|
sqlBuilder.append(" where create_time >= ? and create_time < ? \n");
|
|
|
sqlBuilder.append(" and project_id = ? and group_code = ? \n");
|
|
|
sqlBuilder.append(" group by project_id,group_code,obj_type,class_code,date_type,year,month,day,hour,season,date \n");
|
|
@@ -83,7 +84,11 @@ public class DataExecutorService {
|
|
|
Map<String, String> map = reportUtils.getDate(dateType, startTime, endTime);
|
|
|
String start = map.get("start");
|
|
|
String end = map.get("end");
|
|
|
- reportObjectRepository.deleteDateType(dateType.name(), start, end);
|
|
|
+ QReportRwdObject qt = QReportRwdObject.reportRwdObject;
|
|
|
+ BooleanExpression ex = qt.dateType.eq(dateType).and(qt.createTime.goe(start)).and(qt.createTime.lt(end));
|
|
|
+ Iterable<ReportRwdObject> all = reportObjectRepository.findAll(ex);
|
|
|
+ reportObjectRepository.deleteAll(all);
|
|
|
+
|
|
|
List<ReportRwdObject> save = new ArrayList<>();
|
|
|
result.forEach(item -> save.add((ReportRwdObject) item));
|
|
|
reportObjectRepository.saveAll(save);
|
|
@@ -139,7 +144,11 @@ public class DataExecutorService {
|
|
|
Map<String, String> map = reportUtils.getDate(dateType, startTime, endTime);
|
|
|
String start = map.get("start");
|
|
|
String end = map.get("end");
|
|
|
- reportAlarmRecordRepository.deleteDateType(dateType.name(), start, end);
|
|
|
+ QReportAlarmRecord qt = QReportAlarmRecord.reportAlarmRecord;
|
|
|
+ BooleanExpression ex = qt.dateType.eq(dateType).and(qt.createTime.goe(start)).and(qt.createTime.lt(end));
|
|
|
+ Iterable<ReportAlarmRecord> all = reportAlarmRecordRepository.findAll(ex);
|
|
|
+ reportAlarmRecordRepository.deleteAll(all);
|
|
|
+
|
|
|
List<ReportAlarmRecord> save = new ArrayList<>();
|
|
|
result.forEach(item -> save.add((ReportAlarmRecord) item));
|
|
|
reportAlarmRecordRepository.saveAll(save);
|