From 2d014981bfa74a5653456349dc6dcd229f18c7a2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 06 八月 2024 11:54:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java index e460f8f..ff9459a 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebBtmTypeController.java @@ -8,6 +8,7 @@ import com.vci.starter.web.pagemodel.BaseQueryObject; import com.vci.starter.web.pagemodel.BaseResult; import com.vci.starter.web.pagemodel.DataGrid; +import com.vci.starter.web.pagemodel.Tree; import com.vci.starter.web.util.BeanUtil; import com.vci.starter.web.util.ControllerUtil; import com.vci.starter.web.util.LangBaseUtil; @@ -100,6 +101,37 @@ } } + + /** + * 鑾峰彇鎵�鏈変笟鍔$被鍨嬶紙鏍戝舰缁撴瀯锛� + * @return 鏌ヨ缁撴灉 + */ + @GetMapping( "/getTreeBizTypes") + @VciBusinessLog(operateName = "鑾峰彇鎵�鏈変笟鍔$被鍨嬶紙鏍戝舰缁撴瀯锛�") + @VciUnCheckRight + public BaseResult<List<Tree>> getTreeBizTypes(){ + try { + return btmService.getTreeBizTypes(); + }catch (Exception e) { + e.printStackTrace(); + String exceptionMessage = "鑾峰彇涓氬姟绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e); + logger.error(exceptionMessage); + return BaseResult.fail(exceptionMessage); + } + } + + /** + * 鑾峰彇涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬� + * @param btmId 涓氬姟绫诲瀷鍚嶇О + * @return 灞炴�х殑淇℃伅 + */ + @GetMapping(value = "/getAllAttributesByBtmId") + @VciBusinessLog(operateName = "鏌ョ湅涓氬姟绫诲瀷鐨勫睘鎬�") + public BaseResult<List<OsBtmTypeAttributeVO>> getAllAttributesByBtmId(String btmId){ + List<OsBtmTypeAttributeVO> osBtmTypeAttributeVOS = btmService.listAttributeByBtmIdHasDefault(btmId); + return BaseResult.dataList(osBtmTypeAttributeVOS); + } + /** * 鍙傜収鐨勪笟鍔$被鍨� * @param baseQueryObject 鏌ヨ鏉′欢 -- Gitblit v1.9.3