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

字典

dev
sunyuchao 3 years ago
parent
5e26df02f6
commit
e53cdf7114
5 changed files with 84 additions and 32 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-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
  2. 23
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java
  3. 44
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
  4. 24
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java
  5. 24
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java

1
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
View File

@ -26,6 +26,7 @@ public enum DictTypeEnum {
SELF_ORG_CATEGORY("self_org_category","社区自组织分类",15),
IC_EVENT_SOURCE_TYPE("ic_event_source_type","事件管理",19),
IC_SERVICE_TYPE("ic_service_type","服务类别",20),
IC_DANGER_TYPE("ic_danger_type","危化品种类",24),
;
private final String code;

23
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java
View File

@ -15,17 +15,21 @@ import com.epmet.dto.IcCityManagementDTO;
import com.epmet.dto.form.IcCityManagementAddEditFormDTO;
import com.epmet.dto.form.IcCityManagementListFormDTO;
import com.epmet.dto.result.IcCityManagementListResultDTO;
import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
import com.epmet.entity.IcCityManagementEntity;
import com.epmet.service.CoverageService;
import com.epmet.service.IcCityManagementService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 城市管理图层
@ -36,6 +40,9 @@ import java.util.Map;
@Service
public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagementDao, IcCityManagementEntity> implements IcCityManagementService {
@Autowired
private CoverageService coverageService;
@Override
public PageData<IcCityManagementListResultDTO> list(IcCityManagementListFormDTO formDTO) {
@ -52,13 +59,13 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagemen
//封装类别数据
if (!CollectionUtils.isEmpty(list)) {
/*Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management");
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
for (IcCityManagementListResultDTO v : list) {
if (StringUtils.isNotBlank(v.getCategory())) {
v.setCategoryName(statusMap.get(v.getCategory()));
v.setCategoryName(dictMap.get(v.getCategory()));
}
}*/
}
}
return new PageData<>(list, pageInfo.getTotal());
@ -142,13 +149,13 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagemen
//封装类别数据
if (!CollectionUtils.isEmpty(list)) {
/*Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management");
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
for (IcCityManagementListResultDTO v : list) {
if (StringUtils.isNotBlank(v.getCategory())) {
v.setCategoryName(statusMap.get(v.getCategory()));
v.setCategoryName(dictMap.get(v.getCategory()));
}
}*/
}
}
return resultDTO;

44
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
View File

@ -5,27 +5,37 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.enums.DictTypeEnum;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.IcDangerousChemicalsDao;
import com.epmet.dto.IcDangerousChemicalsDTO;
import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO;
import com.epmet.dto.form.IcDangerousChemicalsListFormDTO;
import com.epmet.dto.result.IcCityManagementListResultDTO;
import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
import com.epmet.dto.result.IcDangerousChemicalsListResultDTO;
import com.epmet.entity.IcDangerousChemicalsEntity;
import com.epmet.feign.EpmetAdminOpenFeignClient;
import com.epmet.service.CoverageService;
import com.epmet.service.IcDangerousChemicalsService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 重点危化品企业
@ -36,6 +46,10 @@ import java.util.Map;
@Service
public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerousChemicalsDao, IcDangerousChemicalsEntity> implements IcDangerousChemicalsService {
@Autowired
private EpmetAdminOpenFeignClient adminOpenFeignClient;
@Autowired
private CoverageService coverageService;
@Override
public PageData<IcDangerousChemicalsListResultDTO> list(IcDangerousChemicalsListFormDTO formDTO) {
@ -52,20 +66,27 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
//封装类别数据
if (!CollectionUtils.isEmpty(list)) {
/*Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
//危化品种类字典
Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode());
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
//企业类别字典数据
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management");
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
for (IcDangerousChemicalsListResultDTO v : list) {
if (StringUtils.isNotBlank(v.getCategory())) {
v.setCategoryName(statusMap.get(v.getCategory()));
v.setCategoryName(dictMap.get(v.getCategory()));
}
}*/
if (StringUtils.isNotBlank(v.getDangerType())) {
v.setDangerTypeName(statusMap.get(v.getDangerType()));
}
}
}
return new PageData<>(list, pageInfo.getTotal());
}
private QueryWrapper<IcDangerousChemicalsEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
private QueryWrapper<IcDangerousChemicalsEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<IcDangerousChemicalsEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -142,13 +163,20 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
//封装类别数据
if (!CollectionUtils.isEmpty(list)) {
/*Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
//危化品种类字典
Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode());
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
//企业类别字典数据
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management");
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
for (IcDangerousChemicalsListResultDTO v : list) {
if (StringUtils.isNotBlank(v.getCategory())) {
v.setCategoryName(statusMap.get(v.getCategory()));
v.setCategoryName(dictMap.get(v.getCategory()));
}
if (StringUtils.isNotBlank(v.getDangerType())) {
v.setDangerTypeName(statusMap.get(v.getDangerType()));
}
}*/
}
}
return resultDTO;

