小程序数据统计

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/request/EmergencyRepairDataRequest.java

@@ -1,12 +1,14 @@
 package cn.com.ty.lift.batch.applet.dao.model.request;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author huangyuan
  * @date 2020/2/3
  * @description
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class EmergencyRepairDataRequest extends CommonRequest {
     /**
@@ -18,4 +20,9 @@ public class EmergencyRepairDataRequest extends CommonRequest {
      * 急修状态
      */
     private Integer status;
+
+    /**
+     * 5 - all
+     */
+    private String numFlag;
 }

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/ContractDataService.java

@@ -77,22 +77,20 @@ public class ContractDataService {
             //设置新增合同数量
             contractTypeToNum.put(1, (long) contractDataModelList.size());
             //设置计划合同数量
-            long planContractNum = contractDataModelList.stream()
-                    .filter(contractDataModel -> {
-                        if (contractDataModel.getContractType() != null) {
-                            return contractDataModel.getContractType() == 2;
-                        }
-                        return false;
-                    }).count();
+            long planContractNum = contractDataModelList.stream().filter(contractDataModel -> {
+                if (contractDataModel.getContractType() != null) {
+                    return contractDataModel.getContractType() == 2;
+                }
+                return false;
+            }).count();
             contractTypeToNum.put(2, planContractNum);
             //设置丢失合同数量
-            long lostContractNum = contractDataModelList.stream()
-                    .filter(contractDataModel -> {
-                        if (contractDataModel.getContractType() != null) {
-                            return contractDataModel.getContractType() == 3;
-                        }
-                        return false;
-                    }).count();
+            long lostContractNum = contractDataModelList.stream().filter(contractDataModel -> {
+                if (contractDataModel.getContractType() != null) {
+                    return contractDataModel.getContractType() == 3;
+                }
+                return false;
+            }).count();
             contractTypeToNum.put(3, lostContractNum);
         }
         return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(contractTypeToNum),

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/EmergencyRepairDataService.java

@@ -161,10 +161,14 @@ public class EmergencyRepairDataService {
         List<EmergencyRepairDataModel> emergencyRepairDataModelList =
                 getEmergencyRepairDataListFromRedis(emergencyRepairDataRequest);
         if (emergencyRepairDataModelList != null && emergencyRepairDataModelList.size() > 0) {
-            //通过发起急修时间降序排列,并获取前5条数据
+            //通过发起时间降序排列
             emergencyRepairDataModelList = emergencyRepairDataModelList.stream()
-                    .sorted(Comparator.comparing(EmergencyRepairDataModel::getCallerDate).reversed()).limit(5)
-                    .collect(Collectors.toList());
+                    .sorted(Comparator.comparing(EmergencyRepairDataModel::getCallerDate).reversed()).collect(Collectors.toList());
+            if ("five".equals(emergencyRepairDataRequest.getNumFlag())) {
+                //通过发起急修时间降序排列,并获取前5条数据
+                emergencyRepairDataModelList = emergencyRepairDataModelList.stream().limit(5)
+                        .collect(Collectors.toList());
+            }
         }
         return RestResponse.success(emergencyRepairDataModelList, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/MaintenanceDataService.java

@@ -48,6 +48,7 @@ public class MaintenanceDataService {
      * @date 2020/2/5 4:50 下午
      */
     public RestResponse maintenanceOverView(CommonRequest commonRequest) {
+        DataStatisticsUtil.initCommonRequest(commonRequest);
         MaintenanceOverViewResponse maintenanceOverViewResponse = new MaintenanceOverViewResponse();
         //从redis中获取数据
         List<MaintenanceDataModel> maintenanceDataModelList = getMaintenanceDataListFromRedis(commonRequest);