中互金查询最大数

src/main/java/com/service/statistics/impl/BaiHangReportAndSearchNum.java

@@ -11,12 +11,10 @@ import com.util.DateUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/service/statistics/impl/ZhjReportAndSearchNum.java

@@ -6,6 +6,7 @@ import com.emums.Corporation;
 import com.emums.DataSource;
 import com.entity.jpa.QueryStatisticsEntry;
 import com.google.common.collect.Lists;
+import com.jpa.repository.QueryStatisticsRepository;
 import com.mapper.report.ZhjMapper;
 import com.service.report.ReportService;
 import com.service.statistics.GetReportAndSearchNum;
@@ -17,6 +18,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author ：dongjianhua
@@ -32,6 +34,8 @@ public class ZhjReportAndSearchNum implements GetReportAndSearchNum {
     private ZhjMapper zhjMapper;
     @Resource
     private ReportService reportService;
+    @Resource
+    private QueryStatisticsRepository queryStatisticsRepository;
 
     @Override
     public List<QueryStatisticsEntry> getByDate(Date date) {
@@ -43,7 +47,7 @@ public class ZhjReportAndSearchNum implements GetReportAndSearchNum {
         //增加一天
         calendar.add(Calendar.DATE, 1);
 
-        Long gdXdReportNum = zhjMapper.getGdXdReportNum(start, calendar.getTime(),0);
+        Long gdXdReportNum = zhjMapper.getGdXdReportNum(start, calendar.getTime(), 0);
         long gdXdSearchNum = zhjMapper.getGdXdSearchNum(start, calendar.getTime());
         QueryStatisticsEntry entry = new QueryStatisticsEntry();
         entry.setReportNum(gdXdReportNum == null ? 0L : gdXdReportNum);
@@ -54,15 +58,33 @@ public class ZhjReportAndSearchNum implements GetReportAndSearchNum {
         /**
          * 如果是当月才回去查
          */
-        if(DateUtil.formatterDate(date, DateUtil.YYYY_MM).equals(DateUtil.formatterDate(new Date(), DateUtil.YYYY_MM))){
+        if (DateUtil.formatterDate(date, DateUtil.YYYY_MM).equals(DateUtil.formatterDate(new Date(), DateUtil.YYYY_MM))) {
             Map<String, String> resultMap = reportService.querycontral();
 
-            if(resultMap.get("code").equals("200")){
+            if (resultMap.get("code").equals("200")) {
                 String data = resultMap.get("data");
                 JSONObject parse = JSON.parseObject(data);
                 String maxquerycount = parse.getString("maxquerycount");
                 entry.setMaxQueryNum(Long.valueOf(maxquerycount));
             }
+        } else {
+            //上月co
+            String preMonth = DateUtil.formatterDate(calendar.getTime(), DateUtil.YYYY_MM);
+
+            List<QueryStatisticsEntry> byReportMonth = queryStatisticsRepository
+                    .findByReportMonthAndDataSource(preMonth, getDataSource());
+
+            Map<Corporation, List<QueryStatisticsEntry>> collect = byReportMonth.stream()
+                    .collect(Collectors.groupingBy(QueryStatisticsEntry::getCorporation));
+
+            collect.forEach((k, v) -> {
+                long sum = v.stream().mapToLong(QueryStatisticsEntry::getReportNum).sum();
+
+                if (Corporation.GUANGDAXIAODAI == k) {
+                    entry.setMaxQueryNum(sum * 15);
+                }
+
+            });
         }
         return Lists.newArrayList(entry);
     }