Browse Source

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

 Conflicts:
	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
master
wangxianzhang 3 years ago
parent
commit
c4abc48886
  1. 4
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java
  2. 33
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/DataListLeftSubTotalFormDTO.java
  3. 39
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SearchDetailFormDTO.java
  4. 19
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/DataListLeftSubTotalResDTO.java
  5. 8
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridInfoResultDTO.java
  6. 9
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/OrgInfoCommonDTO.java
  7. 46
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java
  8. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java
  9. 1
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java
  10. 19
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java
  11. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java
  12. 9
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java
  13. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java
  14. 5
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
  15. 4
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java
  16. 29
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
  17. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
  18. 12
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
  19. 1
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java
  20. 5
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java
  21. 262
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
  22. 4
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
  23. 98
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml
  24. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml
  25. 14
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml
  26. 6
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java
  27. 6
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
  28. 22
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java
  29. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java
  30. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

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

@ -37,4 +37,8 @@ public class CoverageHomeSearchFormDTO extends PageFormDTO implements Serializab
* searchType为resource时此字段必填
*/
private String resourceType;
private String resourceId;
private String icEventId;
private String icUserId;
}

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

@ -0,0 +1,33 @@
package com.epmet.dataaggre.dto.govorg.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Description
* @Author yzm
* @Date 2022/7/29 10:38
*/
@Data
public class DataListLeftSubTotalFormDTO {
public interface AddUserInterGroup{}
@NotBlank(message = "orgId不能为空",groups = AddUserInterGroup.class)
private String orgId;
@NotBlank(message = "orgType不能为空",groups = AddUserInterGroup.class)
private String orgType;
private String coverageType;
@NotBlank(message = "categoryKey不能为空",groups = AddUserInterGroup.class)
private String categoryKey;
@NotBlank(message = "placeType不能为空",groups = AddUserInterGroup.class)
private String placeType;
private String customerId;
private String staffId;
}

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

@ -0,0 +1,39 @@
package com.epmet.dataaggre.dto.govorg.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/7/29 08:48
* @DESC
*/
@Data
public class SearchDetailFormDTO implements Serializable {
private static final long serialVersionUID = 3499320376768396157L;
public interface SearchUserDetailForm{}
public interface SearchEventDetailForm{}
public interface SearchResourceDetailForm{}
@NotBlank(message = "icUserId不能为空",groups = SearchUserDetailForm.class)
private String icUserId;
@NotBlank(message = "icEventId不能为空",groups = SearchEventDetailForm.class)
private String icEventId;
@NotBlank(message = "resourceId不能为空",groups = SearchResourceDetailForm.class)
private String resourceId;
/**
* 资源类型社区自组织community_org;优势资源:superior_resource;城市管理city_management重点危化企业dangerous_chemicals公共服务public_service企事业单位巡查enterprise_patrol
*/
@NotBlank(message = "resourceType不能为空",groups = SearchResourceDetailForm.class)
private String resourceType;
private String customerId;
}

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

@ -0,0 +1,19 @@
package com.epmet.dataaggre.dto.govorg.result;
import lombok.Data;
/**
* @Description
* @Author yzm
* @Date 2022/7/29 10:45
*/
@Data
public class DataListLeftSubTotalResDTO {
private String orgId;
private String orgType;
private String orgName;
private String longitude;
private String latitude;
private Integer total=0;
}

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

@ -38,5 +38,13 @@ public class GridInfoResultDTO implements Serializable {
private String gridId = "";
private String gridName = "";
private String pids = "";
/**
* 中心位置经度
*/
private String longitude;
/**
* 中心位置纬度
*/
private String latitude;
}

9
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/OrgInfoCommonDTO.java

@ -17,4 +17,13 @@ public class OrgInfoCommonDTO implements Serializable {
private String orgId;
private String orgName;
private String orgType;
/**
* 中心位置经度
*/
private String longitude;
/**
* 中心位置纬度
*/
private String latitude;
}

46
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java

