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

【五大图层】数据展示：完善

dev
wangxianzhang 3 years ago
parent
6887cbfb29
commit
c4a0985363
12 changed files with 488 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/IcEnterisePatrolResultDTO.java
  2. 42
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java
  3. 15
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java
  4. 68
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcEnterprisePatrolRecordEntity.java
  5. 178
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/IcEventEntity.java
  6. 7
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java
  7. 15
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java
  8. 21
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
  9. 40
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
  10. 50
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
  11. 43
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml
  12. 6
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml

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

@ -0,0 +1,20 @@
package com.epmet.dataaggre.dto.govorg.result;
import lombok.Data;
@Data
public class IcEnterisePatrolResultDTO {
private String enterpriseId;
private String patrolId;
private String customerId;
private String gridId;
private String agencyId;
private String agencyPids;
private String placeType;
private String placeOrgName;
private String address;
private String longitude;
private String latitude;
private String mobile;
private String sourceType;
}

42
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java
View File

@ -0,0 +1,42 @@
package com.epmet.dataaggre.dao.govorg;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
import com.epmet.dataaggre.entity.govorg.IcEnterprisePatrolRecordEntity;
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 2022-06-17
*/
@Mapper
public interface IcEnterprisePatrolRecordDao extends BaseDao<IcEnterprisePatrolRecordEntity> {
/**
* 企事业单位巡查计数
* @param customerId
* @param staffOrgIds
* @param search
* @param categoryKey
* @return
*/
Integer countEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId,
@Param("staffOrgIds") String staffOrgIds, @Param("search") String search,
@Param("categoryKey") String categoryKey);
/**
* 企事业单位巡查列表
* @param customerId
* @param staffOrgIds
* @param search
* @param categoryKey
* @return
*/
List<IcEnterisePatrolResultDTO> listEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId,
@Param("staffOrgIds") String staffOrgIds, @Param("search") String search,
@Param("categoryKey") String categoryKey);
}

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

@ -0,0 +1,15 @@
package com.epmet.dataaggre.dao.govproject;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dataaggre.entity.govproject.IcEventEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 事件管理表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-05-17
*/
@Mapper
public interface IcEventDao extends BaseDao<IcEventEntity> {
}

68
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcEnterprisePatrolRecordEntity.java
View File

@ -0,0 +1,68 @@
package com.epmet.dataaggre.entity.govorg;
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 2022-06-17
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("ic_enterprise_patrol_record")
public class IcEnterprisePatrolRecordEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户Id
*/
private String customerId;
/**
* 企事业单位id
*/
private String enterpriseId;
/**
* 巡查时间
*/
private Date patrolTime;
/**
* 工作人员id
*/
private String staffId;
/**
* 工作人员姓名
*/
private String staffName;
/**
* 工作人员手机号
*/
private String mobile;
/**
* 检查结果【0:合格 1:不合格】
*/
private String result;
/**
* 隐患明细
*/
private String detailed;
/**
* 拟复查时间
*/
private Date reviewTime;
}

178
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/IcEventEntity.java
View File

