Browse Source

Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage

master
wangxianzhang 3 years ago
parent
commit
ed31dba2c8
  1. 42
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java
  2. 4
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java
  3. 22
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TableConstant.java
  4. 22
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java
  5. 14
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java
  6. 13
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java
  7. 45
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java
  8. 23
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java
  9. 75
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/MenusEnums.java
  10. 5
      epmet-module/data-aggregator/data-aggregator-server/pom.xml
  11. 12
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java
  12. 43
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java
  13. 12
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java
  14. 13
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java
  15. 7
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java
  16. 109
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java
  17. 10
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java
  18. 50
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java
  19. 10
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java
  20. 44
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
  21. 12
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java
  22. 30
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
  23. 12
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
  24. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
  25. 4
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java
  26. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java
  27. 152
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
  28. 9
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryStatsConfigService.java
  29. 20
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
  30. 92
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml
  31. 9
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml
  32. 17
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml
  33. 18
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml

42
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java

@ -0,0 +1,42 @@
package com.epmet.commons.tools.enums;
public enum ResiCategoryEnum {
IS_PARTY("IS_PARTY", "党员"),
IS_DBH("IS_DBH", "低保人员"),
IS_ENSURE_HOUSE("IS_ENSURE_HOUSE", "保障房人员"),
IS_UNEMPLOYED("IS_UNEMPLOYED", "失业人员"),
IS_YLFN("IS_YLFN", "育龄妇女"),
IS_VETERANS("IS_VETERANS", "退役军人"),
IS_UNITED_FRONT("IS_UNITED_FRONT", "统战人员"),
IS_XFRY("IS_XFRY", "信访人员"),
IS_VOLUNTEER("IS_VOLUNTEER", "志愿者"),
IS_OLD_PEOPLE("IS_OLD_PEOPLE", "老年人"),
IS_KC("IS_KC", "空巢"),
IS_SD("IS_SD", "失独人员"),
IS_SN("IS_SN", "失能"),
IS_SZ("IS_SZ", "失智"),
IS_CJ("IS_CJ", "残疾"),
IS_DB("IS_DB", "大病"),
IS_MB("IS_MB", "慢病"),
IS_SPECIAL("IS_SPECIAL", "特殊人群");
private String colName;
private String label;
ResiCategoryEnum(String colName, String label) {
this.colName = colName;
this.label = label;
}
public String getColName() {
return colName;
}
public String getLabel() {
return label;
}
public void setLabel(String label) {
this.label = label;
}
}

4
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java

@ -17,4 +17,8 @@ public interface OrgConstant {
String AGENCY_ID="agencyId";
String AGENC_PATH="agencyPath";
String SEARCH_TYPE_USER = "user";
String SEARCH_TYPE_EVENT = "event";
String SEARCH_TYPE_RESOURCE = "resource";
}

22
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TableConstant.java

@ -0,0 +1,22 @@
package com.epmet.dataaggre.constant;
/**
*
*/
public interface TableConstant {
String IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals";
String IC_SUPERIOR_RESOURCE = "ic_superior_resource";
String IC_ENTERPRISE = "ic_enterprise";
String IC_COMMUNITY_SELF_ORGANIZATION = "ic_community_self_organization";
String IC_CITY_MANAGEMENT = "ic_city_management";
String IC_PUBLIC_SERVICE = "ic_public_service";
String IC_EVENT = "ic_event";
}

22
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java

@ -1,5 +1,6 @@
package com.epmet.dataaggre.dto.govorg.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import java.io.Serializable;
@ -10,11 +11,30 @@ import java.io.Serializable;
* @DESC
*/
@Data
public class CoverageHomeSearchFormDTO implements Serializable {
public class CoverageHomeSearchFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = 3776954636762201010L;
private String name;
private String customerId;
private String userId;
private String orgId;
private String pids;
private String tableName;
/**
* 搜索类型居民user事件event资源resource
*/
private String searchType;
/**
* 资源类型社区自组织community_org;优势资源:superior_resource;城市管理city_management重点危化企业dangerous_chemicals公共服务public_service企事业单位巡查enterprise_patrol
* searchType为resource时此字段必填
*/
private String resourceType;
}

14
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java

@ -1,8 +1,10 @@
package com.epmet.dataaggre.dto.govorg.result;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -19,14 +21,26 @@ public class CoverageHomeSearchResultDTO implements Serializable {
* 居民信息
*/
private List<UserInfoResultDTO> userInfos;
private Long userInfosTotal;
/**
* 事件信息
*/
private List<EventInfoResultDTO> eventInfos;
private Long eventInfoTotal;
/**
* 资源信息
*/
private List<ResourceInfoResultDTO> resourceInfos;
private Long resourceInfoTotal;
public CoverageHomeSearchResultDTO() {
this.userInfos = new ArrayList<>();
this.userInfosTotal = NumConstant.ZERO_L;
this.eventInfos = new ArrayList<>();
this.eventInfoTotal = NumConstant.ZERO_L;
this.resourceInfos = new ArrayList<>();
this.resourceInfoTotal = NumConstant.ZERO_L;
}
}

