代码修改

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -5723,16 +5723,16 @@ public class StatisticsEsService {
        String sameStartDate = DateUtil.getYearDate(DateUtil.strToDate(startDate)) + " 00:00:00";
        String sameEndDate = DateUtil.getYearDate(DateUtil.strToDate(endDate)) + " 23:59:59";
        //环比时间：
        int months = DateUtil.getMonthDiff(DateUtil.strToDateLong(startDate), DateUtil.strToDateLong(endDate));
        String linkStartDate = DateUtil.getMonthDate(DateUtil.strToDateLong(startDate), -months);
        String linkEndDate = DateUtil.getMonthDate(DateUtil.strToDateLong(endDate), -months);
        int months = DateUtil.getMonthDiff(DateUtil.strToDate(startDate), DateUtil.strToDate(endDate));
        String linkStartDate = DateUtil.getMonthDate(DateUtil.strToDate(startDate), -months);
        String linkEndDate = DateUtil.getMonthDate(DateUtil.strToDate(endDate), -months);
        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,"6");
        //发布量环比
        saveModel1 = elasticsearchUtil.findOneDateQuotaLevel1(linkStartDate, linkEndDate, area, level, "75", SaveModel.timeLevel_ZL,slaveKey1);
        saveModel1 = elasticsearchUtil.findOneDateQuotaLevel0(linkStartDate, linkEndDate, area, level, "75", SaveModel.timeLevel_ZL,"6");
        //发布量同比
        saveModel2 = elasticsearchUtil.findOneDateQuotaLevel1(sameStartDate, sameEndDate, area, level, "75", SaveModel.timeLevel_ZL,slaveKey1);
        saveModel2 = elasticsearchUtil.findOneDateQuotaLevel0(sameStartDate, sameEndDate, area, level, "75", SaveModel.timeLevel_ZL,"6");
        Integer publishTotal = saveModel != null ? saveModel.getResult1().intValue() : 0;
        Integer publishLinkTotal = saveModel1 != null ? saveModel1.getResult1().intValue() : 0;
        Integer publishSameTotal = saveModel2 != null ? saveModel2.getResult1().intValue() : 0;
@@ -5744,7 +5744,7 @@ public class StatisticsEsService {
        //收藏量环比
        saveModel4 = elasticsearchUtil.findOneDateQuotaLevel2(linkStartDate, linkEndDate, area, level, "76", SaveModel.timeLevel_ZL, slaveKey1, "3");
        //收藏量同比
        saveModel5 = elasticsearchUtil.findOneDateQuotaLevel1(sameStartDate, sameEndDate, area, level, "76", SaveModel.timeLevel_ZL, slaveKey1, "3");
        saveModel5 = elasticsearchUtil.findOneDateQuotaLevel2(sameStartDate, sameEndDate, area, level, "76", SaveModel.timeLevel_ZL, slaveKey1, "3");
        Integer collectTotal = saveModel3 != null ? saveModel3.getResult1().intValue() : 0;
        Integer collectLinkTotal = saveModel4 != null ? saveModel4.getResult1().intValue() : 0;
        Integer collectSameTotal = saveModel5 != null ? saveModel5.getResult1().intValue() : 0;
@@ -5752,11 +5752,11 @@ public class StatisticsEsService {
        object.put("collectLink", getTwoRange(collectTotal - collectLinkTotal, collectLinkTotal, 0));//环比
        object.put("collectSame", getTwoRange(collectTotal - collectSameTotal, collectSameTotal, 0));//同比
        //浏览量统计
        saveModel6 = elasticsearchUtil.findOneDateQuotaLevel1(startDate, endDate, area, level, "77", SaveModel.timeLevel_ZL,slaveKey1);
        saveModel6 = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, area, level, "77", SaveModel.timeLevel_ZL,"6");
        //浏览量环比
        saveModel7 = elasticsearchUtil.findOneDateQuotaLevel1(linkStartDate, linkEndDate, area, level, "77", SaveModel.timeLevel_ZL,slaveKey1);
        saveModel7 = elasticsearchUtil.findOneDateQuotaLevel0(linkStartDate, linkEndDate, area, level, "77", SaveModel.timeLevel_ZL,"6");
        //浏览量同比
        saveModel8 = elasticsearchUtil.findOneDateQuotaLevel1(sameStartDate, sameEndDate, area, level, "77", SaveModel.timeLevel_ZL,slaveKey1);
        saveModel8 = elasticsearchUtil.findOneDateQuotaLevel0(sameStartDate, sameEndDate, area, level, "77", SaveModel.timeLevel_ZL,"6");
        Integer browseTotal = saveModel6 != null ? saveModel6.getResult1().intValue() : 0;
        Integer browseLinkTotal = saveModel7 != null ? saveModel7.getResult1().intValue() : 0;
        Integer browseSameTotal = saveModel8 != null ? saveModel8.getResult1().intValue() : 0;

business/es-service/src/main/java/com/yihu/jw/es/util/ElasticsearchUtil.java

@@ -2505,6 +2505,9 @@ public class ElasticsearchUtil {
    public SaveModel findOneDateQuotaLevel0(String startDate, String endDate, String area, int level, String index, String timelevel,String areaLevel) throws Exception {
        List list = findDateQuotaLevel0(startDate, endDate, area, level, index, timelevel, null, null,areaLevel);
        if(list==null||list.size()==0){
            return null;
        }
        return (SaveModel) list.get(0);
    }