@ -0,0 +1,178 @@
package com.epmet.dataaggre.entity.govproject;
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 2022-05-17
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("ic_event")
public class IcEventEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户ID
*/
private String customerId;
/**
* 事件所属的网格Id
*/
private String gridId;
/**
* 网格的所属组织
*/
private String agencyId;
/**
* 网格的所有组织Id
*/
private String gridPids;
/**
* 报事的人【居民端/pc端居民Id】可为空
*/
private String reportUserId;
/**
* 报事人姓名
*/
private String name;
/**
* 手机号
*/
private String mobile;
/**
* 身份证号
*/
private String idCard;
/**
* 反映渠道【字典表】
*/
private String sourceType;
/**
* 发生时间
*/
private Date happenTime;
/**
* 事件内容
*/
private String eventContent;
/**
* 纬度
*/
private String latitude;
/**
* 经度
*/
private String longitude;
/**
* 地址
*/
private String address;
/**
* 处理中：processing；已办结：closed_case
*/
private String status;
/**
* 办结时间
*/
private Date closeCaseTime;
/**
* 0:已回复 1:已转项目 2:已转需求
*/
private String operationType;
/**
* 项目、需求ID
*/
private String operationId;
/**
* 事件是否被阅读过;1已读；针对报事人待处理列表
*/
private Integer readFlag;
/**
* 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1;
*/
private Integer redDot;
/**
* 工作端的红点:展示1；不展示：0；【居民报事、回复更新为1】
*/
private Integer govRedDot;
/**
* 最近一次操作时间（回复、立项、转需求、办结更新此列）
*/
private Date latestOperatedTime;
/**
* 是否解决：已解决 resolved，未解决 un_solved
*/
private String resolveStatus;
/**
* 结案说明
*/
private String closeRemark;
/**
* 评论人
*/
private String commentUserId;
/**
* 评论内容
*/
private String satisfaction;
/**
* 评论时间
*/
private Date commentTime;
/**
* 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing；
auto_passed: 自动通过；
review：结果不确定，需要人工审核；
block: 结果违规；
rejected：人工审核驳回;
approved：人工审核通过）
*/
private String auditStatus;
/**
* 审核理由
*/
private String auditReason;
/**
* 是否标记难点堵点 0:否 1：是
*/
private String difficultPoint;
}

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

@ -1,5 +1,6 @@
package com.epmet.dataaggre.service.govorg;
import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
import com.epmet.dataaggre.entity.govorg.*;
import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
import lombok.AllArgsConstructor;
@ -112,4 +113,10 @@ public interface GovOrgCoverageService {
Integer countPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey);
Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey);
Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey);
List<IcEnterisePatrolResultDTO> listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds,
String search, String categoryKey, Boolean isPage, Integer pageNo,
Integer pageSize);
}

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

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.dao.govorg.*;
import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
import com.epmet.dataaggre.entity.govorg.*;
import com.epmet.dataaggre.service.govorg.GovOrgCoverageService;
import com.github.pagehelper.PageHelper;
@ -36,7 +37,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
private IcSuperiorResourceDao superiorResourceDao;
@Autowired
private IcHouseDao icHouseDao;
private IcEnterprisePatrolRecordDao enterprisePatrolRecordDao;
/**
* 根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map
@ -263,4 +264,16 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
return query;
}
@Override
public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) {
return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey);
}
@Override
public List<IcEnterisePatrolResultDTO> listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds,
String search, String categoryKey, Boolean isPage,
Integer pageNo, Integer pageSize) {
return enterprisePatrolRecordDao.listEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey);
}
}

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

@ -4,6 +4,8 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
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;
@ -100,4 +102,23 @@ public interface GovProjectService {
* @return
*/
List<IssueProjectCategory> getIssueProjectFirstCategory(List<String> issueIds);
/**
* 数量
* @param staffOrgIds
* @param isDifficultPoint 是否是难点堵点
* @return
*/
Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint);
/**
* 搜索事件
* @param staffOrgIds
* @param search
* @param isDifficultPoint 是否是难点堵点
* @return
*/
List<IcEventEntity> searchIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint,
Boolean isPage, Integer pageNo, Integer pageSize);
}

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