13
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java

@ -1,5 +1,6 @@
package com.epmet.dataaggre.dto.govorg.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@ -24,6 +25,9 @@ public class EventInfoResultDTO implements Serializable {
*/
private String gridName;
@JsonIgnore
private String gridId;
/**
* 发生时间 yyyy-dd-mm hh:ii:ss
*/
@ -43,4 +47,13 @@ public class EventInfoResultDTO implements Serializable {
* 纬度
*/
private String latitude;
public EventInfoResultDTO() {
this.eventId = "";
this.gridName = "";
this.happenTime = "";
this.eventContent = "";
this.longitude = "";
this.latitude = "";
}
}

45
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java

@ -28,4 +28,49 @@ public class ResourceInfoResultDTO implements Serializable {
* 纬度
*/
private String latitude;
/**
* 分类名称
*/
private String categoryName;
private String category;
/**
* 占地面积
*/
private String areaCovered;
/**
* 容纳人数
*/
private String capacity;
/**
* 地址
*/
private String address;
/**
* 联系电话
*/
private String mobile;
/**
* 联系人
*/
private String principal;
public ResourceInfoResultDTO() {
this.resourceId = "";
this.resourceType = "";
this.name = "";
this.longitude = "";
this.latitude = "";
this.categoryName = "";
this.areaCovered = "";
this.capacity = "";
this.address = "";
this.mobile = "";
this.principal = "";
}
}

23
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java

@ -1,8 +1,10 @@
package com.epmet.dataaggre.dto.govorg.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -27,11 +29,17 @@ public class UserInfoResultDTO implements Serializable {
*/
private String gridName;
@JsonIgnore
private String gridId;
/**
* 所属房屋
*/
private String houseName;
@JsonIgnore
private String homeId;
/**
* 手机号
*/
@ -66,4 +74,19 @@ public class UserInfoResultDTO implements Serializable {
* 纬度
*/
private String latitude;
public UserInfoResultDTO() {
this.icUserId = "";
this.name = "";
this.gridName = "";
this.houseName = "";
this.homeId = "";
this.mobile = "";
this.idCard = "";
this.gzdw = "";
this.rhqk = "";
this.type = new ArrayList<>();
this.longitude = "";
this.latitude = "";
}
}

75
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/MenusEnums.java

@ -0,0 +1,75 @@
package com.epmet.dataaggre.enums;
import org.apache.commons.lang3.StringUtils;
public enum MenusEnums {
IC_DANGEROUS_CHEMICALS("shequzhili/tuceng/anquan/weihua/index","ic_dangerous_chemicals","重点危化品企业","govorg"),
IC_SUPERIOR_RESOURCE("shequzhili/tuceng/yingji/ziyuan/index","ic_superior_resource","优势资源管理","govorg"),
IC_ENTERPRISE("shequzhili/tuceng/anquan/xuncha/index","ic_enterprise","企事业单位巡查","govorg"),
IC_COMMUNITY_SELF_ORGANIZATION("communityService/sqzzz/index","ic_community_self_organization","社区自组织","heart"),
IC_CITY_MANAGEMENT("shequzhili/csgltc/csgl","ic_city_management","城市管理图层","govorg"),
IC_PUBLIC_SERVICE("shequzhili/ggfwtc/ggfw","ic_public_service","公共服务图层","govorg"),
IC_EVENT("shequzhili/event/eventList","ic_event","事件管理","govproject");
private String url;
private String value;
private String name;
private String db;
MenusEnums(String url, String value, String name, String db) {
this.url = url;
this.value = value;
this.name = name;
this.db = db;
}
public static MenusEnums get(String url) {
for (MenusEnums gm : MenusEnums.values()) {
if (gm.url.equals(url)) {
return gm;
}
}
return null;
}
public static String getValueByUrl(String url){
if (StringUtils.isBlank(url)){
return "";
}
for (MenusEnums me : MenusEnums.values()) {
if (me.url.equals(url)) {
return me.getValue();
}
}
return "";
}
public static String getDbByValue(String table){
if (StringUtils.isBlank(table)){
return "";
}
for (MenusEnums me : MenusEnums.values()) {
if (me.value.equals(table)) {
return me.getDb();
}
}
return "";
}
public String getUrl() {
return url;
}
public String getValue() {
return value;
}
public String getName() {
return name;
}
public String getDb() {
return db;
}
}

5
epmet-module/data-aggregator/data-aggregator-server/pom.xml

@ -13,6 +13,11 @@
<artifactId>data-aggregator-server</artifactId>
<dependencies>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>gov-access-client</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart-client</artifactId>

12
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java

@ -21,6 +21,8 @@ import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO;
import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO;
import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
import com.epmet.dto.IcResiUserDTO;
@ -28,7 +30,6 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Set;
/**
* 用户基础信息
@ -98,4 +99,13 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
@Param("name") String name,
@Param("resiRules") List<ResisByPolicyRulesFormDTO.ResiRule> resiRule,
@Param("houseIds") List<String> houseIds);
/**
* Desc: 获取icUser
* @param formDTO
* @author zxc
* @date 2022/7/27 17:09
*/
List<UserInfoResultDTO> getAllIcUser(CoverageHomeSearchFormDTO formDTO);
}

43
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java

@ -1,9 +1,13 @@
package com.epmet.dataaggre.dao.govorg;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 城市管理图层
*
@ -13,5 +17,44 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
/**
* Desc: 资源获取城市管理信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getCityManageInfos(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取公共服务信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取重点危化品企业信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取优势资源信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取企事业单位巡查信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO);
}

12
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java

@ -3,6 +3,9 @@ package com.epmet.dataaggre.dao.govorg;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 五大图层类别字典表
@ -13,4 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface IcCoverageCategoryDictDao extends BaseDao<IcCoverageCategoryDictEntity> {
/**
* Desc: 根据客户ID和数据类型获取字典对应的url
* @param customerId
* @param dataType
* @author zxc
* @date 2022/7/27 16:52
*/
List<String> getAllTypeCoverageByCustomerAndType(@Param("customerId") String customerId, @Param("dataType") String dataType);
}

