From 8ef9e366be48dc5e8e52617ea8ed48b37a0e1f74 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 29 二月 2024 14:33:58 +0800
Subject: [PATCH] 在线部署功能上传，标准申请接口bug修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 209 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 192 insertions(+), 17 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 fcb7bbe..9864832 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
@@ -59,6 +59,7 @@
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.MediaType;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -95,6 +96,7 @@
@Service
@Slf4j
public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {
+
@Value("${dataSyncPush.dataParamName:xmlData}")
public String DATA_PARAM_NAME;
@Value("${dataSyncPush.dataId:itemid}")
@@ -146,21 +148,28 @@
@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() {
@@ -222,6 +231,7 @@
});
return R.success("鎵嬪姩鎺ㄩ�佸畬鎴�,璇锋牳瀵规槸鍚︽帹閫佹垚鍔�");
}
+
private SearchItemDataVO initData(String status,String itemCode,String mmCode){
SearchItemDataVO searchItemDataVO=new SearchItemDataVO();
searchItemDataVO.setLastchangedon(new Date());
@@ -258,6 +268,7 @@
return request;
}
+
/***
* 鍚屾鍨嬪彿浠ｅ彿
*/
@@ -574,6 +585,7 @@
}
return codeOrderSecDTOList;
}
+
/***
* 璇诲彇灞炴�ф槧灏勯厤缃俊鎭�
* @param systemId
@@ -698,7 +710,8 @@
throw new Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
}
}
- private void changeObjectToMap(SearchItemUpperCaseDataVO 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锛�
@@ -731,13 +744,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(StringUtils.isBlank(text)?"":text);
vo.setValue(StringUtils.isBlank(value)?"":value);
propList.add(vo);
}
+
/***
* 鏌ヨredis涓暟鎹紝瀵规瘮鍚庢彃鍏ockingtask
* @param type
@@ -863,7 +878,7 @@
for (DockingTask dockingTask:dockingTaskList){
//姣忎釜task涓�涓簨鍔★紝寮�鍚�
String paramString="";
- String sendString="";
+ Object sendString="";
String backString="";
//鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
String systeminfooid = dockingTask.getSysInfoOid();//sysininfo 鐨刼id
@@ -897,8 +912,9 @@
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.toString();
+ sendString = jsonRootDataDTO;
}else{
//缁勭粐杩斿洖鎺ュ彛淇℃伅
XStream xStream = new XStream(new DomDriver());
@@ -915,6 +931,7 @@
}
}
}
+
/***
* 鍙戦�佺紪鐮佷富鏁版嵁
*/
@@ -923,7 +940,7 @@
for (DockingTask dockingTask:dockingTaskS){
//姣忎釜task涓�涓簨鍔★紝寮�鍚�
String paramString="";
- String sendString="";
+ String sendObject="";
String backString="";
try {
//鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
@@ -997,34 +1014,35 @@
String paramType = dockingSystemConfig.getParamType();//xml/json
if (paramType.equals(DATATYPE_JSON)) {
Object object = JSONObject.toJSON(nodeJosnDTO);
- sendString = object.toString();
+ sendObject = object.toString();
} else {
//缁勭粐杩斿洖鎺ュ彛淇℃伅
XStream xStream = new XStream(new DomDriver());
xStream.processAnnotations(NodedataDTO.class);
xStream.autodetectAnnotations(true);
- sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
+ sendObject = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
}
//璋冪敤鎺ュ彛
- callInterface(sendString,dockingSystemConfig, dockingTask,"pushData");
+ callInterface(sendObject,dockingSystemConfig, dockingTask,"pushData");
}catch (Throwable e){
e.printStackTrace();
}finally {
}
}
}
+
/***
- * 璋冪敤鎺ュ彛
- * @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 = dockingSystemConfig.getContentType().equals(DATATYPE_JSON) ? JSONObject.toJSON(sendObject).toString():sendObject.toString();
+ String msg= "" ;
String url = dockingSystemConfig.getRequestUrl();//url
List<ResultNodeObjectDTO> resultNodeObjectDTOS =new ArrayList<>();
try {
@@ -1055,17 +1073,17 @@
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,new MediaType(dockingSystemConfig.getContentType()));
}
if(backString.startsWith("\"")){
backString=backString.substring(backString.indexOf("\"")+1);
@@ -1163,6 +1181,160 @@
}
}
}
+
+ /**
+ * 璋冪敤鎺ュ彛锛屼紶鍙備负JSON鏃朵紶object绫诲瀷
+ * @param sendObject
+ * @param dockingSystemConfig
+ * @param dockingTask
+ * @param operation
+ * @throws Throwable
+ */
+ private void callInterfaceByContentType(Object sendObject, DockingSystemConfig dockingSystemConfig,DockingTask dockingTask,String operation,String sendType) throws Throwable{
+ String paramString = "";
+ String sendString = sendType.equals(DATATYPE_JSON) ? JSONObject.toJSON(sendObject).toString():sendObject.toString();
+ String backString = "";
+ String msg="";
+ String url = dockingSystemConfig.getRequestUrl();//url
+ List<ResultNodeObjectDTO> resultNodeObjectDTOS =new ArrayList<>();
+ try {
+ boolean usedFlag= dockingSystemConfig.getUsedFlag().equals("true")?true:false;
+ if(!usedFlag){
+ throw new Throwable("鎺ュ彛宸茬粡鍋滅敤锛�");
+ }
+ String type = dockingSystemConfig.getInterfaceType().toLowerCase(Locale.ROOT);//get/post/webserver/corba
+ String paramType = dockingSystemConfig.getParamType();//xml/json
+ String returnType = dockingSystemConfig.getReturnType();//xml/json
+ String requestmethod= dockingSystemConfig.getRequestMethod();
+ String interfaceFunction = dockingSystemConfig.getInterfaceFunction();//涓昏鏄痺ebservice鐨勬柟娉曞悕
+ String namespace = dockingSystemConfig.getNamespace();//namespace
+ String soapaction = dockingSystemConfig.getSoapAction();//soapaction
+ String targName = dockingSystemConfig.getTargetName();//targName
+ String cxfaxis = dockingSystemConfig.getCxfAxis();//webservice鏄痗xf/axis
+ //鏌ヨparam
+ List<DockingSysIntParam> dockingSysIntParamList = dockingSysIntParamService.list(Wrappers.<DockingSysIntParam>query().lambda().eq(DockingSysIntParam::getInfoOid,dockingSystemConfig.getOid()));
+ //鏌ヨheader
+ List<DockingSysIntHeader> dockingSysIntHeaderList = dockingSysIntHeaderService.list(Wrappers.<DockingSysIntHeader>query().lambda().eq(DockingSysIntHeader::getInfoOid,dockingSystemConfig.getOid()));
+ if(type.equals(URLTYPE_HTTP)) {
+ if (requestmethod.equals(URLTYPE_GET)) {//GET璇锋眰
+ String sendurl = url + "?" + DATA_PARAM_NAME + "=" + sendString;
+ //鎷兼帴param
+ for (DockingSysIntParam dockingSysIntParam : dockingSysIntParamList) {
+ sendurl = sendurl + "&" + dockingSysIntParam.getParamKey() + "=" + dockingSysIntParam.getParamValue();
+ }
+ paramString = sendurl;
+ backString = HttpUtils.get(sendurl);
+ } else if (requestmethod.equals(URLTYPE_POST)) {//POST璇锋眰
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ for (DockingSysIntParam dockingSysIntParam : dockingSysIntParamList) {
+ params.add(dockingSysIntParam.getParamKey(), dockingSysIntParam.getParamValue());
+ }
+ 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());
+ }
+ // TODO: 2024-02-25鏀癸紝涓轰簡婊¤冻HR浠ュ強鍏朵粬鎯呭喌涓嬫牴鎹瓹ontent-type鐨勭被鍨嬫潵鍙戣姹傦紝骞朵笖param涓殑json鏄渶鍚庣殑鏃跺�欏彂閫佽姹傚啀杞�
+ backString = HttpUtils.postByMediaType(url, params, headers, MediaType.APPLICATION_FORM_URLENCODED);
+ }
+ if(backString.startsWith("\"")){
+ backString=backString.substring(backString.indexOf("\"")+1);
+ }
+ if(backString.endsWith("\"")){
+ backString=backString.substring(0,backString.lastIndexOf("\""));
+ }
+ if(backString.contains("\n")){
+ String res="\n";
+ backString= backString.replaceAll(res,"");
+ }
+ if(backString.contains("\\")){
+ String res="\\\\\"";
+ backString= backString.replaceAll(res,"\"").trim();
+ }
+ }else if (type.equals(URLTYPE_WEBSERVICE)) {//webserver璇锋眰
+ MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ for (DockingSysIntParam dockingSysIntParam : dockingSysIntParamList) {
+ params.add(dockingSysIntParam.getParamKey(), dockingSysIntParam.getParamValue());
+ }
+
+ paramString = sendString;
+ MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+ for (DockingSysIntHeader dockingSysIntHeader : dockingSysIntHeaderList) {
+ headers.add(dockingSysIntHeader.getHeaderKey(), dockingSysIntHeader.getHeaderValue());
+ }
+ backString = WsErpClientUtil.sendMsg(url, namespace, soapaction, interfaceFunction, targName, sendString, 10000);
+
+ } else {//corba鎺ュ彛
+ //paramString=sendString;
+ // backString = jacorbClient.getBOFactoryService().sendCode(sendString);
+ }
+
+ ResultJsonDTO resultJsonDTO = new ResultJsonDTO();
+ if(returnType.equals(DATATYPE_JSON)){
+ resultJsonDTO =JSONObject.toJavaObject(JSONObject.parseObject(backString), ResultJsonDTO.class);
+ }else {
+ //缁勭粐杩斿洖鎺ュ彛淇℃伅
+ XStream xStream = new XStream(new DomDriver());
+ xStream.processAnnotations(ResultNodeDataDTO.class);
+ xStream.autodetectAnnotations(true);
+ ResultNodeDataDTO resultNodeDataDTO = (ResultNodeDataDTO) xStream.fromXML(backString);
+ resultJsonDTO.setData(resultNodeDataDTO);
+ }
+ ResultNodeDataDTO resultNodeDataDTO=resultJsonDTO.getData();
+ resultNodeObjectDTOS=resultNodeDataDTO.getObject();
+ }catch (Throwable e){
+ msg="璋冪敤鎺ュ彛澶辫触:"+e.getMessage();
+ e.printStackTrace();
+ log.error("璋冪敤鎺ュ彛澶辫触:"+e);
+ // throw new Throwable("璋冪敤鎺ュ彛澶辫触:"+e);
+ ResultNodeObjectDTO resultNodeObjectDTO=new ResultNodeObjectDTO();
+ resultNodeObjectDTO.setErroid("1");
+ resultNodeObjectDTO.setMsg(msg);
+ resultNodeObjectDTO.setCode(dockingSystemConfig.getPushType().equalsIgnoreCase("2")?dockingTask.getClassifyId():dockingTask.getId());
+ resultNodeObjectDTO.setItemid(dockingTask.getBtmOid());
+ resultNodeObjectDTOS.add(resultNodeObjectDTO);
+ }finally {
+ boolean isSend = false;
+ for (ResultNodeObjectDTO resultNodeObjectDTO:resultNodeObjectDTOS){
+ String erroid = resultNodeObjectDTO.getErroid();
+ msg = resultNodeObjectDTO.getMsg();
+ if("0".equals(erroid)){
+ isSend = true;
+ }else if("1".equals(erroid)){
+ isSend=false;
+ }else{
+ isSend=false;
+ }
+ DockingLog dockingLogeDO = new DockingLog();
+ String oid=VciBaseUtil.getPk();
+ dockingLogeDO.setOid(oid);
+ dockingLogeDO.setSystemCode(dockingTask.getSystemCode());
+ dockingLogeDO.setSystemName(dockingTask.getSystemName());
+ dockingLogeDO.setSystemOid(dockingTask.getSystemOid());
+ dockingLogeDO.setClassifyOid(dockingTask.getClassifyOid());
+ dockingLogeDO.setClassifyId(dockingTask.getClassifyId());
+ dockingLogeDO.setClassifyName(dockingTask.getClassifyName());
+ dockingLogeDO.setCreateTime(new Date());
+ dockingLogeDO.setId(dockingTask.getId());
+ dockingLogeDO.setUniqueCode(dockingTask.getUniqueCode());
+ dockingLogeDO.setParamString(paramString);
+ dockingLogeDO.setReturnString(backString);
+ dockingLogeDO.setInterfaceStatus(isSend?"true":"false");
+ dockingLogeDO.setType(operation);
+ dockingLogeDO.setMsg(msg);
+ log.error("闆嗘垚鎺ㄩ�佹暟鎹�,systemcode:"+dockingTask.getSystemCode()+",systemname:"+dockingTask.getSystemName()+",url:"+url+",param:"+paramString+",e:"+msg);
+ dockingLogeService.save(dockingLogeDO);
+ }
+ //鍏ㄩ兘鎺ユ敹鎴愬姛鐨勬儏鍐典笅,淇敼dockingtask sendflag涓哄凡鍙戦��
+ if(isSend) {
+ dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_TRUE);
+ dockingTask.setLastModifyTime(new Date());
+ dockingTaskService.updateById(dockingTask);
+ }
+ }
+ }
+
/***
* 鏌ヨ闇�瑕侀泦鎴愮殑涓氬姟鏁版嵁浠诲姟
*/
@@ -1199,6 +1371,7 @@
List<DockingTask> dockingTaskDOS = dockingTaskService.list(queryWrapper);
sendpushClsfForService(dockingTaskDOS);
}
+
public void initSysadmin(){
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId("sysAdmin");
@@ -1208,6 +1381,7 @@
sessionInfo.setUserSecret(UserSecretEnum.PRIVACY.getValue()+"");
WebUtil.setSessionInfo(sessionInfo);
}
+
/**
* dockingdata鏍规嵁oid淇敼sendflag
* @param oid
@@ -1223,5 +1397,6 @@
}
return u;
}
+
}
--
Gitblit v1.9.3