@ -1,5 +1,6 @@
package com.epmet.dataaggre.service.govproject.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.tools.constant.CustomerIdConstant;
import com.epmet.commons.tools.constant.NumConstant;
@ -18,6 +19,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.dao.govproject.IcEventDao;
import com.epmet.dataaggre.dao.govproject.ProjectDao;
import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO;
import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO;
@ -31,6 +33,7 @@ import com.epmet.dataaggre.dto.govproject.ResiEventReportOrgDTO;
import com.epmet.dataaggre.dto.govproject.form.*;
import com.epmet.dataaggre.dto.govproject.result.*;
import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
import com.epmet.dataaggre.entity.govproject.IcEventEntity;
import com.epmet.dataaggre.service.datastats.DataStatsService;
import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
@ -82,6 +85,8 @@ public class GovProjectServiceImpl implements GovProjectService {
private EpmetUserService epmetUserService;
@Autowired
private LoginUserUtil loginUserUtil;
@Autowired
private IcEventDao icEventDao;
/**
* @Description 查询项目信息
@ -644,4 +649,39 @@ public class GovProjectServiceImpl implements GovProjectService {
return projectDao.selectProjectIssueCategory(issueIds);
}
@Override
public Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint) {
LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint);
return icEventDao.selectCount(query);
}
@Override
public List<IcEventEntity> searchIcEventEntities(String customerId, String staffOrgIds, String search,
Boolean isDifficultPoint, Boolean isPage, Integer pageNo, Integer pageSize) {
LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint);
return icEventDao.selectList(query);
}
/**
* 构造事件查询
* @param customerId
* @param staffOrgIds
* @param search
* @param difficultPoint 是否是难点堵点
* @return
*/
private LambdaQueryWrapper<IcEventEntity> constructIcEventQueryWrapper(String customerId, String staffOrgIds,
String search, Boolean difficultPoint) {
LambdaQueryWrapper<IcEventEntity> query = new LambdaQueryWrapper<>();
query.eq(IcEventEntity::getCustomerId, customerId);
query.likeRight(IcEventEntity::getGridPids, staffOrgIds);
if (StringUtils.isNotBlank(search)) {
query.like(IcEventEntity::getName, search);
}
if (difficultPoint != null) {
query.eq(IcEventEntity::getDifficultPoint, difficultPoint);
}
return query;
}
}

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

@ -8,14 +8,17 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
import com.epmet.commons.tools.utils.EpmetRequestHolder;
import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
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.service.CoverageService;
import com.epmet.dataaggre.service.epmetuser.IcResiService;
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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@ -44,6 +47,9 @@ public class CoverageServiceImpl implements CoverageService {
@Autowired
private HeartService heartService;
@Autowired
private GovProjectService govProjectService;
/**
* 场所类型常量
*/
@ -53,7 +59,7 @@ public class CoverageServiceImpl implements CoverageService {
public static final String PLACE_TYPE_CITY_MANAGEMENT= "city_management";
public static final String PLACE_TYPE_COMUNITY_ORG= "community_org";
public static final String PLACE_TYPE_DANGEROUS_CHEMICALS= "dangerous_chemicals";
public static final String PLACE_TYPE_ENTERPRISE_PARTROL= "enterprise_partrol";
public static final String PLACE_TYPE_ENTERPRISE_PARTROL= "enterprise_patrol";
public static final String PLACE_TYPE_GROUP_RENT= "group_rent";
public static final String PLACE_TYPE_PUBLIC_SERVICE= "public_service";
public static final String PLACE_TYPE_SUPERIOR_RESOURCE= "superior_resource";
@ -188,7 +194,8 @@ public class CoverageServiceImpl implements CoverageService {
// 特殊人群
return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
} else if (PLACE_TYPE_EVENT.equals(placeType)) {
// 难点痛点 todo
// 难点痛点
return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true);
} else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) {
// 城市资源管理
return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey);
@ -205,9 +212,8 @@ public class CoverageServiceImpl implements CoverageService {
// 危化企业
return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey);
} else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) {
// 企事业单位巡查 todo
// 企事业单位巡查
return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey);
} else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) {
// 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） todo
@ -263,18 +269,24 @@ public class CoverageServiceImpl implements CoverageService {
return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), buildingLatitude, buildingLongitude);
}).collect(Collectors.toList());
} else if (PLACE_TYPE_EVENT.equals(placeType)) {
// 难点痛点 todo
// 难点痛点
List<IcEventEntity> icEventEntities = govProjectService.searchIcEventEntities(
customerId, staffOrgIds, search, true, isPage, pageNo, pageSize);
return icEventEntities.stream()
.map(e -> new CoverageAnalisisDataListResultDTO(e.getId(), categoryKey, placeType, e.getName(), e.getLatitude(), e.getLongitude()))
.collect(Collectors.toList());
} else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) {
// 城市资源管理
List<IcCityManagementEntity> cityResources = orgCoverageService.searchCityResourceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
List<IcCityManagementEntity> cityResources = orgCoverageService.searchCityResourceEntities(
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return cityResources.stream()
.map(resource -> new CoverageAnalisisDataListResultDTO(resource.getId(), categoryKey, placeType, resource.getName(), resource.getLatitude(), resource.getLongitude()))
.collect(Collectors.toList());
} else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) {
// 社区自组织
List<IcCommunitySelfOrganizationEntity> l = heartService.searchCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
List<IcCommunitySelfOrganizationEntity> l = heartService.searchCommunityOrgEntities(
customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return l.stream()
.map(org -> new CoverageAnalisisDataListResultDTO(org.getId(), categoryKey, placeType, org.getOrganizationName(), org.getLatitude(), org.getLongitude()))
.collect(Collectors.toList());
@ -282,20 +294,24 @@ public class CoverageServiceImpl implements CoverageService {
// 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7
if (categoryKey.equals("pu_jgzsbm")) {
String partyUnitType = "3";
List<IcPartyUnitEntity> l = heartService.searchPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize);
List<IcPartyUnitEntity> l = heartService.searchPartyUnitEntities(
customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize);
return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getUnitName(), dc.getLatitude(), dc.getLongitude()))
.collect(Collectors.toList());
}
return new ArrayList<>();
} else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) {
// 危化企业
List<IcDangerousChemicalsEntity> l = orgCoverageService.searchDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
List<IcDangerousChemicalsEntity> l = orgCoverageService.searchDangerousChemicalEntities(
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude()))
.collect(Collectors.toList());
} else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) {
// 企事业单位巡查 todo
// 企事业单位巡查
List<IcEnterisePatrolResultDTO> list = orgCoverageService.listEnterprisePatrol(
customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return list.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getPatrolId(), categoryKey, placeType, dc.getPlaceOrgName(), dc.getLatitude(), dc.getLongitude()))
.collect(Collectors.toList());
} else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) {
// 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） todo
//select h.id, b.LATITUDE, b.LONGITUDE, concat(nei.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME, u.UNIT_NAME)
@ -311,12 +327,14 @@ public class CoverageServiceImpl implements CoverageService {
} else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) {
// 公共服务
List<IcPublicServiceEntity> l = orgCoverageService.searchPublicServiceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
List<IcPublicServiceEntity> l = orgCoverageService.searchPublicServiceEntities(
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude()))
.collect(Collectors.toList());
} else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) {
// 优势资源
List<IcSuperiorResourceEntity> l = orgCoverageService.searchSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
List<IcSuperiorResourceEntity> l = orgCoverageService.searchSuporiorResourceEntities(
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude()))
.collect(Collectors.toList());
}