13
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java

@ -1,9 +1,13 @@
package com.epmet.dataaggre.dao.govproject;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO;
import com.epmet.dataaggre.entity.govproject.IcEventEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 事件管理表
*
@ -12,4 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface IcEventDao extends BaseDao<IcEventEntity> {
/**
* Desc: 资源获取事件信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:48
*/
List<EventInfoResultDTO> getEventInfos(CoverageHomeSearchFormDTO formDTO);
}

7
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java

@ -18,9 +18,13 @@
package com.epmet.dataaggre.dao.heart;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 社区自组织表
*
@ -29,4 +33,7 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface IcCommunitySelfOrganizationDao extends BaseDao<IcCommunitySelfOrganizationEntity> {
List<ResourceInfoResultDTO> getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO);
}

109
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java

@ -0,0 +1,109 @@
package com.epmet.dataaggre.redis;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.GovMenuDTO;
import com.epmet.dto.form.GetCustomerMenuListFormDTO;
import com.epmet.feign.GovAccessFeignClient;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 客户菜单配置表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-03-16
*/
@Slf4j
@Component
public class GovCustomerMenuRedis {
@Autowired
private RedisUtils redisUtils;
@Autowired
private GovAccessFeignClient govAccessFeignClient;
/**
* Desc: 保存客户菜单缓存
* @param customerId
* @param type
* @param govMenuDTOS
* @author zxc
* @date 2022/7/27 13:45
*/
public void setCustomerMenuList(String customerId, Integer type, List<GovMenuDTO> govMenuDTOS) {
if (checkParam(customerId, type) && !CollectionUtils.isEmpty(govMenuDTOS) && StringUtils.isNotBlank(govMenuDTOS.get(NumConstant.ZERO).getName())) {
String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId);
govMenuDTOS.forEach(g -> {
Map<String, Object> map = BeanUtil.beanToMap(g, false, true);
redisUtils.listAdd(key,map);
});
}
}
/**
* Desc: 获取客户菜单缓存
* @param customerId
* @param type
* @param tableName
* @author zxc
* @date 2022/7/27 13:45
*/
public List<GovMenuDTO> getCustomerMenuList(String customerId, Integer type, String tableName) {
if (checkParam(customerId, type)) {
String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId);
List<GovMenuDTO> result = new ArrayList<>();
List<Map<String, Object>> maps = (List<Map<String, Object>>) redisUtils.listGetAll(key, NumConstant.ZERO, NumConstant.ONE_NEG);
for (Map<String, Object> map : maps) {
result.add(ConvertUtils.mapToEntity(map,GovMenuDTO.class));
}
// result = (List<GovMenuDTO>) redisUtils.listGetAll(key, NumConstant.ZERO,NumConstant.ONE_NEG);
if (CollectionUtils.isEmpty(result)){
GetCustomerMenuListFormDTO formDTO = new GetCustomerMenuListFormDTO();
formDTO.setCustomerId(customerId);
formDTO.setType(type);
formDTO.setTableName(tableName);
Result<List<GovMenuDTO>> customerMenuList = govAccessFeignClient.getCustomerMenuList(formDTO);
if (!customerMenuList.success()){
throw new EpmetException("查询客户菜单失败"+ JSON.toJSONString(formDTO));
}
result = customerMenuList.getData();
setCustomerMenuList(customerId,type,customerMenuList.getData());
}
return result;
}
return new ArrayList<>();
}
/**
* Desc: 删除客户菜单缓存
* @param
* @author zxc
* @date 2022/7/27 13:47
*/
public void delAllCustomerMenu(String customerId) {
String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId);
redisUtils.delete(key);
}
private boolean checkParam(String customerId, Integer type) {
if (StringUtils.isBlank(customerId) || type == null){
log.warn("checkParam fail, param is null");
return false;
}
return true;
}
}