@ -9,14 +9,11 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.EpmetRequestHolder;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
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.form.*;
import com.epmet.dataaggre.dto.govorg.result.*;
import com.epmet.dataaggre.service.CoverageService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@ -128,4 +125,41 @@ public class CoverageController {
PageData<CoverageAnalisisDataListResultDTOV2> page = coverageService.dataListLeft(formDTO);
return new Result<PageData<CoverageAnalisisDataListResultDTOV2>>().ok(page);
}
@PostMapping("search-user-detail")
public Result<UserInfoResultDTO> searchUserDetail(@RequestBody SearchDetailFormDTO formDTO,@LoginUser TokenDto tokenDto){
ValidatorUtils.validateEntity(formDTO, SearchDetailFormDTO.SearchUserDetailForm.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<UserInfoResultDTO>().ok(coverageService.searchUserDetail(formDTO));
}
@PostMapping("search-event-detail")
public Result<EventInfoResultDTO> searchEventDetail(@RequestBody SearchDetailFormDTO formDTO,@LoginUser TokenDto tokenDto){
ValidatorUtils.validateEntity(formDTO, SearchDetailFormDTO.SearchEventDetailForm.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<EventInfoResultDTO>().ok(coverageService.searchEventDetail(formDTO));
}
@PostMapping("search-resource-detail")
public Result<ResourceInfoResultDTO> searchResourceDetail(@RequestBody SearchDetailFormDTO formDTO,@LoginUser TokenDto tokenDto){
ValidatorUtils.validateEntity(formDTO, SearchDetailFormDTO.SearchResourceDetailForm.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<ResourceInfoResultDTO>().ok(coverageService.searchResourceDetail(formDTO));
}
/**
* 左侧菜单点击后查询当前组织下级组织各分类数量
*
* @param tokenDto
* @param formDTO
* @return
*/
@PostMapping("dataList-left-subtotal")
public Result<List<DataListLeftSubTotalResDTO>> dataListLeftSubTotal(@LoginUser TokenDto tokenDto, @RequestBody DataListLeftSubTotalFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO, DataListLeftSubTotalFormDTO.AddUserInterGroup.class);
List<DataListLeftSubTotalResDTO> resultList = coverageService.dataListLeftSubTotal(formDTO);
return new Result<List<DataListLeftSubTotalResDTO>>().ok(resultList);
}
}

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

@ -26,7 +26,8 @@ public interface IcEnterprisePatrolRecordDao extends BaseDao<IcEnterprisePatrolR
*/
Integer countEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId,
@Param("staffOrgIds") String staffOrgIds, @Param("search") String search,
@Param("categoryKey") String categoryKey,@Param("latestResult")String latestResult);
@Param("categoryKey") String categoryKey,@Param("latestResult")String latestResult,
@Param("gridId")String gridId);
/**
* 企事业单位巡查列表

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

@ -35,5 +35,6 @@ import java.util.List;
public interface IcCommunitySelfOrganizationDao extends BaseDao<IcCommunitySelfOrganizationEntity> {
List<ResourceInfoResultDTO> getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO);
Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO);
}

19
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java

@ -5,9 +5,9 @@ import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
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.form.DataListLeftSubTotalFormDTO;
import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO;
import com.epmet.dataaggre.dto.govorg.result.*;
import java.util.List;
@ -50,4 +50,17 @@ public interface CoverageService {
* @return
*/
PageData<CoverageAnalisisDataListResultDTOV2> dataListLeft(CoverageAnalisisDataListLeftFormDTO formDTO);
UserInfoResultDTO searchUserDetail(SearchDetailFormDTO formDTO);
EventInfoResultDTO searchEventDetail(SearchDetailFormDTO formDTO);
ResourceInfoResultDTO searchResourceDetail(SearchDetailFormDTO formDTO);
/**
* 左侧菜单点击后查询当前组织下级组织各分类数量
* @param formDTO
* @return
*/
List<DataListLeftSubTotalResDTO> dataListLeftSubTotal(DataListLeftSubTotalFormDTO formDTO);
}

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