43
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml
View File

@ -0,0 +1,43 @@
<?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.dataaggre.dao.govorg.IcEnterprisePatrolRecordDao">
<!--企事业单位巡查计数-->
<select id="countEnterprisePatrol" resultType="java.lang.Integer">
select count(1)
from ic_enterprise e
inner join ic_enterprise_patrol_record r on (e.ID = r.ENTERPRISE_ID)
where e.CUSTOMER_ID = #{customerId}
and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%')
and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%'))
and e.PLACE_TYPE = #{categoryKey}
and e.DEL_FLAG = '0'
and r.DEL_FLAG = '0'
</select>
<!--企事业单位巡查列表-->
<select id="listEnterprisePatrol" resultType="com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO">
select e.id enterpriseId,
r.id patrolId,
e.customer_id,
e.grid_id,
e.agency_id,
e.agency_pids,
e.place_type,
e.place_org_name,
e.address,
e.longitude,
e.latitude,
e.mobile,
e.source_type
from ic_enterprise e
inner join ic_enterprise_patrol_record r on (e.ID = r.ENTERPRISE_ID)
where e.CUSTOMER_ID = #{customerId}
and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%')
and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%'))
and e.PLACE_TYPE = #{categoryKey}
and e.DEL_FLAG = '0'
and r.DEL_FLAG = '0'
</select>
</mapper>

6
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml
View File

@ -0,0 +1,6 @@
<?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>
Write Preview
Loading…
Cancel
Save