10
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java

@ -1,6 +1,8 @@
package com.epmet.dataaggre.service.epmetuser;
import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO;
import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
import java.util.List;
@ -39,4 +41,12 @@ public interface IcResiService {
Integer pageNo, Integer pageSize, Boolean isPage);
Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search);
/**
* Desc: 获取icUser
* @param formDTO
* @author zxc
* @date 2022/7/27 17:09
*/
List<UserInfoResultDTO> getAllIcUser(CoverageHomeSearchFormDTO formDTO);
}

50
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java

@ -2,9 +2,12 @@ package com.epmet.dataaggre.service.epmetuser.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.tools.enums.ResiCategoryEnum;
import com.epmet.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.dao.epmetuser.IcResiUserDao;
import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO;
import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
import com.epmet.dataaggre.service.epmetuser.IcResiService;
import com.github.pagehelper.PageHelper;
@ -78,6 +81,42 @@ public class IcResiServiceImpl implements IcResiService {
query.eq(IcResiUserEntity::getIsSn, true);
} else if ("resi_szry".equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsSz, true);
} else if (ResiCategoryEnum.IS_PARTY.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsParty, true);
} else if (ResiCategoryEnum.IS_DBH.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsDbh, true);
} else if (ResiCategoryEnum.IS_ENSURE_HOUSE.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsEnsureHouse, true);
} else if (ResiCategoryEnum.IS_UNEMPLOYED.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsUnemployed, true);
} else if (ResiCategoryEnum.IS_YLFN.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsYlfn, true);
} else if (ResiCategoryEnum.IS_VETERANS.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsVeterans, true);
} else if (ResiCategoryEnum.IS_UNITED_FRONT.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsUnitedFront, true);
} else if (ResiCategoryEnum.IS_XFRY.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsXfry, true);
} else if (ResiCategoryEnum.IS_VOLUNTEER.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsVolunteer, true);
} else if (ResiCategoryEnum.IS_OLD_PEOPLE.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsOldPeople, true);
} else if (ResiCategoryEnum.IS_KC.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsKc, true);
} else if (ResiCategoryEnum.IS_SD.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsSd, true);
} else if (ResiCategoryEnum.IS_SN.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsSn, true);
} else if (ResiCategoryEnum.IS_SZ.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsSz, true);
} else if (ResiCategoryEnum.IS_CJ.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsCj, true);
} else if (ResiCategoryEnum.IS_DB.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsDb, true);
} else if (ResiCategoryEnum.IS_MB.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsMb, true);
} else if (ResiCategoryEnum.IS_SPECIAL.getColName().equals(categoryKey)) {
query.eq(IcResiUserEntity::getIsSpecial, true);
}
if (StringUtils.isNotBlank(search)) {
@ -100,4 +139,15 @@ public class IcResiServiceImpl implements IcResiService {
public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search) {
return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
}
/**
* Desc: 获取icUser
* @param formDTO
* @author zxc
* @date 2022/7/27 17:09
*/
@Override
public List<UserInfoResultDTO> getAllIcUser(CoverageHomeSearchFormDTO formDTO) {
return resiUserDao.getAllIcUser(formDTO);
}
}

10
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java

@ -135,6 +135,16 @@ public interface GovOrgCoverageService {
*/
IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey);
List<IcCoverageCategoryDictEntity> listCoverageCategoryEntities(String coverageType);
/**
* Desc: 根据客户ID和数据类型获取字典对应的url
* @param customerId
* @param dataType
* @author zxc
* @date 2022/7/27 16:52
*/
List<String> getAllTypeCoverageByCustomerAndType(String customerId,String dataType);
List<IcCoverageCategoryDictEntity> listResourceCategoryEntities(String coverageType);
List<IcCoverageCategoryDictEntity> listGovernedTargetCategoryEntities();

