From 33d8416c5a16fee7464df9774678bc60e47ff956 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 19 三月 2024 09:53:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
index 7882b0c..ed8224f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
@@ -1,13 +1,18 @@
package com.vci.ubcs.code.applyjtcodeservice.feign;
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
import com.vci.ubcs.code.applyjtcodeservice.vo.DockingClassifyModelAttrVO;
+import com.vci.ubcs.code.applyjtcodeservice.vo.DockingPreAttrMappingVO;
import com.vci.ubcs.code.applyjtcodeservice.vo.DockingReturnStoreVO;
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/****
@@ -16,7 +21,7 @@
* @date 2023-05-26
*/
@FeignClient(
- value = "ubcs-code"
+ value = "ubcs-applyjtcodeservice"
)
public interface IMdmInterJtClient {
String API_PREFIX = "/mdmInterService";
@@ -24,6 +29,7 @@
String RETURNGROUPCODE = API_PREFIX + "/getApplyGroupCode";
String PUBMDMMODEL = API_PREFIX + "/pubMdmModel";
String RECEIVE_EDITAPPLY =API_PREFIX + "/receiveEditApply";
+ String LIST_MAPPING=API_PREFIX + "/listMapping";
/***
* 灏嗛泦鍥㈢敵璇锋垚鍔熺殑缂栫爜瀛樺叆鐩稿叧鏁版嵁涔嬩腑
@@ -32,8 +38,15 @@
* @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
*/
@GetMapping(APPLYGROUPCODE)
- public R applyGroupCode(String oids,String btmName);
+ public R applyGroupCode(@RequestParam("oids")String oids,@RequestParam("btmName")String btmName);
+ /***
+ *
+ * @param codeClassifyOid
+ * @return
+ */
+ @GetMapping(LIST_MAPPING)
+ public R<List<DockingPreAttrMappingVO>> list_mapping(@RequestParam("codeClassifyOid")String codeClassifyOid);
/***
* 闆嗗洟缂栫爜鏁版嵁淇敼
@@ -42,15 +55,15 @@
* @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
*/
@PostMapping(RECEIVE_EDITAPPLY)
- public R receiveEditApply(String oids,String btmName);
+ public R receiveEditApply(@RequestParam("oids")String oids,@RequestParam("btmName")String btmName);
/***
* 灏嗛泦鍥㈢敵璇锋垚鍔熺殑缂栫爜瀛樺叆鐩稿叧鏁版嵁涔嬩腑
* @param dockingResultVO
* @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
*/
- @GetMapping(RETURNGROUPCODE)
- public R getApplyGroupCode( @RequestParam("dockingResultVO") DockingReturnStoreVO dockingResultVO);
+ @PostMapping(RETURNGROUPCODE)
+ public R getApplyGroupCode( @RequestBody DockingReturnStoreVO dockingResultVO);
/***
* 涓绘暟鎹ā鍨嬭鍥惧彂甯�
--
Gitblit v1.9.3