diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml index 2690c56..f9ddb4e 100644 --- a/epdc-cloud-admin/pom.xml +++ b/epdc-cloud-admin/pom.xml @@ -90,6 +90,12 @@ epdc-cloud-admin-client ${epdc-cloud-client.version} + + + com.esua.epdc.yushan + epdc-cloud-custom-client + ${epdc-cloud-client.version} + diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDictController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDictController.java index 925c2cd..6bfd212 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDictController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDictController.java @@ -18,6 +18,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.SysDictDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO; +import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO; import com.elink.esua.epdc.service.SysDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -152,4 +154,10 @@ public class SysDictController { return new Result(); } + @PostMapping("listPopulationSimple") + public Result> listPopulationSimple(@RequestBody SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO) { + //字典分类数据 + return sysDictService.listPopulationSimple(sysPopulationSimpleDictFormDTO); + } + } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDictService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDictService.java index 7598352..17010ab 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDictService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDictService.java @@ -13,6 +13,8 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SysDictDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO; +import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO; import com.elink.esua.epdc.entity.SysDictEntity; import java.util.List; @@ -59,4 +61,13 @@ public interface SysDictService extends BaseService { * @date 2019/7/15 10:14 */ void delete(Long id); + + /** + * @Description 根据数据字典类型获取简版数据字典列表,用于居民信息采集数据校验 + * @Author songyunpeng + * @Date 2020/8/31 + * @Param [dictType] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java index 5b5a69f..dd041a3 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java @@ -18,6 +18,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.SysDictDao; import com.elink.esua.epdc.dto.SysDictDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO; +import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO; import com.elink.esua.epdc.entity.SysDictEntity; import com.elink.esua.epdc.redis.SysDictRedis; import com.elink.esua.epdc.service.SysDictService; @@ -28,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -121,6 +124,46 @@ public class SysDictServiceImpl extends BaseServiceImpl> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO) { + List sysPopulationSimpleDictDTOS = new ArrayList<>(); + try { + for (String dictType : sysPopulationSimpleDictFormDTO.getDicTypes()) { + SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO = new SysPopulationSimpleDictDTO(); + List simpleDictList = Lists.newArrayList(); + + if (StringUtils.isNotBlank(dictType)) { + List dictList = dictRedis.getSimpleDictList(dictType); + if (null != dictList) { + sysPopulationSimpleDictDTO.setSysSimpleDicts(dictList); + sysPopulationSimpleDictDTO.setDicType(dictType); + sysPopulationSimpleDictDTOS.add(sysPopulationSimpleDictDTO); + continue; + } + + QueryWrapper sdWrapper = new QueryWrapper<>(); + sdWrapper.select("dict_value", "dict_name"); + sdWrapper.eq("dict_type", dictType); + sdWrapper.ne("dict_value", ""); + sdWrapper.isNotNull("dict_value"); + sdWrapper.orderByAsc("SORT", Constant.CREATE_DATE); + List entityList = baseDao.selectList(sdWrapper); + if (!entityList.isEmpty()) { + simpleDictList = ConvertUtils.sourceToTarget(entityList, SysSimpleDictDTO.class); + sysPopulationSimpleDictDTO.setSysSimpleDicts(simpleDictList); + sysPopulationSimpleDictDTO.setDicType(dictType); + sysPopulationSimpleDictDTOS.add(sysPopulationSimpleDictDTO); + dictRedis.setSimpleDictList(dictType, simpleDictList); + } + } + } + + } catch (Exception e) { + log.error("获取数据字典列表失败,错误信息{}", e.getMessage()); + } + return new Result>().ok(sysPopulationSimpleDictDTOS); + } + @Override public Result> listSimpleDictInfo(String dictType) { List simpleDictList = Lists.newArrayList(); @@ -134,7 +177,7 @@ public class SysDictServiceImpl extends BaseServiceImpl sdWrapper = new QueryWrapper<>(); - sdWrapper.select("dict_value", "dict_name","remark"); + sdWrapper.select("dict_value", "dict_name", "remark"); sdWrapper.eq("dict_type", dictType); sdWrapper.ne("dict_value", ""); sdWrapper.isNotNull("dict_value"); diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index c660ca3..aa06473 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit c660ca360356218f48dbdb987f4fba70f7642435 +Subproject commit aa06473cf3f740f6396a8dea3ac2cb61c3567078 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 235f56d..72b0a45 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 235f56d5ea756317efe54c5e0d4be0ac45e09155 +Subproject commit 72b0a4547c75aa6788dcd05749994bc094a38010 diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan index db92131..6c53fd9 160000 --- a/epdc-cloud-parent-yushan +++ b/epdc-cloud-parent-yushan @@ -1 +1 @@ -Subproject commit db9213163f8005cba05ad21334bebb72484174b7 +Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d