From f879ddd80a2bd267a0a575ef03f76d3ec2ae1504 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 04 一月 2024 11:42:22 +0800 Subject: [PATCH] bug列表269:集成日志查询bug修改。 270:关键属性校验,去掉多线程之后请求响应非常慢(之前报错线程阻塞的bug改成单线程导致非常慢,现在又改回ForJoinPool方式限制线程生成数量实现多线程并行,提升执行效率)。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java | 65 +++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java index 92b2711..5ea88bb 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java @@ -11,6 +11,7 @@ import com.vci.ubcs.starter.revision.model.TreeQueryObject; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import com.vci.ubcs.starter.web.pagemodel.DataGrid;import com.vci.ubcs.starter.web.pagemodel.Tree; +import org.apache.ibatis.annotations.Param; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.api.R; import java.io.File; @@ -33,6 +34,13 @@ List<CodeClassify> selectByWrapper(Wrapper wrapper); /** + * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ + * @param wrapper 鏌ヨ灏佽鍣� + * @return 鏁版嵁瀵硅薄 + */ + List<String> select1(Wrapper wrapper); + + /** * 鑷畾涔夊垎椤� * * @param page @@ -46,14 +54,15 @@ * @param codeClassifyEntity 涓婚搴撳垎绫绘暟鎹紶杈撳璞� * @return 鎵ц缁撴灉 */ - R addSave(CodeClassify codeClassifyEntity) ; + R addSave(CodeClassify codeClassifyEntity); /** * 淇敼涓婚搴撳垎绫� * @param codeClassifyEntity 涓婚搴撳垎绫绘暟鎹紶杈撳璞� * @return 鎵ц缁撴灉 */ - R editSave(CodeClassify codeClassifyEntity) ; + R editSave(CodeClassify codeClassifyEntity); + /** * 妫�鏌� 涓婚搴撳垎绫绘槸鍚﹀垹闄� * @param codeClassify 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴�� @@ -126,6 +135,7 @@ * @return 涓婚搴撳垎绫绘樉绀烘爲 */ List<Tree> referTree(TreeQueryObject treeQueryObject); + /** * 鏌ヨ涓婚搴撳垎绫� 鏍� * @param treeQueryObject 鏍戞煡璇㈠璞� @@ -214,6 +224,13 @@ List<CodeClassify> selectAllLevelParents(String oid); /** + * 鑾峰彇鎵�鏈変笂绾ц妭鐐圭殑oid + * @param oid + * @return + */ + List<String> selectAllParentOid(String oid); + + /** * 涓婚敭鑾峰彇涓婚搴撳垎绫� * @param oid 涓婚敭 * @return 涓婚搴撳垎绫绘樉绀哄璞� @@ -226,7 +243,6 @@ * @return 鍒嗙被涓婄骇锛屼笅绾х殑淇℃伅 */ CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid); - /** * 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞� @@ -257,4 +273,47 @@ * @return 涓暟 */ int countChildrenByClassifyOid(String codeClassifyOid); + + /*** + * 鏍规嵁鐖惰妭鐐规煡璇笅绾у彾瀛愯妭鐐� + * @param parentId + * @return + */ + List<CodeClassifyVO> selectCodeClassifyVOByParentId(String parentId); + + /*** + * 鏍规嵁搴撹妭鐐瑰悕绉拌幏鍙栧垎绫� + * @param libName + * @return + */ + List<CodeClassifyVO> getRMLibByName(String libName); + + /*** + * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅 + * @param desc + * @param codeLibName + * @return + */ + List<CodeClassifyVO> getRMTypeByDescAndLib(String desc,String codeLibName); + + /** + * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅 + * @param oid + * @param fieldInPath + * @return + */ + List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath); + + /** + * 鏍规嵁椤跺眰鑺傜偣oid鏌ヨ鎵�鏈夐櫎褰撳墠鑺傜偣浠ュ鎵�鏈変笉鍙備笌鏍¢獙鐨勫垎绫籵id + * @param topOid + * @param currentOid + * @return + */ + String selectLeafByParentClassifyOid(String topOid, String currentOid); + + /** + * 娴佹按渚濊禆鐢熸垚 + */ + R flowingDependencyGen(String classifyOid); } -- Gitblit v1.9.3