From 4187374bbae66190e7eca6f42cc5e61cfae1637f Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期六, 12 八月 2023 13:33:18 +0800 Subject: [PATCH] PDM集成swing界面相关功能开发 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 75 ++++++++++++++++++++++++++++++++++--- 1 files changed, 68 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java index 8d64a67..0e51064 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java @@ -1,29 +1,34 @@ package com.vci.ubcs.code.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; +import com.vci.ubcs.code.dto.CodeOrderDTO; +import com.vci.ubcs.code.entity.CodeClassify; +import com.vci.ubcs.code.enumpack.CodeClassifyProcessUseEnum; import com.vci.ubcs.code.service.ICodeClassifyService; import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService; import com.vci.ubcs.code.service.ICodeClassifyValueService; import com.vci.ubcs.code.service.MdmEngineService; +import com.vci.ubcs.code.service.impl.FormulaServiceImpl; +import com.vci.ubcs.code.vo.ComponentRule; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO; import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO; +import com.vci.ubcs.starter.annotation.VciBusinessLog; import com.vci.ubcs.starter.revision.model.BaseModel; import com.vci.ubcs.starter.revision.model.TreeQueryObject; -import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; -import com.vci.ubcs.starter.web.pagemodel.KeyValue; -import com.vci.ubcs.starter.web.pagemodel.Tree; -import com.vci.ubcs.starter.web.pagemodel.UIFormReferVO; +import com.vci.ubcs.starter.web.pagemodel.*; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; import org.springblade.core.tool.api.R; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * 涓婚搴撳畾涔夎〃 鎺у埗鍣� @@ -53,6 +58,12 @@ * 鍒嗙被鐮佹鏈嶅姟 */ private final ICodeClassifyValueService codeClassifyValueService; + + /** + * 鍏紡鐨勬湇鍔� + */ + @Autowired + private FormulaServiceImpl formulaService; /** * 鑾峰彇搴撹妭鐐逛俊鎭� * @param libName 搴撹妭鐐瑰悕绉� @@ -169,4 +180,54 @@ return R.data(iPage); } + + /** + * 鑾峰彇灞炴�х粍鍚堣鍒欑殑鍊� + * @param componentRule 鍙傜収鐨勯厤缃俊鎭� + * @param componentRule 缁勫悎瑙勫垯 + * @return 鎵ц鐨勭粨鏋� + */ + @GetMapping("/getValueByFormula") + public R<String> getValueByFormula(ComponentRule componentRule){ + String value = formulaService.getValueByFormula(componentRule.getDataMap(),componentRule.getComponentRuleValue()); + return R.data(value); + } + + /** + * 浣跨敤鍒嗙被鑾峰彇瀵瑰簲鐨勬暟鎹� + * @param codeClassifyOid 鍒嗙被鐨勪富閿� + * @param templateOid 妯℃澘鐨勪富閿� + * @param queryObject 鍩虹鏌ヨ瀵硅薄 + * @return 鏁版嵁鐨勪俊鎭紙鍖呭惈涓嬬骇鍒嗙被锛� + */ + @GetMapping("/gridTableDataByClassifyOid") + @VciBusinessLog(operateName = "鏌ヨ涓婚搴撳垎绫荤殑鏁版嵁") + public R<DataGrid<Map<String,String>>> gridTableDataByClassifyOid(String codeClassifyOid, String templateOid, BaseQueryObject queryObject){ + //TODO鍚庣画鍙互瀹氫箟鏌ヨ妯℃澘鏉ユ煡璇� + return R.data(mdmEngineService.gridTableDataByClassifyOid(codeClassifyOid,templateOid,queryObject.getConditionMap(),queryObject.getPageHelper())); + } + + /*** + *缁熻瀛愯妭鐐圭殑涓暟 + * @param parentId 鐖惰妭鐐筼id + * @return + */ + @GetMapping("/countChildrenByClassifyOid") + @VciBusinessLog(operateName = "缁熻瀛愯妭鐐圭殑涓暟") + public R<Integer> countChildrenByClassifyOid(String parentId){ + int count= this.codeClassifyService.countChildrenByClassifyOid(parentId); + return R.data(count); + } + + /** + * 鐢宠缂栫爜淇濆瓨 + * @param orderDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭� + * @return 鎵ц缁撴灉 + */ + @PostMapping("/addSaveCode") + @VciBusinessLog(operateName = "鐢宠鍗曚釜缂栫爜") + public R addSaveCode(@RequestBody CodeOrderDTO orderDTO) throws Exception { + return R.success(mdmEngineService.addSaveCode(orderDTO)); + } + } -- Gitblit v1.9.3