ubcs.git - Gitblit

			@@ -3,7 +3,6 @@

			import com.alibaba.cloud.commons.lang.StringUtils;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.Wrapper;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.thoughtworks.xstream.XStream;
			@@ -23,7 +22,7 @@
			import com.vci.ubcs.code.entity.*;
			import com.vci.ubcs.code.enumpack.SysIntegrationDataFlowTypeEnum;
			import com.vci.ubcs.code.service.*;
			import com.vci.ubcs.code.util.HttpUtils;
			import com.vci.ubcs.starter.util.HttpUtils;
			import com.vci.ubcs.code.util.WsErpClientUtil;
			import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
			import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
			@@ -44,6 +43,7 @@

			import javax.annotation.Resource;
			import java.util.*;
			import java.util.concurrent.atomic.AtomicReference;
			import java.util.stream.Collectors;

			import static com.vci.ubcs.code.constant.MdmDuckingConstant.*;
			@@ -60,8 +60,8 @@
			public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {
			@Value("${dataSyncPush.dataParamName:xmlData}")
			public String DATA_PARAM_NAME;


			@Value("${dataSyncPush.dataId:itemOid}")
			private String itemId;
			@Resource
			private MdmEngineService mdmEngineServiceI;

			@@ -156,7 +156,6 @@
			*/
			private void initPushDataTaks(int type){
			initSysadmin();

			List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list(
			Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true")
			.eq(DockingSystemConfig::getPushType,type==2?"2":"1").eq(DockingSystemConfig::getDataFlowType, SysIntegrationDataFlowTypeEnum.PUSH.getValue()));//2是代表分类推送，1是代表数据推送
			@@ -234,7 +233,10 @@
			dockingTask.setClassifyName(classifyname);//数据所在分类名称
			dockingTask.setSendType(sendtype);//数据推送类型
			dockingTask.setDataOid(dataoid);

			dockingTask.setCreateTime(new Date());
			dockingTask.setLastModifyTime(new Date());
			dockingTask.setCreator("sysAdmin");
			dockingTask.setLastModifier("sysAdmin");
			//intinfo
			dockingTask.setSysInfoOid(sysIntInfoVOi.getOid());//intinfo的oid
			dockingTask.setSystemOid(sysIntInfoVOi.getSysBaseOid());//系统oid
			@@ -244,7 +246,7 @@
			}

			if(dockingTask_insert.size()!=0) {
			// dockingTaskService.saveBatch(dockingTask_insert);
			dockingTaskService.saveBatch(dockingTask_insert);
			}
			//dockingTaskDaoI.updateByPrimaryKey方法报错了，所以手写了这个
			boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
			@@ -307,7 +309,7 @@
			sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
			}
			//调用接口
			callInterface(sendString,dockingSystemConfig,dockingTask);
			callInterface(sendString,dockingSystemConfig,dockingTask,"pushClassifyData");
			}catch (Throwable e){
			e.printStackTrace();
			}finally {
			@@ -319,7 +321,6 @@
			* 发送编码主数据
			*/
			private void sendpushDataForService (List<DockingTask> dockingTaskS){

			//每个task依次执行推送
			for (DockingTask dockingTask:dockingTaskS){
			//每个task一个事务，开启
			@@ -336,6 +337,7 @@
			//表示是主数据
			CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid);
			R<List<Map<String, String>>> r = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid());

			List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyTemplateVO.getAttributes();
			Map<String/英文名称/, String/中文名称/> attrIdNameMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t.getName(), (o1, o2) -> o2));
			Map<String, String> data = new HashMap<>();
			@@ -347,7 +349,12 @@
			}
			List<NodeProDTO> nodeProDTOS = new ArrayList<>();
			Map<String, String> finalData = data;
			AtomicReference<String> newItemId= new AtomicReference<>("");
			attrIdNameMap.keySet().forEach(field -> {
			if(field.toLowerCase(Locale.ROOT).equals(itemId.toLowerCase(Locale.ROOT))){
			String Value = finalData.get(field);
			newItemId.set(Value);
			}
			String outName = attrIdNameMap.get(field);
			if (finalData.containsKey(field)) {
			String Value = finalData.get(field);
			@@ -360,10 +367,19 @@
			});
			//查询推送接口参数
			DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);

			boolean isGroupCodeFlage= dockingSystemConfig.getIsGroupCodeFlag().equals("true")?true:false;
			boolean isGroupCodeFlage=false;
			if(dockingSystemConfig!=null) {
			isGroupCodeFlage = StringUtils.isBlank(dockingSystemConfig.getIsGroupCodeFlag())?false: Boolean.getBoolean(dockingSystemConfig.getIsGroupCodeFlag());
			}
			if(isGroupCodeFlage){
			code=data.getOrDefault("groupcode","");
			if(StringUtils.isBlank(code)) {//如果是集团码，没有领取到集团码则任务不结束等待集团码申请后再通过定时器调用集团码段
			dockingTask.setDescription("等待集团申请集团码");
			dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE);
			dockingTask.setLastModifyTime(new Date());
			dockingTaskService.updateById(dockingTask);
			continue;
			}
			}
			String[] classCodeLeves = dockingTask.getClassifyId().split(",");
			NodeJosnDTO nodeJosnDTO = new NodeJosnDTO();
			@@ -372,6 +388,7 @@
			nodeObjectDTO.setCode(code);//设置编码
			nodeObjectDTO.setClassCode(classCodeLeves[0]);
			nodeObjectDTO.setStatus(data.get("lcstatus"));
			nodeObjectDTO.setItemid(newItemId.get());
			nodeObjectDTO.setLibrary(classCodeLeves[classCodeLeves.length - 1]);
			nodeObjectDTO.setPro(nodeProDTOS);
			List<NodeObjectDTO> nodeObjectDTOS = new ArrayList<>();
			@@ -391,7 +408,7 @@
			sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
			}
			//调用接口
			callInterface(sendString,dockingSystemConfig, dockingTask);
			callInterface(sendString,dockingSystemConfig, dockingTask,"pushData");
			}catch (Throwable e){
			e.printStackTrace();
			}finally {
			@@ -405,7 +422,7 @@
			* @param dockingTask
			* @throws Throwable
			*/
			private void callInterface(String sendString , DockingSystemConfig dockingSystemConfig,DockingTask dockingTask) throws Throwable{
			private void callInterface(String sendString , DockingSystemConfig dockingSystemConfig,DockingTask dockingTask,String operation) throws Throwable{
			String paramString = "";

			String backString = "";
			@@ -497,7 +514,6 @@
			}
			ResultNodeDataDTO resultNodeDataDTO=resultJsonDTO.getData();
			resultNodeObjectDTOS=resultNodeDataDTO.getObject();

			}catch (Throwable e){
			msg="调用接口失败:"+e.getMessage();
			e.printStackTrace();
			@@ -507,7 +523,7 @@
			resultNodeObjectDTO.setErroid("1");
			resultNodeObjectDTO.setMsg(msg);
			resultNodeObjectDTO.setCode(dockingSystemConfig.getPushType().equalsIgnoreCase("2")?dockingTask.getClassifyId():dockingTask.getId());
			resultNodeObjectDTO.setOid(dockingTask.getBtmOid());
			resultNodeObjectDTO.setItemid(dockingTask.getBtmOid());
			resultNodeObjectDTOS.add(resultNodeObjectDTO);
			}finally {
			boolean isSend = false;
			@@ -530,12 +546,13 @@
			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(DATA_LOGE_OUT);
			dockingLogeDO.setType(operation);
			dockingLogeDO.setMsg(msg);
			log.error("集成推送数据,systemcode:"+dockingTask.getSystemCode()+",systemname:"+dockingTask.getSystemName()+",url:"+url+",param:"+paramString+",e:"+msg);
			dockingLogeService.save(dockingLogeDO);
			@@ -543,6 +560,7 @@
			//全都接收成功的情况下,修改dockingtask sendflag为已发送
			if(isSend) {
			dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_TRUE);
			dockingTask.setLastModifyTime(new Date());
			dockingTaskService.updateById(dockingTask);
			}
			}