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

大屏调度指挥增加重点单位

dev
luyan 2 years ago
parent
f91ef20e32
commit
454171a37c
8 changed files with 382 additions and 334 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. 9
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java
  2. 3
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java
  3. 20
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/KeyEnterpriseDao.java
  4. 57
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/KeyEnterpriseEntity.java
  5. 40
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
  6. 46
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
  7. 109
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
  8. 24
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/KeyEnterpriseDao.xml

9
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java
View File

@ -6,10 +6,11 @@ package com.epmet.commons.tools.enums;
public enum CoverageEnums {
ZHZL("zhzl", "综合治理图层", 1),
YJCL("yjcl", "应急处置图层", 1),
AQSC("aqsc", "安全生产图层", 1),
CSGL("csgl", "城市管理图层", 1),
GGFW("ggfw", "公共服务图层", 1),
YJCL("yjcl", "应急处置资源", 1),
AQSC("aqsc", "安全生产资源", 1),
ZDDW("zddw", "重点单位", 1), //日照专用
CSGL("csgl", "城市管理资源", 1),
GGFW("ggfw", "公共服务资源", 1),
DATA_TYPE_GOVERNED_TARGET("governedTarget", "被管理对象", 2),
DATA_TYPE_RESOURCES("resources", "资源", 2);

3
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java
View File

@ -20,7 +20,8 @@ public enum CoveragePlaceTypeEnum {
EVENT("event", "城市管理事件"),
ZHZL_RQ("zhzl_rq", "综合治理人群"),
NUCLEIC_POINT("nucleic_point", "核酸检测点"),
VACCINE_POINT("vaccine_point", "疫苗接种点");
VACCINE_POINT("vaccine_point", "疫苗接种点"),
KEY_UNIT("key_unit", "重点单位"); //日照专用
private final String code;
private final String name;

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

@ -0,0 +1,20 @@
package com.epmet.dataaggre.dao.govorg;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dataaggre.entity.govorg.KeyEnterpriseEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* @author yan Lu
* @description 描述
* @create 2023/6/25 13:44
*/
@Mapper
public interface KeyEnterpriseDao extends BaseDao {
Integer countKeyEnterprise();
List<KeyEnterpriseEntity> getList();
}

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

@ -0,0 +1,57 @@
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;
/**
* @author yan Lu
* @description 描述
* @create 2023/6/25 15:11
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("key_enterprise")
public class KeyEnterpriseEntity extends BaseEpmetEntity {
/**
* 单位名称
*/
private String unitName;
/**
* 单位类型
*/
private String unitType;
/**
* 主营业务
*/
private String business;
/**
* 法人代表
*/
private String legalPerson;
/**
* 电话
*/
private String mobile;
/**
* 地址
*/
private String address;
/**
* 经度
*/
private String longitude;
/**
* 纬度
*/
private String latitude;
}

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

@ -13,6 +13,7 @@ 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.KeyEnterpriseEntity;
import com.epmet.dto.IcNeighborHoodDTO;
import javax.servlet.http.HttpServletResponse;
@ -97,6 +98,7 @@ public interface GovOrgService {
* @author sun
*/
OrgStaffListResultDTO staffList(OrgStaffListFormDTO formDTO);
OrgStaffListResultDTO getCurrentOrgStafflist(OrgStaffListFormDTO formDTO);
/**
@ -124,6 +126,7 @@ public interface GovOrgService {
/**
* desc:工作人员所在网格
*
* @param staffId
* @return
*/
@ -131,6 +134,7 @@ public interface GovOrgService {
/**
* desc:工作人员所在部门
*
* @param staffId
* @return
*/
@ -138,6 +142,7 @@ public interface GovOrgService {
/**
* desc：获取工作人员是由哪个类型添加进来的
*
* @param staffId
* @return
*/
@ -163,16 +168,16 @@ public interface GovOrgService {
List<String> getStaffOrgList(String staffId);
/**
* @Description 查询组织信息
* @param agencyId
* @Description 查询组织信息
* @author zxc
* @date 2021/11/5 2:54 下午
*/
CustomerAgencyDTO getAgencyInfo(String agencyId);
/**
* @Description 查询网格信息
* @param gridId
* @Description 查询网格信息
* @author zxc
* @date 2021/11/5 2:57 下午
*/
@ -198,6 +203,7 @@ public interface GovOrgService {
/**
* 获取楼栋信息
*
* @param buildingId
* @return
*/
@ -205,6 +211,7 @@ public interface GovOrgService {
/**
* 组织下的工作人员下拉框
*
* @param customerId
* @param agencyId
* @return
@ -213,6 +220,7 @@ public interface GovOrgService {
/**
* 查询跟组织信息
*
* @param customerId
* @return
*/
@ -248,57 +256,73 @@ public interface GovOrgService {
/**
* Desc: 【资源】获取城市管理信息
*
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getCityManageInfos(CoverageHomeSearchFormDTO formDTO);
Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 【资源】获取公共服务信息
*
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO);
Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 【资源】获取重点危化品企业信息
*
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO);
Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 【资源】获取优势资源信息
*
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO);
Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 【资源】获取企事业单位巡查信息
*
* @param formDTO
* @author zxc
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO);
Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO);
ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid);
/**
* @Description 查询员工的证件号和手机号
* @param registerId
* @Description 查询员工的证件号和手机号
* @Author zxc
* @Date 2022/10/27 14:03
*/
Map<String, String> getEmployeeRegisterMobileAndIdCard(String registerId);
/**
* 日照，统计重点单位数量
*
* @return
*/
Integer countKeyEnterprise();
/**
* 日照，获取重点单位坐标位置关系
*
* @return
*/
List<KeyEnterpriseEntity> getKeyEnterprise();
}

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

@ -49,6 +49,7 @@ 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.CustomerGridEntity;
import com.epmet.dataaggre.entity.govorg.KeyEnterpriseEntity;
import com.epmet.dataaggre.excel.GridLivelyDetailExcel;
import com.epmet.dataaggre.excel.GridLivelyExcel;
import com.epmet.dataaggre.service.commonservice.AreaCodeService;
@ -133,6 +134,9 @@ public class GovOrgServiceImpl implements GovOrgService {
private GovProjectService govProjectService;
@Autowired
private IcCityManagementDao cityManagementDao;
@Resource
private KeyEnterpriseDao keyEnterpriseDao;
/**
* @param staffId
@ -401,6 +405,7 @@ public class GovOrgServiceImpl implements GovOrgService {
return resultDTO;
}
/**
* @Author sun
* @Description 递归查询当前组织的下一级组织、网格列表
@ -612,6 +617,7 @@ public class GovOrgServiceImpl implements GovOrgService {
}
return orgTreeResultDTOS;
}
private List<OrgTreeResultDTO> buildTempOrgTree(String agencyId, String client) {
List<OrgTreeResultDTO> list = new ArrayList<>();
if ("resi".equals(client)) {
@ -636,8 +642,8 @@ public class GovOrgServiceImpl implements GovOrgService {
}
/**
* @Description 查询组织信息
* @param agencyId
* @Description 查询组织信息
* @author zxc
* @date 2021/11/5 2:54 下午
*/
@ -685,8 +691,8 @@ public class GovOrgServiceImpl implements GovOrgService {
}
/**
* @Description 查询网格信息
* @param gridId
* @Description 查询网格信息
* @author zxc
* @date 2021/11/5 2:57 下午
*/
@ -958,6 +964,7 @@ public class GovOrgServiceImpl implements GovOrgService {
map.put("entity", cl);
return map;
}
/**
* @Author sun
* @Description excel文件sheet页主标题拼接
@ -1434,51 +1441,27 @@ public class GovOrgServiceImpl implements GovOrgService {
return cityManagementDao.getCityManageInfos(formDTO);
}
@Override
public Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getCityManageInfosCount(formDTO);
}
@Override
public List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getPublicServiceInfos(formDTO);
}
@Override
public Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getPublicServiceInfosCount(formDTO);
}
@Override
public List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getDangerousChemicalsInfos(formDTO);
}
@Override
public Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getDangerousChemicalsInfosCount(formDTO);
}
@Override
public List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getSuperiorResourceInfos(formDTO);
}
@Override
public Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getSuperiorResourceInfosCount(formDTO);
}
@Override
public List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getEnterpriseInfos(formDTO);
}
@Override
public Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO) {
return cityManagementDao.getEnterpriseInfosCount(formDTO);
}
@Override
public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid) {
ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO();
@ -1530,8 +1513,8 @@ public class GovOrgServiceImpl implements GovOrgService {
}
/**
* @Description 查询员工的证件号和手机号
* @param registerId
* @Description 查询员工的证件号和手机号
* @Author zxc
* @Date 2022/10/27 14:03
*/
@ -1540,4 +1523,13 @@ public class GovOrgServiceImpl implements GovOrgService {
return customerAgencyDao.getEmployeeRegisterMobileAndIdCard(registerId);
}
@Override
public Integer countKeyEnterprise() { //日照，统计重点单位数量
return keyEnterpriseDao.countKeyEnterprise();
}
@Override
public List<KeyEnterpriseEntity> getKeyEnterprise() {
return keyEnterpriseDao.getList();
}
}

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

@ -105,6 +105,7 @@ public class CoverageServiceImpl implements CoverageService {
/**
* 图层，大屏数据分析，数据列表
*
* @param coverageTypes 图层列表
* @param categoryKeys 分类列表
* @param search 搜索关键词
@ -224,6 +225,7 @@ public class CoverageServiceImpl implements CoverageService {
/**
* Desc: 五大图层首页搜索
*
* @param formDTO
* @author zxc
* @date 2022/7/26 16:29
@ -385,98 +387,10 @@ public class CoverageServiceImpl implements CoverageService {
return result;
}
/**
* Desc: 【资源】优势资源查询
* @param formDTO
* @author zxc
* @date 2022/7/29 08:37
*/
public PageInfo<ResourceInfoResultDTO> getSuperiorResourcePageInfo (CoverageHomeSearchFormDTO formDTO){
PageInfo<ResourceInfoResultDTO> result = new PageInfo<>();
if (formDTO.getIsPage()){
result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO));
}else {
List<ResourceInfoResultDTO> superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO);
result.setTotal(Long.valueOf(String.valueOf(superiorResourceInfos.size())));
result.setList(superiorResourceInfos);
}
return result;
}
/**
* Desc: 【资源】城市管理查询
* @param formDTO
* @author zxc
* @date 2022/7/29 08:37
*/
public PageInfo<ResourceInfoResultDTO> getCityManagePageInfo (CoverageHomeSearchFormDTO formDTO){
PageInfo<ResourceInfoResultDTO> result = new PageInfo<>();
if (formDTO.getIsPage()){
result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO));
}else {
List<ResourceInfoResultDTO> cityManageInfos = govOrgService.getCityManageInfos(formDTO);
result.setTotal(Long.valueOf(String.valueOf(cityManageInfos.size())));
result.setList(cityManageInfos);
}
return result;
}
/**
* Desc: 【资源】公共服务查询
* @param formDTO
* @author zxc
* @date 2022/7/29 08:37
*/
public PageInfo<ResourceInfoResultDTO> getPublicServicePageInfo (CoverageHomeSearchFormDTO formDTO){
PageInfo<ResourceInfoResultDTO> result = new PageInfo<>();
if (formDTO.getIsPage()){
result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO));
}else {
List<ResourceInfoResultDTO> publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO);
result.setTotal(Long.valueOf(String.valueOf(publicServiceInfos.size())));
result.setList(publicServiceInfos);
}
return result;
}
/**
* Desc: 【资源】重点危化品企业查询
* @param formDTO
* @author zxc
* @date 2022/7/29 08:37
*/
public PageInfo<ResourceInfoResultDTO> getDangerousChemicalsPageInfo (CoverageHomeSearchFormDTO formDTO){
PageInfo<ResourceInfoResultDTO> result = new PageInfo<>();
if (formDTO.getIsPage()){
result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO));
}else {
List<ResourceInfoResultDTO> dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO);
result.setTotal(Long.valueOf(String.valueOf(dangerousChemicalsInfos.size())));
result.setList(dangerousChemicalsInfos);
}
return result;
}
/**
* Desc: 【资源】企事业单位查询
* @param formDTO
* @author zxc
* @date 2022/7/29 08:37
*/
public PageInfo<ResourceInfoResultDTO> getEnterpriseInfosPageInfo (CoverageHomeSearchFormDTO formDTO){
PageInfo<ResourceInfoResultDTO> result = new PageInfo<>();
if (formDTO.getIsPage()){
result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO));
}else {
List<ResourceInfoResultDTO> enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO);
result.setTotal(Long.valueOf(String.valueOf(enterpriseInfos.size())));
result.setList(enterpriseInfos);
}
return result;
}
/**
* Desc: 居民信息查询
*
* @param formDTO
* @author zxc
* @date 2022/7/29 08:34
@ -505,6 +419,7 @@ public class CoverageServiceImpl implements CoverageService {
/**
* Desc: 事件查询
*
* @param formDTO
* @author zxc
* @date 2022/7/28 16:03
@ -523,6 +438,7 @@ public class CoverageServiceImpl implements CoverageService {
/**
* 从staff信息中获取工作人员的PIDS
*
* @param staffInfo
* @return
*/
@ -573,6 +489,7 @@ public class CoverageServiceImpl implements CoverageService {
/**
* 计算数据条数
*
* @param customerId
* @param agencyId
* @param staffOrgIds
@ -637,6 +554,8 @@ public class CoverageServiceImpl implements CoverageService {
} else if (CoveragePlaceTypeEnum.NUCLEIC_POINT.getCode().equals(placeType)) {
// 核酸检测点
return epmetUserService.countNucleicPoint(customerId, agencyId, staffOrgIds, search);
} else if (CoveragePlaceTypeEnum.KEY_UNIT.getCode().equals(placeType)) {
return govOrgService.countKeyEnterprise();//重点单位数量统计 日照专用
}
return 0;
@ -644,6 +563,7 @@ public class CoverageServiceImpl implements CoverageService {
/**
* 执行数据查询
*
* @param customerId
* @param agencyId 查询的工作人员所在组织id
* @param staffOrgIds 查询的工作人员所在组织的id path，包含agencyId
@ -828,12 +748,19 @@ public class CoverageServiceImpl implements CoverageService {
.map(np -> new CoverageAnalisisDataListResultDTO(np.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null,
placeType, np.getName(), np.getLatitude(), np.getLongitude()))
.collect(Collectors.toList());
} else if (CoveragePlaceTypeEnum.KEY_UNIT.getCode().equals(placeType)) {
List<KeyEnterpriseEntity> enterpriseList = govOrgService.getKeyEnterprise();
if (null != enterpriseList && enterpriseList.size() > 0) {
return enterpriseList.stream().map(enter -> new CoverageAnalisisDataListResultDTO(enter.getId(),
categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, enter.getUnitName(), enter.getLatitude(), enter.getLongitude())).collect(Collectors.toList());
}
}
return new ArrayList<>();
}
/**
* 获取用户的坐标信息
*
* @param resiId
* @param buildingId
* @param rootAgency 跟组织，用于备选，从其中获取坐标
@ -861,6 +788,7 @@ public class CoverageServiceImpl implements CoverageService {
/**
* 五大图层-可视化-右侧分类树列表
*
* @return
*/
@Override
@ -1075,6 +1003,7 @@ public class CoverageServiceImpl implements CoverageService {
/**
* 填充数量，接收参数为多个placeType(对应左侧菜单的所有一级)
*
* @param results
*/
private void fillQuantities4GovernedTarges(List<AnalysisGovernedTargetsResult> results, String customerId, String agencyId, String staffOrgIds) {
@ -1103,6 +1032,7 @@ public class CoverageServiceImpl implements CoverageService {
/**
* 填充数量，接收参数为左侧单个placeType
*
* @param targetsOfOnePlaceType
* @param customerId
* @param agencyId
@ -1132,7 +1062,6 @@ public class CoverageServiceImpl implements CoverageService {
}
/**
* 五大图层，左侧菜单，点击事件，查询人.事的分布
*

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

@ -0,0 +1,24 @@
<?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.KeyEnterpriseDao">
<select id="countKeyEnterprise" resultType="java.lang.Integer">
select count(id) from key_enterprise where DEL_FLAG = 0
</select>
<select id="getList" resultType="com.epmet.dataaggre.entity.govorg.KeyEnterpriseEntity">
SELECT
ke.ID,
ke.UNIT_NAME,
ke.UNIT_TYPE,
ke.BUSINESS,
ke.LEGAL_PERSON,
ke.MOBILE,
ke.ADDRESS,
ke.LONGITUDE,
ke.LATITUDE
FROM key_enterprise ke
<where>
ke.DEL_FLAG = 0
</where>
</select>
</mapper>
Write Preview
Loading…
Cancel
Save