小程序调整

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

@@ -1,6 +1,6 @@
 package cn.com.ty.lift.batch.applet.controller;
 
-import cn.com.ty.lift.batch.applet.dao.model.request.MaintenanceDataRequest;
+import cn.com.ty.lift.batch.applet.dao.model.request.CommonRequest;
 import cn.com.ty.lift.batch.applet.service.MaintenanceDataService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -28,8 +28,8 @@ public class MaintenanceDataStatisticsController {
      * @date 2020/2/5 4:50 下午
      */
     @RequestMapping("/maintenanceOverView")
-    public RestResponse maintenanceOverView(@RequestBody MaintenanceDataRequest maintenanceDataRequest) {
-        return maintenanceDataService.maintenanceOverView(maintenanceDataRequest);
+    public RestResponse maintenanceOverView(@RequestBody CommonRequest commonRequest) {
+        return maintenanceDataService.maintenanceOverView(commonRequest);
     }
 
     /**
@@ -39,7 +39,7 @@ public class MaintenanceDataStatisticsController {
      * @date 2020/2/5 4:53 下午
      */
     @RequestMapping("/beyondStatistics")
-    public RestResponse beyondStatistics(@RequestBody MaintenanceDataRequest maintenanceDataRequest) {
-        return maintenanceDataService.beyondStatistics(maintenanceDataRequest);
+    public RestResponse beyondStatistics(@RequestBody CommonRequest commonRequest) {
+        return maintenanceDataService.beyondStatistics(commonRequest);
     }
 }

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

@@ -1,45 +0,0 @@
-package cn.com.ty.lift.batch.applet.dao.model.request;
-
-import cn.com.ty.lift.batch.applet.constants.DataStatisticsConstants;
-import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
-import lombok.Data;
-
-import java.time.LocalDate;
-
-/**
- * @author huangyuan
- * @date 2020/2/4
- * @description
- */
-@Data
-public class MaintenanceDataRequest extends CommonRequest {
-    /**
-     * 起始时间
-     */
-    private LocalDate startDate;
-
-    /**
-     * 起始时间字符串
-     */
-    private String startDateStr;
-
-    /**
-     * 结束时间
-     */
-    private LocalDate endDate;
-
-    /**
-     * 结束时间字符串
-     */
-    private String endDateStr;
-
-    public LocalDate getStartDate(){
-        return DataStatisticsUtil.getLocalDateFromStr(startDateStr,
-                DataStatisticsConstants.DATA_STATISTICS_TIME_FORMAT);
-    }
-
-    public LocalDate getEndDate(){
-        return DataStatisticsUtil.getLocalDateFromStr(endDateStr,
-                DataStatisticsConstants.DATA_STATISTICS_TIME_FORMAT);
-    }
-}

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

@@ -101,7 +101,7 @@ public class EmergencyRepairDataService {
                     .collect(Collectors.groupingBy(emergencyRepairDataModel ->
                             DataStatisticsUtil.getMonthStr(emergencyRepairDataModel.getCallerDate()), Collectors.counting()));
             //将monthToUnitsRow月份对应台量的值放入monthToUnits中
-            monthToUnitsRow.forEach((key, value) -> monthToUnits.put(key, value));
+            monthToUnitsRow.forEach(monthToUnits::put);
         }
         return RestResponse.success(ProjectUtils.transReturnMapToStatisticsKVModel(monthToUnits),
                 ApiConstants.RESULT_SUCCESS, "获取统计数据成功");

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

@@ -2,7 +2,7 @@ package cn.com.ty.lift.batch.applet.service;
 
 import cn.com.ty.lift.batch.applet.dao.mapper.MaintenanceDataMapper;
 import cn.com.ty.lift.batch.applet.dao.model.MaintenanceDataModel;
-import cn.com.ty.lift.batch.applet.dao.model.request.MaintenanceDataRequest;
+import cn.com.ty.lift.batch.applet.dao.model.request.CommonRequest;
 import cn.com.ty.lift.batch.applet.dao.model.response.MaintenanceOverViewResponse;
 import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
 import cn.com.ty.lift.common.constants.ApiConstants;
@@ -35,9 +35,9 @@ public class MaintenanceDataService {
      * @description 将维保数据从redis中取出来
      * @date 2020/2/4 2:04 下午
      */
-    public List<MaintenanceDataModel> getMaintenanceDataListFromRedis(MaintenanceDataRequest maintenanceDataRequest) {
+    public List<MaintenanceDataModel> getMaintenanceDataListFromRedis(CommonRequest CommonRequest) {
         //从redis中获取当前公司维保数据
-        return maintenanceDataMapper.getMaintenanceDataList(maintenanceDataRequest);
+        return maintenanceDataMapper.getMaintenanceDataList(CommonRequest);
     }
 
     /**
@@ -46,10 +46,10 @@ public class MaintenanceDataService {
      * @description 获取维保统计总览情况
      * @date 2020/2/5 4:50 下午
      */
-    public RestResponse maintenanceOverView(MaintenanceDataRequest maintenanceDataRequest) {
+    public RestResponse maintenanceOverView(CommonRequest commonRequest) {
         MaintenanceOverViewResponse maintenanceOverViewResponse = new MaintenanceOverViewResponse();
         //从redis中获取数据
-        List<MaintenanceDataModel> maintenanceDataModelList = getMaintenanceDataListFromRedis(maintenanceDataRequest);
+        List<MaintenanceDataModel> maintenanceDataModelList = getMaintenanceDataListFromRedis(commonRequest);
         if (maintenanceDataModelList != null && maintenanceDataModelList.size() > 0) {
             //设置计划保养数
             maintenanceOverViewResponse.setPlanNum((long) maintenanceDataModelList.size());
@@ -74,10 +74,10 @@ public class MaintenanceDataService {
      * @description 超期统计
      * @date 2020/2/5 4:53 下午
      */
-    public RestResponse beyondStatistics(MaintenanceDataRequest maintenanceDataRequest) {
+    public RestResponse beyondStatistics(CommonRequest commonRequest) {
         Map<String, Long> projectNameToBeyondNum = new HashMap<>();
         //从redis中获取维保数据
-        List<MaintenanceDataModel> maintenanceDataModelList = getMaintenanceDataListFromRedis(maintenanceDataRequest);
+        List<MaintenanceDataModel> maintenanceDataModelList = getMaintenanceDataListFromRedis(commonRequest);
         if (maintenanceDataModelList != null && maintenanceDataModelList.size() > 0) {
             //获取超期数
             maintenanceDataModelList = maintenanceDataModelList.stream().filter(maintenanceDataModel -> {