44
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@ -11,13 +11,10 @@ import com.epmet.dataaggre.dto.govorg.form.*;
import com.epmet.dataaggre.dto.govorg.result.*;
import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
import com.epmet.dataaggre.entity.govorg.IcHouseEntity;
import com.epmet.dto.IcNeighborHoodDTO;
import com.epmet.dto.result.NeighborHoodListResultDTO;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Set;
/**
* @Author zxc
@ -223,4 +220,45 @@ public interface GovOrgService {
List<ResisByPolicyRulesFormDTO.StatRule> statRule, Integer pageNo, Integer pageSize);
List<IcNeighborHoodDTO> neighborhoodsByIds(List<String> neighborhoodIds);
/**
* Desc: 资源获取城市管理信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getCityManageInfos(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取公共服务信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取重点危化品企业信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取优势资源信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取企事业单位巡查信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO);
}

12
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java

@ -346,4 +346,16 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
query.eq(IcCoverageCategoryDictEntity::getDataType, CoverageEnums.DATA_TYPE_GOVERNED_TARGET.getKey());
return coverageCategoryDictDao.selectList(query);
}
/**
* Desc: 根据客户ID和数据类型获取字典对应的url
* @param customerId
* @param dataType
* @author zxc
* @date 2022/7/27 16:52
*/
@Override
public List<String> getAllTypeCoverageByCustomerAndType(String customerId, String dataType) {
return coverageCategoryDictDao.getAllTypeCoverageByCustomerAndType(customerId, dataType);
}
}

