From 867b08871855a9a04e13b6af2743a535758bc540 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 14:14:38 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98Id=20=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A0=91=20areaCode=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/enums/KongCunCustomerEnvEnum.java | 70 ----------- .../commons/tools/enums/OrgLevelEnum.java | 33 ++++++ .../commons/tools/utils/TreeAreaCodeNode.java | 38 ++++++ .../epmet/commons/tools/utils/TreeUtils.java | 28 +++++ .../epmet/dto/form/govOrg/OrgTreeFormDTO.java | 22 ++++ .../controller/screen/AgencyController.java | 15 +++ .../screen/ScreenCustomerAgencyDao.java | 37 +++--- .../evaluationindex/screen/AgencyService.java | 12 ++ .../screen/impl/AgencyServiceImpl.java | 109 ++++++++++++++---- .../mapper/screen/ScreenCustomerAgencyDao.xml | 15 +++ .../impl/IndexCalculateStreetServiceImpl.java | 1 - .../main/java/com/epmet/dto/OrgTreeNode.java | 11 +- 12 files changed, 284 insertions(+), 107 deletions(-) delete mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeAreaCodeNode.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/govOrg/OrgTreeFormDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java deleted file mode 100644 index d56cd7615a..0000000000 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.epmet.commons.tools.enums; - -import com.epmet.commons.tools.utils.SpringContextUtils; -import org.springframework.core.env.Environment; - -/** - * 系统环境变量枚举类 - * dev|test|prod - * - * @author jianjun liu - * @date 2020-07-03 11:14 - **/ -public enum KongCunCustomerEnvEnum { - /** - * 环境变量枚举 - */ - DEV("dev", "开发环境", "613cc61a6b8ce4c70d21bd413dac72cc"), - TEST("test", "体验环境", "b272625617e53620b2b3cbc65d1ecbbb"), - PROD("prod", "生产环境", "6f203e30de1a65aab7e69c058826cd80"), - UN_KNOWN("prod", "生产环境", "6f203e30de1a65aab7e69c058826cd80") - ; - - private String code; - private String name; - private String customerId; - - - - KongCunCustomerEnvEnum(String code, String name, String customerId) { - this.code = code; - this.name = name; - this.customerId = customerId; - } - - public static KongCunCustomerEnvEnum getEnum(String code) { - KongCunCustomerEnvEnum[] values = KongCunCustomerEnvEnum.values(); - for (KongCunCustomerEnvEnum value : values) { - if (value.getCode().equals(code)) { - return value; - } - } - return KongCunCustomerEnvEnum.UN_KNOWN; - } - - public static KongCunCustomerEnvEnum getCurrentEnv(){ - try { - Environment environment = SpringContextUtils.getBean(Environment.class); - String[] activeProfiles = environment.getActiveProfiles(); - if (activeProfiles.length > 0) { - return getEnum(activeProfiles[0]); - } - } catch (Exception e) { - e.printStackTrace(); - } - return KongCunCustomerEnvEnum.UN_KNOWN; - } - - - public String getCode() { - return code; - } - - public String getName() { - return name; - } - - public String getCustomerId(){ - return customerId; - } -} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java index 3462ad772b..97087745d0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java @@ -1,7 +1,9 @@ package com.epmet.commons.tools.enums; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import org.apache.commons.lang3.StringUtils; /** * 组织级别枚举类 @@ -42,6 +44,37 @@ public enum OrgLevelEnum { throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode()); } + /** + * desc: 获取下一等级的组织级别 + * + * @param parentAgencyLevel + * @return java.lang.String + * @author LiuJanJun + * @date 2021/8/5 1:57 下午 + * todo 加上数字 根据数据返回 + */ + public static String getSubOrgLevel(String parentAgencyLevel) { + String level = StrConstant.EPMETY_STR; + if (StringUtils.isBlank(parentAgencyLevel)) { + return level; + } + OrgLevelEnum anEnum = OrgLevelEnum.getEnum(parentAgencyLevel); + switch (anEnum){ + case PROVINCE: + return OrgLevelEnum.CITY.getCode(); + case CITY: + return OrgLevelEnum.DISTRICT.getCode(); + case DISTRICT: + return OrgLevelEnum.STREET.getCode(); + case STREET: + return OrgLevelEnum.COMMUNITY.getCode(); + case COMMUNITY: + return OrgLevelEnum.GRID.getCode(); + default: + return level; + } + } + diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeAreaCodeNode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeAreaCodeNode.java new file mode 100644 index 0000000000..2f70659219 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeAreaCodeNode.java @@ -0,0 +1,38 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.commons.tools.utils; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * 树节点，所有需要实现树节点的，都需要继承该类 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +public class TreeAreaCodeNode extends TreeStringNode implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + private String areaCode; + /** + * 上级ID + */ + private String parentAreaCode; + /** + * 子节点列表 + */ + private List children = new ArrayList<>(); +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java index 4272d9cfc6..c321fea717 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java @@ -131,4 +131,32 @@ public class TreeUtils { return result; } + /** + * 构建树节点 + */ + public static List buildTreeByAreaCode(List treeNodes) { + List result = new ArrayList<>(); + + //list转map + Map nodeMap = new LinkedHashMap<>(treeNodes.size()); + for(T treeNode : treeNodes){ + nodeMap.put(treeNode.getAreaCode(), treeNode); + } + + for(T node : nodeMap.values()) { + T parent = nodeMap.get(node.getParentAreaCode()); + if(parent != null && !(node.getAreaCode().equals(parent.getAreaCode()))){ + if (parent.getChildren() == null){ + parent.setChildren(new ArrayList()); + } + parent.getChildren().add(node); + continue; + } + + result.add(node); + } + + return result; + } + } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/govOrg/OrgTreeFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/govOrg/OrgTreeFormDTO.java new file mode 100644 index 0000000000..0eae55ef84 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/govOrg/OrgTreeFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form.govOrg; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 各机关注册用户数入参DTO + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/22 12:47 + */ +@Data +public class OrgTreeFormDTO implements Serializable { + + + private static final long serialVersionUID = 6649155066499141632L; + + private String mobile; + + private String customerId; +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java index 6c71a15009..5adfa369d4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java @@ -5,9 +5,11 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.AgencyService; +import com.epmet.dto.OrgTreeNode; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; +import com.epmet.dto.form.govOrg.OrgTreeFormDTO; import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO; @@ -129,4 +131,17 @@ public class AgencyController { ValidatorUtils.validateEntity(formDTO, AgencyDetailMulticFormDTO.AddUserInternalGroup.class); return new Result().ok(agencyService.queryAgencyDetailMultiC(formDTO)); } + + /** + * desc: 获取组织树 含所有直线上级 但不含部门和网格 目前 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author LiuJanJun + * @date 2021/8/3 5:17 下午 + */ + @PostMapping("getStaffAgencyTree") + public Result getStaffAgencyTree(@RequestBody OrgTreeFormDTO formDTO) { + return new Result().ok(agencyService.getStaffAgencyTree(formDTO)); + } } 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 04c509de8b..051a6ec3e6 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 @@ -114,7 +114,7 @@ public interface ScreenCustomerAgencyDao { CompartmentResultDTO getAgencyInfoByAegncyId(@Param("agencyId") String agencyId); /** - * @Description 查询组织的下级组织ID + * @Description 查询组织的下级组织ID * @Param agencyId * @author zxc * @date 2020/10/28 10:33 上午 @@ -134,7 +134,7 @@ public interface ScreenCustomerAgencyDao { * @description 根据areaCode查询组织机构 * @Date 2021/2/4 21:51 **/ - List queryStaffAgencyTree(@Param("areaCode")String areaCode); + List queryStaffAgencyTree(@Param("areaCode") String areaCode); /** * @param areaCode @@ -143,7 +143,7 @@ public interface ScreenCustomerAgencyDao { * @description 查找组织下的部门 * @Date 2021/2/4 21:51 **/ - List selectDeptList(@Param("areaCode") String areaCode,@Param("agencyId") String agencyId); + List selectDeptList(@Param("areaCode") String areaCode, @Param("agencyId") String agencyId); /** * @param areaCode @@ -152,27 +152,27 @@ public interface ScreenCustomerAgencyDao { * @description 查找组织下的网格 * @Date 2021/2/4 21:52 **/ - List selectGridList(@Param("areaCode") String areaCode,@Param("agencyId") String agencyId); + List selectGridList(@Param("areaCode") String areaCode, @Param("agencyId") String agencyId); /** - * @return java.util.List * @param areaCode * @param agencyId + * @return java.util.List * @author yinzuomei * @description 下一级组织+直属网格 * @Date 2021/5/10 14:02 **/ - List getNextAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId); + List getNextAgencyIds(@Param("areaCode") String areaCode, @Param("agencyId") String agencyId); - List selectSubAgencyIds(@Param("areaCode")String areaCode, @Param("agencyId")String agencyId); + List selectSubAgencyIds(@Param("areaCode") String areaCode, @Param("agencyId") String agencyId); /** - * @Description 根据agencyId查询网格 + * @Description 根据agencyId查询网格 * @Param agencyId * @author zxc * @date 2021/6/8 1:27 下午 */ - List selectGrid(@Param("agencyId")String agencyId,@Param("areaCode")String areaCode); + List selectGrid(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode); /** * 查询当前组织的下一级组织，可根据areaCode查询，也可根据pid查询 @@ -190,13 +190,13 @@ public interface ScreenCustomerAgencyDao { * @param parentAgencyId * @return java.util.List */ - List selectGridDTOList(@Param("areaCode") String areaCode, @Param("parentAgencyId") String parentAgencyId,@Param("allCustomerIds") List allCustomerIds); + List selectGridDTOList(@Param("areaCode") String areaCode, @Param("parentAgencyId") String parentAgencyId, @Param("allCustomerIds") List allCustomerIds); - List selectPAgencyById(@Param("listStr")List pidList); + List selectPAgencyById(@Param("listStr") List pidList); /** - * @return com.epmet.dto.result.ScreenCustomerAgencyDTO * @param customerId + * @return com.epmet.dto.result.ScreenCustomerAgencyDTO * @author yinzuomei * @description 根据客户id，返回当前客户下的跟组织信息 * @Date 2021/6/24 17:43 @@ -204,4 +204,15 @@ public interface ScreenCustomerAgencyDao { ScreenCustomerAgencyDTO selectCustomerRootAgency(String customerId); ScreenCustomerAgencyDTO selectByAreaCode(String areaCode); -} \ No newline at end of file + + /** + * desc: 根据pids 或者 areaCode 获取所有下级组织 + * + * @param pids + * @param areaCode + * @return java.util.List + * @author LiuJanJun + * @date 2021/8/5 11:01 上午 + */ + List selectAllSubAgencyList(@Param("pids") String pids, @Param("areaCode") String areaCode); +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java index aa142bed95..c95977c5bd 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java @@ -1,10 +1,12 @@ package com.epmet.datareport.service.evaluationindex.screen; import com.epmet.dto.AgencyInfoDTO; +import com.epmet.dto.OrgTreeNode; import com.epmet.dto.ScreenCustomerGridDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; +import com.epmet.dto.form.govOrg.OrgTreeFormDTO; import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.ScreenCustomerAgencyDTO; @@ -104,4 +106,14 @@ public interface AgencyService { * @return com.epmet.dto.result.AgencyDetailMulticResultDTO */ AgencyDetailMulticResultDTO queryAgencyDetailMultiC(AgencyDetailMulticFormDTO formDTO); + + /** + * desc: 获取工作人员组织树 含所有直线上级组织 不含网格及部门 + * + * @param mobile + * @return com.epmet.dto.result.plugins.AgencyNodeDTO + * @author LiuJanJun + * @date 2021/8/3 5:03 下午 + */ + OrgTreeNode getStaffAgencyTree(OrgTreeFormDTO mobile); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index c6dc8deba2..42e97e5b29 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -2,23 +2,26 @@ package com.epmet.datareport.service.evaluationindex.screen.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.enums.OrgLevelEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.AgencyTreeUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.TreeUtils; import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao; import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerGridDao; import com.epmet.datareport.redis.DataReportRedis; import com.epmet.datareport.service.evaluationindex.screen.AgencyService; -import com.epmet.dto.AgencyInfoDTO; -import com.epmet.dto.ScreenCustomerGridDTO; +import com.epmet.dto.*; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; +import com.epmet.dto.form.CustomerStaffFormDTO; +import com.epmet.dto.form.govOrg.OrgTreeFormDTO; import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.ParentListResultDTO; @@ -33,6 +36,7 @@ import com.epmet.evaluationindex.screen.dto.result.AgencyDistributionResultDTO; import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO; import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.OperCrmOpenFeignClient; import lombok.extern.slf4j.Slf4j; @@ -70,6 +74,8 @@ public class AgencyServiceImpl implements AgencyService { private OperCrmOpenFeignClient operCrmOpenFeignClient; @Autowired private DataReportRedis dataReportRedis; + @Autowired + private EpmetUserOpenFeignClient userOpenFeignClient; /** * @Description 1、组织机构树 @@ -438,7 +444,7 @@ public class AgencyServiceImpl implements AgencyService { log.info("多客户版本parentList、level要重新赋值;agencysResultDTO.getParentAreaCode()="+agencysResultDTO.getParentAreaCode()); ScreenCustomerAgencyDTO parentAgency=screenCustomerAgencyDao.selectByAreaCode(agencysResultDTO.getParentAreaCode()); if (null != parentAgency) { - agencysResultDTO.setLevel(getAgencyLevelMultiC(parentAgency)); + agencysResultDTO.setLevel(OrgLevelEnum.getSubOrgLevel(parentAgency.getLevel())); List temp = getParentListMultic(parentList, parentAgency, formDTO.getCustomerId(), agencysResultDTO.getRootAgencyId()); agencysResultDTO.setParentList(temp); } @@ -468,6 +474,85 @@ public class AgencyServiceImpl implements AgencyService { return agencysResultDTO; } + @Override + public OrgTreeNode getStaffAgencyTree(OrgTreeFormDTO formDTO) { + //todo 获取客户的所有组织 然后遍历剔除 再构建出一颗树 咋样 + //获取工作人员信息 + CustomerStaffFormDTO staffParam = new CustomerStaffFormDTO(); + staffParam.setMobile(formDTO.getMobile()); + staffParam.setCustomerId(formDTO.getCustomerId()); + Result staffInfoResult = userOpenFeignClient.getCustomerStaffInfo(staffParam); + if (!staffInfoResult.success()){ + throw new RenException(staffInfoResult.getCode(),staffInfoResult.getInternalMsg()); + } + //获取工作人员组织信息 + Result agencyByStaff = govOrgOpenFeignClient.getAgencyByStaff(staffInfoResult.getData().getUserId()); + if (!agencyByStaff.success() || agencyByStaff.getData()== null || StringUtils.isBlank(agencyByStaff.getData().getId()) ){ + throw new RenException(staffInfoResult.getCode(),staffInfoResult.getMsg()); + } + CustomerAgencyDTO staffAgencyDTO = agencyByStaff.getData(); + + + //4、如果当前客户不存在子客户则areaCode置为空 + Result> crmRes=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId()); + if (!crmRes.success()){ + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } + List nodes = new ArrayList<>(); + //单客户 + if (CollectionUtils.isEmpty(crmRes.getData())){ + //todo 暂不处理 有时间再说 + }else { + ScreenCustomerAgencyDTO parentAgencyDTO = null; + String subAgencyAreaCode = staffAgencyDTO.getParentAreaCode(); + List nodeList = new ArrayList<>(); + + /*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); + currentAgency.setCustomerId(staffAgencyDTO.getCustomerId()); + currentAgency.setAgencyId(staffAgencyDTO.getId()); + currentAgency.setAgencyName(staffAgencyDTO.getOrganizationName()); + currentAgency.setLevel(staffAgencyDTO.getLevel()); + currentAgency.setAreaCode(staffAgencyDTO.getAreaCode()); + currentAgency.setParentAreaCode(staffAgencyDTO.getParentAreaCode()); + currentAgency.setPid(staffAgencyDTO.getPid()); + currentAgency.setPids(staffAgencyDTO.getPids()); + + convertOrgTreeNode(nodeList, currentAgency);*/ + //多客户 获取所有直线上级 + do { + parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(subAgencyAreaCode); + if (parentAgencyDTO == null){ + break; + } + convertOrgTreeNode(nodeList, parentAgencyDTO); + if (parentAgencyDTO.getPid() == null || NumConstant.ZERO_STR.equals(parentAgencyDTO.getPid())){ + break; + } + subAgencyAreaCode = parentAgencyDTO.getAreaCode(); + } while (true); + //多客户 获取所有下级 + List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode()); + //孔村降级处理 + String KONG_CUN_AGENCY_ID = "1234085031077498881"; + agencyNodeDTOS.forEach(e->{ + if (e.getPids().contains(KONG_CUN_AGENCY_ID)){ + e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel())); + } + convertOrgTreeNode(nodeList, e); + }); + nodes = TreeUtils.buildTreeByAreaCode(nodeList); + } + //只有一个根节点的树 所以返回一个 + return nodes.get(0); + } + + private void convertOrgTreeNode(List nodeList, ScreenCustomerAgencyDTO currentAgency) { + OrgTreeNode orgTreeNode = ConvertUtils.sourceToTarget(currentAgency, OrgTreeNode.class); + orgTreeNode.setOrgId(currentAgency.getAgencyId()); + orgTreeNode.setOrgName(currentAgency.getAgencyName()); + nodeList.add(orgTreeNode); + } + private List getParentListMultic(List resList, ScreenCustomerAgencyDTO firstParent, String currentUserCustomerId, String rootAgencyId) { ParentListResultDTO resultDTO = new ParentListResultDTO(); resultDTO.setId(firstParent.getAgencyId()); @@ -491,20 +576,4 @@ public class AgencyServiceImpl implements AgencyService { } } } - - private String getAgencyLevelMultiC(ScreenCustomerAgencyDTO parentAgency) { - String level=StrConstant.EPMETY_STR; - if(null!=parentAgency){ - if(Constant.PROVINCE.equals(parentAgency.getLevel())){ - return Constant.CITY; - }else if(Constant.CITY.equals(parentAgency.getLevel())){ - return Constant.DISTRICT; - }else if(Constant.DISTRICT.equals(parentAgency.getLevel())){ - return Constant.STREET; - }else if(Constant.STREET.equals(parentAgency.getLevel())){ - return Constant.COMMUNITY; - } - } - return level; - } } 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 0d940865f0..221f2d2d91 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 @@ -433,4 +433,19 @@ AND sca.AREA_CODE = #{areaCode} limit 1 + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java index b5d77983b0..7401c62038 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; -import com.epmet.commons.tools.enums.KongCunCustomerEnvEnum; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java index 064d2173ea..7cea43566d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java @@ -1,13 +1,18 @@ package com.epmet.dto; +import com.epmet.commons.tools.utils.TreeAreaCodeNode; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data -public class OrgTreeNode { +public class OrgTreeNode extends TreeAreaCodeNode { + private String id; + private String pid; private String orgId; private String orgName; - private String orgType; - private List subOrgs; + private String level; + + private List children=new ArrayList<>(); } From e5658bf9b12f847871d67c6611f9cf01d21e9a89 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 14:19:59 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=8C=85=E4=BD=8D=E7=BD=AE=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/govOrg}/OrgTreeNode.java | 2 +- .../datareport/controller/screen/AgencyController.java | 2 +- .../service/evaluationindex/screen/AgencyService.java | 2 +- .../evaluationindex/screen/impl/AgencyServiceImpl.java | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) rename epmet-module/{gov-org/gov-org-client/src/main/java/com/epmet/dto => data-report/data-report-client/src/main/java/com/epmet/dto/result/govOrg}/OrgTreeNode.java (91%) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/govOrg/OrgTreeNode.java similarity index 91% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/govOrg/OrgTreeNode.java index 7cea43566d..4989cc8bd1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/govOrg/OrgTreeNode.java @@ -1,4 +1,4 @@ -package com.epmet.dto; +package com.epmet.dto.result.govOrg; import com.epmet.commons.tools.utils.TreeAreaCodeNode; import lombok.Data; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java index 5adfa369d4..f393b43c59 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java @@ -5,7 +5,6 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.AgencyService; -import com.epmet.dto.OrgTreeNode; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; @@ -13,6 +12,7 @@ import com.epmet.dto.form.govOrg.OrgTreeFormDTO; import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO; +import com.epmet.dto.result.govOrg.OrgTreeNode; import com.epmet.dto.result.plugins.AgencyNodeDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java index c95977c5bd..284241e296 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java @@ -1,7 +1,6 @@ package com.epmet.datareport.service.evaluationindex.screen; import com.epmet.dto.AgencyInfoDTO; -import com.epmet.dto.OrgTreeNode; import com.epmet.dto.ScreenCustomerGridDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; @@ -11,6 +10,7 @@ import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.ScreenCustomerAgencyDTO; import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO; +import com.epmet.dto.result.govOrg.OrgTreeNode; import com.epmet.dto.result.plugins.AgencyNodeDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 42e97e5b29..6f191c2fc5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -16,7 +16,10 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao; import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerGridDao; import com.epmet.datareport.redis.DataReportRedis; import com.epmet.datareport.service.evaluationindex.screen.AgencyService; -import com.epmet.dto.*; +import com.epmet.dto.AgencyInfoDTO; +import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.CustomerStaffDTO; +import com.epmet.dto.ScreenCustomerGridDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; @@ -27,6 +30,7 @@ import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.ParentListResultDTO; import com.epmet.dto.result.ScreenCustomerAgencyDTO; import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO; +import com.epmet.dto.result.govOrg.OrgTreeNode; import com.epmet.dto.result.plugins.AgencyNodeDTO; import com.epmet.evaluationindex.screen.constant.ScreenConstant; import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO; From 6660fd483800c1560fde1b8b6791476a458e27b3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 14:51:34 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=AD=94=E6=9D=91=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=8E=89=E5=85=9A=E6=80=BB=E6=94=AF=20=E5=B9=B6=E7=BB=99?= =?UTF-8?q?=E5=AD=94=E6=9D=91=E9=95=87=20=E9=99=8D=E7=BA=A7=E4=B8=BA?= =?UTF-8?q?=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/impl/AgencyServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 6f191c2fc5..170ca1c811 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -50,10 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.*; /** * 组织相关api @@ -536,14 +533,21 @@ public class AgencyServiceImpl implements AgencyService { } while (true); //多客户 获取所有下级 List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode()); - //孔村降级处理 + //孔村降级处理 且移除掉 党总支级别 String KONG_CUN_AGENCY_ID = "1234085031077498881"; - agencyNodeDTOS.forEach(e->{ + Iterator iterator = agencyNodeDTOS.iterator(); + while (iterator.hasNext()){ + ScreenCustomerAgencyDTO e = iterator.next(); if (e.getPids().contains(KONG_CUN_AGENCY_ID)){ - e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel())); + if (OrgLevelEnum.STREET.getCode().equals(e.getLevel())){ + iterator.remove(); + } + if (KONG_CUN_AGENCY_ID.equals(e.getAgencyId())){ + e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel())); + } } convertOrgTreeNode(nodeList, e); - }); + } nodes = TreeUtils.buildTreeByAreaCode(nodeList); } //只有一个根节点的树 所以返回一个 From 1d9b07a87f835d46edf191f2b0cbf98481ee15f5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 15:02:23 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=89=93=E4=B8=AA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=81=94=E8=B0=83=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/AgencyServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 170ca1c811..041f5e7bfd 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -505,7 +505,7 @@ public class AgencyServiceImpl implements AgencyService { //todo 暂不处理 有时间再说 }else { ScreenCustomerAgencyDTO parentAgencyDTO = null; - String subAgencyAreaCode = staffAgencyDTO.getParentAreaCode(); + String parentAreaCode = staffAgencyDTO.getParentAreaCode(); List nodeList = new ArrayList<>(); /*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); @@ -521,7 +521,7 @@ public class AgencyServiceImpl implements AgencyService { convertOrgTreeNode(nodeList, currentAgency);*/ //多客户 获取所有直线上级 do { - parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(subAgencyAreaCode); + parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(parentAreaCode); if (parentAgencyDTO == null){ break; } @@ -529,8 +529,9 @@ public class AgencyServiceImpl implements AgencyService { if (parentAgencyDTO.getPid() == null || NumConstant.ZERO_STR.equals(parentAgencyDTO.getPid())){ break; } - subAgencyAreaCode = parentAgencyDTO.getAreaCode(); + parentAreaCode = parentAgencyDTO.getAreaCode(); } while (true); + log.debug("查询所有上级为:{}",JSON.toJSONString(nodeList)); //多客户 获取所有下级 List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode()); //孔村降级处理 且移除掉 党总支级别 @@ -550,6 +551,7 @@ public class AgencyServiceImpl implements AgencyService { } nodes = TreeUtils.buildTreeByAreaCode(nodeList); } + log.debug("查询所有上级树结构为:{}",JSON.toJSONString(nodes)); //只有一个根节点的树 所以返回一个 return nodes.get(0); } From 470c34a65a65364a6efae08a70a582d398dc81ef Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 15:13:29 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/AgencyServiceImpl.java | 6 +++--- .../src/main/resources/logback-spring.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 041f5e7bfd..95bb28a38e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -492,7 +492,7 @@ public class AgencyServiceImpl implements AgencyService { throw new RenException(staffInfoResult.getCode(),staffInfoResult.getMsg()); } CustomerAgencyDTO staffAgencyDTO = agencyByStaff.getData(); - + log.debug("getStaffAgencyTree查询当前工作人员组织信息为:{}",JSON.toJSONString(staffAgencyDTO)); //4、如果当前客户不存在子客户则areaCode置为空 Result> crmRes=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId()); @@ -531,7 +531,7 @@ public class AgencyServiceImpl implements AgencyService { } parentAreaCode = parentAgencyDTO.getAreaCode(); } while (true); - log.debug("查询所有上级为:{}",JSON.toJSONString(nodeList)); + log.debug("getStaffAgencyTree查询所有上级为:{}",JSON.toJSONString(nodeList)); //多客户 获取所有下级 List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode()); //孔村降级处理 且移除掉 党总支级别 @@ -551,7 +551,7 @@ public class AgencyServiceImpl implements AgencyService { } nodes = TreeUtils.buildTreeByAreaCode(nodeList); } - log.debug("查询所有上级树结构为:{}",JSON.toJSONString(nodes)); + log.debug("getStaffAgencyTree查询所有上级树结构为:{}",JSON.toJSONString(nodes)); //只有一个根节点的树 所以返回一个 return nodes.get(0); } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml index 9cda990ac0..34664cd623 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml @@ -142,7 +142,7 @@ - + From 54ef157c7eb8bb6c071e3537972e99954844ffa2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 15:31:04 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AFareaCode=20par?= =?UTF-8?q?entAreaCode=E4=B8=8D=E4=BC=9A=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenCustomerAgencyDao.xml | 2 ++ 1 file changed, 2 insertions(+) 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 221f2d2d91..f0e65a8bd1 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 @@ -445,6 +445,8 @@ AND sca.AREA_CODE like CONCAT(#{areaCode},'%') + AND sca.PARENT_AREA_CODE != '' + AND sca.PARENT_AREA_CODE IS NOT NULL From c4eda026df99fa56e068ed8a221280a7f66b2005 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 16:35:55 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/BaseStatsDataResultDTO.java | 26 ++++++++ .../result/TotalAndIncrResultDTO.java | 19 ++++++ .../controller/pub/PubController.java | 41 ++++++++++++ .../dataaggre/dao/datastats/DataStatsDao.java | 62 ++++++++++++------- .../service/datastats/DataStatsService.java | 4 +- .../datastats/impl/DataStatsServiceImpl.java | 50 +++++++++++++-- .../impl/EvaluationIndexServiceImpl.java | 8 +-- .../mapper/datastats/DatsStatsDao.xml | 42 +++++++++++++ 8 files changed, 220 insertions(+), 32 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/TotalAndIncrResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java new file mode 100644 index 0000000000..1381870afa --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 基础数据-组织各种数据汇总-接口返参 + * @Auth sun + */ +@Data +public class BaseStatsDataResultDTO implements Serializable { + private static final long serialVersionUID = -771436069527114021L; + + private Integer topicTotal; + private Integer topicIncr; + private Integer issueTotal; + private Integer issueIncr; + private Integer projectTotal; + private Integer projectIncr; + private Integer closedProjectTotal; + private Integer closedProjectIncr; + + + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/TotalAndIncrResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/TotalAndIncrResultDTO.java new file mode 100644 index 0000000000..59ce8a4aa1 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/TotalAndIncrResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 基础数据-组织各种数据汇总-接口返参 + * @Auth sun + */ +@Data +public class TotalAndIncrResultDTO implements Serializable { + + private static final long serialVersionUID = -6624315950853255235L; + private Integer total; + private Integer incr; + private Integer total2; + private Integer incr2; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java new file mode 100644 index 0000000000..60bb5474c8 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java @@ -0,0 +1,41 @@ +package com.epmet.dataaggre.controller.pub; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dataaggre.dto.app.form.AppFootBarFormDTO; +import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.BaseStatsDataResultDTO; +import com.epmet.dataaggre.service.datastats.DataStatsService; +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; + +/** + * 小程序相关配置，可以放在这，目前只放了footbar + * + * @author yinzuomei@elink-cn.com + * @date 2021/7/27 18:36 + */ +@RestController +@RequestMapping("pub") +public class PubController { + @Autowired + private DataStatsService dataStatsService; + + /** + * 查询 话题 议题 项目数 + * + * @param formDTO + * @return com.epmet.dataaggre.dto.app.result.AppFootBarResultDTO + * @author yinzuomei + * @date 2021/7/27 18:59 + */ + @PostMapping("baseDataAgg") + public Result getBaseStatsData(@RequestBody AgenctBasicDataFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,AppFootBarFormDTO.AddUserInternalGroup.class); + BaseStatsDataResultDTO resultDTO=dataStatsService.getBaseStatsData(formDTO); + return new Result().ok(resultDTO); + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index d157058b2e..0ae15cd019 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -33,7 +33,7 @@ import java.util.List; /** * @Author sun - * @Description 数据统计服务 + * @Description 数据统计服务 */ @Mapper public interface DataStatsDao { @@ -178,50 +178,54 @@ public interface DataStatsDao { /** * 查询组织党员先锋详情 - * @author zhaoqifeng - * @date 2021/5/18 14:40 + * * @param agencyId * @return com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO + * @author zhaoqifeng + * @date 2021/5/18 14:40 */ PartyMemberVanguardDetailResultDTO selectAgencyVanguardDetail(@Param("agencyId") String agencyId); /** * 查询网格党员先锋详情 - * @author zhaoqifeng - * @date 2021/5/18 14:40 + * * @param grid * @return com.epmet.dataaggre.dto.datastats.result.PartyMemberVanguardDetailResultDTO + * @author zhaoqifeng + * @date 2021/5/18 14:40 */ PartyMemberVanguardDetailResultDTO selectGridVanguardDetail(@Param("grid") String grid); /** * 查询组织党员先锋排行 - * @author zhaoqifeng - * @date 2021/5/18 15:02 + * * @param agencyId * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/18 15:02 */ List selectAgencyVanguardRank(@Param("agencyId") String agencyId); /** * 查询网格党员先锋排行 - * @author zhaoqifeng - * @date 2021/5/18 15:03 + * * @param agencyId * @return java.util.List + * @author zhaoqifeng + * @date 2021/5/18 15:03 */ List selectGridVanguardRank(@Param("agencyId") String agencyId); - List branchConAnalysis(@Param("customerId")String customerId, - @Param("orgId")String orgId, - @Param("orgType")String orgType, - @Param("dateId")String dateId, - @Param("parentCode")String parentCode); + List branchConAnalysis(@Param("customerId") String customerId, + @Param("orgId") String orgId, + @Param("orgType") String orgType, + @Param("dateId") String dateId, + @Param("parentCode") String parentCode); - List querySubAnalysisByCode(@Param("customerId")String customerId, - @Param("pid")String pid, - @Param("dateId")String dateId, - @Param("categoryCode")String categoryCode); + List querySubAnalysisByCode(@Param("customerId") String customerId, + @Param("pid") String pid, + @Param("dateId") String dateId, + @Param("categoryCode") String categoryCode); List selectGroupActRankDetail(@Param("customerId") String customerId, @Param("dateId") String dateId, @@ -246,11 +250,27 @@ public interface DataStatsDao { /** * 根据组织Id查询事件治理指数 - * @author zhaoqifeng - * @date 2021/6/25 15:08 + * * @param agencyIds * @param dateId * @return com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity + * @author zhaoqifeng + * @date 2021/6/25 15:08 */ List getAgencyGovernDaily(@Param("agencyIds") List agencyIds, @Param("dateId") String dateId); -} \ No newline at end of file + + /** + * desc: 根据组织Id和时间获取 话题总数及增量 + * + * @param agencyList + * @param dateId + * @return com.epmet.dataaggre.dto.datastats.result.TotalAndIncrResultDTO + * @author LiuJanJun + * @date 2021/8/5 3:59 下午 + */ + TotalAndIncrResultDTO getAgencySumTopic(@Param("agencyList") List agencyList, @Param("dateId") String dateId); + + TotalAndIncrResultDTO getAgencySumIssue(@Param("agencyList") List agencyList, @Param("dateId") String dateId); + + TotalAndIncrResultDTO getAgencySumProject(@Param("agencyList") List agencyList, @Param("dateId") String dateId); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 36ec2943db..2fb47aab0d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -7,7 +7,6 @@ import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; -import java.security.PrivateKey; import java.util.List; /** @@ -182,4 +181,7 @@ public interface DataStatsService { * @date 2021.07.05 16:05 */ GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(String staffId); + + BaseStatsDataResultDTO getBaseStatsData(AgenctBasicDataFormDTO formDTO); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index bfa9a29710..32848cc717 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1,6 +1,5 @@ package com.epmet.dataaggre.service.datastats.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.DateUtils; @@ -11,20 +10,18 @@ import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao; import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO; import com.epmet.dataaggre.dto.datastats.form.*; import com.epmet.dataaggre.dto.datastats.result.*; -import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; +import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; -import com.epmet.dataaggre.entity.datastats.DimGridEntity; -import com.epmet.dataaggre.entity.datastats.FactGridMemberStatisticsDailyEntity; import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; -import com.github.pagehelper.PageHelper; import com.epmet.dataaggre.service.opercrm.CustomerRelation; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -1428,6 +1425,49 @@ public class DataStatsServiceImpl implements DataStatsService { public GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(String staffId) { return factGridMemberStatisticsDailyDao.getGridMemberIssueProjectStats( staffId); } + + @Override + public BaseStatsDataResultDTO getBaseStatsData(AgenctBasicDataFormDTO formDTO) { + //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行 + if (StringUtils.isBlank(formDTO.getDateId())) { + Date yesterday = DateUtils.addDateDays(new Date(), -1); + SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD); + formDTO.setDateId(format.format(yesterday)); + } + BaseStatsDataResultDTO result = new BaseStatsDataResultDTO(); + result.setTopicTotal(0); + result.setTopicIncr(0); + + result.setIssueTotal(0); + result.setIssueIncr(0); + result.setProjectTotal(0); + result.setProjectIncr(0); + result.setClosedProjectTotal(0); + result.setClosedProjectIncr(0); + + + //0.根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表 + List agencyList = indexService.getAgencyIdsByAgencyId(formDTO.getAgencyId()); + agencyList.add(formDTO.getAgencyId()); + TotalAndIncrResultDTO sum = dataStatsDao.getAgencySumTopic(agencyList, formDTO.getDateId()); + if (sum == null){ + return result; + } + result.setTopicIncr(sum.getIncr()); + result.setTopicTotal(sum.getTotal()); + + sum = dataStatsDao.getAgencySumIssue(agencyList,formDTO.getDateId()); + result.setIssueIncr(sum.getIncr()); + result.setIssueTotal(sum.getTotal()); + + sum = dataStatsDao.getAgencySumProject(agencyList,formDTO.getDateId()); + result.setProjectIncr(sum.getIncr()); + result.setProjectTotal(sum.getTotal()); + result.setClosedProjectIncr(sum.getIncr2()); + result.setClosedProjectTotal(sum.getTotal2()); + return result; + } + private String getPercentage(Integer countInt, Integer totalInt) { if (NumConstant.ZERO == totalInt) { return "0%"; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java index fc9e6b8ba6..8f682b1e43 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java @@ -1,9 +1,7 @@ package com.epmet.dataaggre.service.evaluationindex.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dataaggre.constant.DataSourceConstant; -import com.epmet.dataaggre.dao.datastats.DataStatsDao; import com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao; import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO; import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO; @@ -14,13 +12,10 @@ import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -114,6 +109,9 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService { public List getAgencyIdsByAgencyId(String agencyId) { //1.查询agencyId对应组织信息 ScreenCustomerAgencyDTO dto = evaluationIndexDao.getByAgencyId(agencyId); + if (dto == null){ + return new ArrayList<>(); + } //2.判断客户是否存在子客户 List list = customerRelation.haveSubCustomer(dto.getCustomerId()); if (!CollectionUtils.isNotEmpty(list)) { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index 7b4361e463..c1d88ccc8e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -685,5 +685,47 @@ AGENCY_ID = #{agencyId} + + + From 810972aae1f76783c6dfa0a6b3cb437a339b4807 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Aug 2021 09:48:26 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/DateUtils.java | 143 ++++++++++++++++-- .../dto/datastats/form/BaseDataFormDTO.java | 34 +++++ .../datastats/result/WorkFactResultDTO.java | 24 +++ .../controller/pub/PubController.java | 25 ++- .../service/datastats/DataStatsService.java | 3 +- .../datastats/impl/DataStatsServiceImpl.java | 39 ++++- 6 files changed, 251 insertions(+), 17 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index c2988b67f9..6ce1d2a810 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -664,15 +664,6 @@ public class DateUtils { return result; } - public static void main(String[] args) { - Date today=new Date(); - Date yesterDay=DateUtils.parse("2020-07-28 15:33:00","yyyy-MM-dd HH:mm:ss"); - Date tomorrow=DateUtils.parse("2020-07-30 15:33:00","yyyy-MM-dd HH:mm:ss"); - System.out.println(comparteDate(today,today)); - System.out.println(comparteDate(yesterDay,today)); - System.out.println(comparteDate(tomorrow,today)); - } - public static String getYearId(String monthId) { if (StringUtils.isNotBlank(monthId) && monthId.length() > 4) { return monthId.substring(NumConstant.ZERO, NumConstant.FOUR); @@ -874,4 +865,138 @@ public class DateUtils { return DateUtils.format(date,dateType); } + /** + * 获取指定日期的 所在周的第一天和和最后一天 + * @param dataStr + * @return + * @throws ParseException + */ + public static String getLastOfWeek(String dataStr) throws ParseException { + Calendar cal = Calendar.getInstance(); + if (StringUtils.isNotBlank(dataStr)){ + cal.setTime(new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).parse(dataStr)); + } + + int d = 0; + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + d = -6; + } else { + d = 2 - cal.get(Calendar.DAY_OF_WEEK); + } + cal.add(Calendar.DAY_OF_WEEK, d); + // 所在周开始日期 + String data1 = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(cal.getTime()); + cal.add(Calendar.DAY_OF_WEEK, 6); + // 所在周结束日期 + String data2 = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(cal.getTime()); + return data1 + "-" + data2; + + } + + /** + * 获取指定日期的 所在周的第一天和和最后一天 + * @param dataStr + * @return + * @throws ParseException + */ + public static String getFirstOfWeek(String dataStr) throws ParseException { + Calendar cal = Calendar.getInstance(); + if (StringUtils.isNotBlank(dataStr)){ + cal.setTime(new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).parse(dataStr)); + } + + int d = 0; + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + d = -6; + } else { + d = 2 - cal.get(Calendar.DAY_OF_WEEK); + } + cal.add(Calendar.DAY_OF_WEEK, d); + // 所在周开始日期 + String data1 = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(cal.getTime()); + cal.add(Calendar.DAY_OF_WEEK, 6); + // 所在周结束日期 + String data2 = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(cal.getTime()); + return data1 + "-" + data2; + + } + + + /** + * 获取本周的第一天 + * @return String + * **/ + public static String getWeekStart(String dateId){ + Calendar cal=Calendar.getInstance(); + if (StringUtils.isNotBlank(dateId)){ + cal.setTime(DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD)); + } + int d = 0; + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + d = -6; + } else { + d = 2 - cal.get(Calendar.DAY_OF_WEEK); + } + cal.add(Calendar.DAY_OF_WEEK, d); + Date time=cal.getTime(); + return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(time); + } + /** + * 获取本周的最后一天 + * @return String + * **/ + public static String getWeekEnd(String dateId){ + Calendar cal=Calendar.getInstance(); + if (StringUtils.isNotBlank(dateId)){ + cal.setTime(DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD)); + } + int d = 0; + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + d = -6; + } else { + d = 2 - cal.get(Calendar.DAY_OF_WEEK); + } + cal.add(Calendar.DAY_OF_WEEK, d); + cal.add(Calendar.DAY_OF_WEEK, 6); + Date time=cal.getTime(); + return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(time); + } + + /** + * 获取本月开始日期 + * @return String + * **/ + public static String getMonthStart(){ + Calendar cal=Calendar.getInstance(); + cal.add(Calendar.MONTH, 0); + cal.set(Calendar.DAY_OF_MONTH, 1); + Date time=cal.getTime(); + return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMM).format(time); + } + /** + * 获取本月最后一天 + * @return String + * **/ + public static String getMonthEnd(){ + Calendar cal=Calendar.getInstance(); + cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH)); + Date time=cal.getTime(); + return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMM).format(time); + } + + public static void main(String[] args) throws ParseException { + String first = DateUtils.getFirstOfWeek("20210801"); + System.out.println(first); + String fLastOfWeek = DateUtils.getLastOfWeek("20210801"); + System.out.println(fLastOfWeek); + + System.out.println(DateUtils.getWeekStart("20210801")); + System.out.println(DateUtils.getWeekEnd("20210801")); + + Date dateIdDate = DateUtils.parse("20210801", DateUtils.DATE_PATTERN_YYYYMMDD); + String format = DateUtils.format(DateUtils.getMonthStart(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD); + System.out.println(format); + format = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD); + System.out.println(format); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java new file mode 100644 index 0000000000..d2513cf19d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dataaggre.dto.datastats.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 基础参数实体类 + * @Auth sun + */ +@Data +public class BaseDataFormDTO implements Serializable { + + private static final long serialVersionUID = 6766797386944333123L; + /** + * 组织Id + */ + @NotBlank(message = "组织ID不能为空",groups = {BaseDataFormDTO.BaseData.class,BaseDataFormDTO.WorkFact.class}) + private String agencyId; + @NotBlank(message = "组织级别不能为空",groups = BaseDataFormDTO.WorkFact.class) + private String agencyLevel; + private String type; + /** + * 日维度Id + */ + private String dateId; + private String startDateId; + private String endDateId; + public interface BaseData extends CustomerClientShowGroup{} + public interface WorkFact extends CustomerClientShowGroup{} + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java new file mode 100644 index 0000000000..01d72bb538 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * desc: + * + * @author: LiuJanJun + * @date: 2021/8/5 4:51 下午 + * @version: 1.0 + */ +@Data +public class WorkFactResultDTO implements Serializable { + private static final long serialVersionUID = -8149310637601355664L; + private double topicToIssueTotal; + private double issueToProjectTotal; + private double closedProjectTotal; + private double patrolTotal; + private String patrolTotalTime; + private String orgId; + private String orgName; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java index 60bb5474c8..f78ac2226c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java @@ -2,9 +2,9 @@ package com.epmet.dataaggre.controller.pub; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dataaggre.dto.app.form.AppFootBarFormDTO; -import com.epmet.dataaggre.dto.datastats.form.AgenctBasicDataFormDTO; +import com.epmet.dataaggre.dto.datastats.form.BaseDataFormDTO; import com.epmet.dataaggre.dto.datastats.result.BaseStatsDataResultDTO; +import com.epmet.dataaggre.dto.datastats.result.WorkFactResultDTO; import com.epmet.dataaggre.service.datastats.DataStatsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -33,9 +33,22 @@ public class PubController { * @date 2021/7/27 18:59 */ @PostMapping("baseDataAgg") - public Result getBaseStatsData(@RequestBody AgenctBasicDataFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO,AppFootBarFormDTO.AddUserInternalGroup.class); - BaseStatsDataResultDTO resultDTO=dataStatsService.getBaseStatsData(formDTO); - return new Result().ok(resultDTO); + public Result getBaseStatsData(@RequestBody BaseDataFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.BaseData.class); + return new Result().ok(dataStatsService.getBaseStatsData(formDTO)); + } + + /** + * 查询下级工作实况 + * + * @param formDTO + * @return com.epmet.dataaggre.dto.app.result.AppFootBarResultDTO + * @author yinzuomei + * @date 2021/7/27 18:59 + */ + @PostMapping("subWorkFact") + public Result getSubWorkFact(@RequestBody BaseDataFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.WorkFact.class); + return new Result().ok(dataStatsService.getSubWorkFact(formDTO)); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 2fb47aab0d..e7d15e95f5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -182,6 +182,7 @@ public interface DataStatsService { */ GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(String staffId); - BaseStatsDataResultDTO getBaseStatsData(AgenctBasicDataFormDTO formDTO); + BaseStatsDataResultDTO getBaseStatsData(BaseDataFormDTO formDTO); + WorkFactResultDTO getSubWorkFact(BaseDataFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 32848cc717..5699c0d8fd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1427,7 +1427,7 @@ public class DataStatsServiceImpl implements DataStatsService { } @Override - public BaseStatsDataResultDTO getBaseStatsData(AgenctBasicDataFormDTO formDTO) { + public BaseStatsDataResultDTO getBaseStatsData(BaseDataFormDTO formDTO) { //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行 if (StringUtils.isBlank(formDTO.getDateId())) { Date yesterday = DateUtils.addDateDays(new Date(), -1); @@ -1468,6 +1468,43 @@ public class DataStatsServiceImpl implements DataStatsService { return result; } + @Override + public WorkFactResultDTO getSubWorkFact(BaseDataFormDTO formDTO) { + //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行 + if (StringUtils.isBlank(formDTO.getType())){ + formDTO.setType("yesterday"); + } + if (StringUtils.isBlank(formDTO.getDateId())) { + Date yesterday = DateUtils.addDateDays(new Date(), -1); + SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD); + formDTO.setDateId(format.format(yesterday)); + } + String startDate,endDate; + Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD); + boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId()); + switch (formDTO.getType()){ + case "yesterday": + startDate = DateUtils.getBeforeNDay(NumConstant.ONE); + endDate = startDate; + break; + case "thisWeek": + startDate = DateUtils.getWeekStart(formDTO.getDateId()); + if (!isYesterday){ + endDate = DateUtils.getWeekEnd(formDTO.getDateId()); + } + break; + case "thisMonth": + startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD); + if (!isYesterday) { + endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD); + } + } + + + + return null; + } + private String getPercentage(Integer countInt, Integer totalInt) { if (NumConstant.ZERO == totalInt) { return "0%"; From 959a5782928ed1b3d0710857e2722bb9ef24eb13 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Aug 2021 10:04:13 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/DateUtils.java | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 6ce1d2a810..02b07ed286 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -962,27 +962,6 @@ public class DateUtils { return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(time); } - /** - * 获取本月开始日期 - * @return String - * **/ - public static String getMonthStart(){ - Calendar cal=Calendar.getInstance(); - cal.add(Calendar.MONTH, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - Date time=cal.getTime(); - return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMM).format(time); - } - /** - * 获取本月最后一天 - * @return String - * **/ - public static String getMonthEnd(){ - Calendar cal=Calendar.getInstance(); - cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH)); - Date time=cal.getTime(); - return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMM).format(time); - } public static void main(String[] args) throws ParseException { String first = DateUtils.getFirstOfWeek("20210801"); From a90e4cda800ac5764d4db4738efc6ddc54f84e4f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 6 Aug 2021 10:15:25 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=81=E8=AF=9D=E9=A2=98=E3=80=81=E5=B0=8F?= =?UTF-8?q?=E7=BB=84=E6=95=B0=E6=9F=A5=E8=AF=A2-=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/SubTopicAndGroupFormDTO.java | 33 +++++++++++++++++++ .../datastats/form/SubUserTotalFormDTO.java | 33 +++++++++++++++++++ .../result/SubTopicAndGroupResultDTO.java | 23 +++++++++++++ .../result/SubUserTotalResultDTO.java | 23 +++++++++++++ .../controller/pub/PubController.java | 29 ++++++++++++++++ .../service/datastats/DataStatsService.java | 14 ++++++++ .../datastats/impl/DataStatsServiceImpl.java | 33 +++++++++++++++++++ 7 files changed, 188 insertions(+) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubTopicAndGroupFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubUserTotalFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubTopicAndGroupFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubTopicAndGroupFormDTO.java new file mode 100644 index 0000000000..f86c97fcfa --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubTopicAndGroupFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dataaggre.dto.datastats.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 对外接口-查询下级话题和小组数-接口入参 + * @Auth sun + */ +@Data +public class SubTopicAndGroupFormDTO implements Serializable { + + private static final long serialVersionUID = -3381286960911634231L; + /** + * 当前组织id；从组织树取 + */ + @NotBlank(message = "组织ID不能为空", groups = SubTopicAndGroupFormDTO.Agency.class) + private String agencyId; + /** + * 当前组织级别；从组织树取 + */ + @NotBlank(message = "组织级别不能为空", groups = SubTopicAndGroupFormDTO.Agency.class) + private String agencyLevel; + /** + * 日维度Id【yyyyMMdd eg：20210808，默认前一天】 + */ + private String dateId; + public interface Agency extends CustomerClientShowGroup{} + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubUserTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubUserTotalFormDTO.java new file mode 100644 index 0000000000..8538e067a1 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubUserTotalFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dataaggre.dto.datastats.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 对外接口-查询下级用户党员数-接口入参 + * @Auth sun + */ +@Data +public class SubUserTotalFormDTO implements Serializable { + + private static final long serialVersionUID = -3381286960911634231L; + /** + * 当前组织id；从组织树取 + */ + @NotBlank(message = "组织ID不能为空", groups = SubUserTotalFormDTO.Agency.class) + private String agencyId; + /** + * 当前组织级别；从组织树取 + */ + @NotBlank(message = "组织级别不能为空", groups = SubUserTotalFormDTO.Agency.class) + private String agencyLevel; + /** + * 日维度Id【yyyyMMdd eg：20210808，默认前一天】 + */ + private String dateId; + public interface Agency extends CustomerClientShowGroup{} + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java new file mode 100644 index 0000000000..9c965e88cc --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 对外接口-查询下级话题和小组数-接口返参 + * @Auth sun + */ +@Data +public class SubTopicAndGroupResultDTO implements Serializable { + private static final long serialVersionUID = 466974582608407121L; + //组织或网格ID + private String orgId; + //组织或网格名称 + private String orgName = ""; + //问题解决总数 + private Integer userTotal = 0; + //党群自治占比 + private Integer partyMemberTotal = 0; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java new file mode 100644 index 0000000000..d14c6a2381 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 对外接口-查询下级用户党员数-接口返参 + * @Auth sun + */ +@Data +public class SubUserTotalResultDTO implements Serializable { + private static final long serialVersionUID = 466974582608407121L; + //组织或网格ID + private String orgId; + //组织或网格名称 + private String orgName = ""; + //问题解决总数 + private Integer userTotal = 0; + //党群自治占比 + private Integer partyMemberTotal = 0; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java index f78ac2226c..e3e783217c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java @@ -3,7 +3,11 @@ package com.epmet.dataaggre.controller.pub; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.datastats.form.BaseDataFormDTO; +import com.epmet.dataaggre.dto.datastats.form.SubTopicAndGroupFormDTO; +import com.epmet.dataaggre.dto.datastats.form.SubUserTotalFormDTO; import com.epmet.dataaggre.dto.datastats.result.BaseStatsDataResultDTO; +import com.epmet.dataaggre.dto.datastats.result.SubTopicAndGroupResultDTO; +import com.epmet.dataaggre.dto.datastats.result.SubUserTotalResultDTO; import com.epmet.dataaggre.dto.datastats.result.WorkFactResultDTO; import com.epmet.dataaggre.service.datastats.DataStatsService; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +16,8 @@ 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; + /** * 小程序相关配置，可以放在这，目前只放了footbar * @@ -51,4 +57,27 @@ public class PubController { ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.WorkFact.class); return new Result().ok(dataStatsService.getSubWorkFact(formDTO)); } + + /** + * @Param formDTO + * @Description 对外接口--查询下级用户党员数 + * @author sun + */ + @PostMapping("subUserTotal") + public Result> subUserTotal(@RequestBody SubUserTotalFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, SubUserTotalFormDTO.Agency.class); + return new Result>().ok(dataStatsService.subUserTotal(formDTO)); + } + + /** + * @Param formDTO + * @Description 对外接口--查询下级话题和小组数 + * @author sun + */ + @PostMapping("subTopicAndGroup") + public Result> subTopicAndGroup(@RequestBody SubTopicAndGroupFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, SubTopicAndGroupFormDTO.Agency.class); + return new Result>().ok(dataStatsService.subTopicAndGroup(formDTO)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index e7d15e95f5..1aadb44563 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -185,4 +185,18 @@ public interface DataStatsService { BaseStatsDataResultDTO getBaseStatsData(BaseDataFormDTO formDTO); WorkFactResultDTO getSubWorkFact(BaseDataFormDTO formDTO); + + /** + * @Param formDTO + * @Description 对外接口--查询下级用户党员数 + * @author sun + */ + List subUserTotal(SubUserTotalFormDTO formDTO); + + /** + * @Param formDTO + * @Description 对外接口--查询下级话题和小组数 + * @author sun + */ + List subTopicAndGroup(SubTopicAndGroupFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 5699c0d8fd..9cd49ff145 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1516,4 +1516,37 @@ public class DataStatsServiceImpl implements DataStatsService { return ratio.toString().concat("%"); } + /** + * @Param formDTO + * @Description 对外接口--查询下级用户党员数 + * @author sun + */ + @Override + public List subUserTotal(SubUserTotalFormDTO formDTO) { + List resultList = new ArrayList<>(); + //1.入参有日期的则按具体时间执行,没有的则按当前时间前一天执行 + if (StringUtils.isBlank(formDTO.getDateId())) { + Date yesterday = DateUtils.addDateDays(new Date(), -1); + SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD); + formDTO.setDateId(format.format(yesterday)); + } + + //2. + //3. + //4. + + + return null; + } + + /** + * @Param formDTO + * @Description 对外接口--查询下级话题和小组数 + * @author sun + */ + @Override + public List subTopicAndGroup(SubTopicAndGroupFormDTO formDTO) { + return null; + } + } From e8131f1a33a66ac8f419b8dfe2c10041e0468c57 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 6 Aug 2021 14:32:03 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=81=E8=AF=9D=E9=A2=98=E3=80=81=E5=B0=8F?= =?UTF-8?q?=E7=BB=84=E6=95=B0=E6=9F=A5=E8=AF=A2-=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/SubTopicAndGroupFormDTO.java | 5 + .../datastats/form/SubUserTotalFormDTO.java | 5 + .../result/SubTopicAndGroupResultDTO.java | 8 +- .../result/SubUserTotalResultDTO.java | 4 +- .../datastats/impl/DataStatsServiceImpl.java | 143 +++++++++++++++++- 5 files changed, 154 insertions(+), 11 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubTopicAndGroupFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubTopicAndGroupFormDTO.java index f86c97fcfa..7a64b567d7 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubTopicAndGroupFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubTopicAndGroupFormDTO.java @@ -21,6 +21,11 @@ public class SubTopicAndGroupFormDTO implements Serializable { private String agencyId; /** * 当前组织级别；从组织树取 + * 机关级别（社区级：community， + * 乡（镇、街道）级:street, + * 区县级: district, + * 市级: city + * 省级:province） */ @NotBlank(message = "组织级别不能为空", groups = SubTopicAndGroupFormDTO.Agency.class) private String agencyLevel; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubUserTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubUserTotalFormDTO.java index 8538e067a1..f97af0583e 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubUserTotalFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/SubUserTotalFormDTO.java @@ -21,6 +21,11 @@ public class SubUserTotalFormDTO implements Serializable { private String agencyId; /** * 当前组织级别；从组织树取 + * 机关级别（社区级：community， + * 乡（镇、街道）级:street, + * 区县级: district, + * 市级: city + * 省级:province） */ @NotBlank(message = "组织级别不能为空", groups = SubUserTotalFormDTO.Agency.class) private String agencyLevel; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java index 9c965e88cc..0b76a3d2a1 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubTopicAndGroupResultDTO.java @@ -15,9 +15,9 @@ public class SubTopicAndGroupResultDTO implements Serializable { private String orgId; //组织或网格名称 private String orgName = ""; - //问题解决总数 - private Integer userTotal = 0; - //党群自治占比 - private Integer partyMemberTotal = 0; + //话题总数 + private Integer topicTotal = 0; + //小组总数 + private Integer groupTotal = 0; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java index d14c6a2381..2f87e63143 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubUserTotalResultDTO.java @@ -15,9 +15,9 @@ public class SubUserTotalResultDTO implements Serializable { private String orgId; //组织或网格名称 private String orgName = ""; - //问题解决总数 + //用户总数 private Integer userTotal = 0; - //党群自治占比 + //党员总数 private Integer partyMemberTotal = 0; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 9cd49ff145..1fd450840d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1531,12 +1531,66 @@ public class DataStatsServiceImpl implements DataStatsService { formDTO.setDateId(format.format(yesterday)); } - //2. - //3. - //4. + //根据组织级别判断查询直属下级组织或网格数据 + //2.直属网格 + if ("community".equals(formDTO.getAgencyLevel())) { + //2-1.查询组织直属网格列表【网格维度】 + List gridList = indexService.getSubGridList(formDTO.getAgencyId()); + if (gridList.size() < NumConstant.ONE) { + return resultList; + } + List gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList()); + //2-2.查询网格下用户、党员日统计数据，按用户总数降序 + List list = dataStatsDao.getSubGridUser(gridIds, formDTO.getDateId()); + //2-3.封装数据 + gridList.forEach(gr -> { + SubUserTotalResultDTO dto = new SubUserTotalResultDTO(); + dto.setOrgId(gr.getGridId()); + dto.setOrgName(gr.getGridName()); + list.forEach(re -> { + if (gr.getGridId().equals(re.getGridId())) { + dto.setUserTotal(re.getUserTotal()); + dto.setPartyMemberTotal(re.getPartyMemberTotal()); + } + }); + resultList.add(dto); + }); + } else { + //3.直属组织 + //3-1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查 + List subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId()); + if (subAgencyList.size() < NumConstant.ONE) { + return resultList; + } + List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList()); + //3-2.查询组织下用户、党员日统计数据，按用户总数降序 + List list = dataStatsDao.getSubAgencyUser(agencyIds, formDTO.getDateId()); + //3-3.封装数据 + subAgencyList.forEach(sub -> { + SubUserTotalResultDTO dto = new SubUserTotalResultDTO(); + dto.setOrgId(sub.getAgencyId()); + dto.setOrgName(sub.getAgencyName()); + list.forEach(u -> { + if (sub.getAgencyId().equals(u.getAgencyId())) { + dto.setUserTotal(u.getUserTotal()); + dto.setPartyMemberTotal(u.getPartyMemberTotal()); + } + }); + resultList.add(dto); + }); + } - return null; + //4.按用户数降序排序并返回 + Collections.sort(resultList, new Comparator() { + @Override + public int compare(SubUserTotalResultDTO o1, SubUserTotalResultDTO o2) { + //降序 + return o2.getUserTotal().compareTo(o1.getUserTotal()); + } + }); + + return resultList; } /** @@ -1546,7 +1600,86 @@ public class DataStatsServiceImpl implements DataStatsService { */ @Override public List subTopicAndGroup(SubTopicAndGroupFormDTO formDTO) { - return null; + List resultList = new ArrayList<>(); + //1.入参有日期的则按具体时间执行,没有的则按当前时间前一天执行 + if (StringUtils.isBlank(formDTO.getDateId())) { + Date yesterday = DateUtils.addDateDays(new Date(), -1); + SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD); + formDTO.setDateId(format.format(yesterday)); + } + + //根据组织级别判断查询直属下级组织或网格数据 + //2.直属网格 + if ("community".equals(formDTO.getAgencyLevel())) { + //2-1.查询组织直属网格列表【网格维度】 + List gridList = indexService.getSubGridList(formDTO.getAgencyId()); + if (gridList.size() < NumConstant.ONE) { + return resultList; + } + List gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList()); + //2-2.查询网格下热议中话题日统计数据 + List hotdiscuss = dataStatsDao.getSubGridTopicHotDiscuss(gridIds, formDTO.getDateId()); + //2-2.查询网格层级小组日统计数据 + List list = dataStatsDao.getSubGridGroup(gridIds, formDTO.getDateId()); + //2-3.封装数据 + gridList.forEach(gr -> { + SubTopicAndGroupResultDTO resultDTO = new SubTopicAndGroupResultDTO(); + resultDTO.setOrgId(gr.getGridId()); + resultDTO.setOrgName(gr.getGridName()); + hotdiscuss.forEach(t -> { + if (t.getGridId().equals(gr.getGridId())) { + resultDTO.setTopicTotal(t.getTopicTotal()); + } + }); + list.forEach(l -> { + if (l.getGridId().equals(gr.getGridId())) { + resultDTO.setGroupTotal(l.getGroupTotal()); + } + }); + resultList.add(resultDTO); + }); + + } else { + //3.直属组织 + //3-1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查 + List subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId()); + if (subAgencyList.size() < NumConstant.ONE) { + return resultList; + } + List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList()); + //3-2.查询组织下热议中话题日统计数据 + List hotdiscuss = dataStatsDao.getSubAgencyTopicHotDiscuss(agencyIds, formDTO.getDateId()); + //3-3.查询直属下级组织小组日统计数据 + List list = dataStatsDao.getSubAgencyGroup(agencyIds, formDTO.getDateId()); + //3-4.封装数据 + subAgencyList.forEach(sub -> { + SubTopicAndGroupResultDTO resultDTO = new SubTopicAndGroupResultDTO(); + resultDTO.setOrgId(sub.getAgencyId()); + resultDTO.setOrgName(sub.getAgencyName()); + hotdiscuss.forEach(t -> { + if (t.getAgencyId().equals(sub.getAgencyId())) { + resultDTO.setTopicTotal(t.getTopicTotal()); + } + }); + list.forEach(u -> { + if (sub.getAgencyId().equals(u.getAgencyId())) { + resultDTO.setGroupTotal(u.getGroupTotal()); + } + }); + resultList.add(resultDTO); + }); + } + + //4.按用户数降序排序并返回 + Collections.sort(resultList, new Comparator() { + @Override + public int compare(SubTopicAndGroupResultDTO o1, SubTopicAndGroupResultDTO o2) { + //降序 + return o2.getTopicTotal().compareTo(o1.getTopicTotal()); + } + }); + + return resultList; } } From 1a23c28557cded18091a4576ab6e5d747777d8ca Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Aug 2021 15:07:29 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=AE=9E=E5=86=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/DateUtils.java | 17 +++ .../result/BaseStatsDataResultDTO.java | 6 + .../result/TotalAndIncrResultDTO.java | 3 +- .../datastats/result/WorkFactResultDTO.java | 12 +- .../controller/pub/PubController.java | 4 +- .../dataaggre/dao/datastats/DataStatsDao.java | 8 ++ .../StatsStaffPatrolRecordDailyDao.java | 45 +++++++ .../StatsStaffPatrolRecordDailyEntity.java | 125 ++++++++++++++++++ .../service/datastats/DataStatsService.java | 12 +- .../datastats/impl/DataStatsServiceImpl.java | 83 +++++++++++- .../StatsStaffPatrolRecordDailyService.java | 42 ++++++ ...tatsStaffPatrolRecordDailyServiceImpl.java | 43 ++++++ .../mapper/datastats/DatsStatsDao.xml | 15 +++ .../StatsStaffPatrolRecordDailyDao.xml | 17 +++ 14 files changed, 416 insertions(+), 16 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StatsStaffPatrolRecordDailyEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 02b07ed286..faaf5f2c3a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -425,6 +425,23 @@ public class DateUtils { return DateUtils.format(date,DateUtils.DATE_PATTERN_YYYYMMDD); } + /** + * @return java.lang.String + * @param beforDay + * @author yinzuomei + * @description 获取当前日期的前n天 返回yyyyMMdd + * @Date 2020/6/23 1:50 + **/ + public static String getBeforeNDay(String dateId,int beforDay){ + Calendar c = Calendar.getInstance(); + if (StringUtils.isNotBlank(dateId)){ + c.setTime(DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD)); + } + c.add(Calendar.DATE, - beforDay); + Date date = c.getTime(); + return DateUtils.format(date,DateUtils.DATE_PATTERN_YYYYMMDD); + } + public static String getBeforeNDay(int beforDay,String format){ Calendar c = Calendar.getInstance(); c.add(Calendar.DATE, - beforDay); diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java index 1381870afa..8302d08e49 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java @@ -14,12 +14,18 @@ public class BaseStatsDataResultDTO implements Serializable { private Integer topicTotal; private Integer topicIncr; + // private Integer topicToIssueTotal; private Integer issueTotal; private Integer issueIncr; + // private Integer issueToProjectTotal; private Integer projectTotal; private Integer projectIncr; private Integer closedProjectTotal; private Integer closedProjectIncr; +// private Integer patrolTotal; +// private Integer patrolTotalTime; +// private Integer orgId; +// private Integer orgName; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/TotalAndIncrResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/TotalAndIncrResultDTO.java index 59ce8a4aa1..02fee2c919 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/TotalAndIncrResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/TotalAndIncrResultDTO.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * @Description 基础数据-组织各种数据汇总-接口返参 + * @Description 总数及增量 返回结果 * @Auth sun */ @Data @@ -16,4 +16,5 @@ public class TotalAndIncrResultDTO implements Serializable { private Integer incr; private Integer total2; private Integer incr2; + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java index 01d72bb538..9eebe98854 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java @@ -14,11 +14,13 @@ import java.io.Serializable; @Data public class WorkFactResultDTO implements Serializable { private static final long serialVersionUID = -8149310637601355664L; - private double topicToIssueTotal; - private double issueToProjectTotal; - private double closedProjectTotal; - private double patrolTotal; - private String patrolTotalTime; + private Integer topicToIssueTotal = 0; + private Integer issueToProjectTotal = 0; + private Integer closedProjectTotal = 0; + private Integer patrolTotal = 0; + private String patrolTotalTime = "0"; private String orgId; private String orgName; + + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java index e3e783217c..964e5225d1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java @@ -53,9 +53,9 @@ public class PubController { * @date 2021/7/27 18:59 */ @PostMapping("subWorkFact") - public Result getSubWorkFact(@RequestBody BaseDataFormDTO formDTO){ + public Result> getSubWorkFact(@RequestBody BaseDataFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.WorkFact.class); - return new Result().ok(dataStatsService.getSubWorkFact(formDTO)); + return new Result>().ok(dataStatsService.getSubWorkFact(formDTO)); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index 0ae15cd019..46f7e64cb6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -273,4 +273,12 @@ public interface DataStatsDao { TotalAndIncrResultDTO getAgencySumIssue(@Param("agencyList") List agencyList, @Param("dateId") String dateId); TotalAndIncrResultDTO getAgencySumProject(@Param("agencyList") List agencyList, @Param("dateId") String dateId); + + /** + * 获取话题相关总数 + * @param agencyList + * @param dateId + * @return + */ + List getSubSumAgencyTopic(@Param("agencyList") List agencyList, @Param("dateId") String dateId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java new file mode 100644 index 0000000000..4d082fe5d9 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java @@ -0,0 +1,45 @@ +/** + * 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.dataaggre.dao.epmetuser; + + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 工作人员巡查统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-07 + */ +@Mapper +public interface StatsStaffPatrolRecordDailyDao extends BaseDao { + + /** + * desc:获取巡查次数和时间 + * @param agencyList + * @param startDateId + * @param endDateId + * @return + */ + List getPatrolSumList(@Param("agencyList") List agencyList, @Param("startDateId") String startDateId, @Param("endDateId") String endDateId); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StatsStaffPatrolRecordDailyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StatsStaffPatrolRecordDailyEntity.java new file mode 100644 index 0000000000..1c52ad1336 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StatsStaffPatrolRecordDailyEntity.java @@ -0,0 +1,125 @@ +/** + * 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.dataaggre.entity.epmetuser; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * [天]工作人员巡查记录统计 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-29 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("stats_staff_patrol_record_daily") +public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 来源类型 external:外部，internal:内部 + */ + private String sourceType; + + /** + * 客户Id + */ + private String customerId; + + /** + * 数据来源客户Id + */ + private String sourceCustomerId; + + /** + * 统计日期 关联日期dim表 + */ + private String dateId; + + /** + * 周ID + */ + private String weekId; + + /** + * 月ID + */ + private String monthId; + + /** + * 季ID + */ + private String quarterId; + + /** + * 年ID + */ + private String yearId; + + /** + * 网格id + */ + private String gridId; + + /** + * 工作人员所属组织id=网格所属的组织id + */ + private String agencyId; + + /** + * 网格所有上级id + */ + private String gridPids; + + /** + * 工作人员用户id + */ + private String staffId; + + /** + * 巡查次数 + */ + private Integer patrolTotal; + + /** + * 巡查时长 单位：秒 + */ + private Integer totalTime; + + /** + * 巡查期间直接立项项目数 + */ + private Integer reportProjectCount; + + /** + * 最新的巡查开始时间 + */ + private Date latestPatrolTime; + + /** + * 最新的巡查状态 正在巡查中：patrolling；结束：end + */ + private String latestPatrolStatus; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 1aadb44563..621a336fb2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -182,9 +182,19 @@ public interface DataStatsService { */ GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(String staffId); + /** + * desc:获取话题 议题 项目 关闭项目数 + * @param formDTO + * @return + */ BaseStatsDataResultDTO getBaseStatsData(BaseDataFormDTO formDTO); - WorkFactResultDTO getSubWorkFact(BaseDataFormDTO formDTO); + /** + * 获取工作实况中的数 + * @param formDTO + * @return + */ + List getSubWorkFact(BaseDataFormDTO formDTO); /** * @Param formDTO diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 1fd450840d..7e76550402 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1,7 +1,8 @@ package com.epmet.dataaggre.service.datastats.impl; -import com.epmet.commons.dynamic.datasource.annotation.DataSource; + import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.enums.OrgLevelEnum; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.OrgConstant; @@ -18,7 +19,9 @@ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; +import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity; import com.epmet.dataaggre.service.datastats.DataStatsService; +import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; import com.github.pagehelper.PageHelper; @@ -54,6 +57,8 @@ public class DataStatsServiceImpl implements DataStatsService { @Autowired private FactGridMemberStatisticsDailyDao factGridMemberStatisticsDailyDao; + @Autowired + private StatsStaffPatrolRecordDailyService statsStaffPatrolRecordDailyService; /** @@ -1469,40 +1474,104 @@ public class DataStatsServiceImpl implements DataStatsService { } @Override - public WorkFactResultDTO getSubWorkFact(BaseDataFormDTO formDTO) { + public List getSubWorkFact(BaseDataFormDTO formDTO) { //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行 if (StringUtils.isBlank(formDTO.getType())){ formDTO.setType("yesterday"); } + Date yesterday = DateUtils.addDateDays(new Date(), -1); if (StringUtils.isBlank(formDTO.getDateId())) { - Date yesterday = DateUtils.addDateDays(new Date(), -1); SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD); formDTO.setDateId(format.format(yesterday)); } - String startDate,endDate; + String startDate = null; + String endDate = null; Date dateIdDate = DateUtils.parse(formDTO.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD); boolean isYesterday = DateUtils.getBeforeNDay(1,DateUtils.DATE_PATTERN_YYYYMMDD).equals(formDTO.getDateId()); switch (formDTO.getType()){ case "yesterday": - startDate = DateUtils.getBeforeNDay(NumConstant.ONE); - endDate = startDate; + startDate = DateUtils.getBeforeNDay(formDTO.getDateId(),1); + endDate = formDTO.getDateId(); break; case "thisWeek": startDate = DateUtils.getWeekStart(formDTO.getDateId()); + startDate = DateUtils.getBeforeNDay(startDate,1); + DateUtils.format(DateUtils.addDateDays(yesterday, -1),DateUtils.DATE_PATTERN_YYYYMMDD); if (!isYesterday){ endDate = DateUtils.getWeekEnd(formDTO.getDateId()); } break; case "thisMonth": startDate = DateUtils.format(DateUtils.getMonthStart(dateIdDate),DateUtils.DATE_PATTERN_YYYYMMDD); + startDate = DateUtils.getBeforeNDay(startDate,1); if (!isYesterday) { endDate = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD); } + break; + default: + log.warn("==========="); } + formDTO.setStartDateId(startDate); + formDTO.setEndDateId(endDate); + List result = new ArrayList<>(); + //如果是社区 则下级是网格 查询网格的数据 + if (OrgLevelEnum.COMMUNITY.getCode().equals(formDTO.getAgencyLevel())){ + }else { + //0.根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表 + List subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId()); + if (subAgencyList.size() < NumConstant.ONE) { + return null; + } + + List agencyList = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList()); + //查询组织的话题转议题数据 + List toIssueStart = dataStatsDao.getSubAgencyTopicShiftIssue(agencyList, formDTO.getStartDateId()); + List toIssueEnd = dataStatsDao.getSubAgencyTopicShiftIssue(agencyList, formDTO.getEndDateId()); + Map toIssueStartMap = toIssueStart.stream().collect(Collectors.toMap(SubAgencyFormDTO.Topic::getAgencyId, SubAgencyFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1)); + Map toIssueEndMap = toIssueEnd.stream().collect(Collectors.toMap(SubAgencyFormDTO.Topic::getAgencyId, SubAgencyFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1)); + //查询组织的议题转项目数据 + List toProjectStart = dataStatsDao.getSubAgencyIssue(agencyList, formDTO.getStartDateId()); + List toProjectEnd = dataStatsDao.getSubAgencyIssue(agencyList, formDTO.getEndDateId()); + Map toProjectStartMap = toProjectStart.stream().collect(Collectors.toMap(SubAgencyIssueResultDTO::getAgencyId, SubAgencyIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1)); + Map toProjectEndMap = toProjectEnd.stream().collect(Collectors.toMap(SubAgencyIssueResultDTO::getAgencyId, SubAgencyIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1)); + //查询组织已关闭的项目数据 + List closeProjectStart = dataStatsDao.getSubAgencyProject(agencyList, formDTO.getStartDateId()); + List closeProjectEnd = dataStatsDao.getSubAgencyProject(agencyList, formDTO.getEndDateId()); + Map closeProjectStartMap = closeProjectStart.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1)); + Map closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1)); + //巡查次数和时间 + List patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyList,formDTO.getStartDateId(),formDTO.getEndDateId()); + Map patrolListMap = patrolList.stream().collect(Collectors.toMap(StatsStaffPatrolRecordDailyEntity::getAgencyId, o -> o, (o1, o2) -> o1)); + + subAgencyList.forEach(agency->{ + String agencyId = agency.getAgencyId(); + WorkFactResultDTO resultDTO = new WorkFactResultDTO(); + resultDTO.setOrgId(agencyId); + resultDTO.setOrgName(agency.getAgencyName()); + resultDTO.setTopicToIssueTotal(getTotal(toIssueStartMap,toIssueEndMap,agencyId)); + resultDTO.setIssueToProjectTotal(getTotal(toProjectStartMap,toProjectEndMap,agencyId)); + resultDTO.setClosedProjectTotal(getTotal(closeProjectStartMap,closeProjectEndMap,agencyId)); + StatsStaffPatrolRecordDailyEntity patrolRecordDTO = patrolListMap.get(agencyId); + if (patrolRecordDTO != null){ + resultDTO.setPatrolTotal(patrolRecordDTO.getPatrolTotal()); + Integer totalTime = patrolRecordDTO.getTotalTime(); + resultDTO.setPatrolTotalTime(totalTime.toString()); + } + result.add(resultDTO); + }); + } - return null; + return result; + } + private Integer getTotal(Map startMap, Map endMap,String agencyId){ + Integer total1 = startMap.getOrDefault(agencyId,NumConstant.ZERO); + Integer total2 = endMap.getOrDefault(agencyId,NumConstant.ZERO); + if (total1.equals(total2)){ + log.warn("===========相等,total:{}",total1); + } + return Math.max(total2-total1,0); } private String getPercentage(Integer countInt, Integer totalInt) { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java new file mode 100644 index 0000000000..4de390526a --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java @@ -0,0 +1,42 @@ +/** + * 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.dataaggre.service.epmetuser; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity; + +import java.util.List; + +/** + * 工作人员巡查主记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-06-07 + */ +public interface StatsStaffPatrolRecordDailyService extends BaseService { + + /** + * desc:获取组织或网格的 时间段内的总次数等 + * @param agencyList + * @param startDateId + * @param endDateId + * @return + */ + List getPatrolSumList(List agencyList, String startDateId, String endDateId); + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java new file mode 100644 index 0000000000..41818e1b6d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java @@ -0,0 +1,43 @@ +package com.epmet.dataaggre.service.epmetuser.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dao.epmetuser.StatsStaffPatrolRecordDailyDao; +import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity; +import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * desc: + * + * @author: LiuJanJun + * @date: 2021/8/6 11:06 上午 + * @version: 1.0 + */ +@DataSource(DataSourceConstant.EPMET_USER) +@Slf4j +@Service +public class StatsStaffPatrolRecordDailyServiceImpl extends BaseServiceImpl implements StatsStaffPatrolRecordDailyService { + /** + * desc:获取组织或网格的 时间段内的总次数等 + * + * @param agencyList + * @param startDateId + * @param endDateId + * @return + */ + @Override + public List getPatrolSumList(List agencyList, String startDateId, String endDateId) { + /* LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StatsStaffPatrolRecordDailyEntity::getDelFlag, NumConstant.ZERO_STR) + .between(StatsStaffPatrolRecordDailyEntity::getDateId, startDateId,endDateId) + .in(StatsStaffPatrolRecordDailyEntity::getAgencyId, agencyList) + ;*/ + return baseDao.getPatrolSumList(agencyList,startDateId,endDateId); + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index c1d88ccc8e..d9f6301ad2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -727,5 +727,20 @@ agency_id = #{agencyId} + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml new file mode 100644 index 0000000000..4cc36dc640 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml @@ -0,0 +1,17 @@ + + + + + From 6a3681fad8958a4d8ebd2bc58a7da74ebac89bf0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Aug 2021 15:26:35 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=AE=9E=E5=86=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=8E=92=E5=BA=8F=E5=8F=8A=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datastats/impl/DataStatsServiceImpl.java | 50 +++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 7e76550402..600d74b413 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1516,7 +1516,49 @@ public class DataStatsServiceImpl implements DataStatsService { List result = new ArrayList<>(); //如果是社区 则下级是网格 查询网格的数据 if (OrgLevelEnum.COMMUNITY.getCode().equals(formDTO.getAgencyLevel())){ + //0.根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表 + List subAgencyList = indexService.getSubGridList(formDTO.getAgencyId()); + if (subAgencyList.size() < NumConstant.ONE) { + return null; + } + List gridIdList = subAgencyList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList()); + //查询组织的话题转议题数据 + List toIssueStart = dataStatsDao.getSubGridTopicShiftIssue(gridIdList, formDTO.getStartDateId()); + List toIssueEnd = dataStatsDao.getSubGridTopicShiftIssue(gridIdList, formDTO.getEndDateId()); + Map toIssueStartMap = toIssueStart.stream().collect(Collectors.toMap(SubGridFormDTO.Topic::getGridId, SubGridFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1)); + Map toIssueEndMap = toIssueEnd.stream().collect(Collectors.toMap(SubGridFormDTO.Topic::getGridId, SubGridFormDTO.Topic::getShiftedIssueTotal, (o1, o2) -> o1)); + //查询组织的议题转项目数据 + List toProjectStart = dataStatsDao.getSubGridIssue(gridIdList, formDTO.getStartDateId()); + List toProjectEnd = dataStatsDao.getSubGridIssue(gridIdList, formDTO.getEndDateId()); + Map toProjectStartMap = toProjectStart.stream().collect(Collectors.toMap(SubGridIssueResultDTO::getGridId, SubGridIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1)); + Map toProjectEndMap = toProjectEnd.stream().collect(Collectors.toMap(SubGridIssueResultDTO::getGridId, SubGridIssueResultDTO::getShiftProjectTotal, (o1, o2) -> o1)); + //查询组织已关闭的项目数据 + List closeProjectStart = dataStatsDao.getSubGridProject(gridIdList, formDTO.getStartDateId()); + List closeProjectEnd = dataStatsDao.getSubGridProject(gridIdList, formDTO.getEndDateId()); + Map closeProjectStartMap = closeProjectStart.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1)); + Map closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1)); + //巡查次数和时间 + List patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(gridIdList,formDTO.getStartDateId(),formDTO.getEndDateId()); + Map patrolListMap = patrolList.stream().collect(Collectors.toMap(StatsStaffPatrolRecordDailyEntity::getAgencyId, o -> o, (o1, o2) -> o1)); + subAgencyList.forEach(agency->{ + String gridId = agency.getGridId(); + WorkFactResultDTO resultDTO = new WorkFactResultDTO(); + resultDTO.setOrgId(gridId); + resultDTO.setOrgName(agency.getGridName()); + resultDTO.setTopicToIssueTotal(getTotal(toIssueStartMap,toIssueEndMap,gridId)); + resultDTO.setIssueToProjectTotal(getTotal(toProjectStartMap,toProjectEndMap,gridId)); + resultDTO.setClosedProjectTotal(getTotal(closeProjectStartMap,closeProjectEndMap,gridId)); + StatsStaffPatrolRecordDailyEntity patrolRecordDTO = patrolListMap.get(gridId); + if (patrolRecordDTO != null){ + resultDTO.setPatrolTotal(patrolRecordDTO.getPatrolTotal()); + Integer totalTime = patrolRecordDTO.getTotalTime(); + int minutes = totalTime / 60; + String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分"; + resultDTO.setPatrolTotalTime(totalTimeDesc); + } + result.add(resultDTO); + }); }else { //0.根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表 List subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId()); @@ -1556,14 +1598,16 @@ public class DataStatsServiceImpl implements DataStatsService { if (patrolRecordDTO != null){ resultDTO.setPatrolTotal(patrolRecordDTO.getPatrolTotal()); Integer totalTime = patrolRecordDTO.getTotalTime(); - resultDTO.setPatrolTotalTime(totalTime.toString()); + int minutes = totalTime / 60; + String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分"; + resultDTO.setPatrolTotalTime(totalTimeDesc); } result.add(resultDTO); }); } - - return result; + List newResult = result.stream().sorted(Comparator.comparing(o -> o.getTopicToIssueTotal() + o.getIssueToProjectTotal() + o.getClosedProjectTotal() + o.getPatrolTotal())).collect(Collectors.toList()); + return newResult; } private Integer getTotal(Map startMap, Map endMap,String agencyId){ Integer total1 = startMap.getOrDefault(agencyId,NumConstant.ZERO); From da7b516fd6e8b14cdf405b46d87d20e057b6dfe5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Aug 2021 15:38:07 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/impl/EvaluationIndexServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java index 8f682b1e43..f8c7eb301a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.evaluationindex.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.exception.RenException; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao; import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO; @@ -129,6 +130,9 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService { public List getSubAgencyListByAgency(String agencyId) { //1.查询agencyId对应组织信息 ScreenCustomerAgencyDTO dto = evaluationIndexDao.getByAgencyId(agencyId); + if (dto == null){ + throw new RenException("组织信息不存在！"); + } //2.判断客户是否存在子客户 List list = customerRelation.haveSubCustomer(dto.getCustomerId()); if (!CollectionUtils.isNotEmpty(list)) { From 13220a306b4e34552b9759384e1c5b88fec529a3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Aug 2021 15:47:37 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8D=95=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=BB=84=E7=BB=87=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/impl/AgencyServiceImpl.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 95bb28a38e..7b4516ab77 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -477,7 +477,6 @@ public class AgencyServiceImpl implements AgencyService { @Override public OrgTreeNode getStaffAgencyTree(OrgTreeFormDTO formDTO) { - //todo 获取客户的所有组织 然后遍历剔除 再构建出一颗树 咋样 //获取工作人员信息 CustomerStaffFormDTO staffParam = new CustomerStaffFormDTO(); staffParam.setMobile(formDTO.getMobile()); @@ -500,13 +499,30 @@ public class AgencyServiceImpl implements AgencyService { throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } List nodes = new ArrayList<>(); + ScreenCustomerAgencyDTO parentAgencyDTO = null; + + List nodeList = new ArrayList<>(); //单客户 if (CollectionUtils.isEmpty(crmRes.getData())){ + String parentId = staffAgencyDTO.getPid(); //todo 暂不处理 有时间再说 + do { + parentAgencyDTO = screenCustomerAgencyDao.selectByAgencyId(parentId); + if (parentAgencyDTO == null){ + break; + } + convertOrgTreeNode(nodeList, parentAgencyDTO); + if (parentAgencyDTO.getPid() == null || NumConstant.ZERO_STR.equals(parentAgencyDTO.getPid())){ + break; + } + parentId = parentAgencyDTO.getAreaCode(); + } while (true); + //多客户 获取所有下级 + List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(staffAgencyDTO.getPids(),null); + agencyNodeDTOS.forEach(agency->convertOrgTreeNode(nodeList, agency)); + nodes = TreeUtils.buildTreeByAreaCode(nodeList); }else { - ScreenCustomerAgencyDTO parentAgencyDTO = null; String parentAreaCode = staffAgencyDTO.getParentAreaCode(); - List nodeList = new ArrayList<>(); /*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); currentAgency.setCustomerId(staffAgencyDTO.getCustomerId()); From 4e077a7f6f0f42d27ebc0e684e4b3e677efc0380 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Aug 2021 15:47:55 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8D=95=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=BB=84=E7=BB=87=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/impl/AgencyServiceImpl.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 7b4516ab77..8b45ddb6ef 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -505,7 +505,6 @@ public class AgencyServiceImpl implements AgencyService { //单客户 if (CollectionUtils.isEmpty(crmRes.getData())){ String parentId = staffAgencyDTO.getPid(); - //todo 暂不处理 有时间再说 do { parentAgencyDTO = screenCustomerAgencyDao.selectByAgencyId(parentId); if (parentAgencyDTO == null){ @@ -523,18 +522,6 @@ public class AgencyServiceImpl implements AgencyService { nodes = TreeUtils.buildTreeByAreaCode(nodeList); }else { String parentAreaCode = staffAgencyDTO.getParentAreaCode(); - - /*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); - currentAgency.setCustomerId(staffAgencyDTO.getCustomerId()); - currentAgency.setAgencyId(staffAgencyDTO.getId()); - currentAgency.setAgencyName(staffAgencyDTO.getOrganizationName()); - currentAgency.setLevel(staffAgencyDTO.getLevel()); - currentAgency.setAreaCode(staffAgencyDTO.getAreaCode()); - currentAgency.setParentAreaCode(staffAgencyDTO.getParentAreaCode()); - currentAgency.setPid(staffAgencyDTO.getPid()); - currentAgency.setPids(staffAgencyDTO.getPids()); - - convertOrgTreeNode(nodeList, currentAgency);*/ //多客户 获取所有直线上级 do { parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(parentAreaCode); From 3e8b215b519a2e28a996e6682efeb01af07eb7c7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Aug 2021 16:49:43 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/datastats/form/BaseDataFormDTO.java | 6 +- .../controller/pub/PubController.java | 57 +++++++++++++++---- .../service/datastats/DataStatsService.java | 6 +- .../datastats/impl/DataStatsServiceImpl.java | 6 +- 4 files changed, 57 insertions(+), 18 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java index d2513cf19d..1eae69043b 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java @@ -17,9 +17,9 @@ public class BaseDataFormDTO implements Serializable { /** * 组织Id */ - @NotBlank(message = "组织ID不能为空",groups = {BaseDataFormDTO.BaseData.class,BaseDataFormDTO.WorkFact.class}) + @NotBlank(message = "组织ID不能为空",groups = {BaseDataFormDTO.BaseData.class, AgencyIdAndLevel.class}) private String agencyId; - @NotBlank(message = "组织级别不能为空",groups = BaseDataFormDTO.WorkFact.class) + @NotBlank(message = "组织级别不能为空",groups = AgencyIdAndLevel.class) private String agencyLevel; private String type; /** @@ -29,6 +29,6 @@ public class BaseDataFormDTO implements Serializable { private String startDateId; private String endDateId; public interface BaseData extends CustomerClientShowGroup{} - public interface WorkFact extends CustomerClientShowGroup{} + public interface AgencyIdAndLevel extends CustomerClientShowGroup{} } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java index 964e5225d1..2d6b0fa999 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java @@ -3,19 +3,20 @@ package com.epmet.dataaggre.controller.pub; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.datastats.form.BaseDataFormDTO; -import com.epmet.dataaggre.dto.datastats.form.SubTopicAndGroupFormDTO; -import com.epmet.dataaggre.dto.datastats.form.SubUserTotalFormDTO; import com.epmet.dataaggre.dto.datastats.result.BaseStatsDataResultDTO; import com.epmet.dataaggre.dto.datastats.result.SubTopicAndGroupResultDTO; import com.epmet.dataaggre.dto.datastats.result.SubUserTotalResultDTO; import com.epmet.dataaggre.dto.datastats.result.WorkFactResultDTO; import com.epmet.dataaggre.service.datastats.DataStatsService; +import lombok.extern.log4j.Log4j; 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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; /** @@ -24,6 +25,7 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2021/7/27 18:36 */ +@Log4j @RestController @RequestMapping("pub") public class PubController { @@ -41,7 +43,8 @@ public class PubController { @PostMapping("baseDataAgg") public Result getBaseStatsData(@RequestBody BaseDataFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.BaseData.class); - return new Result().ok(dataStatsService.getBaseStatsData(formDTO)); + BaseStatsDataResultDTO baseStatsData = dataStatsService.getBaseStatsData(formDTO); + return new Result().ok(baseStatsData); } /** @@ -54,8 +57,9 @@ public class PubController { */ @PostMapping("subWorkFact") public Result> getSubWorkFact(@RequestBody BaseDataFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.WorkFact.class); - return new Result>().ok(dataStatsService.getSubWorkFact(formDTO)); + ValidatorUtils.validateEntity(formDTO, BaseDataFormDTO.AgencyIdAndLevel.class); + List subWorkFact = dataStatsService.getSubWorkFact(formDTO); + return new Result>().ok(subWorkFact); } /** @@ -64,9 +68,10 @@ public class PubController { * @author sun */ @PostMapping("subUserTotal") - public Result> subUserTotal(@RequestBody SubUserTotalFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, SubUserTotalFormDTO.Agency.class); - return new Result>().ok(dataStatsService.subUserTotal(formDTO)); + public Result> subUserTotal(@RequestBody BaseDataFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, BaseDataFormDTO.AgencyIdAndLevel.class); + List data = dataStatsService.subUserTotal(formDTO); + return new Result>().ok(data); } /** @@ -75,9 +80,39 @@ public class PubController { * @author sun */ @PostMapping("subTopicAndGroup") - public Result> subTopicAndGroup(@RequestBody SubTopicAndGroupFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, SubTopicAndGroupFormDTO.Agency.class); - return new Result>().ok(dataStatsService.subTopicAndGroup(formDTO)); + public Result> subTopicAndGroup(@RequestBody BaseDataFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, BaseDataFormDTO.AgencyIdAndLevel.class); + List data = dataStatsService.subTopicAndGroup(formDTO); + return new Result>().ok(data); + } + + /** + * 导出数据，使用map接收 + * + * @param map + * @param response + * @throws IOException + */ + @PostMapping("/exportExcel") + public void exportExcel(@RequestBody BaseDataFormDTO formDTO, HttpServletResponse response) throws IOException { + /* try { + Map mapData = new HashMap<>(); + BaseStatsDataResultDTO baseStatsData = dataStatsService.getBaseStatsData(formDTO); + String templatePath = "excel/trace_temp.xlsx"; + log.info("exportExcel templatePath:{}",templatePath); + mapData.put("dataType", baseStatsData); + + start = System.currentTimeMillis(); + Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath, "数据汇总"), baseStatsData); + //header + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("继续追踪导出详情-".concat(DateUtils.formatDate()) + ".xlsx", "UTF-8")); + //加密 + log.error("excelExport build wb cost:{}",System.currentTimeMillis()-start); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + }*/ + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 621a336fb2..9db20ef41c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -200,13 +200,15 @@ public interface DataStatsService { * @Param formDTO * @Description 对外接口--查询下级用户党员数 * @author sun + * @param formDTO */ - List subUserTotal(SubUserTotalFormDTO formDTO); + List subUserTotal(BaseDataFormDTO formDTO); /** * @Param formDTO * @Description 对外接口--查询下级话题和小组数 * @author sun + * @param formDTO */ - List subTopicAndGroup(SubTopicAndGroupFormDTO formDTO); + List subTopicAndGroup(BaseDataFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 600d74b413..e8cfd1c8ba 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1633,9 +1633,10 @@ public class DataStatsServiceImpl implements DataStatsService { * @Param formDTO * @Description 对外接口--查询下级用户党员数 * @author sun + * @param formDTO */ @Override - public List subUserTotal(SubUserTotalFormDTO formDTO) { + public List subUserTotal(BaseDataFormDTO formDTO) { List resultList = new ArrayList<>(); //1.入参有日期的则按具体时间执行,没有的则按当前时间前一天执行 if (StringUtils.isBlank(formDTO.getDateId())) { @@ -1710,9 +1711,10 @@ public class DataStatsServiceImpl implements DataStatsService { * @Param formDTO * @Description 对外接口--查询下级话题和小组数 * @author sun + * @param formDTO */ @Override - public List subTopicAndGroup(SubTopicAndGroupFormDTO formDTO) { + public List subTopicAndGroup(BaseDataFormDTO formDTO) { List resultList = new ArrayList<>(); //1.入参有日期的则按具体时间执行,没有的则按当前时间前一天执行 if (StringUtils.isBlank(formDTO.getDateId())) {