@ -24,7 +24,7 @@ public interface IcResiService {
List<IcResiUserEntity> listResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,
Integer pageNo, Integer pageSize, Boolean isPage);
Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search);
Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,String gridId);
/**
* 使用特殊人群类别查询居民列表

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

@ -40,7 +40,7 @@ public class IcResiServiceImpl implements IcResiService {
PageHelper.startPage(pageNo, pageSize);
}
LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search, null);
query.orderByAsc(IcResiUserEntity::getCreatedTime);
return resiUserDao.selectList(query);
}
@ -55,8 +55,8 @@ public class IcResiServiceImpl implements IcResiService {
* @return
*/
@Override
public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search, String gridId) {
LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search,gridId);
return resiUserDao.selectCount(query);
}
@ -69,11 +69,12 @@ public class IcResiServiceImpl implements IcResiService {
* @param search
* @return
*/
LambdaQueryWrapper<IcResiUserEntity> constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
LambdaQueryWrapper<IcResiUserEntity> constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,String gridId) {
LambdaQueryWrapper<IcResiUserEntity> query = new LambdaQueryWrapper<>();
query.eq(IcResiUserEntity::getCustomerId, customerId);
query.eq(IcResiUserEntity::getStatus, "0"); // 只查询0 正常的居民。
query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids));
query.eq(StringUtils.isNotBlank(gridId), IcResiUserEntity::getGridId, gridId);
if ("resi_xfry".equals(categoryKey)) {
// 信访人员
query.eq(IcResiUserEntity::getIsXfry, true);

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

@ -112,7 +112,7 @@ public interface GovOrgCoverageService {
Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey);
Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult);
Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId);
List<IcEnterisePatrolResultDTO> listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds,
String search, String categoryKey, Boolean isPage, Integer pageNo,

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

@ -228,6 +228,7 @@ public interface GovOrgService {
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getCityManageInfos(CoverageHomeSearchFormDTO formDTO);
Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取公共服务信息
@ -236,6 +237,7 @@ public interface GovOrgService {
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO);
Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取重点危化品企业信息
@ -244,6 +246,7 @@ public interface GovOrgService {
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO);
Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取优势资源信息
@ -252,6 +255,7 @@ public interface GovOrgService {
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO);
Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO);
/**
* Desc: 资源获取企事业单位巡查信息
@ -260,5 +264,6 @@ public interface GovOrgService {
* @date 2022/7/28 10:22
*/
List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO);
Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO);
}

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

@ -293,8 +293,8 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
}
@Override
public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult) {
return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult);
public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId) {
return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult,gridId);
}
@Override

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

@ -246,6 +246,8 @@ public class GovOrgServiceImpl implements GovOrgService {
agecnyInfo.setOrgId(agencyEntity.getId());
agecnyInfo.setOrgName(agencyEntity.getOrganizationName());
agecnyInfo.setOrgType("agency");
agecnyInfo.setLatitude(agencyEntity.getLatitude());
agecnyInfo.setLongitude(agencyEntity.getLongitude());
result.add(agecnyInfo);
});
return result;
@ -257,6 +259,8 @@ public class GovOrgServiceImpl implements GovOrgService {
gridInfo.setOrgId(grid.getGridId());
gridInfo.setOrgName(grid.getGridName());
gridInfo.setOrgType("grid");
gridInfo.setLongitude(grid.getLongitude());
gridInfo.setLatitude(grid.getLatitude());
result.add(gridInfo);
});
}
@ -1135,23 +1139,48 @@ 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);
}
}

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

