sz 字典添加查询方法

common/src/main/java/com/jpsoft/smart/modules/sys/dao/DataDictionaryDAO.java

@@ -18,7 +18,11 @@ public interface DataDictionaryDAO {
 	String getName(String id);
 	String getValue(String id);
 	List<DataDictionary> list();
-	List<Map<String, Object>> queryChildren(String parentId);
 	String findParentId(String parentId,String value);
+	List<Map<String, Object>> queryChildren(String parentId);
 	List<DataDictionary> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+	List<DataDictionary> findByCatalogName(String catalogName);
+
+	String findNameByCatalogNameAndValue(String catalogName,String value);
 }

common/src/main/java/com/jpsoft/smart/modules/sys/service/DataDictionaryService.java

@@ -1,8 +1,8 @@
 package com.jpsoft.smart.modules.sys.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
 import com.jpsoft.smart.modules.sys.entity.DataDictionary;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;
@@ -19,4 +19,6 @@ public interface DataDictionaryService {
 	String findParentId(String parentId,String value);
 	List<Map<String, Object>> queryChildren(String parentId);
 	Page<DataDictionary> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
+	List<DataDictionary> findByCatalogName(String catalogName);
+	String findNameByCatalogNameAndValue(String catalogName,String value);
 }

common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/DataDictionaryServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -29,14 +30,14 @@ public class DataDictionaryServiceImpl implements DataDictionaryService {
 	public int insert(DataDictionary model) {
 		// TODO Auto-generated method stub
 		//model.setId(UUID.randomUUID().toString());
-		
+
 		return dataDictionaryDAO.insert(model);
 	}
 
 	@Override
 	public int update(DataDictionary model) {
 		// TODO Auto-generated method stub
-		return dataDictionaryDAO.update(model);		
+		return dataDictionaryDAO.update(model);
 	}
 
 	@Override
@@ -49,7 +50,7 @@ public class DataDictionaryServiceImpl implements DataDictionaryService {
 	public boolean exist(String id) {
 		// TODO Auto-generated method stub
 		int count = dataDictionaryDAO.exist(id);
-		
+
 		return count > 0 ? true : false;
 	}
 
@@ -61,29 +62,43 @@ public class DataDictionaryServiceImpl implements DataDictionaryService {
 	public String getValue(String id){
 		return dataDictionaryDAO.getValue(id);
 	}
-	
-	@Override
-	public List<DataDictionary> list() {
-		// TODO Auto-generated method stub
-		return dataDictionaryDAO.list();
-	}
 
 	@Override
 	public String findParentId(String parentId,String value){
 		return dataDictionaryDAO.findParentId(parentId,value);
 	}
 
+	@Override
+	public List<DataDictionary> list() {
+		// TODO Auto-generated method stub
+		return dataDictionaryDAO.list();
+	}
+
 	@Override
 	public List<Map<String, Object>> queryChildren(String parentId){
 		return dataDictionaryDAO.queryChildren(parentId);
 	}
-		
+
 	@Override
 	public Page<DataDictionary> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
-        Page<DataDictionary> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
-            dataDictionaryDAO.search(searchParams,sortList);
-        });
-        
-        return page;
+		Page<DataDictionary> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
+			dataDictionaryDAO.search(searchParams,sortList);
+		});
+
+		return page;
+	}
+
+	@Override
+	public List<DataDictionary> findByCatalogName(String catalogName) {
+		return dataDictionaryDAO.findByCatalogName(catalogName);
+	}
+
+	@Override
+	public String findNameByCatalogNameAndValue(String catalogName,String value) {
+//		Map<String,Object> map = new HashMap<>();
+//		map.put("catalogName",catalogName);
+//		map.put("value",value);
+
+		return dataDictionaryDAO.findNameByCatalogNameAndValue(catalogName,value);
 	}
 }

common/src/main/resources/mapper/sys/DataDictionary.xml

@@ -158,4 +158,20 @@
         from sys_data_dictionary a
         where a.id_=#{0} and a.del_flag = 0
     </select>
+    <select id="findByCatalogName" resultMap="DataDictionaryMap">
+        select a.*
+        from sys_data_dictionary a,sys_data_dictionary b
+        where a.parent_id =b.id_ and b.name_=#{0}
+        and a.del_flag = 0
+        order by a.sort_no asc
+    </select>
+    <select id="findNameByCatalogNameAndValue" parameterType="map" resultType="string">
+        select a.name_
+        from sys_data_dictionary a,sys_data_dictionary b
+        where a.parent_id =b.id_ and b.name_=#{catalogName}
+        and a.del_flag = 0
+        and a.value_=#{value}
+        order by a.sort_no asc
+        limit 1
+    </select>
 </mapper>

web/src/main/java/com/jpsoft/smart/modules/sys/controller/DataDictionaryController.java

@@ -7,6 +7,8 @@ import com.jpsoft.smart.modules.common.utils.PojoUtils;
 import com.jpsoft.smart.modules.sys.entity.DataDictionary;
 import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -281,4 +283,27 @@ public class DataDictionaryController {
         msgResult.setData(dataDictionaryList);
         return msgResult;
     }
+
+    @PostMapping("findByCatalogName")
+    @ApiOperation(value = "根据目录名称查询数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "catalogName",value = "数据目录名称", required = true, paramType = "form",dataType = "String"),
+    })
+    public MessageResult<List> findByCatalogName(String catalogName){
+        MessageResult<List> messageResult = new MessageResult<>();
+
+        try {
+            //todo
+            List<DataDictionary> list = dataDictionaryService.findByCatalogName(catalogName);
+            messageResult.setData(list);
+
+            messageResult.setResult(true);
+        }
+        catch (Exception ex){
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
 }