30
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@ -5,7 +5,6 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dingtalk.api.request.OapiRobotSendRequest;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.tools.constant.Constant;
@ -27,7 +26,6 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
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.EpmetRequestHolder;
import com.epmet.commons.tools.utils.HttpClientManager;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dataaggre.constant.DataSourceConstant;
@ -41,7 +39,6 @@ import com.epmet.dataaggre.dto.govorg.form.*;
import com.epmet.dataaggre.dto.govorg.result.*;
import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
import com.epmet.dataaggre.entity.govorg.IcHouseEntity;
import com.epmet.dataaggre.excel.GridLivelyDetailExcel;
import com.epmet.dataaggre.excel.GridLivelyExcel;
import com.epmet.dataaggre.service.commonservice.AreaCodeService;
@ -117,6 +114,8 @@ public class GovOrgServiceImpl implements GovOrgService {
private IcHouseDao houseDao;
@Autowired
private IcNeighborhoodDao neighborhoodDao;
@Autowired
private IcCityManagementDao cityManagementDao;
/**
* @param staffId
@ -1130,4 +1129,29 @@ public class GovOrgServiceImpl implements GovOrgService {
public List<IcNeighborHoodDTO> neighborhoodsByIds(List<String> neighborhoodIds) {
return neighborhoodDao.neighborhoodsByIds(neighborhoodIds);
}
@Override
public List<ResourceInfoResultDTO> getCityManageInfos(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getCityManageInfos(formDTO);
}
@Override
public List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getPublicServiceInfos(formDTO);
}
@Override
public List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getDangerousChemicalsInfos(formDTO);
}
@Override
public List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getSuperiorResourceInfos(formDTO);
}
@Override
public List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getEnterpriseInfos(formDTO);
}
}

12
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java

@ -2,10 +2,12 @@ package com.epmet.dataaggre.service.govproject;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO;
import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
import com.epmet.dataaggre.dto.govproject.form.*;
import com.epmet.dataaggre.dto.govproject.result.*;
import com.epmet.dataaggre.entity.govproject.IcEventEntity;
import com.sun.org.apache.xpath.internal.operations.Bool;
import java.util.LinkedList;
import java.util.List;
@ -121,4 +123,12 @@ public interface GovProjectService {
List<IcEventEntity> searchIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint,
Boolean isPage, Integer pageNo, Integer pageSize);
/**
* Desc: 资源获取事件信息
* @param formDTO
* @author zxc
* @date 2022/7/28 10:48
*/
List<EventInfoResultDTO> getEventInfos(CoverageHomeSearchFormDTO formDTO);
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@ -26,6 +26,9 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO;
import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO;
import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO;
import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO;
import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
import com.epmet.dataaggre.dto.govproject.ProjectDTO;
import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO;
import com.epmet.dataaggre.dto.govproject.ResiEventDTO;
@ -665,6 +668,11 @@ public class GovProjectServiceImpl implements GovProjectService {
return icEventDao.selectList(query);
}
@Override
public List<EventInfoResultDTO> getEventInfos(CoverageHomeSearchFormDTO formDTO) {
return icEventDao.getEventInfos(formDTO);
}
/**
* 构造事件查询
* @param customerId

4
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java

@ -1,5 +1,7 @@
package com.epmet.dataaggre.service.heart;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
@ -40,4 +42,6 @@ public interface HeartService {
Integer countPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search);
Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey);
List<ResourceInfoResultDTO> getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO);
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java

@ -5,10 +5,11 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.dao.heart.IcCommunitySelfOrganizationDao;
import com.epmet.dataaggre.dao.heart.IcPartyUnitDao;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
import com.epmet.dataaggre.service.heart.HeartService;
import com.epmet.dto.result.PartyMemberUserIdsResultDTO;
import com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -57,6 +58,11 @@ public class HeartServiceImpl implements HeartService {
return communitySelfOrganizationDao.selectCount(query);
}
@Override
public List<ResourceInfoResultDTO> getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO) {
return communitySelfOrganizationDao.getCommunitySelOrgInfos(formDTO);
}
private LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> constructCommunityOrgQueryWrapper(
String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) {
LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> query = new LambdaQueryWrapper<>();

152
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@ -15,6 +15,8 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
import com.epmet.commons.tools.utils.EpmetRequestHolder;
import com.epmet.dataaggre.constant.OrgConstant;
import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
import com.epmet.dataaggre.constant.OrgConstant;
import com.epmet.dataaggre.constant.TableConstant;
import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
@ -23,11 +25,14 @@ import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2;
import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO;
import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
import com.epmet.dataaggre.dto.govorg.result.*;
import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
import com.epmet.dataaggre.entity.govorg.*;
import com.epmet.dataaggre.entity.govproject.IcEventEntity;
import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
import com.epmet.dataaggre.enums.MenusEnums;
import com.epmet.dataaggre.redis.GovCustomerMenuRedis;
import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity;
import com.epmet.dataaggre.service.CoverageService;
import com.epmet.dataaggre.service.epmetuser.IcResiService;
@ -35,6 +40,9 @@ import com.epmet.dataaggre.service.govorg.GovOrgCoverageService;
import com.epmet.dataaggre.service.govorg.GovOrgService;
import com.epmet.dataaggre.service.govproject.GovProjectService;
import com.epmet.dataaggre.service.heart.HeartService;
import com.epmet.dto.GovMenuDTO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@ -69,6 +77,9 @@ public class CoverageServiceImpl implements CoverageService {
@Autowired
private GovOrgCoverageService govOrgCoverageService;
@Autowired
private GovCustomerMenuRedis govCustomerMenuRedis;
@Autowired
private IcResiCategoryWarnService icResiCategoryWarnService;
@ -217,7 +228,146 @@ public class CoverageServiceImpl implements CoverageService {
*/
@Override
public CoverageHomeSearchResultDTO coverageHomeSearch(CoverageHomeSearchFormDTO formDTO) {
return null;
String customerId = formDTO.getCustomerId();
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, formDTO.getUserId());
if (null == staffInfo){
throw new EpmetException("查询工作人员失败:"+formDTO.getUserId());
}
formDTO.setOrgId(staffInfo.getAgencyId());
CoverageHomeSearchResultDTO result = new CoverageHomeSearchResultDTO();
// 缓存的客户菜单
List<GovMenuDTO> customerMenuList = govCustomerMenuRedis.getCustomerMenuList(customerId, 0, "gov_menu");
// org库配置的
List<String> resources = govOrgCoverageService.getAllTypeCoverageByCustomerAndType(customerId, "resources");
if (CollectionUtils.isEmpty(resources)){
return result;
}
if (CollectionUtils.isEmpty(customerMenuList)){
return result;
}
List<String> tables = new ArrayList<>();
customerMenuList.forEach(cm -> {
resources.forEach(r -> {
if (cm.getUrl().equals(r)){
String tableName = MenusEnums.getValueByUrl(r);
if (StringUtils.isNotBlank(tableName)){
tables.add(tableName);
}
}
});
});
if (CollectionUtils.isEmpty(tables)){
return result;
}
if (StringUtils.isNotBlank(formDTO.getSearchType())){
if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_USER)){
PageInfo<UserInfoResultDTO> allIcUserPageInfo = getIcUserPageInfo(formDTO);
result.setUserInfos(allIcUserPageInfo.getList());
result.setUserInfosTotal(allIcUserPageInfo.getTotal());
}else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_EVENT)){
for (String resource : resources) {
if (MenusEnums.IC_EVENT.getUrl().equals(resource)){
PageInfo<EventInfoResultDTO> eventPageInfo = getEventInfo(formDTO);
result.setEventInfos(eventPageInfo.getList());
result.setEventInfoTotal(eventPageInfo.getTotal());
break;
}
}
}else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){
}
}else {
// 查询居民
PageInfo<UserInfoResultDTO> allIcUserPageInfo = getIcUserPageInfo(formDTO);
result.setUserInfos(allIcUserPageInfo.getList());
result.setUserInfosTotal(allIcUserPageInfo.getTotal());
List<ResourceInfoResultDTO> reInfos = new ArrayList<>();
for (String table : tables) {
switch (table){
case TableConstant.IC_SUPERIOR_RESOURCE:
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO));
List<ResourceInfoResultDTO> superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO);
if (!superiorResourceInfos.isEmpty()){
reInfos.addAll(superiorResourceInfos);
}
break;
case TableConstant.IC_CITY_MANAGEMENT:
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO));
List<ResourceInfoResultDTO> cityManageInfos = govOrgService.getCityManageInfos(formDTO);
if (!cityManageInfos.isEmpty()){
reInfos.addAll(cityManageInfos);
}
break;
case TableConstant.IC_COMMUNITY_SELF_ORGANIZATION:
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> heartService.getCommunitySelOrgInfos(formDTO));
List<ResourceInfoResultDTO> communitySelOrgInfos = heartService.getCommunitySelOrgInfos(formDTO);
if (!communitySelOrgInfos.isEmpty()){
reInfos.addAll(communitySelOrgInfos);
}
break;
case TableConstant.IC_DANGEROUS_CHEMICALS:
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO));
List<ResourceInfoResultDTO> dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO);
if (!dangerousChemicalsInfos.isEmpty()){
reInfos.addAll(dangerousChemicalsInfos);
}
break;
case TableConstant.IC_ENTERPRISE:
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO));
List<ResourceInfoResultDTO> enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO);
if (!enterpriseInfos.isEmpty()){
reInfos.addAll(enterpriseInfos);
}
break;
case TableConstant.IC_PUBLIC_SERVICE:
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO));
List<ResourceInfoResultDTO> publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO);
if (!publicServiceInfos.isEmpty()){
reInfos.addAll(publicServiceInfos);
}
break;
case TableConstant.IC_EVENT:
PageInfo<EventInfoResultDTO> eventPageInfo = getEventInfo(formDTO);
result.setEventInfos(eventPageInfo.getList());
result.setEventInfoTotal(eventPageInfo.getTotal());
break;
default:
break;
}
}
result.setResourceInfos(reInfos);
}
return result;
}
public PageInfo<UserInfoResultDTO> getIcUserPageInfo (CoverageHomeSearchFormDTO formDTO){
PageInfo<UserInfoResultDTO> result = new PageInfo<>();
if (formDTO.getIsPage()){
result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icResiService.getAllIcUser(formDTO));
}else {
List<UserInfoResultDTO> allIcUser = icResiService.getAllIcUser(formDTO);
result.setTotal(Long.valueOf(String.valueOf(allIcUser.size())));
result.setList(allIcUser);
}
return result;
}
/**
* Desc: 事件查询
* @param formDTO
* @author zxc
* @date 2022/7/28 16:03
*/
public PageInfo<EventInfoResultDTO> getEventInfo (CoverageHomeSearchFormDTO formDTO){
PageInfo<EventInfoResultDTO> result = new PageInfo<>();
if (formDTO.getIsPage()){
result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govProjectService.getEventInfos(formDTO));
}else {
List<EventInfoResultDTO> eventInfos = govProjectService.getEventInfos(formDTO);
result.setTotal(Long.valueOf(String.valueOf(eventInfos.size())));
result.setList(eventInfos);
}
return result;
}
/**

9
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryStatsConfigService.java

@ -0,0 +1,9 @@
package com.epmet.dataaggre.service.opercustomize;
/**
* @Author zxc
* @DateTime 2022/7/27 17:20
* @DESC
*/
public interface IcResiCategoryStatsConfigService {
}

