rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改： 

1.网格员巡查，增加mobile的返回
dev
wangxianzhang 4 years ago
parent
5d84824046
commit
c0bc7a7a8f
6 changed files with 107 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java
  2. 20
      epmet-module/data-aggregator/data-aggregator-server/pom.xml
  3. 52
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
  4. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
  5. 6
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
  6. 20
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java

1
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java
View File

@ -7,6 +7,7 @@ public class GridMemberDataAnalysisResultDTO {
private String gridId;
private String staffId;
private String mobile;
private String staffName;
private String orgName;
//private String gridName;

20
epmet-module/data-aggregator/data-aggregator-server/pom.xml
View File

@ -82,6 +82,26 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>3.0.3</version>
<!--<exclusions>
<exclusion>
<artifactId>poi</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
<exclusion>
<artifactId>poi-ooxml</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
<exclusion>
<artifactId>poi-ooxml-schemas</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
</exclusions>-->
</dependency>
</dependencies>
<build>

52
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
View File

@ -1,5 +1,6 @@
package com.epmet.dataaggre.controller;
import com.alibaba.excel.EasyExcel;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.annotation.RequirePermission;
import com.epmet.commons.tools.enums.RequirePermissionEnum;
@ -223,4 +224,55 @@ public class GovOrgController {
return new Result().ok(page);
}
/**
* pc 工作端，网格员巡查统计，导出excel
* @param input
* @return
*/
@PostMapping("pcwork/gridmember-analysis/export")
public Result exportGridMemberAnalysis4PcWork(@RequestBody GridMemberDataAnalysisFromDTO input) {
//ValidatorUtils.validateEntity(input, GridMemberDataAnalysisFromDTO.listGridMemberDatas4PcWork.class);
//
//String agencyId = input.getAgencyId();
//Date startTime = input.getStartTime();
//Date endTime = input.getEndTime();
//
//int pageNo = 0;
//int pageSize = 1000;
//
//PageData<GridMemberDataAnalysisResultDTO> page;
//do {
// page = aggreGridService.getGridMemberDataAnalysis4PcWork(agencyId, pageNo, pageSize, startTime, endTime);
// List<GridMemberDataAnalysisResultDTO> pageList = page.getList();
//
// EasyExcel
//
//
//} while (page.getList().size() == pageSize);
return null;
}
/**
* 网格员数据分析excel导出bean
*/
public class GridMemberDataAnalysisExcelExportBean {
private String staffName;
private String orgName;
// 项目议题等
private Integer projectCount;
private Integer issueToProjectCount;
private Integer closedIssueCount;
private Integer projectResponseCount;
private Integer projectTransferCount;
private Integer projectClosedCount;
// 巡查
private int patrolTimes;
private int totalTime;
private int patrolRoutineWorkTimes;
}
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
View File

@ -6,6 +6,7 @@ import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO;
import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.UserBaseInfoDTO;
@ -167,4 +168,11 @@ public interface EpmetUserService {
* @author sun
*/
List<ProjectAnalysisResultDTO.Home> getHomeUserList(String homeId, String icUserId);
/**
* 使用staffId批量查询staff信息
* @param userIdsPart
* @return
*/
List<CustomerStaffEntity> listStaffsByIds(List<String> userIdsPart);
}

6
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
View File

@ -735,5 +735,11 @@ public class EpmetUserServiceImpl implements EpmetUserService {
return icResiUserDao.getHomeUserList(homeId, icUserId);
}
@Override
public List<CustomerStaffEntity> listStaffsByIds(List<String> userIds) {
LambdaQueryWrapper<CustomerStaffEntity> query = new LambdaQueryWrapper<>();
query.in(CustomerStaffEntity::getUserId, userIds);
return customerStaffDao.selectList(query);
}
}

20
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java
View File

@ -9,9 +9,11 @@ import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.dataaggre.dto.epmetuser.result.StaffPatrolRecordDailyResultDTO;
import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
import com.epmet.dataaggre.service.AggreGridService;
import com.epmet.dataaggre.service.datastats.DataStatsService;
import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
import com.epmet.dataaggre.service.govorg.GovOrgService;
import com.github.pagehelper.PageInfo;
@ -20,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@Service
public class AggreGridServiceImpl implements AggreGridService {
@ -33,6 +37,9 @@ public class AggreGridServiceImpl implements AggreGridService {
@Autowired
private StatsStaffPatrolRecordDailyService statsStaffPatrolRecordDailyService;
@Autowired
private EpmetUserService epmetUserService;
@Override
public List<GridMemberDataAnalysisResultDTO> getGridMemberDataAnalysis(
List<String> gridIds,
@ -100,6 +107,19 @@ public class AggreGridServiceImpl implements AggreGridService {
List<List<String>> userIdsParts = Lists.partition(userIds, partSize);
for (List<String> userIdsPart : userIdsParts) {
// 批量查询出用户信息
List<CustomerStaffEntity> staffInfos = epmetUserService.listStaffsByIds(userIdsPart);
//Map<String, CustomerStaffEntity> staffIdAndStaffInfo = staffInfos.stream().collect(Collectors.toMap((s) -> s.getUserId(), Function.identity()));
for (CustomerStaffEntity staffInfo : staffInfos) {
Map<String, GridMemberDataAnalysisResultDTO> gridAndData = structedData.get(staffInfo.getUserId());
if (gridAndData != null) {
gridAndData.forEach((k, v) -> v.setMobile(staffInfo.getMobile()));
}
}
// 批量查询出巡查信息
List<StaffPatrolRecordDailyResultDTO> patrolDatas = statsStaffPatrolRecordDailyService.listStaffPatrolRecordDailyAnalysis(pids, userIdsPart, startDateID, endDateID);
for (StaffPatrolRecordDailyResultDTO d : patrolDatas) {
Map<String, GridMemberDataAnalysisResultDTO> gridAndData = structedData.get(d.getStaffId());

Write Preview
Loading…
Cancel
Save