From a62e367693061a20a710c353dcd10f33356b5cec Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 29 Jul 2022 16:55:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/CustomerStaffAgencyDao.java | 3 + .../dao/govorg/CustomerStaffGridDao.java | 2 + .../dataaggre/dao/govproject/ProjectDao.java | 2 + .../epmetuser/impl/EpmetUserServiceImpl.java | 3 + .../govorg/impl/GovOrgServiceImpl.java | 167 ++++++++++++++---- .../service/govproject/GovProjectService.java | 16 ++ .../impl/GovProjectServiceImpl.java | 36 ++++ .../mapper/govorg/CustomerStaffAgencyDao.xml | 35 ++++ .../mapper/govorg/CustomerStaffGridDao.xml | 13 ++ .../mapper/govproject/ProjectDao.xml | 37 ++++ 10 files changed, 280 insertions(+), 34 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java index 043d5c245d..96e44d2c3a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java @@ -22,6 +22,7 @@ import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.CustomerStaffAgencyDTO; import com.epmet.dataaggre.dto.govorg.OrgDTO; +import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO; import com.epmet.dataaggre.entity.govorg.CustomerStaffAgencyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -71,4 +72,6 @@ public interface CustomerStaffAgencyDao extends BaseDao selectSubAgency(@Param("agencyId") String agencyId, @Param("userId") String userId); + List getStaffList(@Param("orgId") String orgId, @Param("orgType") String orgType); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffGridDao.java index 2fcba2cdc4..b481617cb2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffGridDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffGridDao.java @@ -56,4 +56,6 @@ public interface CustomerStaffGridDao extends BaseDao { * @Date 2021/8/20 14:37 */ List selectGridList(@Param("agencyId") String agencyId, @Param("userId") String userId); + + List getGridStaffByAgency(@Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 05354d0b8b..956e8b95ed 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -130,4 +130,6 @@ public interface ProjectDao extends BaseDao { List getGridClosedProjectCount(OrgStatisticsFormDTO formDTO); List getMemberProjectCount(OrgStatisticsFormDTO formDTO); List getMemberClosedProjectCount(OrgStatisticsFormDTO formDTO); + List getAgencyProjectCount(OrgStatisticsFormDTO formDTO); + List getAgencyClosedProjectCount(OrgStatisticsFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 4e31dd4a5d..025f550198 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -605,6 +605,9 @@ public class EpmetUserServiceImpl implements EpmetUserService { queryWrapper.eq(CustomerStaffEntity::getUserId,staffId) .eq(CustomerStaffEntity::getDelFlag,NumConstant.ZERO_STR); CustomerStaffEntity staffEntity = customerStaffDao.selectOne(queryWrapper); + if (null == staffEntity) { + return null; + } CustomerStaffResultDTO result = ConvertUtils.sourceToTarget(staffEntity, CustomerStaffResultDTO.class); //查询工作人员所属组织信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 99318e966c..f9772a9f47 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.dataaggre.service.govorg.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.dingtalk.api.request.OapiRobotSendRequest; @@ -24,17 +25,17 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; +import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.dao.govorg.*; -import com.epmet.dataaggre.dto.datastats.result.SubAgencyProjectResultDTO; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.CustomerStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; @@ -66,6 +67,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.commons.CommonsMultipartFile; @@ -75,6 +77,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; +import java.text.Collator; import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -1153,17 +1156,12 @@ public class GovOrgServiceImpl implements GovOrgService { public PageData orgProjectDetailList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) { List resultList = new ArrayList<>(); if (StringUtils.isBlank(formDTO.getAgencyId())) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); if (null == staffInfo) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); } formDTO.setAgencyId(staffInfo.getAgencyId()); } - if (StringUtils.isEmpty(formDTO.getStartDate()) && StringUtils.isEmpty(formDTO.getEndDate())) { - //当前日期前一天 - String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD); - formDTO.setEndDate(dateId); - } CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); if (null == agencyEntity) { return new PageData<>(Collections.emptyList(), NumConstant.ZERO); @@ -1184,7 +1182,7 @@ public class GovOrgServiceImpl implements GovOrgService { //统计网格关闭项目数 Map closedMap = govProjectService.getGridClosedProjectMap(formDTO); //网格员统计 - Map memberMap = dataStatsService.getMemberMap(formDTO.getAgencyId()); + Map memberMap = getMemberMap(tokenDto.getCustomerId(), formDTO.getAgencyId()); resultList = gridList.stream().map(grid -> { OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO(); dto.setOrgId(grid.getId()); @@ -1197,9 +1195,11 @@ public class GovOrgServiceImpl implements GovOrgService { dto.setClosedCount(closedMap.get(grid.getId())); } if (memberMap.containsKey(grid.getId())) { - dto.setMemberCount(memberMap.get(grid.getId())); - dto.setProjectAve(dto.getProjectCount()/memberMap.get(grid.getId())); - dto.setClosedAve(dto.getClosedCount()/memberMap.get(grid.getId())); + dto.setMemberCount(Math.toIntExact(memberMap.get(grid.getId()))); + if (NumConstant.ZERO != dto.getMemberCount()) { + dto.setProjectAve(dto.getProjectCount() / dto.getMemberCount()); + dto.setClosedAve(dto.getClosedCount() / dto.getMemberCount()); + } } return dto; }).collect(Collectors.toList()); @@ -1221,7 +1221,10 @@ public class GovOrgServiceImpl implements GovOrgService { //拼装数据 if (CollectionUtils.isNotEmpty(agencyList)) { //项目相关统计 - Map projectMap = dataStatsService.getAgencyProjectTotal(formDTO); + //统计项目数 + Map projectMap = govProjectService.getAgencyProjectMap(formDTO); + //统计关闭项目数 + Map closedMap = govProjectService.getAgencyClosedProjectMap(formDTO); //网格员统计 Map memberMap = epmetUserService.getMemberCount(tokenDto.getCustomerId()); @@ -1230,12 +1233,12 @@ public class GovOrgServiceImpl implements GovOrgService { dto.setOrgId(agency.getId()); dto.setOrgType(OrgConstant.AGENCY); dto.setOrgName(agency.getOrganizationName()); - if (projectMap.containsKey(agency.getId())) { - dto.setProjectCount(projectMap.get(agency.getId()).getProjectTotal()); - dto.setClosedCount(projectMap.get(agency.getId()).getClosedProjectTotal()); - } //获取当前组织的所有下级组织ID（包含本级） List agencyIds = customerAgencyDao.getSubAgencyList(agency.getId()); + int projectCount = agencyIds.stream().filter(projectMap::containsKey).mapToInt(projectMap::get).sum(); + int closedCount = agencyIds.stream().filter(closedMap::containsKey).mapToInt(closedMap::get).sum(); + dto.setProjectCount(projectCount); + dto.setClosedCount(closedCount); //将下级组织网格员数加起来 int memberCount = agencyIds.stream().filter(memberMap::containsKey).mapToInt(memberMap::get).sum(); dto.setMemberCount(memberCount); @@ -1268,30 +1271,25 @@ public class GovOrgServiceImpl implements GovOrgService { @Override public PageData memberProjectInfoList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); - PageData result; if (StringUtils.isBlank(formDTO.getOrgId())) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); if (null == staffInfo) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); } formDTO.setOrgId(staffInfo.getAgencyId()); formDTO.setOrgType(OrgConstant.AGENCY); } - if (StringUtils.isEmpty(formDTO.getStartDate()) && StringUtils.isEmpty(formDTO.getEndDate())) { - //当前日期前一天 - String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD); - formDTO.setEndDate(dateId); - } - if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) { - //获取当前组织的所有下级组织ID（包含本级） - List agencyIds = customerAgencyDao.getSubAgencyList(formDTO.getOrgId()); - formDTO.setAgencyList(agencyIds); - //获取组织下的网格员 - result = epmetUserService.getMemberList(formDTO); - } else { - //获取网格下的网格员 - result = dataStatsService.getMemberList(formDTO); - } + PageData result = getGridMemberList(formDTO); + //if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) { + // //获取当前组织的所有下级组织ID（包含本级） + // //List agencyIds = customerAgencyDao.getSubAgencyList(formDTO.getOrgId()); + // //formDTO.setAgencyList(agencyIds); + // //获取组织下的网格员 + // result = epmetUserService.getMemberList(formDTO); + //} else { + // //获取网格下的网格员 + // result = dataStatsService.getMemberList(formDTO); + //} if (CollectionUtils.isNotEmpty(result.getList())) { //统计项目数 Map projectMap = govProjectService.getMemberProjectMap(formDTO); @@ -1319,4 +1317,105 @@ public class GovOrgServiceImpl implements GovOrgService { } return result; } + + private PageData getGridMemberList(OrgStatisticsFormDTO formDTO) { + List list = new ArrayList<>(); + List staffList = customerStaffAgencyDao.getStaffList(formDTO.getOrgId(), formDTO.getOrgType()); + if (OrgConstant.AGENCY.equals(formDTO.getOrgType())) { + for (StaffOrgRelationResultDTO staff : staffList) { + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), staff.getStaffId()); + if (null != staffInfo) { + if(staffInfo.getRoleMap().containsKey("grid_member")) { + MemberProjectInfoResultDTO dto = new MemberProjectInfoResultDTO(); + dto.setStaffId(staff.getStaffId()); + dto.setStaffName(staffInfo.getRealName()); + dto.setOrgId(staff.getOrgId()); + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staff.getOrgId()); + if (null != agencyInfo) { + dto.setOrgName(agencyInfo.getOrganizationName()); + } + list.add(dto); + } + } + } + } else { + for (StaffOrgRelationResultDTO staff : staffList) { + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), staff.getStaffId()); + if (null != staffInfo) { + if(staffInfo.getRoleMap().containsKey("grid_member")) { + MemberProjectInfoResultDTO dto = new MemberProjectInfoResultDTO(); + dto.setStaffId(staff.getStaffId()); + dto.setStaffName(staffInfo.getRealName()); + dto.setOrgId(staff.getOrgId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(staff.getOrgId()); + if (null != gridInfo) { + dto.setOrgName(gridInfo.getGridName()); + } + list.add(dto); + } + } + } + } + int num = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + PageInfo pageInfo = new PageInfo<>(list); + list = list.stream().sorted((o1, o2) -> + Collator.getInstance(Locale.SIMPLIFIED_CHINESE) + .compare(o1.getStaffName(),o2.getStaffName())).collect(Collectors.toList()); + list = list.stream().skip(num).limit(formDTO.getPageSize()).collect(Collectors.toList()); + return new PageData<>(list, pageInfo.getTotal()); + + } + + private Map getMemberMap(String customerId, String agencyId) { + List list = customerStaffGridDao.getGridStaffByAgency(agencyId); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + list = list.stream().filter(item -> { + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(customerId, item.getStaffId()); + if (null != staffInfo) { + if (staffInfo.getRoleMap().containsKey("grid_member")) { + return true; + } + } + return false; + }).collect(Collectors.toList()); + + return list.stream().collect(Collectors.groupingBy(GridStaffResultDTO::getGridId, Collectors.counting())); + } + + + private CustomerStaffInfoCacheResult getStaffInfo(String customerId, String staffId) { + if (StringUtils.isBlank(customerId) || StringUtils.isBlank(staffId)){ + log.warn("getStaffInfo param is blank,customerId:{},staffId:{}",customerId,staffId); + return null; + } + String key = RedisKeys.getCustomerStaffInfoKey(customerId, staffId); + Map roleMap = redisUtils.hGetAll(key); + if (!org.springframework.util.CollectionUtils.isEmpty(roleMap)) { + return ConvertUtils.mapToEntity(roleMap, CustomerStaffInfoCacheResult.class); + } + + CustomerStaffInfoCache resultData = reloadStaffCache(staffId, key); + if (resultData == null) { + return null; + } + + return ConvertUtils.sourceToTarget(resultData, CustomerStaffInfoCacheResult.class); + } + + @Nullable + private CustomerStaffInfoCache reloadStaffCache(String staffId, String key) { + CustomerStaffResultDTO staffResult = epmetUserService.getStaffInfo(staffId); + if (staffResult == null) { + log.warn("getStaffInfo staff is null,staffId:{}", staffId); + return null; + } + CustomerStaffInfoCache resultData =ConvertUtils.sourceToTarget(staffResult, CustomerStaffInfoCache.class); + + Map map = BeanUtil.beanToMap(resultData, false, true); + redisUtils.hMSet(key, map); + return resultData; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 31beec2422..27e554145d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -153,4 +153,20 @@ public interface GovProjectService { * @Date 2022/7/28 9:29 */ Map getMemberClosedProjectMap(OrgStatisticsFormDTO formDTO); + /** + * 组织上报项目数 + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + Map getAgencyProjectMap(OrgStatisticsFormDTO formDTO); + /** + * 组织关闭项目数 + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + Map getAgencyClosedProjectMap(OrgStatisticsFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 72e51a6a54..ffe5d2d7a3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -721,6 +721,42 @@ public class GovProjectServiceImpl implements GovProjectService { return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); } + /** + * 组织上报项目数 + * + * @param formDTO + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + @Override + public Map getAgencyProjectMap(OrgStatisticsFormDTO formDTO) { + List list = projectDao.getAgencyProjectCount(formDTO); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } + + /** + * 组织关闭项目数 + * + * @param formDTO + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + @Override + public Map getAgencyClosedProjectMap(OrgStatisticsFormDTO formDTO) { + List list = projectDao.getAgencyClosedProjectCount(formDTO); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } + /** * 构造事件查询 * @param customerId diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml index d2c47a0922..b39a38745d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml @@ -124,4 +124,39 @@ ca.ID ORDER BY ca.CREATED_TIME ASC + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffGridDao.xml index d7bfb5ff40..0120ff67a5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffGridDao.xml @@ -55,4 +55,17 @@ cg.ID ORDER BY cg.CREATED_TIME ASC + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index e56a84c754..5771dfad79 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -501,5 +501,42 @@ GROUP BY STAFF_ID + + From 86c31a0c57e888108c68f884f45fbce528210c76 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 1 Aug 2022 12:51:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90rocketmq=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E3=80=91=E4=B9=8B=E5=89=8D=E4=BF=AE=E6=94=B9mq=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=BF=98=E4=BA=86?= =?UTF-8?q?=E5=8A=A0=E4=B8=8Ayml=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-admin-server/src/main/resources/bootstrap.yml | 3 ++- .../data-statistical-server/src/main/resources/bootstrap.yml | 2 ++ .../epmet-heart-server/src/main/resources/bootstrap.yml | 2 ++ .../epmet-message-server/src/main/resources/bootstrap.yml | 2 ++ .../epmet-point-server/src/main/resources/bootstrap.yml | 4 +++- .../epmet-third-server/src/main/resources/bootstrap.yml | 2 ++ .../gov-issue-server/src/main/resources/bootstrap.yml | 2 ++ .../gov-org/gov-org-server/src/main/resources/bootstrap.yml | 2 ++ .../open-data-worker-server/src/main/resources/bootstrap.yml | 2 ++ .../oper-customize-server/src/main/resources/bootstrap.yml | 2 ++ .../resi-group-server/src/main/resources/bootstrap.yml | 2 ++ .../resi-partymember-server/src/main/resources/bootstrap.yml | 4 +++- epmet-user/epmet-user-server/src/main/resources/bootstrap.yml | 2 ++ 13 files changed, 28 insertions(+), 3 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml index 80503e260f..c6a439be3c 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -140,7 +140,8 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - + client: + logUseSlf4j: true thread: # 线程池配置 threadPool: diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index 530c216a2d..0fdb1169d4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -226,3 +226,5 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml index 0f10a78167..124d7b778b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml @@ -151,6 +151,8 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true # 停机选项 shutdown: graceful: diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml index 1c4e2f2bfd..1f5a8c83bf 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml @@ -152,6 +152,8 @@ shutdown: waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警 rocketmq: + client: + logUseSlf4j: true name-server: @rocketmq.nameserver@ producer: group: @rocketmq.producer.group@ diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index b3fa3f8fe9..4c7bbe3542 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -147,4 +147,6 @@ shutdown: rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 573b117d9d..67cbb2570e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -157,6 +157,8 @@ shutdown: waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警 rocketmq: + client: + logUseSlf4j: true # epmet-cloud集群内部用的rocketmq # epmet-cloud-inner: # enable: @rocketmq.epmet-cloud-inner.enable@ diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 06f9b57041..940a51c056 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -142,6 +142,8 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true thread: # 线程池配置 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 5a6a066a1b..2dd0a7d172 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -165,6 +165,8 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true # consume-thread-min: 2 # consume-thread-max: 2 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 6118195219..397003f631 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -147,6 +147,8 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true thread: # 线程池配置 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml index 346506fb54..91b9bbfe59 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml @@ -130,6 +130,8 @@ dingTalk: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true # 停机选项 shutdown: diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index b782d086dc..e1e520b3dd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -175,3 +175,5 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml index 751620e91d..7513661df2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml @@ -147,4 +147,6 @@ thread: # rocketmq rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index a9ec2fcadb..cfe4da3c8f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -168,6 +168,8 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true # 停机选项 shutdown: