From 6cdce28d612c56bc5b8524268c78064c0818e46f Mon Sep 17 00:00:00 2001 From: ludc <pUXmgxCf6A> Date: 星期四, 18 五月 2023 16:27:31 +0800 Subject: [PATCH] 以及发布webservice接口功能搭建,将通通用接口移植过来 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 15 ++++++++++++--- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 42 ++++++++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java index 26f7d67..acb40c9 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java @@ -6,7 +6,11 @@ import com.vci.ubcs.code.dto.CodeOrderDTO; import com.vci.ubcs.code.dto.CodeOrderSecDTO; import com.vci.ubcs.code.dto.datapush.BaseModelDTO; +import com.vci.ubcs.code.service.ICodeRuleService; +import com.vci.ubcs.code.service.MdmEngineService; import com.vci.ubcs.code.service.MdmIOService; +import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO; +import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO; import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO; import com.vci.ubcs.code.vo.pagemodel.MdmUIInfoVO; import com.vci.ubcs.starter.annotation.VciBusinessLog; @@ -18,6 +22,7 @@ import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,26 +36,27 @@ import java.util.Map; @RestController -//@AllArgsConstructor +@AllArgsConstructor @RequestMapping("/mdmEngineController") @Api(value = "缂栫爜鏁版嵁绠$悊", tags = "缂栫爜鏁版嵁绠$悊") -public class MdmEngineController { -// -//// /** -//// * 鏃ュ織 -//// */ -// private Logger logger = LoggerFactory.getLogger(getClass()); -// /** -// * 涓绘暟鎹紩鎿庢湇鍔� -// */ -// @Autowired -// private MdmEngineService engineService; -// /** -// * 涓绘暟鎹鍏ュ鍑烘湇鍔� -// */ -// @Autowired -// private MdmIOService mdmIOService; -// +public class MdmEngineController extends BladeController { + /** + * 涓绘暟鎹紩鎿庢湇鍔� + */ + private final MdmEngineService engineService; + + /** + * 鏍规嵁鍒嗙被id鑾峰彇妯℃澘淇℃伅 + * @param codeClassifyOid + * @return + */ + @GetMapping("/getUsedTemplateByClassifyOid") + public R<CodeClassifyTemplateVO> getUsedTemplateByClassifyOid(String codeClassifyOid){ + CodeClassifyTemplateVO codeClassifyTemplateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyOid); + return R.data(codeClassifyTemplateVO); + } + + // /** // * 涓嬭浇鎵归噺鐢宠鐨勫鍏ユā鏉� // * @param codeClassifyOid 鍒嗙被鐨勪富閿� diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java index f631260..7309f87 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java @@ -61,6 +61,12 @@ */ @Autowired(required = false) private ICodeRuleService codeRuleService; + /*** + * 鍒嗙被妯℃澘鏈嶅姟 + */ + @Autowired(required = false) + private ICodeClstemplateService plCodeClstemplateService; + /** * 浣跨敤鍒嗙被鐨勪富閿幏鍙栧彲浠ヤ娇鐢ㄧ殑妯℃澘瀵硅薄 * @@ -81,9 +87,12 @@ */ @Override public CodeClassifyTemplateVO getUsedTemplateByClassifyOid(String codeClassifyOid, boolean hasAttr) { - List<CodeClassifyTemplateVO> templateVOs=new ArrayList<>(); - //templateVOs = codeClassifyTemplateAttrService.listReleaseTemplateByClassifyOid(codeClassifyOid, hasAttr); - return templateVOs.get(templateVOs.size() - 1); + CodeClassifyTemplateVO templateVO=new CodeClassifyTemplateVO(); + List<CodeClassifyTemplateVO>templateVOs=plCodeClstemplateService.listReleaseTemplateByClassifyOid(codeClassifyOid,hasAttr); + if(templateVOs.size()>0){ + templateVO= templateVOs.get(templateVOs.size() - 1); + } + return templateVO; } -- Gitblit v1.9.3