24
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java
View File

@ -14,18 +14,23 @@ import com.epmet.dao.IcPublicServiceDao;
import com.epmet.dto.IcPublicServiceDTO;
import com.epmet.dto.form.IcPublicServiceAddEditFormDTO;
import com.epmet.dto.form.IcPublicServiceListFormDTO;
import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
import com.epmet.dto.result.IcPublicServiceListResultDTO;
import com.epmet.dto.result.IcSuperiorResourceListResultDTO;
import com.epmet.entity.IcPublicServiceEntity;
import com.epmet.service.CoverageService;
import com.epmet.service.IcPublicServiceService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 公共服务图层
@ -36,6 +41,9 @@ import java.util.Map;
@Service
public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceDao, IcPublicServiceEntity> implements IcPublicServiceService {
@Autowired
private CoverageService coverageService;
@Override
public PageData<IcPublicServiceListResultDTO> list(IcPublicServiceListFormDTO formDTO) {
@ -52,13 +60,13 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
//封装类别数据
if (!CollectionUtils.isEmpty(list)) {
/*Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service");
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
for (IcPublicServiceListResultDTO v : list) {
if (StringUtils.isNotBlank(v.getCategory())) {
v.setCategoryName(statusMap.get(v.getCategory()));
v.setCategoryName(dictMap.get(v.getCategory()));
}
}*/
}
}
return new PageData<>(list, pageInfo.getTotal());
@ -142,13 +150,13 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
//封装类别数据
if (!CollectionUtils.isEmpty(list)) {
/*Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service");
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
for (IcPublicServiceListResultDTO v : list) {
if (StringUtils.isNotBlank(v.getCategory())) {
v.setCategoryName(statusMap.get(v.getCategory()));
v.setCategoryName(dictMap.get(v.getCategory()));
}
}*/
}
}
return resultDTO;

24
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java
View File

@ -14,18 +14,23 @@ import com.epmet.dao.IcSuperiorResourceDao;
import com.epmet.dto.IcSuperiorResourceDTO;
import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO;
import com.epmet.dto.form.IcSuperiorResourceListFormDTO;
import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
import com.epmet.dto.result.IcSuperiorResourceListResultDTO;
import com.epmet.dto.result.StaffRoleResultDTO;
import com.epmet.entity.IcSuperiorResourceEntity;
import com.epmet.service.CoverageService;
import com.epmet.service.IcSuperiorResourceService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 优势资源管理
@ -36,6 +41,9 @@ import java.util.Map;
@Service
public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorResourceDao, IcSuperiorResourceEntity> implements IcSuperiorResourceService {
@Autowired
private CoverageService coverageService;
@Override
public PageData<IcSuperiorResourceListResultDTO> list(IcSuperiorResourceListFormDTO formDTO) {
@ -52,13 +60,13 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
//封装类别数据
if (!CollectionUtils.isEmpty(list)) {
/*Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource");
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
for (IcSuperiorResourceListResultDTO v : list) {
if (StringUtils.isNotBlank(v.getCategory())) {
v.setCategoryName(statusMap.get(v.getCategory()));
v.setCategoryName(dictMap.get(v.getCategory()));
}
}*/
}
}
return new PageData<>(list, pageInfo.getTotal());
@ -142,13 +150,13 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
//封装类别数据
if (!CollectionUtils.isEmpty(list)) {
/*Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode());
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "superior_resource");
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getCategoryKey, IcCoverageCategoryDictListResultDTO::getCategoryName));
for (IcSuperiorResourceListResultDTO v : list) {
if (StringUtils.isNotBlank(v.getCategory())) {
v.setCategoryName(statusMap.get(v.getCategory()));
v.setCategoryName(dictMap.get(v.getCategory()));
}
}*/
}
}
return resultDTO;

Write Preview
Loading…
Cancel
Save