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

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java

@@ -20,6 +20,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.SysDictDataDTO;
 import com.epmet.service.SysDictDataService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -118,6 +119,18 @@ public class SysDictDataController {
         return new Result<List<OptionResultDTO>>().ok(sysDictDataService.getNationOption());
     }
 
+    /**
+     * 字典下拉框接口
+     * @param dictType
+     * @return
+     */
+    @PostMapping("dictOption/{dictType}")
+    public Result<List<OptionResultDTO>> getDictOption(@PathVariable("dictType")String dictType) {
+        if(StringUtils.isBlank(dictType)){
+            return  new Result<>();
+        }
+        return new Result<List<OptionResultDTO>>().ok(sysDictDataService.getDictOption(dictType));
+    }
     /**
      * @Description 人员关系
      * @Param

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java

@@ -92,4 +92,6 @@ public interface SysDictDataService extends BaseService<SysDictDataEntity> {
     List<DictTreeResultDTO> dictListTree(String dictType);
 
     List<SysDictDataDTO> getDictDataList(String dictType);
+
+    List<OptionResultDTO> getDictOption(String dictType);
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java

@@ -19,13 +19,17 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.TreeUtils;
 import com.epmet.dao.SysDictDataDao;
+import com.epmet.dao.SysDictTypeDao;
 import com.epmet.dto.SysDictDataDTO;
 import com.epmet.entity.SysDictDataEntity;
+import com.epmet.entity.SysDictTypeEntity;
 import com.epmet.service.SysDictDataService;
 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 java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +42,9 @@ import java.util.stream.Collectors;
  */
 @Service
 public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysDictDataEntity> implements SysDictDataService {
+    @Autowired
+    private SysDictTypeDao sysDictTypeDao;
+
 
     @Override
     public PageData<SysDictDataDTO> page(Map<String, Object> params) {
@@ -230,4 +237,28 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
         return baseDao.selectDictDataList(dictType);
     }
 
+    /**
+     * 传入dictType返回字典列表
+     * @param dictType
+     * @return
+     */
+    @Override
+    public List<OptionResultDTO> getDictOption(String dictType) {
+        LambdaQueryWrapper<SysDictTypeEntity> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysDictTypeEntity::getDictType,dictType);
+        SysDictTypeEntity sysDictTypeEntity=sysDictTypeDao.selectOne(queryWrapper);
+        if(null==sysDictTypeEntity){
+            return  new ArrayList<>();
+        }
+        LambdaQueryWrapper<SysDictDataEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysDictDataEntity::getDictTypeId,sysDictTypeEntity.getId() );
+        wrapper.orderByAsc(SysDictDataEntity::getSort);
+        List<SysDictDataEntity> list = baseDao.selectList(wrapper);
+        return list.stream().map(item -> {
+            OptionResultDTO dto = new OptionResultDTO();
+            dto.setValue(item.getDictValue());
+            dto.setLabel(item.getDictLabel());
+            return dto;
+        }).collect(Collectors.toList());
+    }
 }