elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

又暂提了搜索

master
zxc 3 years ago
parent
06447f68f6
commit
2c9d66709c
7 changed files with 159 additions and 4 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. 1
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java
  2. 5
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
  3. 25
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
  4. 1
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java
  5. 5
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java
  6. 110
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
  7. 12
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml

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

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

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

@ -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);
}

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

@ -1135,23 +1135,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);
}
}

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

@ -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
View File

@ -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<>();

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

@ -245,14 +245,24 @@ public class CoverageServiceImpl implements CoverageService {
result.setUserInfos(allIcUserPageInfo.getList());
result.setUserInfosTotal(allIcUserPageInfo.getTotal());
}else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){
Integer total = NumConstant.ZERO;
Integer start = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
Integer end = start + formDTO.getPageSize();
Integer flag;
for (String resource : resources) {
if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){
Integer superiorResourceInfosCount = govOrgService.getSuperiorResourceInfosCount(formDTO);
total = total + superiorResourceInfosCount;
if (superiorResourceInfosCount > start){
}
}else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){
Integer cityManageInfosCount = govOrgService.getCityManageInfosCount(formDTO);
total = total + cityManageInfosCount;
}else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){
Integer communitySelOrgInfosCount = heartService.getCommunitySelOrgInfosCount(formDTO);
total = total + communitySelOrgInfosCount;
}else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){
}else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){
@ -340,6 +350,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()){

12
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml
View File

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