|
@@ -26,7 +26,7 @@ import com.persagy.proxy.common.entity.InstanceUrlParam;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
-import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
@@ -48,6 +48,9 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
|
|
@Autowired
|
|
@Autowired
|
|
private DmpDicClient dicClient;
|
|
private DmpDicClient dicClient;
|
|
|
|
|
|
|
|
+ @Value("${middleware.group.code}")
|
|
|
|
+ private String groupCode;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查询DMP字典数据
|
|
* 查询DMP字典数据
|
|
* @param context
|
|
* @param context
|
|
@@ -60,7 +63,7 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
|
|
// 转换参数
|
|
// 转换参数
|
|
JSONObject para = null;
|
|
JSONObject para = null;
|
|
try {
|
|
try {
|
|
- para = JsonHelper.toJSONObject(dmpRequest);
|
|
|
|
|
|
+ para = JsonHelper.toJsonObject(dmpRequest);
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
log.error(e.getMessage(), e);
|
|
log.error(e.getMessage(), e);
|
|
return null;
|
|
return null;
|
|
@@ -88,7 +91,7 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
|
|
// 转换参数
|
|
// 转换参数
|
|
JSONObject para = null;
|
|
JSONObject para = null;
|
|
try {
|
|
try {
|
|
- para = JsonHelper.toJSONObject(dmpRequest);
|
|
|
|
|
|
+ para = JsonHelper.toJsonObject(dmpRequest);
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
log.error(e.getMessage(), e);
|
|
log.error(e.getMessage(), e);
|
|
return null;
|
|
return null;
|
|
@@ -119,7 +122,7 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
|
|
// 转换参数
|
|
// 转换参数
|
|
JSONObject para = null;
|
|
JSONObject para = null;
|
|
try {
|
|
try {
|
|
- para = JsonHelper.toJSONObject(dmpRequest);
|
|
|
|
|
|
+ para = JsonHelper.toJsonObject(dmpRequest);
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
log.error(e.getMessage(), e);
|
|
log.error(e.getMessage(), e);
|
|
return null;
|
|
return null;
|
|
@@ -192,6 +195,7 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
|
|
admVO.setSecondName(admVO.getSecondTag());
|
|
admVO.setSecondName(admVO.getSecondTag());
|
|
admVO.setMultiple(admVO.getIsMultiple());
|
|
admVO.setMultiple(admVO.getIsMultiple());
|
|
admVO.setRegion(admVO.getIsRegion());
|
|
admVO.setRegion(admVO.getIsRegion());
|
|
|
|
+ admVO.setGroupCode(groupCode);
|
|
|
|
|
|
//path路径处理
|
|
//path路径处理
|
|
if(StringUtils.isEmpty(admVO.getFirstName()) || AdmDictConstant.FIRST_BASE_TAG.equals(admVO.getFirstName())
|
|
if(StringUtils.isEmpty(admVO.getFirstName()) || AdmDictConstant.FIRST_BASE_TAG.equals(admVO.getFirstName())
|