|
|
|
@ -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<SysDictDao, SysDictEntit |
|
|
|
baseDao.deleteById(id); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result<List<SysPopulationSimpleDictDTO>> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO) { |
|
|
|
List<SysPopulationSimpleDictDTO> sysPopulationSimpleDictDTOS = new ArrayList<>(); |
|
|
|
try { |
|
|
|
for (String dictType : sysPopulationSimpleDictFormDTO.getDicTypes()) { |
|
|
|
SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO = new SysPopulationSimpleDictDTO(); |
|
|
|
List<SysSimpleDictDTO> simpleDictList = Lists.newArrayList(); |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(dictType)) { |
|
|
|
List<SysSimpleDictDTO> dictList = dictRedis.getSimpleDictList(dictType); |
|
|
|
if (null != dictList) { |
|
|
|
sysPopulationSimpleDictDTO.setSysSimpleDicts(dictList); |
|
|
|
sysPopulationSimpleDictDTO.setDicType(dictType); |
|
|
|
sysPopulationSimpleDictDTOS.add(sysPopulationSimpleDictDTO); |
|
|
|
continue; |
|
|
|
} |
|
|
|
|
|
|
|
QueryWrapper<SysDictEntity> 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<SysDictEntity> 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<List<SysPopulationSimpleDictDTO>>().ok(sysPopulationSimpleDictDTOS); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType) { |
|
|
|
List<SysSimpleDictDTO> simpleDictList = Lists.newArrayList(); |
|
|
|
|