@ -4,7 +4,6 @@ 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;
@ -111,7 +110,7 @@ public interface GovProjectService {
* @param isDifficultPoint 是否是难点堵点
* @return
*/
Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint);
Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint,String gridId);
/**
* 搜索事件

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

@ -28,7 +28,6 @@ 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;
@ -653,15 +652,15 @@ public class GovProjectServiceImpl implements GovProjectService {
}
@Override
public Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint) {
LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint);
public Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint, String gridId) {
LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint,gridId);
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);
LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint,null);
if (isPage) {
PageHelper.startPage(pageNo, pageSize);
}
@ -682,9 +681,10 @@ public class GovProjectServiceImpl implements GovProjectService {
* @return
*/
private LambdaQueryWrapper<IcEventEntity> constructIcEventQueryWrapper(String customerId, String staffOrgIds,
String search, Boolean difficultPoint) {
String search, Boolean difficultPoint, String gridId) {
LambdaQueryWrapper<IcEventEntity> query = new LambdaQueryWrapper<>();
query.eq(IcEventEntity::getCustomerId, customerId);
query.eq(IcEventEntity::getCustomerId, customerId)
.eq(StringUtils.isNotBlank(gridId), IcEventEntity::getGridId, gridId);
query.likeRight(IcEventEntity::getGridPids, staffOrgIds);
if (StringUtils.isNotBlank(search)) {
query.like(IcEventEntity::getName, search);

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

@ -44,4 +44,5 @@ public interface HeartService {
Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey);
List<ResourceInfoResultDTO> getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO);
Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO);
}

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

