From d2ce490fd94ae0c65196a90dc91a650537904dab Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 8 Jun 2021 14:32:56 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=85=B1=E5=BB=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B5=8B=E8=AF=95=E4=B8=8B=20=E7=9C=8B?= =?UTF-8?q?=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GrassrootsPartyDevServiceImpl.java | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java index 54b0b797be..1fc834ae1f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java @@ -164,7 +164,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService BranchBuildTrendResultDTO result = new BranchBuildTrendResultDTO(); //生成近十二个月的横坐标数组 Map monthMap = dateUtils.getXpro(); - result.setXAxis(monthMap.values().stream().collect(Collectors.toList())); + result.setXAxis(new ArrayList<>(monthMap.values())); List dataArray = new LinkedList<>(); List yearlyDataList = @@ -185,15 +185,26 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService BranchTrendSeriesDataResultDTO data = new BranchTrendSeriesDataResultDTO(); data.setName(issue); if(null != issueYearlyDataList && !issueYearlyDataList.isEmpty()){ - monthMap.keySet().forEach( monthId ->{ - Optional optional + int i = 0; + monthMap.keySet().forEach(monthId->{ + Map collect = val.stream().collect(Collectors.toMap(BranchIssueDataResultDTO::getMonthId, BranchIssueDataResultDTO::getData, (o1, o2) -> o1)); + numArray.add(collect.getOrDefault(monthId,NumConstant.ZERO)); + }); + + //for (int i=0;i< monthMap.keySet().size();i++) { + String monthId = monthMap.keySet().iterator().next(); + + + // 202007 + // 2007->list + /* Optional optional = issueYearlyDataList.stream().filter(yearly -> StringUtils.equals(monthId,yearly.getMonthId())).findAny(); if(optional.isPresent()){ numArray.add(optional.get().getData()); }else{ numArray.add(NumConstant.ZERO); - } - }); + }*/ + //} }else{ for(int i = NumConstant.ZERO ; i < NumConstant.TWELVE ; i++){ numArray.add(NumConstant.ZERO); @@ -225,6 +236,14 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService return result; } + public static void main(String[] args) { + DateUtils dateUtils = new DateUtils(); + Map monthMap = dateUtils.getXpro(); + + System.out.println(monthMap); + System.out.println(monthMap.keySet().iterator().next()); + } + /** * @Description 4、支部建设情况|联建共建情况-排行 * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982 From 55a3cf5b1e25d3776054f4295b696a1a988bd9bf Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 8 Jun 2021 14:47:12 +0800 Subject: [PATCH 2/7] =?UTF-8?q?Revert=20"=E8=81=94=E5=BB=BA=E5=85=B1?= =?UTF-8?q?=E5=BB=BAbug=E4=BF=AE=E6=94=B9=20=E6=B5=8B=E8=AF=95=E4=B8=8B=20?= =?UTF-8?q?=E7=9C=8B=E7=9C=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d2ce490f --- .../impl/GrassrootsPartyDevServiceImpl.java | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java index 1fc834ae1f..3173e1269e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java @@ -185,26 +185,15 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService BranchTrendSeriesDataResultDTO data = new BranchTrendSeriesDataResultDTO(); data.setName(issue); if(null != issueYearlyDataList && !issueYearlyDataList.isEmpty()){ - int i = 0; - monthMap.keySet().forEach(monthId->{ - Map collect = val.stream().collect(Collectors.toMap(BranchIssueDataResultDTO::getMonthId, BranchIssueDataResultDTO::getData, (o1, o2) -> o1)); - numArray.add(collect.getOrDefault(monthId,NumConstant.ZERO)); - }); - - //for (int i=0;i< monthMap.keySet().size();i++) { - String monthId = monthMap.keySet().iterator().next(); - - - // 202007 - // 2007->list - /* Optional optional + monthMap.keySet().forEach( monthId ->{ + Optional optional = issueYearlyDataList.stream().filter(yearly -> StringUtils.equals(monthId,yearly.getMonthId())).findAny(); if(optional.isPresent()){ numArray.add(optional.get().getData()); }else{ numArray.add(NumConstant.ZERO); - }*/ - //} + } + }); }else{ for(int i = NumConstant.ZERO ; i < NumConstant.TWELVE ; i++){ numArray.add(NumConstant.ZERO); @@ -236,14 +225,6 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService return result; } - public static void main(String[] args) { - DateUtils dateUtils = new DateUtils(); - Map monthMap = dateUtils.getXpro(); - - System.out.println(monthMap); - System.out.println(monthMap.keySet().iterator().next()); - } - /** * @Description 4、支部建设情况|联建共建情况-排行 * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982 From 026851fc2b1eef53a48604f8e8fcec6c012b1f13 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 8 Jun 2021 15:20:33 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/EIDimServiceImpl.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java index 0633983ea4..8b5b67fe7d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java @@ -52,6 +52,7 @@ public class EIDimServiceImpl implements EIDimService { /** * 查询可更新的单位 + * * @return */ private List listAgencies2Update() { @@ -69,6 +70,7 @@ public class EIDimServiceImpl implements EIDimService { /** * 查询可增加的单位 + * * @return */ private List listAgencies2Add() { @@ -92,6 +94,7 @@ public class EIDimServiceImpl implements EIDimService { /** * 查询需要更新的部门列表 + * * @return */ private List listDepts2Update() { @@ -109,6 +112,7 @@ public class EIDimServiceImpl implements EIDimService { /** * 查询需要新增的部门列表 + * * @return */ private List listDepts2Add() { @@ -126,36 +130,28 @@ public class EIDimServiceImpl implements EIDimService { @Override public void initGrids() { List grids2Add = listGrids2Add(); - List grids2Update =listGrids2Update(); + List grids2Update = listGrids2Update(); screenCustomerGridService.addAndUpdateGrids(grids2Add, grids2Update); } @Override - public Map updateCenterPointByName(GridCenterPointForm param) { - //todo 怎么反向判断 左匹配 + public Map updateCenterPointByName(GridCenterPointForm param) { List gridInfos = screenCustomerGridService.selectGridInfoByCustomerId(param.getCustomerId()); - Map result = new HashMap<>(); + Map result = new HashMap<>(); - - gridInfos.forEach(grid->{ + gridInfos.forEach(grid -> { //客户id 和组织id 都相等 且 名字 包含关系时才修改 - if (grid.getCustomerId().equals(param.getCustomerId())){ + if (grid.getCustomerId().equals(param.getCustomerId())) { AtomicInteger integer = new AtomicInteger(0); - param.getCenterDataList().forEach(o ->{ - if (grid.getGridName().contains(o.getTitle())) { - Integer effectRow = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(), o.getTitle(), o.getCenter()); - integer.addAndGet(effectRow); - } - result.put(grid.getGridId(),integer.intValue()); - }); + param.getCenterDataList().forEach(o -> { + if (grid.getGridName().contains(o.getTitle())) { + Integer effectRow = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(), o.getTitle(), o.getCenter()); + integer.addAndGet(effectRow); + } + result.put(grid.getGridId(), integer.intValue()); + }); } }); - /*param.getCenterDataList().forEach(o ->{ - Integer integer = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(),param.getAgencyId(), o.getTitle(), o.getCenter()); - if (integer == 0 || integer > 1){ - result.put(o.getTitle(),integer); - } - });*/ return result; } From 1eb61b3725ec353dcc5a84ad984d4e955f21c2c3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 8 Jun 2021 16:18:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8A=BD=E5=8F=96=E5=88=B0=E5=A4=A7=E5=B1=8F=20=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactOriginProjectMainDailyService.java | 4 +-- ...FactOriginProjectMainDailyServiceImpl.java | 10 +------ .../impl/ScreenProjectSettleServiceImpl.java | 27 +++---------------- 3 files changed, 6 insertions(+), 35 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java index d9a4c12c93..0f55775b23 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java @@ -361,13 +361,11 @@ public interface FactOriginProjectMainDailyService extends BaseService * @author wangc * @date 2021.03.04 22:56 */ - List initNewScreenProjectData(String customerId,Integer rows ,String dateId,Integer exceedLimit,Integer about2exceedLimit); + List initNewScreenProjectData(String customerId,Integer rows ,String dateId); void computerIfExceed(List list,Integer exceedLimit,Integer about2exceedLimit); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java index 7347feb480..3e8b210781 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java @@ -20,7 +20,6 @@ package com.epmet.service.evaluationindex.extract.todata.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.DataSourceConstant; import com.epmet.constant.OrgTypeConstant; @@ -470,19 +469,12 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl * @author wangc * @date 2021.03.04 22:56 */ @Override - public List initNewScreenProjectData(String customerId,Integer rows , String dateId,Integer exceedLimit,Integer about2exceedLimit) { - boolean ifBeforeYesterday = true; - int beforeDate = Integer.parseInt(DateUtils.getBeforeNDay(NumConstant.ONE)); - if(beforeDate > Integer.parseInt(dateId)){ - ifBeforeYesterday = false; - } + public List initNewScreenProjectData(String customerId,Integer rows , String dateId) { List projects = baseDao.initNewScreenProjectData(customerId, rows <= NumConstant.ZERO ? "" : dateId, dateId); projects.forEach(project -> { if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java index 730c2e8f17..a92f1169c6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java @@ -1,7 +1,5 @@ package com.epmet.service.evaluationindex.extract.toscreen.impl; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.dto.project.result.ProjectExceedParamsResultDTO; import com.epmet.dto.screen.ScreenProjectDataDTO; import com.epmet.dto.screen.ScreenProjectImgDataDTO; import com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO; @@ -71,27 +69,9 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic public void extractScreenData(ScreenCentralZoneDataFormDTO param) { //screen_project_data表是否存在此客户数据 int rows = targetDbService.checkIfExisted(param.getCustomerId()); - //查找客户项目超期参数 - List exceedParams = projectService.getProjectExceedParams(param.getCustomerId()); - Integer exceedLimit = NumConstant.FIVE; - Integer about2ExceedLimit = NumConstant.FIVE; - - - if(!CollectionUtils.isEmpty(exceedParams)){ - for(ProjectExceedParamsResultDTO ex :exceedParams){ - if(null != ex.getDefaultExceedLimit()){ - exceedLimit = null == ex.getExceedLimit() ? ex.getDefaultExceedLimit() : ex.getExceedLimit(); - } - if(null != ex.getDefaultAbout2ExceedLimit()){ - about2ExceedLimit = null == ex.getAbout2ExceedLimit() ? ex.getDefaultAbout2ExceedLimit() : ex.getDefaultAbout2ExceedLimit(); - } - } - } - //因为即将超期提醒时间(天)就是即将超期期限，在表中存储的是超期前多少天 - //所以这里要换算成滞留日 - about2ExceedLimit = exceedLimit >= about2ExceedLimit ? exceedLimit - about2ExceedLimit : exceedLimit; + List metaData = - originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId(),exceedLimit,about2ExceedLimit); + originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId()); if(!CollectionUtils.isEmpty(metaData)) { // 查询项目信息 @@ -137,7 +117,8 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic //重新计算orientData的级别 有现成的方法 fact_origin_project_org_period_daily // originMainService.computerIfExceed(orientData, exceedLimit,about2ExceedLimit); - originMainService.setProjectLevel(orientData, param.getCustomerId()); + //todo 与上面重复处理 暂时注释掉 + //originMainService.setProjectLevel(orientData, param.getCustomerId()); processService.updateProjectCloseTime(metaData); //更新结案时间和结案状态 processService.updateProjectStatus(orientData,param.getDateId(),param.getCustomerId()); From 3de74d7681f3b3b504dfdc7012675ce8be9d97c8 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 8 Jun 2021 18:02:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8A=BD=E5=8F=96=E5=88=B0=E5=A4=A7=E5=B1=8F=20=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9B=B4=E6=8E=A5=E7=AB=8B=E9=A1=B9=E7=9A=84=20?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=8F=8A=E7=94=B5=E8=AF=9D=20?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=BE=85=E8=B0=83=E6=95=B4=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E8=8E=B7=E5=8F=96=E7=BD=91=E6=A0=BC=E5=91=98?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/screen/ScreenProjectDataDTO.java | 9 ++- .../main/java/com/epmet/dao/user/UserDao.java | 56 +++++++++++-------- .../epmet/entity/project/ProjectEntity.java | 2 +- .../impl/ScreenProjectSettleServiceImpl.java | 9 +++ .../com/epmet/service/user/UserService.java | 2 +- .../service/user/impl/UserServiceImpl.java | 35 ++++++++++-- .../main/resources/mapper/user/UserDao.xml | 19 ++++++- 7 files changed, 96 insertions(+), 36 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java index aeb148d8e9..6c292909d2 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java @@ -17,11 +17,11 @@ package com.epmet.dto.screen; -import java.io.Serializable; -import java.util.Date; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; /** * 中央区-项目数据 @@ -54,6 +54,11 @@ public class ScreenProjectDataDTO implements Serializable { */ private String orgId; + /** + * 来源：议题issue，组织agency + */ + private String origin; + /** * 上级组织Id */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java index e48dc81ab3..dabacfd7da 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java @@ -22,97 +22,97 @@ import java.util.Set; public interface UserDao { /** - * @Description 查询注册用户的总量与增量 * @param * @return + * @Description 查询注册用户的总量与增量 * @author wangc * @date 2020.06.18 18:50 - **/ - CommonTotalAndIncCountResultDTO selectResiTotalAndIncrByLevel(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("targetDate")Date targetDate); + **/ + CommonTotalAndIncCountResultDTO selectResiTotalAndIncrByLevel(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("targetDate") Date targetDate); /** - * @Description 查询党员的总量与增量 * @param * @return + * @Description 查询党员的总量与增量 * @author wangc * @date 2020.06.18 18:50 **/ CommonTotalAndIncCountResultDTO selectPartyTotalAndIncr(@Param("userIds") List userIds, @Param("incrUserIds") List incrUserIds, @Param("targetDate") Date targetDate); /** - * @Description 查询热心居民的总量与增量 * @param * @return + * @Description 查询热心居民的总量与增量 * @author wangc * @date 2020.06.18 18:50 **/ CommonTotalAndIncCountResultDTO selectWarmTotalAndIncr(@Param("userIds") List userIds, @Param("incrUserIds") List incrUserIds, @Param("gridIds") Set gridIds, @Param("targetDate") Date targetDate); /** - * @Description 查询指定网格范围下单位时间内新增的注册用户Id * @param * @return + * @Description 查询指定网格范围下单位时间内新增的注册用户Id * @author wangc * @date 2020.06.18 18:50 **/ List selectIncrUserIds(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("targetDate") Date targetDate); /** - * @Description 查询指定网格范围下截至指定位时间累计的注册用户Id * @param * @return + * @Description 查询指定网格范围下截至指定位时间累计的注册用户Id * @author wangc * @date 2020.06.18 18:50 **/ List selectTotalUserIds(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("targetDate") Date targetDate); /** - * @Description 查询指定时间范围内网格新增的注册/参与用户Id * @param * @return + * @Description 查询指定时间范围内网格新增的注册/参与用户Id * @author wangc * @date 2020.06.18 18:50 **/ - List selectIncrUserIdsWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("startDate")Date startDate,@Param("endDate")Date endDate); + List selectIncrUserIdsWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate); /** - * @Description 查询指定时间范围内注册/参与用户增量 * @param * @return + * @Description 查询指定时间范围内注册/参与用户增量 * @author wangc * @date 2020.06.18 18:50 **/ - Integer selectResiIncrWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("startDate")Date startDate,@Param("endDate")Date endDate); + Integer selectResiIncrWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate); /** - * @Description 查询指定时间范围内党员的增量 * @param * @return + * @Description 查询指定时间范围内党员的增量 * @author wangc * @date 2020.06.18 18:50 **/ - Integer selectPartyIncrWithinTimeRange(@Param("incrUserIds")List incrUserIds,@Param("startDate")Date startDate,@Param("endDate")Date endDate); + Integer selectPartyIncrWithinTimeRange(@Param("incrUserIds") List incrUserIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate); /** - * @Description 查询指定时间范围内热心居民的增量 * @param * @return + * @Description 查询指定时间范围内热心居民的增量 * @author wangc * @date 2020.06.18 18:50 **/ - Integer selectWarmIncrWithinTimeRange(@Param("incrUserIds")List incrUserIds,@Param("gridIds") Set gridIds,@Param("startDate")Date startDate,@Param("endDate")Date endDate); + Integer selectWarmIncrWithinTimeRange(@Param("incrUserIds") List incrUserIds, @Param("gridIds") Set gridIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate); /** - * @Description 查询用户是不是党员 * @param userIds + * @Description 查询用户是不是党员 * @author zxc * @date 2020/9/15 4:23 下午 */ List selectUserIsParty(@Param("userIds") List userIds); - List selectPartymembersByCustomerId(@Param("customerId")String customerId); + List selectPartymembersByCustomerId(@Param("customerId") String customerId); - List selectWarmHeartedByCustomerId(@Param("customerId")String customerId); + List selectWarmHeartedByCustomerId(@Param("customerId") String customerId); /** * @param customerId @@ -125,22 +125,22 @@ public interface UserDao { List selectGridRegUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId); /** - * @Description 获取客户下的网格注册居民 * @param customerId * @return + * @Description 获取客户下的网格注册居民 * @author wangc * @date 2020.09.25 13:54 **/ List selectRegisteredUserByCustomerId(@Param("customerId") String customerId); /** - * @Description 获取大屏项目相关信息 联系人 - * @param list + * @param userIdList * @return java.util.List + * @Description 获取大屏项目相关信息 联系人 * @author wangc * @date 2021.03.08 17:16 */ - List selectScreenProjectData(@Param("list") List list); + List selectScreenProjectData(@Param("list") List userIdList); /** * 根据工作员用户id, 返回这些人当中多少个网格员 @@ -148,6 +148,16 @@ public interface UserDao { * @param staffIds * @return int */ - int selectGridManagerTotal(@Param("customerId")String customerId,@Param("staffIds")List staffIds); + int selectGridManagerTotal(@Param("customerId") String customerId, @Param("staffIds") List staffIds); + + /** + * desc: 根据Id获取工作人员 昵称及手机号 + * + * @param staffUserIdList + * @return java.util.List + * @author LiuJanJun + * @date 2021/6/8 5:21 下午 + */ + List selectStaffInfo(@Param("list") List staffUserIdList); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java index 15c533efc3..7a59cbb9ce 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java @@ -46,7 +46,7 @@ public class ProjectEntity extends BaseEpmetEntity { private String agencyId; /** - * 来源：议题issue + * 来源：议题issue，组织agency */ private String origin; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java index a92f1169c6..afd8256f26 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.evaluationindex.extract.toscreen.impl; +import com.epmet.constant.ProjectConstant; import com.epmet.dto.screen.ScreenProjectDataDTO; import com.epmet.dto.screen.ScreenProjectImgDataDTO; import com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO; @@ -81,11 +82,19 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic nature.getId())).map(projectInfo -> { meta.setProjectCreateTime(projectInfo.getCreatedTime()); meta.setProjectTitle(projectInfo.getTitle()); + meta.setOrigin(projectInfo.getOrigin()); + //直接立项的话 项目内容是项目背景 + if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(projectInfo.getOrigin())){ + meta.setProjectContent(projectInfo.getBackGround()); + meta.setLinkName(projectInfo.getCreatedBy()); + } return meta; })).collect(Collectors.toList()); } + //设置项目经纬度和项目内容 topicService.fillScreenProjectData(metaData); //metaData = Optional.ofNullable(topicService.getScreenProjectData(metaData)).orElse(metaData); + //设置联系人及电话 userService.fillScreenProjectData(metaData); //metaData = Optional.ofNullable(userService.getScreenProjectData(metaData)).orElse(metaData); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java index b7cab26df1..ebc01ebdb3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java @@ -84,7 +84,7 @@ public interface UserService { * @author wangc * @date 2021.03.08 17:16 */ - List fillScreenProjectData(List list); + void fillScreenProjectData(List list); /** * 返回每个组织或者每个网格下的网格员数量 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java index fc40a2e5fd..a7f1d594c4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java @@ -4,6 +4,7 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.constant.DataSourceConstant; import com.epmet.constant.ExtractConstant; +import com.epmet.constant.ProjectConstant; import com.epmet.dao.user.UserDao; import com.epmet.dto.AgencySubTreeDto; import com.epmet.dto.extract.form.GridHeartedFormDTO; @@ -744,16 +745,38 @@ public class UserServiceImpl implements UserService { * @date 2021.03.08 17:16 */ @Override - public List fillScreenProjectData(List list) { - List collection = userDao.selectScreenProjectData(list); - if(!CollectionUtils.isEmpty(collection)){ - list = list.stream().flatMap(target -> collection.stream().filter(res -> StringUtils.equals(target.getLinkName(),res.getTopicId())) + public void fillScreenProjectData(List list) { + List topicUserIdList = list.stream().filter(o -> ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(o.getOrigin())) + .map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList()); + if (CollectionUtils.isEmpty(topicUserIdList)){ + return; + } + List collection = userDao.selectScreenProjectData(topicUserIdList); + Map topicUserMap = collection.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getTopicId,o->o,(o1,o2)->o1)); + /* if(!CollectionUtils.isEmpty(collection)){ + list.stream().flatMap(target -> collection.stream().filter(res -> StringUtils.equals(target.getLinkName(),res.getTopicId())) .map(merge -> { target.setLinkName(merge.getLinkName()); target.setLinkMobile(merge.getLinkMobile()); - return target;})).collect(Collectors.toList()); + return target;})); + }*/ + List staffUserIdList = list.stream().filter(o -> ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(o.getOrigin())) + .map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList()); + if (CollectionUtils.isEmpty(topicUserIdList)){ + return; } - return collection; + List staffList = userDao.selectStaffInfo(staffUserIdList); + Map collect = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1)); + list.forEach(project->{ + ScreenProjectDataDTO userDTO = collect.get(project.getLinkName()); + if (userDTO == null){ + userDTO = topicUserMap.get(project.getLinkName()); + } + if (userDTO != null){ + project.setLinkName(userDTO.getLinkName()); + project.setLinkMobile(userDTO.getLinkMobile()); + } + }); } /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml index 51db8980fc..acb6c9feb3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml @@ -528,8 +528,8 @@ user_base_info WHERE del_flag = '0' - - user_id = #{project.linkName} + + user_id = #{userId} @@ -550,11 +550,24 @@ WHERE m.DEL_FLAG = '0' AND m.CUSTOMER_ID = #{customerId} - AND m.ROLE_KEY = 'grid_manager' + AND m.ROLE_KEY = 'grid_member' ) AND sr.STAFF_ID in #{staffId} + From 135936f874c50c409e5538cdc992fef46bfab04f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 9 Jun 2021 13:30:24 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=82=B9=E6=97=B6=E5=8E=BB=E6=8E=89=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=87=8C=E7=9A=84=E5=A7=94=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/EIDimServiceImpl.java | 5 +++-- .../stats/impl/ScreenCentralZoneDataExtractServiceImpl.java | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java index 8b5b67fe7d..c846f14f30 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java @@ -144,8 +144,9 @@ public class EIDimServiceImpl implements EIDimService { if (grid.getCustomerId().equals(param.getCustomerId())) { AtomicInteger integer = new AtomicInteger(0); param.getCenterDataList().forEach(o -> { - if (grid.getGridName().contains(o.getTitle())) { - Integer effectRow = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(), o.getTitle(), o.getCenter()); + String title = o.getTitle().replace("委会",""); + if (grid.getGridName().contains(title)) { + Integer effectRow = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(), title, o.getCenter()); integer.addAndGet(effectRow); } result.put(grid.getGridId(), integer.intValue()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java index ff368ab5da..36511421f3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java @@ -182,11 +182,7 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon o.setDataEndTime(dimId); //For:06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数 - if(gridManagerMap.containsKey(orgId)){ - o.setGridMemberTotal(gridManagerMap.get(orgId)); - }else{ - o.setGridMemberTotal(NumConstant.ZERO); - } + o.setGridMemberTotal(gridManagerMap.getOrDefault(orgId, NumConstant.ZERO)); }); return result; } From 0f6a9e12a78b434ec3bcaac5b6b9c29809a870b7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 9 Jun 2021 15:15:11 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=B7=A1=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/form/GridManagerListFormDTO.java | 4 +- .../user/result/GridManagerListResultDTO.java | 24 ++++ .../datareport/constant/PatrolConstant.java | 20 +++ .../user/StaffPatrolDetailController.java | 8 +- .../screen/ScreenCustomerAgencyDao.java | 9 ++ .../dao/user/StaffPatrolDetailDao.java | 2 +- .../dao/user/StaffPatrolRecordDao.java | 14 +- .../screen/ScreenOrgService.java | 23 +++ .../screen/impl/ScreenOrgServiceImpl.java | 44 ++++++ .../user/StaffPatrolDetailService.java | 10 +- .../impl/StaffPatrolDetailServiceImpl.java | 131 +++++++++++++++++- .../mapper/screen/ScreenCustomerAgencyDao.xml | 20 +++ .../mapper/user/StaffPatrolDetailDao.xml | 2 +- .../mapper/user/StaffPatrolRecordDao.xml | 24 +++- .../epmet/dto/result/GridStaffResultDTO.java | 21 +++ .../epmet/feign/GovOrgOpenFeignClient.java | 9 ++ .../GovOrgOpenFeignClientFallback.java | 5 + .../CustomerStaffGridController.java | 12 ++ .../com/epmet/dao/CustomerStaffGridDao.java | 9 ++ .../service/CustomerStaffGridService.java | 9 ++ .../impl/CustomerStaffGridServiceImpl.java | 35 +++++ .../resources/mapper/CustomerStaffGridDao.xml | 14 ++ .../epmet/dto}/form/PatrolTrackFormDTO.java | 2 +- .../epmet/dto}/form/RecordListFormDTO.java | 2 +- .../result/GridManagerUserListResultDTO.java | 65 +++++++++ .../dto/result/GridStaffUserResultDTO.java | 20 +++ .../dto}/result/PatrolTrackResultDTO.java | 2 +- .../dto}/result/RecordListResultDTO.java | 2 +- .../dto/result/UserNameAndLLResultDTO.java | 33 +++++ .../epmet/dto/result/UserNameResultDTO.java | 19 +++ .../epmet/feign/EpmetUserOpenFeignClient.java | 36 +++++ .../EpmetUserOpenFeignClientFallback.java | 21 +++ .../controller/StaffPatrolController.java | 68 +++++++++ .../epmet/controller/StaffRoleController.java | 16 ++- .../java/com/epmet/dao/CustomerStaffDao.java | 8 ++ .../com/epmet/dao/StaffPatrolDetailDao.java | 14 +- .../com/epmet/dao/StaffPatrolRecordDao.java | 24 +++- .../main/java/com/epmet/dao/StaffRoleDao.java | 13 +- .../service/StaffPatrolRecordService.java | 30 ++++ .../com/epmet/service/StaffRoleService.java | 13 +- .../impl/StaffPatrolRecordServiceImpl.java | 90 +++++++++--- .../service/impl/StaffRoleServiceImpl.java | 24 +++- .../resources/mapper/CustomerStaffDao.xml | 17 +++ .../resources/mapper/StaffPatrolDetailDao.xml | 34 ++--- .../resources/mapper/StaffPatrolRecordDao.xml | 53 ++++--- .../main/resources/mapper/StaffRoleDao.xml | 14 ++ 46 files changed, 966 insertions(+), 103 deletions(-) create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/PatrolConstant.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenOrgService.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenOrgServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java rename {epmet-module/data-report/data-report-client/src/main/java/com/epmet/user => epmet-user/epmet-user-client/src/main/java/com/epmet/dto}/form/PatrolTrackFormDTO.java (94%) rename {epmet-module/data-report/data-report-client/src/main/java/com/epmet/user => epmet-user/epmet-user-client/src/main/java/com/epmet/dto}/form/RecordListFormDTO.java (95%) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUserResultDTO.java rename {epmet-module/data-report/data-report-client/src/main/java/com/epmet/user => epmet-user/epmet-user-client/src/main/java/com/epmet/dto}/result/PatrolTrackResultDTO.java (92%) rename {epmet-module/data-report/data-report-client/src/main/java/com/epmet/user => epmet-user/epmet-user-client/src/main/java/com/epmet/dto}/result/RecordListResultDTO.java (95%) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameAndLLResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameResultDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/GridManagerListFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/GridManagerListFormDTO.java index 58a1912d1f..7f2e582ef3 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/GridManagerListFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/GridManagerListFormDTO.java @@ -20,6 +20,8 @@ public class GridManagerListFormDTO implements Serializable { @NotBlank(message = "组织ID不能为空",groups = GridManagerListForm.class) private String agencyId; - @NotBlank(message = "行政区域编码不能为空",groups = GridManagerListForm.class) + /** + * 行政区域编码 【平阴传】 + */ private String areaCode; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java index 7ea6da09f1..986350e424 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.user.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -49,4 +50,27 @@ public class GridManagerListResultDTO implements Serializable { */ private String staffName; + /** + * 中心点位 + */ + @JsonIgnore + private String centerMark; + + /** + * 经纬度赋值状态 + */ + @JsonIgnore + private Boolean llStatus; + + public GridManagerListResultDTO() { + this.staffId = ""; + this.longitude = ""; + this.latitude = ""; + this.gridId = ""; + this.status = ""; + this.gridName = ""; + this.staffName = ""; + this.centerMark = ""; + this.llStatus = false; + } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/PatrolConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/PatrolConstant.java new file mode 100644 index 0000000000..eff0bdd451 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/PatrolConstant.java @@ -0,0 +1,20 @@ +package com.epmet.datareport.constant; + +/** + * @Author zxc + * @DateTime 2021/6/9 1:49 下午 + * @DESC + */ +public interface PatrolConstant { + + /** + * 经度 + */ + String LONGITUDE = "longitude"; + + /** + * 纬度 + */ + String LATITUDE = "latitude"; + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java index e853fa3a48..72329ea1a1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java @@ -4,11 +4,11 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.user.StaffPatrolDetailService; import com.epmet.user.form.GridManagerListFormDTO; -import com.epmet.user.form.PatrolTrackFormDTO; -import com.epmet.user.form.RecordListFormDTO; +import com.epmet.dto.form.PatrolTrackFormDTO; +import com.epmet.dto.form.RecordListFormDTO; import com.epmet.user.result.GridManagerListResultDTO; -import com.epmet.user.result.PatrolTrackResultDTO; -import com.epmet.user.result.RecordListResultDTO; +import com.epmet.dto.result.PatrolTrackResultDTO; +import com.epmet.dto.result.RecordListResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java index a0992f8d97..986a880aac 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java @@ -22,6 +22,7 @@ import com.epmet.dto.result.plugins.AgencyNodeDTO; import com.epmet.dto.result.plugins.DeptNodeDTO; import com.epmet.dto.result.plugins.GridNodeDTO; import com.epmet.evaluationindex.screen.dto.result.*; +import com.epmet.user.result.GridManagerListResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -161,4 +162,12 @@ public interface ScreenCustomerAgencyDao { List getNextAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId); List selectSubAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId); + + /** + * @Description 根据agencyId查询网格 + * @Param agencyId + * @author zxc + * @date 2021/6/8 1:27 下午 + */ + List selectGrid(@Param("agencyId")String agencyId,@Param("areaCode")String areaCode); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolDetailDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolDetailDao.java index 56e3249113..fafcc77d6e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolDetailDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolDetailDao.java @@ -19,7 +19,7 @@ package com.epmet.datareport.dao.user; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.datareport.entity.user.StaffPatrolDetailEntity; -import com.epmet.user.result.PatrolTrackResultDTO; +import com.epmet.dto.result.PatrolTrackResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java index a8637bd720..19849b856b 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java @@ -19,9 +19,11 @@ package com.epmet.datareport.dao.user; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.datareport.entity.user.StaffPatrolRecordEntity; -import com.epmet.user.form.RecordListFormDTO; -import com.epmet.user.result.RecordListResultDTO; +import com.epmet.dto.form.RecordListFormDTO; +import com.epmet.user.result.GridManagerListResultDTO; +import com.epmet.dto.result.RecordListResultDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -41,5 +43,13 @@ public interface StaffPatrolRecordDao extends BaseDao { * @date 2021/6/7 5:29 下午 */ List recordList(RecordListFormDTO formDTO); + + /** + * @Description 查询经纬度 + * @Param userIds + * @author zxc + * @date 2021/6/9 10:24 上午 + */ + List selectLL(@Param("userIds")List userIds); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenOrgService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenOrgService.java new file mode 100644 index 0000000000..3de2656f69 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenOrgService.java @@ -0,0 +1,23 @@ +package com.epmet.datareport.service.evaluationindex.screen; + +import com.epmet.user.result.GridManagerListResultDTO; + +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/6/8 10:45 上午 + * @DESC + */ +public interface ScreenOrgService { + + /** + * @Description 查询组织下的所有网格 + * @Param agencyId + * @Param areaCode + * @author zxc + * @date 2021/6/8 10:46 上午 + */ + List selectAllGrid(String agencyId,String areaCode); + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenOrgServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenOrgServiceImpl.java new file mode 100644 index 0000000000..c387350d34 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenOrgServiceImpl.java @@ -0,0 +1,44 @@ +package com.epmet.datareport.service.evaluationindex.screen.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.constant.DataSourceConstant; +import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao; +import com.epmet.datareport.service.evaluationindex.screen.ScreenOrgService; +import com.epmet.user.result.GridManagerListResultDTO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/6/8 10:45 上午 + * @DESC + */ +@Service +@Slf4j +@DataSource(DataSourceConstant.EVALUATION_INDEX) +public class ScreenOrgServiceImpl implements ScreenOrgService { + + @Autowired + private ScreenCustomerAgencyDao agencyDao; + + /** + * @Description 查询组织下的所有网格 + * @Param agencyId + * @Param areaCode + * @author zxc + * @date 2021/6/8 10:46 上午 + */ + @Override + public List selectAllGrid(String agencyId,String areaCode) { + List result = agencyDao.selectGrid(agencyId, areaCode); + if (!CollectionUtils.isEmpty(result)){ + return result; + } + return new ArrayList<>(); + } +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java index 8afa465ea3..98260990a3 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java @@ -1,13 +1,11 @@ package com.epmet.datareport.service.user; -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.datareport.entity.user.StaffPatrolDetailEntity; import com.epmet.user.form.GridManagerListFormDTO; -import com.epmet.user.form.PatrolTrackFormDTO; -import com.epmet.user.form.RecordListFormDTO; +import com.epmet.dto.form.PatrolTrackFormDTO; +import com.epmet.dto.form.RecordListFormDTO; import com.epmet.user.result.GridManagerListResultDTO; -import com.epmet.user.result.PatrolTrackResultDTO; -import com.epmet.user.result.RecordListResultDTO; +import com.epmet.dto.result.PatrolTrackResultDTO; +import com.epmet.dto.result.RecordListResultDTO; import java.util.List; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java index 5c9537862f..fb205ff276 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java @@ -1,21 +1,33 @@ 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.Result; +import com.epmet.datareport.constant.PatrolConstant; import com.epmet.datareport.dao.user.StaffPatrolDetailDao; import com.epmet.datareport.dao.user.StaffPatrolRecordDao; +import com.epmet.datareport.service.evaluationindex.screen.ScreenOrgService; import com.epmet.datareport.service.user.StaffPatrolDetailService; +import com.epmet.dto.result.GridStaffResultDTO; +import com.epmet.dto.result.UserNameAndLLResultDTO; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.user.form.GridManagerListFormDTO; -import com.epmet.user.form.PatrolTrackFormDTO; -import com.epmet.user.form.RecordListFormDTO; +import com.epmet.dto.form.PatrolTrackFormDTO; +import com.epmet.dto.form.RecordListFormDTO; import com.epmet.user.result.GridManagerListResultDTO; -import com.epmet.user.result.PatrolTrackResultDTO; -import com.epmet.user.result.RecordListResultDTO; +import com.epmet.dto.result.PatrolTrackResultDTO; +import com.epmet.dto.result.RecordListResultDTO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 工作人员巡查记录明细 @@ -33,16 +45,111 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService { @Autowired private StaffPatrolRecordDao staffPatrolRecordDao; + @Autowired + private ScreenOrgService screenOrgService; + + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; + + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + /** * @Description 001、网格员分布 + * 1.根据agencyId或者areaCode查询出网格 + * 2.根据查出来的网格ID去查网格下边的人【人只要网格员】 + * 3.根据userId查询巡查记录表 + * 4.数据补全 * @Param formDTO * @author zxc * @date 2021/6/7 3:06 下午 */ @Override public List gridManagerList(GridManagerListFormDTO formDTO) { + List grids = new ArrayList<>(); + if (StringUtils.isEmpty(formDTO.getAreaCode())){ + // 根据agencyId查询网格 + grids = screenOrgService.selectAllGrid(formDTO.getAgencyId(), null); + }else { + // 根据areaCode查询网格 + grids = screenOrgService.selectAllGrid(null, formDTO.getAreaCode()); + } + if (CollectionUtils.isEmpty(grids)){ + return new ArrayList<>(); + } + List gridIds = grids.stream().map(m -> m.getGridId()).collect(Collectors.toList()); + // 查询网格下的网格员 + Result> resultData = govOrgOpenFeignClient.selectGridStaffByGridIds(gridIds); + if(!resultData.success()){ + throw new RenException("查询网格下的网格员失败【"+resultData.getMsg()+"】"); + } + List data = resultData.getData(); + if (CollectionUtils.isEmpty(data)){ + return new ArrayList<>(); + } + List result = ConvertUtils.sourceToTarget(data, GridManagerListResultDTO.class); + // 查询经纬度 + Result selectll = epmetUserOpenFeignClient.selectll(result.stream().map(m -> m.getStaffId()).collect(Collectors.toList())); + if (!selectll.success()){ + throw new RenException("查询经纬度和姓名失败【"+selectll.getMsg()+"】"); + } + UserNameAndLLResultDTO llAndNameData = selectll.getData(); + List finalGrids = grids; + result.forEach(r -> { + // 经纬度赋值 巡查状态赋值 + if (!CollectionUtils.isEmpty(llAndNameData.getLl())) { + llAndNameData.getLl().forEach(l -> { + if (r.getStaffId().equals(l.getStaffId()) && r.getGridId().equals(l.getGridId())) { + r.setLatitude(l.getLatitude()); + r.setLongitude(l.getLongitude()); + r.setStatus(l.getStatus()); + r.setLlStatus(true); + } + }); + } + // 姓名赋值 + if (!CollectionUtils.isEmpty(llAndNameData.getUserNames())){ + llAndNameData.getUserNames().forEach(n -> { + if (r.getStaffId().equals(n.getUserId())){ + r.setStaffName(n.getUserName()); + } + }); + } + finalGrids.forEach(g -> { + if (r.getGridId().equals(g.getGridId())){ + r.setGridName(g.getGridName()); + } + }); + }); + result.forEach(r -> { + if (!r.getLlStatus()){ + finalGrids.forEach(g -> { + if (StringUtils.isNotBlank(g.getCenterMark())){ + r.setLongitude(getLL(g.getCenterMark(),PatrolConstant.LONGITUDE)); + r.setLatitude(getLL(g.getCenterMark(),PatrolConstant.LATITUDE)); + } + }); + } + }); + return result; + } - return null; + /** + * @Description 根据中心点位截取经纬度 + * @Param centMark + * @Param ll + * @author zxc + * @date 2021/6/9 2:08 下午 + */ + public String getLL(String centMark,String ll){ + if (ll.equals(PatrolConstant.LONGITUDE)){ + String longitude = centMark.substring(NumConstant.TWO, centMark.indexOf(",")); + return longitude; + }else { + String s = centMark.substring(NumConstant.ZERO, centMark.indexOf(",")); + String latitude = centMark.substring(s.length() + NumConstant.ONE, centMark.length() - NumConstant.TWO); + return latitude; + } } /** @@ -53,7 +160,11 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService { */ @Override public List recordList(RecordListFormDTO formDTO) { - List result = staffPatrolRecordDao.recordList(formDTO); + Result> listResult = epmetUserOpenFeignClient.recordList(formDTO); + if (!listResult.success()){ + throw new RenException("查询巡查记录失败【"+listResult.getMsg()+"】"); + } + List result = listResult.getData(); if (!CollectionUtils.isEmpty(result)){ return result; } @@ -68,10 +179,16 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService { */ @Override public List patrolTrack(PatrolTrackFormDTO formDTO) { - List results = staffPatrolDetailDao.selectPatrolTrack(formDTO.getStaffPatrolRecId()); + Result> result = epmetUserOpenFeignClient.patrolTrack(formDTO); + if (!result.success()){ + throw new RenException("查询 巡查轨迹失败【"+result.getMsg()+"】"); + } + List results = result.getData(); if (!CollectionUtils.isEmpty(results)){ return results; } return new ArrayList<>(); } + + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index 328bb2f753..4397b99fd6 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -320,4 +320,24 @@ + + + diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolDetailDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolDetailDao.xml index cdc99d435b..2bf91e89f2 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolDetailDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolDetailDao.xml @@ -4,7 +4,7 @@ - SELECT LATITUDE, LONGITUDE diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolRecordDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolRecordDao.xml index 5fef17c84a..02e4069ff7 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolRecordDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolRecordDao.xml @@ -4,7 +4,7 @@ - SELECT ID AS staffPatrolRecId, DATE_FORMAT(PATROL_START_TIME,'%Y-%m-%d %H:%i:%s') AS patrolStartTime, @@ -16,4 +16,26 @@ AND STAFF_ID = #{staffId} ORDER BY CREATED_TIME DESC + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java new file mode 100644 index 0000000000..d74af6d7f6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/6/8 3:23 下午 + * @DESC + */ +@Data +public class GridStaffResultDTO implements Serializable { + + private static final long serialVersionUID = -5910427385795368242L; + + private String gridId; + + private String staffId; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 6cefd55a53..4e28d10dc1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -333,4 +333,13 @@ public interface GovOrgOpenFeignClient { **/ @PostMapping(value = "/gov/org/customeragency/getprocessorlist/{agencyId}") Result getProcessorList(@PathVariable("agencyId") String agencyId); + + /** + * @Description 查询网格下的网格员 + * @Param gridIds + * @author zxc + * @date 2021/6/8 3:36 下午 + */ + @PostMapping("/gov/org/customerstaffgrid/gridstaff") + Result> selectGridStaffByGridIds(@RequestBody List gridIds); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index f34b6f53ae..4976297323 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -192,4 +192,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { public Result getProcessorList(String agencyId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getProcessorList", agencyId); } + + @Override + public Result> selectGridStaffByGridIds(List gridIds) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectGridStaffByGridIds", gridIds); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java index 72b6dabe25..53e6330d06 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java @@ -29,6 +29,7 @@ import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.LatestGridFormDTO; import com.epmet.dto.result.CustomerGridByUserIdResultDTO; +import com.epmet.dto.result.GridStaffResultDTO; import com.epmet.excel.CustomerStaffGridExcel; import com.epmet.service.CustomerStaffGridService; import org.springframework.beans.factory.annotation.Autowired; @@ -119,4 +120,15 @@ public class CustomerStaffGridController { ValidatorUtils.validateEntity(gridIdFormDTO); return customerStaffGridService.getAllGridStaffs(gridIdFormDTO); } + + /** + * @Description 查询网格下的人 + * @Param gridIds + * @author zxc + * @date 2021/6/8 3:36 下午 + */ + @PostMapping("gridstaff") + public Result> selectGridStaffByGridIds(@RequestBody List gridIds){ + return new Result>().ok(customerStaffGridService.selectGridStaffByGridIds(gridIds)); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java index 54cad95662..d9ce1b0e61 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java @@ -22,6 +22,7 @@ import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.CustomerStaffDepartmentDTO; import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.dto.form.LatestGridFormDTO; +import com.epmet.dto.result.GridStaffResultDTO; import com.epmet.entity.CustomerStaffGridEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -97,4 +98,12 @@ public interface CustomerStaffGridDao extends BaseDao { * @Description 查询人员在客户下参与的网格列表 */ List selectStaffGridList(CustomerStaffGridDTO staffGridDTO); + + /** + * @Description 查询网格下的人 + * @Param gridIds + * @author zxc + * @date 2021/6/8 3:36 下午 + */ + List selectGridStaffByGridIds(@Param("gridIds") List gridIds); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java index 7813dd3b06..0cf4041cce 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java @@ -26,6 +26,7 @@ import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.LatestGridFormDTO; import com.epmet.dto.result.CommonStaffInfoResultDTO; import com.epmet.dto.result.CustomerGridByUserIdResultDTO; +import com.epmet.dto.result.GridStaffResultDTO; import com.epmet.entity.CustomerStaffGridEntity; import java.util.List; @@ -117,4 +118,12 @@ public interface CustomerStaffGridService extends BaseService> getAllGridStaffs(CommonGridIdFormDTO gridIdFormDTO); + + /** + * @Description 查询网格下的人 + * @Param gridIds + * @author zxc + * @date 2021/6/8 3:36 下午 + */ + List selectGridStaffByGridIds(List gridIds); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java index 2eb0873cc8..ac8abc82fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -30,13 +31,16 @@ import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.LatestGridFormDTO; import com.epmet.dto.result.CustomerGridByUserIdResultDTO; +import com.epmet.dto.result.GridStaffResultDTO; import com.epmet.entity.CustomerStaffGridEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.redis.CustomerStaffGridRedis; import com.epmet.service.CustomerStaffGridService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Arrays; @@ -56,6 +60,9 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl page(Map params) { @@ -146,4 +153,32 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl selectGridStaffByGridIds(List gridIds) { + if (CollectionUtils.isEmpty(gridIds)){ + return new ArrayList<>(); + } + // 查询网格下所有的人 + List gridStaff = baseDao.selectGridStaffByGridIds(gridIds); + if (CollectionUtils.isEmpty(gridStaff)){ + return new ArrayList<>(); + } + // 拿着网格下所有人去筛选网格员 + Result> result = epmetUserOpenFeignClient.staffGridRole(gridStaff); + if (!result.success()){ + throw new RenException("查询网格下的网格员失败【"+result.getMsg()+"】"); + } + List data = result.getData(); + if (CollectionUtils.isEmpty(data)){ + return new ArrayList<>(); + } + return data; + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml index 7f1a8d3220..5e08a59b97 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml @@ -88,6 +88,20 @@ AND customer_id = #{customerId} + + + insert into customer_staff_grid diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/PatrolTrackFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolTrackFormDTO.java similarity index 94% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/PatrolTrackFormDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolTrackFormDTO.java index 831a4ee8fd..6c0dfb8478 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/PatrolTrackFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolTrackFormDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.form; +package com.epmet.dto.form; import lombok.Data; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/RecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java similarity index 95% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/RecordListFormDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java index c540ddc579..cfaf7a62c4 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/RecordListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.form; +package com.epmet.dto.form; import lombok.Data; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java new file mode 100644 index 0000000000..8a8e51887b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/6/7 2:57 下午 + * @DESC + */ +@Data +public class GridManagerUserListResultDTO implements Serializable { + + private static final long serialVersionUID = 3606766812822179356L; + + /** + * 工作人员id + */ + private String staffId; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 网格ID + */ + private String gridId; + + /** + * 正在巡查：patrolling；否则返回空字符串 + */ + private String status; + + /** + * 网格名称，最多显示上两级 + */ + private String gridName; + + /** + * 姓名 + */ + private String staffName; + + /** + * 中心点位 + */ + @JsonIgnore + private String centerMark; + + /** + * 经纬度赋值状态 + */ + @JsonIgnore + private Boolean llStatus; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUserResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUserResultDTO.java new file mode 100644 index 0000000000..da70a707fe --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUserResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/6/8 4:30 下午 + * @DESC + */ +@Data +public class GridStaffUserResultDTO implements Serializable { + + private static final long serialVersionUID = 7715622585539953368L; + + private String gridId; + + private String staffId; +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/PatrolTrackResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolTrackResultDTO.java similarity index 92% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/PatrolTrackResultDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolTrackResultDTO.java index 070b5a7d9a..d20d951367 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/PatrolTrackResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolTrackResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.result; +package com.epmet.dto.result; import lombok.Data; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/RecordListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RecordListResultDTO.java similarity index 95% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/RecordListResultDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RecordListResultDTO.java index aab9d52ef0..078586c69d 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/RecordListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RecordListResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.user.result; +package com.epmet.dto.result; import lombok.Data; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameAndLLResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameAndLLResultDTO.java new file mode 100644 index 0000000000..ac255b7c56 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameAndLLResultDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/6/9 11:12 上午 + * @DESC + */ +@Data +public class UserNameAndLLResultDTO implements Serializable { + + private static final long serialVersionUID = 8997436689118596889L; + + /** + * 用户名字 + */ + private List userNames; + + /** + * 经纬度 + */ + private List ll; + + public UserNameAndLLResultDTO() { + this.userNames = new ArrayList<>(); + this.ll = new ArrayList<>(); + } +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameResultDTO.java new file mode 100644 index 0000000000..286fc17ea7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/6/9 11:12 上午 + * @DESC + */ +@Data +public class UserNameResultDTO implements Serializable { + + private static final long serialVersionUID = 5383959788021394553L; + + private String userId; + private String userName; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index f85ba6d782..95c98adfa6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -530,4 +530,40 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/badge/userbadges") Result> userBadges(@RequestBody UserBadgesFormDTO formDTO); + + /** + * @Description 查询网格员角色 + * @Param forms + * @author zxc + * @date 2021/6/8 4:42 下午 + */ + @PostMapping("/epmetuser/staffrole/staffgridrole") + Result> staffGridRole(@RequestBody List forms); + + /** + * @Description 查询经纬度 + * @Param userIds + * @author zxc + * @date 2021/6/9 10:40 上午 + */ + @PostMapping("/epmetuser/staffpatrol/getll") + Result selectll(@RequestBody List userIds); + + /** + * @Description 002、查看巡查记录 + * @Param formDTO + * @author zxc + * @date 2021/6/7 3:25 下午 + */ + @PostMapping("/epmetuser/staffpatrol/recordlist") + Result> recordList(@RequestBody RecordListFormDTO formDTO); + + /** + * @Description 003、巡查轨迹 + * @Param formDTO + * @author zxc + * @date 2021/6/7 3:35 下午 + */ + @PostMapping("/epmetuser/staffpatrol/patroltrack") + Result> patrolTrack(@RequestBody PatrolTrackFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 518cca9cef..2263284f8e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -373,4 +373,25 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> userBadges(UserBadgesFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "userBadges", formDTO); } + + @Override + public Result> staffGridRole(List forms) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "staffGridRole", forms); + } + + @Override + public Result selectll(List userIds) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectll", userIds); + } + + @Override + public Result> recordList(RecordListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "recordList", formDTO); + } + + @Override + public Result> patrolTrack(PatrolTrackFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolTrack", formDTO); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java new file mode 100644 index 0000000000..f0a0558c34 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java @@ -0,0 +1,68 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.PatrolTrackFormDTO; +import com.epmet.dto.form.RecordListFormDTO; +import com.epmet.dto.result.GridManagerUserListResultDTO; +import com.epmet.dto.result.PatrolTrackResultDTO; +import com.epmet.dto.result.RecordListResultDTO; +import com.epmet.dto.result.UserNameAndLLResultDTO; +import com.epmet.service.StaffPatrolRecordService; +import com.epmet.user.result.GridManagerListResultDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/6/9 10:32 上午 + * @DESC + */ +@RestController +@RequestMapping("staffpatrol") +public class StaffPatrolController { + + @Autowired + private StaffPatrolRecordService staffPatrolRecordService; + + /** + * @Description 查询经纬度 + * @Param userIds + * @author zxc + * @date 2021/6/9 10:40 上午 + */ + @PostMapping("getll") + public Result selectll(@RequestBody List userIds){ + return new Result().ok(staffPatrolRecordService.selectLL(userIds)); + } + + /** + * @Description 002、查看巡查记录 + * @Param formDTO + * @author zxc + * @date 2021/6/7 3:25 下午 + */ + @PostMapping("recordlist") + public Result> recordList(@RequestBody RecordListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, RecordListFormDTO.RecordListForm.class); + return new Result>().ok(staffPatrolRecordService.recordList(formDTO)); + } + + /** + * @Description 003、巡查轨迹 + * @Param formDTO + * @author zxc + * @date 2021/6/7 3:35 下午 + */ + @PostMapping("patroltrack") + public Result> patrolTrack(@RequestBody PatrolTrackFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PatrolTrackFormDTO.PatrolTrackForm.class); + return new Result>().ok(staffPatrolRecordService.patrolTrack(formDTO)); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java index 60b4d5400e..00d3cd154e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java @@ -10,11 +10,8 @@ import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.CustomerRoleFormDTO; import com.epmet.dto.form.RolesUsersListFormDTO; import com.epmet.dto.form.StaffRoleFormDTO; -import com.epmet.dto.result.CustomerStaffRoleResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.form.*; -import com.epmet.dto.result.CustomerStaffRoleListResultDTO; -import com.epmet.dto.result.GovStaffRoleResultDTO; -import com.epmet.dto.result.StaffRolesResultDTO; import com.epmet.entity.GovStaffRoleEntity; import com.epmet.service.GovStaffRoleService; import com.epmet.service.StaffRoleService; @@ -181,4 +178,15 @@ public class StaffRoleController { staffRoleService.changeRoleOrg(formDTO); return new Result(); } + + /** + * @Description 查询网格员角色 + * @Param forms + * @author zxc + * @date 2021/6/8 4:42 下午 + */ + @PostMapping("staffgridrole") + public Result> staffGridRole(@RequestBody List forms){ + return new Result>().ok(staffRoleService.staffGridRole(forms)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java index acffa2840e..6a580a6372 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java @@ -197,4 +197,12 @@ public interface CustomerStaffDao extends BaseDao { * @return */ BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO); + + /** + * @Description 查询用户名字 + * @Param userIds + * @author zxc + * @date 2021/6/9 1:36 下午 + */ + List selectUserName(@Param("userIds")List userIds); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolDetailDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolDetailDao.java index 844e0d0036..2d7ed83136 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolDetailDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolDetailDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.PatrolTrackResultDTO; import com.epmet.entity.StaffPatrolDetailEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 工作人员巡查记录明细 @@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface StaffPatrolDetailDao extends BaseDao { - + + /** + * @Description 查询巡查轨迹 + * @Param staffPatrolRecId + * @author zxc + * @date 2021/6/7 5:13 下午 + */ + List selectPatrolTrack(@Param("staffPatrolRecId") String staffPatrolRecId); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java index 61f5769af4..a476cfd3a5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java @@ -18,8 +18,14 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.RecordListFormDTO; +import com.epmet.dto.result.GridManagerUserListResultDTO; +import com.epmet.dto.result.RecordListResultDTO; import com.epmet.entity.StaffPatrolRecordEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 工作人员巡查主记录 @@ -29,5 +35,21 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface StaffPatrolRecordDao extends BaseDao { - + + /** + * @Description 查询经纬度 + * @Param userIds + * @author zxc + * @date 2021/6/9 10:24 上午 + */ + List selectLL(@Param("userIds")List userIds); + + /** + * @Description 巡查记录查询 + * @Param formDTO + * @author zxc + * @date 2021/6/7 5:29 下午 + */ + List recordList(RecordListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java index 3124fc68c7..6d10c5fe23 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java @@ -24,10 +24,7 @@ import com.epmet.dto.StaffRoleDTO; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.CustomerStaffRoleListFormDTO; import com.epmet.dto.form.GetRoleKeyListFormDTO; -import com.epmet.dto.result.CustomerStaffRoleListResultDTO; -import com.epmet.dto.result.CustomerStaffRoleResultDTO; -import com.epmet.dto.result.GovStaffRoleResultDTO; -import com.epmet.dto.result.StaffRolesResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.StaffRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -131,4 +128,12 @@ public interface StaffRoleDao extends BaseDao { * @Description 工作端-查询用户角色key列表 **/ List selectStaffRoleKeyList(GetRoleKeyListFormDTO formDTO); + + /** + * @Description 查询是网格员的人 + * @Param forms + * @author zxc + * @date 2021/6/8 4:53 下午 + */ + List staffGridRole(@Param("forms") List forms); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java index ae347f87e7..9883d87bc9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java @@ -18,8 +18,15 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.PatrolTrackFormDTO; +import com.epmet.dto.form.RecordListFormDTO; +import com.epmet.dto.result.PatrolTrackResultDTO; +import com.epmet.dto.result.RecordListResultDTO; +import com.epmet.dto.result.UserNameAndLLResultDTO; import com.epmet.entity.StaffPatrolRecordEntity; +import java.util.List; + /** * 工作人员巡查主记录 @@ -29,5 +36,28 @@ import com.epmet.entity.StaffPatrolRecordEntity; */ public interface StaffPatrolRecordService extends BaseService { + /** + * @Description 查询经纬度 + * @Param userIds + * @author zxc + * @date 2021/6/9 10:40 上午 + */ + UserNameAndLLResultDTO selectLL(List userIds); + + /** + * @Description 002、查看巡查记录 + * @Param formDTO + * @author zxc + * @date 2021/6/7 3:25 下午 + */ + List recordList(RecordListFormDTO formDTO); + + /** + * @Description 003、巡查轨迹 + * @Param formDTO + * @author zxc + * @date 2021/6/7 3:35 下午 + */ + List patrolTrack(PatrolTrackFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java index 5e260dd3c3..31a9883a4f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java @@ -25,10 +25,7 @@ import com.epmet.dto.StaffRoleDTO; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.CustomerStaffRoleListFormDTO; import com.epmet.dto.form.RolesUsersListFormDTO; -import com.epmet.dto.result.CustomerStaffRoleResultDTO; -import com.epmet.dto.result.CustomerStaffRoleListResultDTO; -import com.epmet.dto.result.GovStaffRoleResultDTO; -import com.epmet.dto.result.StaffRolesResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.StaffRoleEntity; import java.util.List; @@ -159,4 +156,12 @@ public interface StaffRoleService extends BaseService { * @return void */ void changeRoleOrg(StaffRoleDTO formDTO); + + /** + * @Description 查询网格员角色 + * @Param forms + * @author zxc + * @date 2021/6/8 4:42 下午 + */ + List staffGridRole(List forms); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java index aa6f7c5571..f0d9103e51 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java @@ -1,27 +1,21 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.dao.CustomerStaffDao; +import com.epmet.dao.StaffPatrolDetailDao; import com.epmet.dao.StaffPatrolRecordDao; +import com.epmet.dao.UserBaseInfoDao; +import com.epmet.dto.form.PatrolTrackFormDTO; +import com.epmet.dto.form.RecordListFormDTO; +import com.epmet.dto.result.*; import com.epmet.entity.StaffPatrolRecordEntity; import com.epmet.service.StaffPatrolRecordService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; /** * 工作人员巡查主记录 @@ -32,5 +26,67 @@ import org.springframework.stereotype.Service; @Service public class StaffPatrolRecordServiceImpl extends BaseServiceImpl implements StaffPatrolRecordService { + @Autowired + private CustomerStaffDao customerStaffDao; + + @Autowired + private StaffPatrolRecordDao staffPatrolRecordDao; + + @Autowired + private StaffPatrolDetailDao staffPatrolDetailDao; + + /** + * @Description 查询经纬度 + * @Param userIds + * @author zxc + * @date 2021/6/9 10:40 上午 + */ + @Override + public UserNameAndLLResultDTO selectLL(List userIds) { + UserNameAndLLResultDTO result = new UserNameAndLLResultDTO(); + if (CollectionUtils.isEmpty(userIds)){ + return result; + } + // 经纬度查询 + List llResult = baseDao.selectLL(userIds); + if (!CollectionUtils.isEmpty(llResult)){ + result.setLl(llResult); + } + // 姓名查询 + List nameResult = customerStaffDao.selectUserName(userIds); + if (!CollectionUtils.isEmpty(nameResult)){ + result.setUserNames(nameResult); + } + return result; + } + + /** + * @Description 002、查看巡查记录 + * @Param formDTO + * @author zxc + * @date 2021/6/7 3:25 下午 + */ + @Override + public List recordList(RecordListFormDTO formDTO) { + List result = staffPatrolRecordDao.recordList(formDTO); + if (!CollectionUtils.isEmpty(result)){ + return result; + } + return new ArrayList<>(); + } + /** + * @Description 003、巡查轨迹 + * @Param formDTO + * @author zxc + * @date 2021/6/7 3:35 下午 + */ + @Override + public List patrolTrack(PatrolTrackFormDTO formDTO) { + List results = staffPatrolDetailDao.selectPatrolTrack(formDTO.getStaffPatrolRecId()); + if (!CollectionUtils.isEmpty(results)){ + return results; + } + return new ArrayList<>(); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java index bb85550f3c..0e65e701b2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java @@ -32,10 +32,7 @@ import com.epmet.dto.StaffRoleDTO; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.CustomerStaffRoleListFormDTO; import com.epmet.dto.form.RolesUsersListFormDTO; -import com.epmet.dto.result.CustomerStaffRoleResultDTO; -import com.epmet.dto.result.CustomerStaffRoleListResultDTO; -import com.epmet.dto.result.GovStaffRoleResultDTO; -import com.epmet.dto.result.StaffRolesResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.StaffRoleEntity; import com.epmet.redis.StaffRoleRedis; import com.epmet.service.StaffRoleService; @@ -43,6 +40,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Arrays; @@ -188,4 +186,22 @@ public class StaffRoleServiceImpl extends BaseServiceImpl staffGridRole(List forms) { + if (CollectionUtils.isEmpty(forms)){ + return new ArrayList<>(); + } + List result = baseDao.staffGridRole(forms); + if (CollectionUtils.isEmpty(result)){ + return new ArrayList<>(); + } + return result; + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index eab3a42191..e6db9c61a6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -357,4 +357,21 @@ AND user_id = #{staffId} LIMIT 1 + + + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolDetailDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolDetailDao.xml index 235ad55597..0168ef7042 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolDetailDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolDetailDao.xml @@ -3,27 +3,17 @@ - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml index c57b356e99..2e760a499e 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml @@ -3,25 +3,40 @@ - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml index 0b39b350b7..fe378570ec 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml @@ -193,4 +193,18 @@ AND gsr.del_flag = '0' AND sr.staff_id = #{userId} + + +