20
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@ -151,4 +151,24 @@
<include refid="segmentForPolicyRules"></include>
</select>
<!-- 获取icUser -->
<select id="getAllIcUser" resultType="com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO">
SELECT
u.ID AS icUserId,
u.`NAME`,
u.GRID_ID,
u.HOME_ID,
ifnull(u.MOBILE,'') as mobile,
u.ID_CARD,
ifnull(u.GZDW,'') as gzdw,
ifnull(u.RHZK,'') as rhzk
FROM ic_resi_user u
WHERE u.DEL_FLAG = '0'
AND u.CUSTOMER_ID = #{customerId}
<if test='name != null and name != "" '>
AND u.`NAME` LIKE CONCAT('%',#{name},'%')
</if>
AND u.PIDS LIKE CONCAT('%',#{orgId},'%')
</select>
</mapper>

92
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml

@ -3,4 +3,96 @@
<mapper namespace="com.epmet.dataaggre.dao.govorg.IcCityManagementDao">
<select id="getCityManageInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
SELECT
ID AS resourceId,
'city_management' AS resourceType,
IFNULL(`NAME`,'') AS name,
IFNULL(LONGITUDE,'') AS LONGITUDE,
IFNULL(LATITUDE,'') AS LATITUDE,
IFNULL(CATEGORY,'') AS CATEGORY,
IFNULL(AREA_COVERED,'') AS areaCovered,
IFNULL(CAPACITY,0) AS CAPACITY,
IFNULL(ADDRESS,'') AS ADDRESS,
IFNULL(PRINCIPAL,'') AS PRINCIPAL,
IFNULL(MOBILE,'') AS MOBILE
FROM ic_city_management
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
AND `NAME` LIKE CONCAT('%',#{name},'%')
</select>
<select id="getPublicServiceInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
SELECT
ID AS resourceId,
'public_service' AS resourceType,
IFNULL(`NAME`,'') AS name,
IFNULL(LONGITUDE,'') AS LONGITUDE,
IFNULL(LATITUDE,'') AS LATITUDE,
IFNULL(CATEGORY,'') AS CATEGORY,
IFNULL(AREA_COVERED,'') AS areaCovered,
IFNULL(CAPACITY,0) AS CAPACITY,
IFNULL(ADDRESS,'') AS ADDRESS,
IFNULL(PRINCIPAL,'') AS PRINCIPAL,
IFNULL(MOBILE,'') AS MOBILE
FROM ic_public_service
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
AND `NAME` LIKE CONCAT('%',#{name},'%')
</select>
<select id="getDangerousChemicalsInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
SELECT
ID AS resourceId,
'dangerous_chemicals' AS resourceType,
IFNULL(`NAME`,'') AS name,
IFNULL(LONGITUDE,'') AS LONGITUDE,
IFNULL(LATITUDE,'') AS LATITUDE,
CATEGORY,
ifnull(ADDRESS,'') as address,
ifnull(PRINCIPAL_NAME,'') AS principal,
ifnull(PRINCIPAL_MOBILE,'') AS mobile
FROM ic_dangerous_chemicals
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
AND `NAME` LIKE CONCAT('%',#{name},'%')
</select>
<select id="getSuperiorResourceInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
SELECT
ID AS resourceId,
'superior_resource' AS resourceType,
IFNULL(`NAME`,'') AS name,
IFNULL(LONGITUDE,'') AS LONGITUDE,
IFNULL(LATITUDE,'') AS LATITUDE,
IFNULL(AREA_COVERED,'') AS areaCovered,
ifnull(CAPACITY,0) as CAPACITY,
CATEGORY,
ifnull(ADDRESS,'') as ADDRESS
FROM ic_superior_resource
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
AND `NAME` LIKE CONCAT('%',#{name},'%')
</select>
<select id="getEnterpriseInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
SELECT
ID AS resourceId,
'enterprise_patrol' AS resourceType,
PLACE_ORG_NAME AS `NAME`,
ifnull(LONGITUDE,'') as LONGITUDE,
ifnull(LATITUDE,'') as LATITUDE,
ifnull(ADDRESS,'') as ADDRESS,
ifnull(PERSON_IN_CHARGE,'') AS principal,
ifnull(MOBILE,'') AS mobile
FROM ic_enterprise
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
AND PLACE_ORG_NAME LIKE CONCAT('%',#{name},'%')
</select>
</mapper>

9
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml

@ -3,6 +3,15 @@
<mapper namespace="com.epmet.dataaggre.dao.govorg.IcCoverageCategoryDictDao">
<!-- 根据客户ID和数据类型获取字典对应的url -->
<select id="getAllTypeCoverageByCustomerAndType" resultType="java.lang.String">
SELECT
DISTINCT MENU_URL
FROM ic_coverage_category_dict
WHERE DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId}
AND data_type = #{dataType}
</select>
<resultMap type="com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity" id="icCoverageCategoryDictMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>

17
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml

@ -1,6 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.IcEventDao">
<mapper namespace="com.epmet.dataaggre.dao.govproject.IcEventDao">
<select id="getEventInfos" resultType="com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO">
SELECT
id AS eventId,
GRID_ID,
DATE_FORMAT(HAPPEN_TIME,'%Y-%m-%d %H:%i:%s') AS happenTime,
EVENT_CONTENT,
LONGITUDE,
LATITUDE
FROM ic_event
WHERE del_flag = '0'
AND customer_id = #{customerId}
AND DIFFICULT_POINT = '1'
AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%')
AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%')
</select>
</mapper>

18
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml

@ -2,4 +2,22 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dataaggre.dao.heart.IcCommunitySelfOrganizationDao">
<select id="getCommunitySelOrgInfos" resultType="com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO">
SELECT
ID AS resourceId,
'community_org' AS resourceType,
ifnull(ORGANIZATION_NAME,'') AS name,
ifnull(PRINCIPAL_NAME,'') AS principal,
ifnull(PRINCIPAL_PHONE,'') AS mobile,
ifnull(ADDRESS,'') as address,
ifnull(LONGITUDE,'') as longitude,
ifnull(LATITUDE,'') as latitude
FROM ic_community_self_organization
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND CONCAT(PIDS,':',ORG_ID) LIKE CONCAT('%',#{orgId},'%')
AND ORGANIZATION_NAME LIKE CONCAT('%',#{name},'%')
</select>
</mapper>
Loading…
Cancel
Save