@ -63,6 +63,11 @@ public class HeartServiceImpl implements HeartService {
return communitySelfOrganizationDao.getCommunitySelOrgInfos(formDTO);
}
@Override
public Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO) {
return communitySelfOrganizationDao.getCommunitySelOrgInfosCount(formDTO);
}
private LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> constructCommunityOrgQueryWrapper(
String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) {
LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> query = new LambdaQueryWrapper<>();

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

@ -9,11 +9,16 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.EpmetRequestHolder;
import com.epmet.commons.tools.utils.SpringContextUtils;
import com.epmet.dataaggre.constant.OrgConstant;
import com.epmet.dataaggre.constant.TableConstant;
import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
@ -21,7 +26,10 @@ import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
import com.epmet.dataaggre.dto.govorg.form.DataListLeftSubTotalFormDTO;
import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO;
import com.epmet.dataaggre.dto.govorg.result.*;
import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
import com.epmet.dataaggre.entity.govorg.*;
import com.epmet.dataaggre.entity.govproject.IcEventEntity;
@ -52,6 +60,8 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@ -154,7 +164,7 @@ public class CoverageServiceImpl implements CoverageService {
for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) {
Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, agencyPath, e.getPlaceType(),
e.getCategoryKey(), search);
e.getCategoryKey(), search,null);
lastTotalCount = totalCount;
totalCount += tempCount;
@ -247,28 +257,50 @@ public class CoverageServiceImpl implements CoverageService {
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());
return result;
}else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){
List<ResourceInfoResultDTO> reInfos = new ArrayList<>();
List<CompletableFuture<List<ResourceInfoResultDTO>>> futures = new ArrayList<>();
for (String resource : resources) {
if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){
CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getSuperiorResourceInfos(formDTO));
futures.add(c);
}else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){
CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getCityManageInfos(formDTO));
futures.add(c);
}else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){
CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> heartService.getCommunitySelOrgInfos(formDTO));
futures.add(c);
}else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){
CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getDangerousChemicalsInfos(formDTO));
futures.add(c);
}else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){
CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getEnterpriseInfos(formDTO));
futures.add(c);
}else if (MenusEnums.IC_PUBLIC_SERVICE.getUrl().equals(resource)){
CompletableFuture<List<ResourceInfoResultDTO>> c = CompletableFuture.supplyAsync(() -> govOrgService.getPublicServiceInfos(formDTO));
futures.add(c);
}
}
for (CompletableFuture<List<ResourceInfoResultDTO>> future : futures) {
try {
if (CollectionUtils.isNotEmpty(future.get())){
reInfos.addAll(future.get());
}
} catch (InterruptedException e) {
log.error("【五大图层首页】异步获取资源列表被中断:{}", ExceptionUtils.getErrorStackTrace(e));
} catch (ExecutionException e) {
log.error("【五大图层首页】异步获取异步获取资源列表失败:{}", ExceptionUtils.getErrorStackTrace(e));
}
}
result.setResourceInfos(reInfos);
return result;
}
}else {
// 查询居民
@ -348,6 +380,102 @@ 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
*/
public PageInfo<UserInfoResultDTO> getIcUserPageInfo (CoverageHomeSearchFormDTO formDTO){
PageInfo<UserInfoResultDTO> result = new PageInfo<>();
if (formDTO.getIsPage()){
@ -439,18 +567,18 @@ public class CoverageServiceImpl implements CoverageService {
* @return
*/
public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType,
String categoryKey, String search) {
String categoryKey, String search,String gridId) {
if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeType)) {
// 使用分类查询居民信息
return icResiService.countResisByCategories4Coverage(customerId, agencyId,
staffOrgIds, categoryKey, search);
staffOrgIds, categoryKey, search,gridId);
} else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) {
// 特殊人群
return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
} else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) {
// 难点痛点
return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true);
return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true,gridId);
} else if (CoveragePlaceTypeEnum.CITY_MANAGEMENT.getCode().equals(placeType)) {
// 城市资源管理
return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey);
@ -469,7 +597,7 @@ public class CoverageServiceImpl implements CoverageService {
return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey);
} else if (CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode().equals(placeType)) {
// 企事业单位巡查
return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,null);
return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,null,null);
} else if (CoveragePlaceTypeEnum.GROUP_RENT.getCode().equals(placeType)) {
// 群租房。出租的房屋,住的人口超过5人属于群租房(是个规定
return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT);
@ -482,7 +610,7 @@ public class CoverageServiceImpl implements CoverageService {
} else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.getCode().equals(placeType)){
// 企事业单位巡查
// 最新巡查结果【0:合格 1:不合格】
return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR );
return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR,gridId);
}
return 0;
@ -986,4 +1114,112 @@ public class CoverageServiceImpl implements CoverageService {
// page.getTotal()是多少条业务数据
return new PageData<>(list, page.getTotal());
}
@Override
public UserInfoResultDTO searchUserDetail(SearchDetailFormDTO formDTO) {
CoverageHomeSearchFormDTO dto = ConvertUtils.sourceToTarget(formDTO, CoverageHomeSearchFormDTO.class);
UserInfoResultDTO result = new UserInfoResultDTO();
List<UserInfoResultDTO> allIcUser = icResiService.getAllIcUser(dto);
if (CollectionUtils.isNotEmpty(allIcUser)){
result = allIcUser.get(NumConstant.ZERO);
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(result.getGridId());
if (null == gridInfo){
throw new EpmetException("获取网格信息失败:"+result.getGridId());
}
result.setGridName(gridInfo.getGridNamePath());
HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), result.getHomeId());
if (null == houseInfo){
throw new EpmetException("获取房屋信息失败:"+result.getHomeId());
}
result.setHouseName(houseInfo.getAllName());
result.setLongitude(houseInfo.getBuildingLongitude());
result.setLatitude(houseInfo.getBuildingLatitude());
}
return result;
}
@Override
public EventInfoResultDTO searchEventDetail(SearchDetailFormDTO formDTO) {
CoverageHomeSearchFormDTO dto = ConvertUtils.sourceToTarget(formDTO, CoverageHomeSearchFormDTO.class);
EventInfoResultDTO result = new EventInfoResultDTO();
List<EventInfoResultDTO> eventInfos = govProjectService.getEventInfos(dto);
if (CollectionUtils.isNotEmpty(eventInfos)){
result = eventInfos.get(NumConstant.ZERO);
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(result.getGridId());
if (null == gridInfo){
throw new EpmetException("获取网格信息失败:"+result.getGridId());
}
result.setGridName(gridInfo.getGridNamePath());
}
return result;
}
@Override
public ResourceInfoResultDTO searchResourceDetail(SearchDetailFormDTO formDTO) {
CoverageHomeSearchFormDTO dto = ConvertUtils.sourceToTarget(formDTO, CoverageHomeSearchFormDTO.class);
ResourceInfoResultDTO result = new ResourceInfoResultDTO();
List<ResourceInfoResultDTO> infos = new ArrayList<>();
switch (formDTO.getResourceType()){
case "community_org":
infos = heartService.getCommunitySelOrgInfos(dto);
break;
case "superior_resource":
infos = govOrgService.getSuperiorResourceInfos(dto);
break;
case "city_management":
infos = govOrgService.getCityManageInfos(dto);
break;
case "dangerous_chemicals":
infos = govOrgService.getDangerousChemicalsInfos(dto);
break;
case "public_service":
infos = govOrgService.getPublicServiceInfos(dto);
break;
case "enterprise_patrol":
infos = govOrgService.getEnterpriseInfos(dto);
break;
default:
break;
}
if (CollectionUtils.isNotEmpty(infos)){
result = infos.get(NumConstant.ZERO);
}
return result;
}
/**
* 左侧菜单点击后查询当前组织下级组织各分类数量
*
* @param formDTO
* @return
*/
@Override
public List<DataListLeftSubTotalResDTO> dataListLeftSubTotal(DataListLeftSubTotalFormDTO formDTO) {
List<DataListLeftSubTotalResDTO> resultList=new ArrayList<>();
List<OrgInfoCommonDTO> list = SpringContextUtils.getBean(GovOrgService.class).queryNextOrgInfoDTO(formDTO.getCoverageType(), formDTO.getOrgId());
if(CollectionUtils.isNotEmpty(list)){
resultList=ConvertUtils.sourceToTarget(list,DataListLeftSubTotalResDTO.class);
for(DataListLeftSubTotalResDTO orgRes:resultList){
String gridId=StrConstant.EPMETY_STR;
String agencyId=StrConstant.EPMETY_STR;
String orgIdPath=StrConstant.EPMETY_STR;
if(OrgConstant.AGENCY.equals(orgRes.getOrgType())){
agencyId=orgRes.getOrgId();
AgencyInfoCache agencyInfoCache=CustomerOrgRedis.getAgencyInfo(orgRes.getOrgId());
if (StringUtils.isNotBlank(agencyInfoCache.getPids()) && !"0".equals(agencyInfoCache.getPids()) && !"0".equals(agencyInfoCache)) {
orgIdPath = agencyInfoCache.getPids().concat(":").concat(agencyId);
} else {
orgIdPath = agencyId;
}
}else{
gridId=orgRes.getOrgId();
GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(orgRes.getOrgId());
orgIdPath=gridInfoCache.getPids().concat(":").concat(gridId);
}
int count = doDataListCount(formDTO.getCustomerId(), agencyId, orgIdPath, formDTO.getPlaceType(), formDTO.getCategoryKey(), null, gridId);
orgRes.setTotal(count);
}
}
return resultList;
}
}

