巡查人数优化

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java

@@ -6,11 +6,11 @@ import com.epmet.datareport.service.user.StaffPatrolDetailService;
 import com.epmet.user.form.GridManagerListFormDTO;
 import com.epmet.dto.form.PatrolTrackFormDTO;
 import com.epmet.dto.form.RecordListFormDTO;
-import com.epmet.user.form.PatrolCountFormDTO;
+import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.user.result.GridManagerListResultDTO;
 import com.epmet.dto.result.PatrolTrackResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
-import com.epmet.user.result.PatrolCountResultDTO;
+import com.epmet.dto.result.PatrolCountResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java

@@ -3,11 +3,11 @@ package com.epmet.datareport.service.user;
 import com.epmet.user.form.GridManagerListFormDTO;
 import com.epmet.dto.form.PatrolTrackFormDTO;
 import com.epmet.dto.form.RecordListFormDTO;
-import com.epmet.user.form.PatrolCountFormDTO;
+import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.user.result.GridManagerListResultDTO;
 import com.epmet.dto.result.PatrolTrackResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
-import com.epmet.user.result.PatrolCountResultDTO;
+import com.epmet.dto.result.PatrolCountResultDTO;
 
 import java.util.List;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java

@@ -3,6 +3,7 @@ package com.epmet.datareport.service.user.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.datareport.constant.PatrolConstant;
 import com.epmet.datareport.dao.user.StaffPatrolDetailDao;
@@ -15,9 +16,9 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.user.form.GridManagerListFormDTO;
 import com.epmet.dto.form.PatrolTrackFormDTO;
 import com.epmet.dto.form.RecordListFormDTO;
-import com.epmet.user.form.PatrolCountFormDTO;
+import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.user.result.GridManagerListResultDTO;
-import com.epmet.user.result.PatrolCountResultDTO;
+import com.epmet.dto.result.PatrolCountResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +27,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -200,24 +200,11 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
      */
     @Override
     public PatrolCountResultDTO patrolCount(PatrolCountFormDTO formDTO) {
-        PatrolCountResultDTO result = new PatrolCountResultDTO();
+        Result<PatrolCountResultDTO> resultDTOResult = epmetUserOpenFeignClient.patrolCount(formDTO);
-        GridManagerListFormDTO gridManagerListFormDTO = ConvertUtils.sourceToTarget(formDTO, GridManagerListFormDTO.class);
+        if (!resultDTOResult.success()){
-        List<GridManagerListResultDTO> resultDTOS = gridManagerList(gridManagerListFormDTO);
+            throw new RenException("查询巡查人数失败...");
-        // 结果为空就是没网格员
-        if (CollectionUtils.isEmpty(resultDTOS)){
-            return result;
-        }
-        // 根据状态分组，只取巡查中的网格员；巡查中的为0，剩下的都是未巡查，巡查中不为0，总数 - 巡查中 = 未巡查
-        Map<String, List<GridManagerListResultDTO>> groupByStatus = resultDTOS.stream().collect(Collectors.groupingBy(GridManagerListResultDTO::getStatus));
-        List<GridManagerListResultDTO> patrolling = groupByStatus.get(PatrolConstant.PATROLLING);
-        if (CollectionUtils.isEmpty(patrolling)){
-            result.setElseCount(resultDTOS.size());
-            return result;
         }
-        result.setPatrollingCount(patrolling.size());
+        return resultDTOResult.getData();
-        result.setElseCount(resultDTOS.size() - patrolling.size());
-        return result;
     }
 
-
 }