From a5d07b650755aa4822cc82cf849f40c0a1a7f267 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 18 三月 2024 17:58:46 +0800
Subject: [PATCH] 主题库定于左侧树取消节点
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 192 +++++++++++++++++++++++++++++++-----------------
1 files changed, 124 insertions(+), 68 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index bf169dd..0c617d2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.thoughtworks.xstream.XStream;
@@ -35,8 +36,6 @@
import com.vci.ubcs.code.vo.webserviceModel.apply.ApplyDatasVO;
import com.vci.ubcs.code.vo.webserviceModel.apply.ProppertyVO;
import com.vci.ubcs.code.vo.webserviceModel.apply.SectionVO;
-import com.vci.ubcs.code.vo.webserviceModel.applybz.ApplyBZDataVO;
-import com.vci.ubcs.code.vo.webserviceModel.applybz.ApplyBZDatasVO;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.*;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.code.webService.config.AttributeMapConfig;
@@ -49,14 +48,12 @@
import com.vci.ubcs.code.util.WsErpClientUtil;
import com.vci.ubcs.starter.web.enumpck.UserSecretEnum;
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
-import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
-import com.vci.ubcs.system.user.entity.User;
+import com.xkcoding.http.support.Http;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.map.CaseInsensitiveMap;
-import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
@@ -64,6 +61,8 @@
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -76,10 +75,7 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
-import javax.jws.WebMethod;
import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
@@ -99,6 +95,7 @@
@Service
@Slf4j
public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {
+
@Value("${dataSyncPush.dataParamName:xmlData}")
public String DATA_PARAM_NAME;
@Value("${dataSyncPush.dataId:itemid}")
@@ -117,54 +114,80 @@
@Value("${erp.item.btmName:XHDH}")
public String btmName;
+
+ @Value("${erp.item.bearer:bearer: Bearer 7fc32939-0a59-da71-a6e6-6b0d37b53e8a}")
+ private String ERPXHDHAUTH;
+
+ @Value("${erp.item.url:http://127.0.0.1/api/pp/pp/ext/extend/v1.0}")
+ private String ERPXHDHURL;
+
+ @Value("${erp.item.tenant:10000}")
+ private String ERPXHDHTENANT;
+
+
/**
* 涓氬姟绫诲瀷鐨勬湇鍔�
*/
@Autowired
private IBtmTypeClient btmTypeClient;
+
/**
* 閫氱敤鏌ヨ
*/
@Resource
private CommonsMapper commonsMapper;
+
@Resource
private MdmEngineService mdmEngineServiceI;
+
/**
* 鎵归噺澶勭悊鐨勬湇鍔�
*/
@Resource
private MdmIOService mdmIOService;
+
@Resource
private IPasswordFreeLoginService passwordFreeLoginService;
@Resource
private IDockingLogeService dockingLogeService;
+
@Resource
private IDockingDataService dockingDataService;
+
@Resource
private IDockingTaskService dockingTaskService;
+
@Resource
private IDockingSystemConfigService dockingSystemConfigService;
+
@Resource
private ICodeClassifyService codeClassifyService;
@Autowired
private ICodeClassifyValueService codeClassifyValueService;
+
@Autowired(required = false)
private AttributeMapConfig attributeMapConfig;
+
/***
* resdis缂撳瓨鏈嶅姟
*/
@Resource
private BladeRedis bladeRedis;
+
@Resource
private IDockingSysIntParamService dockingSysIntParamService;
+
@Resource
private IDockingSysIntHeaderService dockingSysIntHeaderService;
+
@Autowired(required = false)
private MdmSearchItemCodeProvider mdmSearchItemCodeProvider;
+
@Autowired
HttpServletRequest request;
+
@Override
public void DockingDataSyncScheduing() {
@@ -226,6 +249,7 @@
});
return R.success("鎵嬪姩鎺ㄩ�佸畬鎴�,璇锋牳瀵规槸鍚︽帹閫佹垚鍔�");
}
+
private SearchItemDataVO initData(String status,String itemCode,String mmCode){
SearchItemDataVO searchItemDataVO=new SearchItemDataVO();
searchItemDataVO.setLastchangedon(new Date());
@@ -257,14 +281,17 @@
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)RequestContextHolder.currentRequestAttributes();
request = servletRequestAttributes.getRequest();
}
+ org.springblade.core.tool.utils.WebUtil.setRequest(new ServletRequestAttributes(request));
}
+
return request;
}
+
/***
* 鍚屾鍨嬪彿浠ｅ彿
*/
@Override
- public void saveItemDataSyncScheduing(String endDate) {
+ public void saveItemDataSyncScheduing(String endDate) throws ServiceException {
String paramString="";
String backString="鎴愬姛";
String msg="鎴愬姛";
@@ -288,26 +315,32 @@
Map<String,String>searchDataMap= VciBaseUtil.objectToMapString(searchItemParam);
try {
paramString=JSONObject.toJSON(searchItemParam).toString();
- SearchItemVO searchItemVO = mdmSearchItemCodeProvider.getppModelByElem(searchItemParam);
- /*SearchItemVO searchItemVO=new SearchItemVO();
- List<SearchItemDataVO> data=new ArrayList<>();
- SearchItemDataVO searchItemDataVO1=initData("1","","pro-00001");
- SearchItemDataVO searchItemDataVO2=initData("0","item-00001","");
- data.add(searchItemDataVO1);
- data.add(searchItemDataVO2);
- searchItemVO.setData(data);
- searchItemVO.setCode("200");
- searchItemVO.setMsg("");*/
+ // TODO: 鏀逛负浣跨敤HttpUtils鏂瑰紡杩涜鐢宠锛屽洜涓虹幇鍦ㄧ敵璇风敤涔嬪墠鐨勬柟寮忎細鎶ラ敊
+ LinkedMultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+ headers.add("Authorization",ERPXHDHAUTH);
+ headers.add("X-ECC-Current-Tenant",ERPXHDHTENANT);
+ headers.add("Accept-Language","zh-CHS");
+ headers.add("Content-Type",MediaType.APPLICATION_JSON.toString());
+ String res = HttpUtils.request(ERPXHDHURL+"/getppModelByElemNew",paramString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
+ // String res= mdmSearchItemCodeProvider.getppModelByElem(searchItemParam);
+ SearchItemVO searchItemVO = JSONObject.toJavaObject(JSONObject.parseObject(res), SearchItemVO.class);
if (searchItemVO != null) {
+ BladeUser finalUser;
paramString = JSONObject.toJSON(searchItemVO).toString();
+ log.info("鍨嬪彿浠ｅ彿鏁版嵁鍊�-------銆�"+paramString);
+ HttpServletRequest request=getRequest();
try {
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
try {
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), getRequest());
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), request);
+ BladeUser user = AuthUtil.getUser();
+ if(Func.isEmpty(user)){
+ user=request.getAttribute("_BLADE_USER_REQUEST_ATTR_")==null?null:(BladeUser)request.getAttribute("_BLADE_USER_REQUEST_ATTR_");
+ }
+ finalUser = user;
} catch (Throwable e) {
throw new Throwable("鐢ㄦ埛閴存潈澶辫触.");
}
- final BladeUser user = AuthUtil.getUser();
List<CodeClassify> codeClassifyList = codeClassifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, btmName));
if (CollectionUtils.isEmpty(codeClassifyList)) {
throw new Throwable("鍒嗙被鏈煡璇㈠埌");
@@ -320,14 +353,14 @@
List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
((Func.isNotEmpty(s.getClassifyInvokeAttr()) || Func.isNotEmpty(s.getClassifyInvokeAttrName())) || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
).collect(Collectors.toList());
- List<SearchItemDataVO> dataList = searchItemVO.getData();
- Map<String, SearchItemDataVO> dataVOMap = new HashMap<>();
+ List<SearchItemUpperCaseDataVO> dataList = searchItemVO.getData();
+ Map<String, SearchItemUpperCaseDataVO> dataVOMap = new HashMap<>();
List<String> itemCodeList = new ArrayList<>();
ApplyDatasVO allDatasVO = new ApplyDatasVO();
List<ApplyDataVO> allObjectList = new ArrayList<>();
if (!CollectionUtils.isEmpty(dataList)) {
dataList.stream().forEach(searchItemDataVO -> {
- String itemCode = StringUtils.isNotBlank(searchItemDataVO.getProjectitem()) ? searchItemDataVO.getProjectitem() : searchItemDataVO.getMmodelcode();//椤圭洰浠ｅ彿
+ String itemCode = StringUtils.isNotBlank(searchItemDataVO.getPROJECTITEM()) ? searchItemDataVO.getPROJECTITEM() : searchItemDataVO.getMMODELCODE();//椤圭洰浠ｅ彿
dataVOMap.put(itemCode, searchItemDataVO);
itemCodeList.add(itemCode);
});
@@ -352,27 +385,32 @@
sb.append(" and codeclsfid = '" + codeClassify.getOid() + "' ");
sb.append(" and " + VciBaseUtil.toInSql(attrKey, itemCodeList.toArray(new String[]{})));
List<Map<String, String>> newDataList = commonsMapper.queryByOnlySqlForMap(sb.toString());
+
//List<BaseModel> baseModelList=new ArrayList<>();
Map<String, BaseModel> baseModelMap = new HashMap<>();
- newDataList.stream().forEach(dataMap -> {
- BaseModel baseModel = new BaseModel();
- Map<String, String> newDateMap = new CaseInsensitiveMap<>(dataMap);
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(newDateMap, baseModel, true, user);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel, user);
- //baseModelList.add(baseModel);
-
- String attrKeyValue = newDateMap.getOrDefault(attrKey, "");
- baseModelMap.put(attrKeyValue, baseModel);
- });
-
+ if(!CollectionUtils.isEmpty(newDataList)) {
+ newDataList.stream().forEach(dataMap -> {
+ BaseModel baseModel = new BaseModel();
+ Map<String, String> newDateMap = new CaseInsensitiveMap<>(dataMap);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(newDateMap, baseModel, true, finalUser);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel, finalUser);
+ //baseModelList.add(baseModel);
+ String attrKeyValue = newDateMap.getOrDefault(attrKey, "");
+ if (StringUtils.isBlank(attrKeyValue)) {
+ log.info(baseModel.getId());
+ }
+ baseModelMap.put(attrKeyValue, baseModel);
+ });
+ }
List<ApplyDataVO> addObjectList = new ArrayList<>();
List<ApplyDataVO> editObjectList = new ArrayList<>();
+
dataVOMap.forEach((key, value) -> {
if (baseModelMap.containsKey(key)) {
BaseModel baseModel = baseModelMap.get(key);
- changeObjectToMap(value, baseModel.getId(), user, "editstatus", editObjectList);
+ changeObjectToMap(value, baseModel.getId(), finalUser, "editstatus", editObjectList);
} else {
- changeObjectToMap(value, "", user, "create", addObjectList);
+ changeObjectToMap(value, "", finalUser, "create", addObjectList);
}
});
allObjectList.addAll(addObjectList);
@@ -426,10 +464,11 @@
paramString = Func.isEmpty(paramObject) ? "" : paramObject.toString();
Object backObject = JSONObject.toJSON(allResultDataObjectDetailDOS);
backString = Func.isEmpty(backObject) ? "" : backObject.toString();
+ }else{
+ throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�");
}
} catch (Throwable e) {
e.printStackTrace();
- ;
log.error("鏌ヨ澶辫触--->" + e);
success = false;
backString = "鏌ヨ澶辫触--->" + e;
@@ -446,7 +485,7 @@
}
}
}else{
- throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�");
+ throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�");
}
}catch (Throwable e1){
e1.printStackTrace();
@@ -461,8 +500,9 @@
} catch (Throwable e) {
e.printStackTrace();
log.error(e.getMessage());
- throw new VciBaseException(e.getMessage());
+ throw new ServiceException(e.getMessage());
}
+ throw new ServiceException(e1.getMessage());
}
}
@@ -561,6 +601,7 @@
}
return codeOrderSecDTOList;
}
+
/***
* 璇诲彇灞炴�ф槧灏勯厤缃俊鎭�
* @param systemId
@@ -685,26 +726,27 @@
throw new Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
}
}
- private void changeObjectToMap(SearchItemDataVO searchItemDataVO, String code, BladeUser user,String operation,List<ApplyDataVO> object){
+
+ private void changeObjectToMap(SearchItemUpperCaseDataVO searchItemDataVO, String code, BladeUser user,String operation,List<ApplyDataVO> object){
ApplyDataVO applyDataVO=new ApplyDataVO();
List<ProppertyVO> propList=new ArrayList<>();
//String status= searchItemDataVO.getStatus();//鏁版嵁鐘舵�� 瀛楃鍨嬶紝鏋氫妇鍊硷紱鍒跺崟锛�0锛涘鎵逛腑锛�1锛涢�氳繃锛�2锛涢┏鍥烇細3锛�
- String mmodelCode=searchItemDataVO.getMmodelcode();//鍒堕�犲瀷鍙蜂唬鍙�
+ String mmodelCode=searchItemDataVO.getMMODELCODE();//鍒堕�犲瀷鍙蜂唬鍙�
initProperty("mmodelcode","",mmodelCode,propList);
- String projectCode= searchItemDataVO.getProjectcode();//椤圭洰缂栫爜
+ String projectCode= searchItemDataVO.getPROJECTCODE();//椤圭洰缂栫爜
initProperty("projectcode","",projectCode,propList);
- String projectItem=searchItemDataVO.getProjectitem();//椤圭洰浠ｅ彿
+ String projectItem=searchItemDataVO.getPROJECTITEM();//椤圭洰浠ｅ彿
initProperty("projectitem","",projectItem,propList);
- String materialCode=searchItemDataVO.getMaterialcode();//浜у搧缂栫爜
+ String materialCode=searchItemDataVO.getMATERIALCODE();//浜у搧缂栫爜
initProperty("materialcode","",materialCode,propList);
//缁勫悎灞炴�х殑澶勭悊
initProperty(attrKey,"",StringUtils.isNotBlank(projectItem)?projectItem:mmodelCode,propList);
- String creatBy=searchItemDataVO.getCreatby();//鍒涘缓鑰�
- Date cretaeDon= searchItemDataVO.getCreatedon();//鍒涘缓鏃ユ湡 鏃ユ湡鍨嬶紝濡傦細2023-09-08 19:24:11
- String lastchangeBy=searchItemDataVO.getLastchangedby();//鏇存敼鑰�
- Date lastchangeDon=searchItemDataVO.getLastchangedon();//鏇存敼鏃堕棿 鏃ユ湡鍨嬶紝濡傦細2023-09-08 19:24:11
- String isenabled= searchItemDataVO.getIsenabled();//瀛楃鍨嬶紝鏋氫妇鍊硷紱鍋滅敤锛�0锛涘惎鐢細1锛�
+ String creatBy=searchItemDataVO.getCREATBY();//鍒涘缓鑰�
+ Date cretaeDon= searchItemDataVO.getCREATEDON();//鍒涘缓鏃ユ湡 鏃ユ湡鍨嬶紝濡傦細2023-09-08 19:24:11
+ String lastchangeBy=searchItemDataVO.getLASTCHANGEDBY();//鏇存敼鑰�
+ Date lastchangeDon=searchItemDataVO.getLASTCHANGEDON();//鏇存敼鏃堕棿 鏃ユ湡鍨嬶紝濡傦細2023-09-08 19:24:11
+ String isenabled= searchItemDataVO.getISENABLED();//瀛楃鍨嬶紝鏋氫妇鍊硷紱鍋滅敤锛�0锛涘惎鐢細1锛�
applyDataVO.setOperate(operation);
applyDataVO.setCode(code);
if(isenabled.equals("0")){
@@ -718,13 +760,15 @@
applyDataVO.setProp(propList);
object.add(applyDataVO);
}
- private void initProperty(String key,String text,String value,List<ProppertyVO> propList){
+
+ private void initProperty(String key,String text,String value,List<ProppertyVO> propList){
ProppertyVO vo=new ProppertyVO();
vo.setKey(key);
- vo.setText(text);
- vo.setValue(value);
+ vo.setText(StringUtils.isBlank(text)?"":text);
+ vo.setValue(StringUtils.isBlank(value)?"":value);
propList.add(vo);
}
+
/***
* 鏌ヨredis涓暟鎹紝瀵规瘮鍚庢彃鍏ockingtask
* @param type
@@ -850,7 +894,7 @@
for (DockingTask dockingTask:dockingTaskList){
//姣忎釜task涓�涓簨鍔★紝寮�鍚�
String paramString="";
- String sendString="";
+ Object sendString="";
String backString="";
//鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
String systeminfooid = dockingTask.getSysInfoOid();//sysininfo 鐨刼id
@@ -884,8 +928,8 @@
DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);
String paramType = dockingSystemConfig.getParamType();//xml/json
if(paramType.equals(DATATYPE_JSON)){
- Object object = JSONObject.toJSON(jsonRootDataDTO);
- sendString = object.toString();
+ Object object = JSONObject.toJSON(jsonRootDataDTO);
+ sendString = object;
}else{
//缁勭粐杩斿洖鎺ュ彛淇℃伅
XStream xStream = new XStream(new DomDriver());
@@ -902,6 +946,7 @@
}
}
}
+
/***
* 鍙戦�佺紪鐮佷富鏁版嵁
*/
@@ -910,7 +955,7 @@
for (DockingTask dockingTask:dockingTaskS){
//姣忎釜task涓�涓簨鍔★紝寮�鍚�
String paramString="";
- String sendString="";
+ Object sendString="";
String backString="";
try {
//鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
@@ -935,7 +980,7 @@
List<NodeProDTO> nodeProDTOS = new ArrayList<>();
Map<String, String> finalData = data;
AtomicReference<String> newItemId= new AtomicReference<>("");
- attrIdNameMap.keySet().forEach(field -> {
+ finalData.keySet().forEach(field -> {
if(field.toLowerCase(Locale.ROOT).equals(itemId.toLowerCase(Locale.ROOT))){
String Value = finalData.get(field);
newItemId.set(Value);
@@ -954,7 +999,7 @@
DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);
boolean isGroupCodeFlage=false;
if(dockingSystemConfig!=null) {
- isGroupCodeFlage = StringUtils.isBlank(dockingSystemConfig.getIsGroupCodeFlag())?false: Boolean.getBoolean(dockingSystemConfig.getIsGroupCodeFlag());
+ isGroupCodeFlage = StringUtils.isBlank(dockingSystemConfig.getIsGroupCodeFlag())?false: Boolean.parseBoolean(dockingSystemConfig.getIsGroupCodeFlag());
}
if(isGroupCodeFlage){
code=data.getOrDefault("groupcode","");
@@ -984,7 +1029,8 @@
String paramType = dockingSystemConfig.getParamType();//xml/json
if (paramType.equals(DATATYPE_JSON)) {
Object object = JSONObject.toJSON(nodeJosnDTO);
- sendString = object.toString();
+ //sendString = object.toString();
+ sendString = object;
} else {
//缁勭粐杩斿洖鎺ュ彛淇℃伅
XStream xStream = new XStream(new DomDriver());
@@ -1000,18 +1046,19 @@
}
}
}
+
/***
- * 璋冪敤鎺ュ彛
- * @param sendString
+ * 璋冪敤鎺ュ彛锛屼紶鍙備负JSON鏃朵紶object绫诲瀷,Content-Type鏀逛负鐣岄潰閰嶇疆鐨�
+ * @param sendObject
* @param dockingSystemConfig
* @param dockingTask
* @throws Throwable
*/
- private void callInterface(String sendString , DockingSystemConfig dockingSystemConfig,DockingTask dockingTask,String operation) throws Throwable{
+ private void callInterface(Object sendObject, DockingSystemConfig dockingSystemConfig,DockingTask dockingTask,String operation) throws Throwable{
String paramString = "";
-
String backString = "";
- String msg="";
+ String sendString = sendObject.toString();
+ String msg= "" ;
String url = dockingSystemConfig.getRequestUrl();//url
List<ResultNodeObjectDTO> resultNodeObjectDTOS =new ArrayList<>();
try {
@@ -1042,17 +1089,22 @@
paramString = sendurl;
backString = HttpUtils.get(sendurl);
} else if (requestmethod.equals(URLTYPE_POST)) {//POST璇锋眰
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
for (DockingSysIntParam dockingSysIntParam : dockingSysIntParamList) {
params.add(dockingSysIntParam.getParamKey(), dockingSysIntParam.getParamValue());
}
- params.add(DATA_PARAM_NAME,sendString);
+ params.add(DATA_PARAM_NAME,sendObject);
paramString = params.toString();
MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
for (DockingSysIntHeader dockingSysIntHeader : dockingSysIntHeaderList) {
headers.add(dockingSysIntHeader.getHeaderKey(), dockingSysIntHeader.getHeaderValue());
}
- backString = HttpUtils.post(url, params, headers);
+ backString = HttpUtils.postByMediaType(
+ url,
+ params,
+ headers,
+ Func.isNotBlank(dockingSystemConfig.getContentType()) ? MediaType.valueOf(dockingSystemConfig.getContentType()):MediaType.APPLICATION_FORM_URLENCODED
+ );
}
if(backString.startsWith("\"")){
backString=backString.substring(backString.indexOf("\"")+1);
@@ -1150,6 +1202,7 @@
}
}
}
+
/***
* 鏌ヨ闇�瑕侀泦鎴愮殑涓氬姟鏁版嵁浠诲姟
*/
@@ -1186,6 +1239,7 @@
List<DockingTask> dockingTaskDOS = dockingTaskService.list(queryWrapper);
sendpushClsfForService(dockingTaskDOS);
}
+
public void initSysadmin(){
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId("sysAdmin");
@@ -1195,6 +1249,7 @@
sessionInfo.setUserSecret(UserSecretEnum.PRIVACY.getValue()+"");
WebUtil.setSessionInfo(sessionInfo);
}
+
/**
* dockingdata鏍规嵁oid淇敼sendflag
* @param oid
@@ -1210,5 +1265,6 @@
}
return u;
}
+
}
--
Gitblit v1.9.3