From 29ab7773efe351a879ce9b3c29ab3ca50f4e62cb Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 15 一月 2025 21:36:08 +0800 Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 162 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 864a2a9..57afa21 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,21 +1,28 @@ package com.vci.ubcs.code.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; +import com.vci.ubcs.code.dto.CodeOrderDTO; 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.vo.pagemodel.CodeClassifyTemplateVO; -import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO; -import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO; -import com.vci.ubcs.starter.web.pagemodel.KeyValue; +import com.vci.ubcs.code.service.impl.FormulaServiceImpl; +import com.vci.ubcs.code.vo.ComponentRule; +import com.vci.ubcs.code.vo.pagemodel.*; +import com.vci.ubcs.starter.annotation.VciBusinessLog; +import com.vci.ubcs.starter.revision.model.TreeQueryObject; +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.HashMap; import java.util.List; +import java.util.Map; /** * 涓婚搴撳畾涔夎〃 鎺у埗鍣� @@ -40,6 +47,17 @@ * 妯℃澘灞炴�ф湇鍔� */ private final ICodeClassifyTemplateAttrService codeClstempattrService; + + /*** + * 鍒嗙被鐮佹鏈嶅姟 + */ + private final ICodeClassifyValueService codeClassifyValueService; + + /** + * 鍏紡鐨勬湇鍔� + */ + @Autowired + private FormulaServiceImpl formulaService; /** * 鑾峰彇搴撹妭鐐逛俊鎭� * @param libName 搴撹妭鐐瑰悕绉� @@ -61,6 +79,23 @@ public R<List<CodeClassifyVO>> getRMTypeByDescAndLib(String desc,String codeLibName) { List<CodeClassifyVO> codeClassifyVOList=codeClassifyService.getRMTypeByDescAndLib(desc,codeLibName); return R.data(codeClassifyVOList) ; + } + + /** + * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟 + * @param map 浼犵殑鏁版嵁 + * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗曪級 + */ + @RequestMapping("/getFormDefineByTemplateOid") + public MdmUIInfoVO getFormDefineByTemplateOid(@RequestParam Map<String,String> map){ +// CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(codeClassifyOid); + CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(map.get("codeClassifyOid")); + MdmUIInfoVO formDefineByTemplate = mdmEngineService.getFormDefineByTemplateOid(usedTemplateByClassifyOid.getOid(), map.get("codeClassifyOid")); + for (UIFormItemVO item : formDefineByTemplate.getFormDefineVO().getItems()) { + if(map.get(item.getField()) != null){ + item.getAddField().put("defaultValue",map.get(item.getField())); + } + }return formDefineByTemplate; } /** @@ -110,4 +145,124 @@ List<KeyValue> keyValueList=mdmEngineService.listComboboxItems(codeClstempattrService.getObjectByOid(oid)); return R.data(keyValueList); } + + /** + * 鍒嗙被鐮佹鐮佸�艰幏鍙� + * @param secOid + * @param parentClassifyValueOid + * @return + */ + @GetMapping("/listCodeClassifyValueBySecOid") + public R<List<CodeClassifyValueVO>> listCodeClassifyValueBySecOid(String secOid,String parentClassifyValueOid){ + List<CodeClassifyValueVO> codeClassifyValueVOS= codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid); + return R.data(codeClassifyValueVOS); + } + + /** + * 涓婚搴撳垎绫绘爲 + * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 + * @return 涓婚搴撳垎绫绘樉绀烘爲 + */ + @GetMapping("/treeCodeClassify") + public R<List<Tree>> treeCodeClassify(TreeQueryObject treeQueryObject) { + List<Tree> treeList = codeClassifyService.treeCodeClassify(treeQueryObject); + return R.data(treeList); + } + + /** + * 榛樿鐨勬爲褰㈠弬鐓у垪琛� + * @param referConfigVO 鍙傜収鐨勯厤缃俊鎭� + * @return 鎵ц鐨勭粨鏋� + */ + @GetMapping("/defaultReferTree") + public R<List<Tree>> defaultReferTree(UIFormReferVO referConfigVO, TreeQueryObject queryObject){ + List<Tree> defaultReferTree= mdmEngineService.referTree(referConfigVO,queryObject); + return R.data(defaultReferTree); + } + + /** + * 榛樿鐨勫弬鐓у垪琛� + * @param referConfigVO 鍙傜収鐨勯厤缃俊鎭� + * @return 鎵ц鐨勭粨鏋� + */ + @GetMapping("/defaultReferDataGrid") + public R<IPage<BaseModelVO>> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){ + IPage<BaseModelVO> iPage = mdmEngineService.referDataGrid(referConfigVO,baseQueryObject); + 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.data(mdmEngineService.addSaveCode(orderDTO)); + } + /** + * 鐢宠缂栫爜淇濆瓨 + * @param orderDTO 缂栫爜鐢宠鐩稿叧鐨勪俊鎭紝闇�瑕佹湁灞炴�у拰鐮佹鐩稿叧鐨勪俊鎭� + * @return 鎵ц缁撴灉 + */ + @PostMapping("/checkKeyAttrOnOrderFordatas") + @VciBusinessLog(operateName = "鐢宠鍗曚釜缂栫爜") + public R checkKeyAttrOnOrderFordatas(@RequestBody CodeOrderDTO orderDTO) throws Exception { + return R.data(mdmEngineService.checkKeyAttrOnOrderFordatas(orderDTO)); + } + + /** + * 闆嗗洟/浼佷笟鐮佹鍒ゆ柇 + * @param classifyGroupCode 浼犲叆鏁版嵁 ,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣 + * @param oid 浼犲叆鏁版嵁 ,閫夋嫨鑺傜偣鐨刼id--锛宯owApplyCode锛氬綋鍓嶇敵璇风紪鐮佺殑鍒嗙被 + * @return 鎵ц缁撴灉 + */ + @GetMapping("/checkGroupCode") + @VciBusinessLog(operateName = "闆嗗洟/浼佷笟鐮佹鍒ゆ柇") + public R checkGroupCode(String oid,String classifyGroupCode) throws Exception { + Map<String,String> codtionMap=new HashMap<>(); + codtionMap.put("oid",oid); + codtionMap.put("classifyGroupCode",classifyGroupCode); + return mdmEngineService.checkGroupCode(codtionMap); + } } -- Gitblit v1.9.3