4
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml

@ -47,7 +47,9 @@
<select id="selectGridListByAgencyId" resultType="com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO">
SELECT
id AS "gridId",
grid_name AS "gridName"
grid_name AS "gridName",
LATITUDE as latitude,
LONGITUDE as longitude,
FROM
customer_grid
WHERE

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

@ -18,8 +18,15 @@
IFNULL(MOBILE,'') AS MOBILE
FROM ic_city_management
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
<if test='resourceId != null and resourceId != "" '>
AND ID = #{resourceId}
</if>
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND `NAME` LIKE CONCAT('%',#{name},'%')
</if>
@ -40,8 +47,15 @@
IFNULL(MOBILE,'') AS MOBILE
FROM ic_public_service
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
<if test='resourceId != null and resourceId != "" '>
AND ID = #{resourceId}
</if>
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND `NAME` LIKE CONCAT('%',#{name},'%')
</if>
@ -60,8 +74,15 @@
ifnull(PRINCIPAL_MOBILE,'') AS mobile
FROM ic_dangerous_chemicals
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
<if test='resourceId != null and resourceId != "" '>
AND ID = #{resourceId}
</if>
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND `NAME` LIKE CONCAT('%',#{name},'%')
</if>
@ -80,8 +101,15 @@
ifnull(ADDRESS,'') as ADDRESS
FROM ic_superior_resource
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
<if test='resourceId != null and resourceId != "" '>
AND ID = #{resourceId}
</if>
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND `NAME` LIKE CONCAT('%',#{name},'%')
</if>
@ -99,8 +127,15 @@
ifnull(MOBILE,'') AS mobile
FROM ic_enterprise
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
<if test='resourceId != null and resourceId != "" '>
AND ID = #{resourceId}
</if>
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND PLACE_ORG_NAME LIKE CONCAT('%',#{name},'%')
</if>
@ -109,8 +144,15 @@
select count(id)
FROM ic_city_management
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
<if test='resourceId != null and resourceId != "" '>
AND ID = #{resourceId}
</if>
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND `NAME` LIKE CONCAT('%',#{name},'%')
</if>
@ -119,8 +161,12 @@
select count(id)
FROM ic_public_service
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND `NAME` LIKE CONCAT('%',#{name},'%')
</if>
@ -129,8 +175,12 @@
select count(id)
FROM ic_dangerous_chemicals
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND `NAME` LIKE CONCAT('%',#{name},'%')
</if>
@ -139,8 +189,12 @@
select count(id)
FROM ic_superior_resource
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND `NAME` LIKE CONCAT('%',#{name},'%')
</if>
@ -149,8 +203,12 @@
select count(id)
FROM ic_enterprise
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
<if test='customerId != null and customerId != ""'>
AND CUSTOMER_ID = #{customerId}
</if>
<if test='orgId != null and orgId != ""'>
AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
</if>
<if test=' name != null and name != "" '>
AND PLACE_ORG_NAME LIKE CONCAT('%',#{name},'%')
</if>

3
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml

@ -17,6 +17,9 @@
<if test='null != latestResult and "" != latestResult'>
and e.LATEST_RESULT = #{latestResult}
</if>
<if test='null != gridId and "" != gridId'>
and e.GRID_ID = #{gridId}
</if>
</select>
<!--企事业单位巡查列表-->

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

@ -18,6 +18,18 @@
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND CONCAT(PIDS,':',ORG_ID) LIKE CONCAT('%',#{orgId},'%')
AND ORGANIZATION_NAME LIKE CONCAT('%',#{name},'%')
<if test='name != null and name != ""'>
AND ORGANIZATION_NAME LIKE CONCAT('%',#{name},'%')
</if>
</select>
<select id="getCommunitySelOrgInfosCount" resultType="java.lang.Integer">
select count(id)
FROM ic_community_self_organization
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
AND CONCAT(PIDS,':',ORG_ID) LIKE CONCAT('%',#{orgId},'%')
<if test='name != null and name != ""'>
AND ORGANIZATION_NAME LIKE CONCAT('%',#{name},'%')
</if>
</select>
</mapper>

6
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java

@ -176,9 +176,11 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
SendSmsFormDTO sms = new SendSmsFormDTO();
sms.setCustomerId(customerId);
sms.setMobile(serverInfoDTO.getMobile());
sms.setAliyunTemplateCode(SmsTemplateConstant.COMMON_SMS_TEM);
sms.setAliyunTemplateCode(SmsTemplateConstant.IC_SERVICE_TEM);
Map<String, String> paramMap = new HashMap<>();
paramMap.put("content", String.format("%s发起一个【%s】服务,请服务完成后尽快反馈,谢谢合作。", staffInfoCacheResult.getAgencyName(), serviceName));
//${nane}发起一个${serviceName}服务,请服务完成后尽快反馈,谢谢合作。
paramMap.put("nane",staffInfoCacheResult.getAgencyName());
paramMap.put("serviceName",serviceName);
sms.setParamMap(paramMap);
smsList.add(sms);
messageOpenFeignClient.sendMsg(smsList);

6
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@ -453,12 +453,12 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
SendSmsFormDTO sms = new SendSmsFormDTO();
sms.setCustomerId(customerId);
sms.setMobile(mobile);
sms.setAliyunTemplateCode(SmsTemplateConstant.COMMON_SMS_TEM);
sms.setAliyunTemplateCode(SmsTemplateConstant.DEMAND_SERVICE_TEM);
Map<String, String> paramMap = new HashMap<>();
paramMap.put("content", String.format("%s给您指派了一个新的需求,请查看", staffInfoCacheResult.getAgencyName()));
paramMap.put("name",staffInfoCacheResult.getAgencyName());
sms.setParamMap(paramMap);
smsList.add(sms);
messageOpenFeignClient.sendMsg(smsList);
Result res=messageOpenFeignClient.sendMsg(smsList);
}
/**

22
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java

@ -39,10 +39,22 @@ public interface SmsTemplateConstant {
String PROJECT_OVERDUE = "SMS_206885207";
/**
* 通用的短信模板翻出来的内容
*党群e事通:XXXXX
* 参数keycontent
* 模板名称
* 数字社区-服务方接收消息模板
* 模板CODE
* SMS_247205033
* 模板内容
* ${nane}发起一个${serviceName}服务请服务完成后尽快反馈谢谢合作
*/
// todo
String COMMON_SMS_TEM="";
String IC_SERVICE_TEM="SMS_247205033";
/**
* 模板名称
* 数字社区-需求服务方接收消息模板
* 模板CODE
* SMS_247645013
* 模板内容
* ${name}给您指派了一个新的需求请服务完成后尽快反馈谢谢合作
*/
String DEMAND_SERVICE_TEM="SMS_247645013";
}

5
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java

@ -71,6 +71,11 @@ public class AddDepartmentFormDTO implements Serializable {
* 总人数
*/
private Integer totalUser;
/**
* 联建单位: party_unit
* 社会自组织: community_org
*/
private String deptType;
}

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@ -107,6 +107,9 @@ public class DepartmentServiceImpl implements DepartmentService {
Result<AddDepartmentResultDTO> result = new Result<AddDepartmentResultDTO>();
AddDepartmentResultDTO addDepartmentResultDTO = new AddDepartmentResultDTO();
CustomerDepartmentEntity entity = ConvertUtils.sourceToTarget(formDTO, CustomerDepartmentEntity.class);
if (formDTO.getTotalUser() > NumConstant.ZERO) {
entity.setTotalUser(formDTO.getTotalUser());
}
entity.setTotalUser(NumConstant.ZERO);
//1:查询当前组织机构信息,获取客户Id
CustomerAgencyEntity parentEntity = customerAgencyDao.selectById(formDTO.getAgencyId());
@ -403,6 +406,7 @@ public class DepartmentServiceImpl implements DepartmentService {
deptDTO.setAgencyId(staffInfo.getAgencyId());
deptDTO.setDepartmentDuty("");
deptDTO.setDepartmentName(formDTO.getDeptName());
deptDTO.setDeptType(formDTO.getDeptType());
deptDTO.setTotalUser(1);
Result<AddDepartmentResultDTO> deptResult = addDepartment(deptDTO);
//三、新增组织人员关系数据
@ -464,6 +468,7 @@ public class DepartmentServiceImpl implements DepartmentService {
deptDTO.setAgencyId(staffInfo.getAgencyId());
deptDTO.setDepartmentDuty("");
deptDTO.setDepartmentName(formDTO.getDeptName());
deptDTO.setDeptType(formDTO.getDeptType());
deptDTO.setTotalUser(1);
Result<AddDepartmentResultDTO> deptResult = addDepartment(deptDTO);
//三、部门下新增人员关系数据

Loading…
Cancel
Save