From 4ead3f1a8571b3536daedbd4a0268aebdfb86517 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 31 五月 2023 10:31:14 +0800
Subject: [PATCH] 1、对MDM服务的Feign进行改动
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java | 14 ++-----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineFallback.java | 8 +---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java | 36 ++++++++---------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 4 ++
4 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java
index 5b56de6..74564c5 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java
@@ -16,18 +16,12 @@
*/
package com.vci.ubcs.code.feign;
-import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.starter.revision.model.BaseModel;
import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.core.mp.support.BladePage;
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.RequestParam;
+import org.springframework.web.bind.annotation.*;
-import java.beans.IntrospectionException;
-import java.lang.reflect.InvocationTargetException;
-import java.sql.SQLException;
import java.util.List;
/**
@@ -54,7 +48,7 @@
* @return 鏌ヨ鍑虹殑鏁版嵁
*/
@GetMapping(SELECT_BY_TYPE_OID)
- R<List<BaseModel>> selectByTypeAndOid(@RequestParam("btmType") String btmType, @RequestParam("oids") String oids) throws SQLException, IntrospectionException, NoSuchFieldException, InvocationTargetException, IllegalAccessException, InstantiationException;
+ R<List<BaseModel>> selectByTypeAndOid(@RequestParam("btmType") String btmType, @RequestParam("oids") String oids);
/**
@@ -64,6 +58,6 @@
* @param baseModels 澶勭悊鏁版嵁
* @return 澶勭悊鎴愬姛鏁版嵁鏉℃暟
*/
- @GetMapping(INSERT_BATCH_BY_TYPE)
- R<Integer> insertBatchByType(String btmType, List<BaseModel> baseModels) throws Exception;
+ @PostMapping(INSERT_BATCH_BY_TYPE)
+ R<Integer> insertBatchByType(@RequestParam("btmType")String btmType,@RequestBody List<BaseModel> baseModels);
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineFallback.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineFallback.java
index 490de26..7571929 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineFallback.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineFallback.java
@@ -19,10 +19,6 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Component;
-
-import java.beans.IntrospectionException;
-import java.lang.reflect.InvocationTargetException;
-import java.sql.SQLException;
import java.util.List;
/**
@@ -34,12 +30,12 @@
public class IMdmEngineFallback implements IMdmEngineClient {
@Override
- public R<List<BaseModel>> selectByTypeAndOid(String btmType, String oids) throws SQLException, IntrospectionException, NoSuchFieldException, InvocationTargetException, IllegalAccessException, InstantiationException {
+ public R<List<BaseModel>> selectByTypeAndOid(String btmType, String oids) {
return R.fail("鑾峰彇鏁版嵁澶辫触");
}
@Override
- public R<Integer> insertBatchByType(String btmType, List<BaseModel> baseModels) throws Exception {
+ public R<Integer> insertBatchByType(String btmType, List<BaseModel> baseModels){
return R.fail("鑾峰彇鏁版嵁澶辫触");
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java
index 1695aca..e4b173e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java
@@ -20,8 +20,12 @@
import com.vci.ubcs.code.service.MdmEngineService;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.AllArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -41,7 +45,6 @@
@AllArgsConstructor
public class MdmEngineClient implements IMdmEngineClient {
private final MdmEngineService mdmEngineService;
-
/**
* 浼犲叆涓氬姟绫诲瀷浠ュ強鐩竜id闆嗗悎鏌ヨ鏁版嵁杩涜杩斿洖
*
@@ -51,8 +54,12 @@
*/
@Override
@GetMapping(SELECT_BY_TYPE_OID)
- public R<List<BaseModel>> selectByTypeAndOid(String btmType, String oids) throws SQLException, IntrospectionException, NoSuchFieldException, InvocationTargetException, IllegalAccessException, InstantiationException {
- return R.data(mdmEngineService.selectByTypeAndOid(btmType,oids));
+ public R<List<BaseModel>> selectByTypeAndOid(String btmType, String oids) {
+ try {
+ return R.data(mdmEngineService.selectByTypeAndOid(btmType, oids));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
/**
@@ -63,22 +70,13 @@
* @return 澶勭悊鎴愬姛鏁版嵁鏉℃暟
*/
@Override
- @GetMapping(INSERT_BATCH_BY_TYPE)
- public R<Integer> insertBatchByType(String btmType, List<BaseModel> baseModels) throws Exception {
- return R.data(mdmEngineService.insertBatchByType(btmType,baseModels));
+ @PostMapping(INSERT_BATCH_BY_TYPE)
+ public R<Integer> insertBatchByType(String btmType, List<BaseModel> baseModels) {
+ try {
+ return R.data(mdmEngineService.insertBatchByType(btmType,baseModels));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
-
-// private final CodeWupinMapper codeWupinMapper;
-
-// @Override
-// @GetMapping(TOP)
-// public BladePage<CodeWupin> top(Integer current, Integer size) {
-// Query query = new Query();
-// query.setCurrent(current);
-// query.setSize(size);
-// IPage<CodeWupin> page = codeWupinMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());//service.page(Condition.getPage(query));
-// return BladePage.of(page);
-// }
-
}
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 61d5c0e..5f36b78 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
@@ -2987,6 +2987,10 @@
}
}
}
+ for (Object key : map.keySet()) {
+ map.put(key,String.valueOf(map.get(key)));
+ }
+
((BaseModel) obj).setData(map);
baseModels.add((BaseModel) obj);
}
--
Gitblit v1.9.3