指标目录添加关键字搜索接口

src/main/java/com/keymobile/indicators/api/hytobacco/IndCatalogCtrl.java

@@ -46,6 +46,12 @@ public class IndCatalogCtrl {
 		return indCatalogService.getCatalog(parentId, codes);
 	}
 	
+	@ApiOperation(value = "根据关键字搜索获取基础指标目录", notes = "根据关键字搜索获取基础指标目录")
+	@PostMapping(value = "/getBaseIndCatalogByKeyword")
+	public List<IndCatalog> getBaseIndCatalogByKeyword(@RequestParam(required=false) String keyword){
+		return indCatalogService.getCatalogByKeyword(keyword);
+	}
+	
 	//考核指标目录
 	@ApiOperation(value = "新建考核指标目录", notes = "新建考核指标目录")
 	@PostMapping(value = "/createDriveIndCatalog")
@@ -66,4 +72,10 @@ public class IndCatalogCtrl {
 			@RequestParam List<String> codes){
 		return driveIndCatalogService.getCatalog(parentId, codes);
 	}
+	
+	@ApiOperation(value = "根据关键字搜索获取考核指标目录", notes = "根据关键字搜索获取考核指标目录")
+	@PostMapping(value = "/getDriveIndCatalogByKeyword")
+	public List<DriveIndCatalog> getDriveIndCatalogByKeyword(@RequestParam(required=false) String keyword){
+		return driveIndCatalogService.getCatalogByKeyword(keyword);
+	}
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/DriveIndCatalogMapper.java

@@ -16,4 +16,6 @@ public interface DriveIndCatalogMapper extends BaseMapper<DriveIndCatalog>{
 	public List<DriveIndCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(Map<String,Object> params);
 	
 	public List<DriveIndCatalog> findByParentId(@Param("pid") Integer pid);
+	
+	public List<DriveIndCatalog> findByKeyword(@Param("keyword") String keyword);
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/IndCatalogMapper.java

@@ -17,4 +17,6 @@ public interface IndCatalogMapper extends BaseMapper<IndCatalog>{
 	public List<IndCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(Map<String,Object> params);
 	
 	public List<IndCatalog> findByParentId(@Param("pid") Integer pid);
+	
+	public List<IndCatalog> findByKeyword(@Param("keyword") String keyword);
 }

src/main/java/com/keymobile/indicators/service/hytobacco/DriveIndCatalogService.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,4 +82,13 @@ public class DriveIndCatalogService {
 		paramMap.put("codes", codes);
 		return driveIndCatalogMapper.findByParentIdAndCodeInOrderByLastUpdateTimeDesc(paramMap);
 	}
+	
+	//根据关键字获取目录树
+	public List<DriveIndCatalog> getCatalogByKeyword(String keyword){
+		if(StringUtils.isBlank(keyword)) {
+			return new ArrayList<>();
+		}else {
+			return driveIndCatalogMapper.findByKeyword(keyword);
+		}
+	}
 }

src/main/java/com/keymobile/indicators/service/hytobacco/IndCatalogService.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,4 +81,12 @@ public class IndCatalogService {
 		paramMap.put("codes", codes);
 		return indCatalogMapper.findByParentIdAndCodeInOrderByLastUpdateTimeDesc(paramMap);
 	}
+	
+	//根据目录树获取
+	public List<IndCatalog> getCatalogByKeyword(String keyword){
+		if(StringUtils.isBlank(keyword)) {
+			return new ArrayList<>();
+		}
+		return indCatalogMapper.findByKeyword("%"+keyword+"%");
+	}
 }

src/main/resources/mybatis/mapping/DriveIndCatalogMapper.xml

@@ -26,4 +26,10 @@
         from drive_ind_catalog 
         where parent_id = #{pid}
     </select>
+    
+    <select id="findByKeyword" resultType="com.keymobile.indicators.model.entity.indicators.DriveIndCatalog" >
+        select * 
+        from drive_ind_catalog 
+        where catalog_name like #{keyword}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/IndCatalogMapper.xml

@@ -26,4 +26,10 @@
         from base_ind_catalog 
         where parent_id = #{pid}
     </select>
+    
+    <select id="findByKeyword" resultType="com.keymobile.indicators.model.entity.indicators.IndCatalog" >
+        select * 
+        from base_ind_catalog 
+        where catalog_name like #{keyword}
+    </select>
 </mapper>
\ No newline at end of file