|
@ -5624,9 +5624,9 @@ public class StatisticsEsService {
|
|
|
String[] periodYear = calculatePreviousYearPeriod(startDate, endDate);
|
|
|
JSONObject object = new JSONObject();
|
|
|
//发布量统计
|
|
|
saveModel = elasticsearchUtil.findOneDateQuotaLevel1(startDate, endDate, area, level, "75", SaveModel.timeLevel_ZL,slaveKey1);
|
|
|
saveModelH = elasticsearchUtil.findOneDateQuotaLevel1(period[0], period[1], area, level, "75", SaveModel.timeLevel_ZL,slaveKey1);
|
|
|
saveModelT = elasticsearchUtil.findOneDateQuotaLevel1(periodYear[0], periodYear[1], area, level, "75", SaveModel.timeLevel_ZL,slaveKey1);
|
|
|
saveModel = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, area, level, "75", SaveModel.timeLevel_ZL);
|
|
|
saveModelH = elasticsearchUtil.findOneDateQuotaLevel0(period[0], period[1], area, level, "75", SaveModel.timeLevel_ZL);
|
|
|
saveModelT = elasticsearchUtil.findOneDateQuotaLevel0(periodYear[0], periodYear[1], area, level, "75", SaveModel.timeLevel_ZL);
|
|
|
Integer publishTotal = saveModel != null ? saveModel.getResult1().intValue() : 0;
|
|
|
Integer publishTotalT = saveModelT != null ? saveModelT.getResult1().intValue() : 0;
|
|
|
Integer publishTotalH = saveModelH != null ? saveModelH.getResult1().intValue() : 0;
|
|
@ -5691,7 +5691,7 @@ public class StatisticsEsService {
|
|
|
}
|
|
|
JSONObject object = new JSONObject();
|
|
|
//发布量统计
|
|
|
saveModel = elasticsearchUtil.findOneDateQuotaLevel1(startDate, endDate, area, level, "75", SaveModel.timeLevel_ZL,slaveKey1);
|
|
|
saveModel = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, area, level, "75", SaveModel.timeLevel_ZL);
|
|
|
Integer publishTotal = saveModel != null ? saveModel.getResult1().intValue() : 0;
|
|
|
object.put("publishTotal", publishTotal);//发布量
|
|
|
//收藏量统计
|
|
@ -6080,10 +6080,10 @@ public class StatisticsEsService {
|
|
|
endDate = DateUtil.getCurrentYearEndTime() + " 23:59:59";
|
|
|
}
|
|
|
//文章发布数
|
|
|
SaveModel totalMap = elasticsearchUtil.findOneDateQuotaLevel1(startDate, endDate, area, level, "75", SaveModel.timeLevel_ZL,lowCode);//总数
|
|
|
SaveModel totalMap = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, area, level, "75", SaveModel.timeLevel_ZL);//总数
|
|
|
int total = 0;
|
|
|
if (totalMap != null) {
|
|
|
|
|
|
total = totalMap.getResult1().intValue();
|
|
|
}
|
|
|
//发布类型
|
|
|
List<SaveModel> publishTypeTotal = elasticsearchUtil.findListDateQuotaLevel1(startDate, endDate, area, level, "75", SaveModel.timeLevel_ZL, lowLevel, lowCode);//发布类型
|