Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java

@@ -2,7 +2,9 @@


import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSON;
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,26 +37,23 @@
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;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.HttpUtils;
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 lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
import org.apache.commons.collections4.map.CaseInsensitiveMap;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
@@ -62,23 +61,26 @@
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;
import org.springframework.transaction.support.DefaultTransactionStatus;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
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;
import java.util.stream.Collectors;

import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK;
import static com.vci.ubcs.code.constant.MdmDuckingConstant.*;
import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
import static com.vci.ubcs.code.enumpack.CodeSecTypeEnum.CODE_CLASSIFY_SEC;
@@ -93,73 +95,103 @@
@Service
@Slf4j
public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {

   @Value("${dataSyncPush.dataParamName:xmlData}")
   public String DATA_PARAM_NAME;
   @Value("${dataSyncPush.dataId:itemid}")
   private String itemId;
   @Value("${erp.item.attrKey:xhdh}")
   public String attrKey;
   @Value("${erp.item.itemStatus:2}")
   public String itemStatus;

   @Value("${erp.item.systemId:ERP}")
   public String systemId;
   @Value("${erp.item.secName:固定码段}")
   public String secName;
   @Value("${erp.item.secValue:A}")
   public String secValue;

   @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 WebServiceContext webServiceContext;

   @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;

   @Resource
   private ICodeAllCodeService codeAllCodeService;

   @Override
   public void DockingDataSyncScheduing() {

      // insertCache2();
      initPushDataTaks(1);
      sendpushDataForService();

   }

   /***
@@ -215,140 +247,297 @@
      return  R.success("手动推送完成,请核对是否推送成功");
   }

   private SearchItemDataVO initData(String status,String itemCode,String mmCode){
      SearchItemDataVO searchItemDataVO=new SearchItemDataVO();
      searchItemDataVO.setLastchangedon(new Date());
      searchItemDataVO.setLastchangedby("19831133");
      searchItemDataVO.setCreatby("19831133");
      searchItemDataVO.setCreatedon(new Date());
      searchItemDataVO.setIsenabled(status);
      searchItemDataVO.setMaterialcode("XMDH0001");
      searchItemDataVO.setStatus("1");
      searchItemDataVO.setProjectcode("3333");
      searchItemDataVO.setProjectitem(itemCode);
      searchItemDataVO.setMmodelcode(mmCode);

      return searchItemDataVO;
   }

   public HttpServletRequest  getRequest(){
      HttpServletRequest request =null;
      RequestAttributes requestAttributes = null;
      try{
         requestAttributes = RequestContextHolder.currentRequestAttributes();
      }catch (IllegalStateException e){
         //requestAttributes = new NonWebRequestAttributes();
         //RequestContextHolder.setRequestAttributes(requestAttributes, true);
         request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request),true);
      }finally {
         if (requestAttributes instanceof  ServletRequestAttributes) {
            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 btmName) {
   public void saveItemDataSyncScheduing(String endDate) throws ServiceException {
      String paramString="";
      String backString="成功";
      String msg="成功";
      boolean success=true;
      SearchItemParam searchItemParam=new SearchItemParam();
      searchItemParam.setSystag("VCI"); //调用系统标识
      Calendar calendar= Calendar.getInstance();
      calendar.set(Calendar.HOUR_OF_DAY,0);
      calendar.set(Calendar.MINUTE,0);
      calendar.set(Calendar.SECOND,0);
      log.info("查询时间------->"+calendar.getTime());
      SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
      String lastchangedon= dft.format(calendar.getTime());
      String lastchangedon="";
      if(StringUtils.isBlank(endDate)) {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
         log.info("查询时间------->"+dft.format(new Date()));
         lastchangedon= dft.format(calendar.getTime());
      }else{
         lastchangedon=endDate;
      }
      searchItemParam.setLastchangedon(lastchangedon);
      searchItemParam.setStatus("1");//
      Map<String,String>searchDataMap=  VciBaseUtil.objectToMapString(searchItemParam);
      SearchItemVO searchItemVO= mdmSearchItemCodeProvider.getppModelByElem(searchDataMap);
      if(searchItemVO!=null) {
         try {
            //免密登录申请token，request中添加用户信息
      searchItemParam.setIsenabled("");
      searchItemParam.setStatus(itemStatus);
      //Map<String,String> searchDataMap = VciBaseUtil.objectToMapString(searchItemParam);
      try {
         String sendParamString=JSONObject.toJSON(searchItemParam).toString();
         // 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",sendParamString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
         // String res= mdmSearchItemCodeProvider.getppModelByElem(searchItemParam);
         SearchItemVO searchItemVO = JSONObject.toJavaObject(JSONObject.parseObject(res), SearchItemVO.class);
         if (searchItemVO != null) {
            if(!"200".equals(searchItemVO.getStatus())){
               throw new ServiceException(String.format("接口返回状态码为：%s，原因：%s",searchItemVO.getStatus(),searchItemVO.getMessage()));
            }
            BladeUser finalUser;
            paramString = JSONObject.toJSON(searchItemVO).toString();
            log.info("型号代号数据值-------》"+paramString);
            HttpServletRequest request=getRequest();
            try {
               passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), request);
            }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("分类未查询到");
            }
            CodeClassify codeClassify= codeClassifyList.get(0);
            CodeClassifyTemplateVO templateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(codeClassify.getOid());
            if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
               throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
            }
            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<String> itemCodeList = new ArrayList<>();
            if (!CollectionUtils.isEmpty(dataList)) {
               dataList.stream().forEach(searchItemDataVO -> {
                  String itemCode = StringUtils.isNotBlank(searchItemDataVO.getProjectitem()) ? searchItemDataVO.getProjectitem() : searchItemDataVO.getMmodelcode();//项目代号
                  dataVOMap.put(itemCode, searchItemDataVO);
                  itemCodeList.add(itemCode);
               });
               String tableName = "";
               R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(btmName);
               if (!r.isSuccess()) {
                  throw new Throwable(r.getMsg());
               }
               BtmTypeVO btmTypeVO = r.getData();
               if (btmTypeVO == null) {
                  throw new Throwable("根据业务类型未查询到业务类型对象！");
               }
               tableName = btmTypeVO.getTableName();
               if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
                  throw new Throwable("根据业务类型未查询到业务类型相关联的表");
               }
               StringBuffer sb = new StringBuffer();
               sb.append(" select * from  ");
               sb.append(tableName);
               sb.append(" where 1=1");
               sb.append(" and lastr=1 and lastv=1");
               sb.append(" and codeclsfid = '" + codeClassify.getOid() + "' ");
               sb.append( VciBaseUtil.toInSql(attrKey,VciBaseUtil.array2String(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();
                  DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,baseModel,false,user);
                  DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,user);
                  //baseModelList.add(baseModel);
                  String attrKeyValue=dataMap.getOrDefault(attrKey,"");
                  baseModelMap.put(attrKeyValue,baseModel);
               });
               ApplyDatasVO editDatasVO = new ApplyDatasVO();
               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);
                  }else{
                     changeObjectToMap(value,"",user,"create",addObjectList);
               //免密登录申请token，request中添加用户信息
               try {
                  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_");
                  }
               });
               if(!CollectionUtils.isEmpty(addObjectList)){
                  //规则的主键需要去获取
                  CodeClassifyFullInfoBO classifyFullInfo = codeClassifyService.getClassifyFullInfo(codeClassify.getOid());
                  if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
                     log.info("classifyFullInfo:"+"根据传输的分类，未获取分类相关信息");
                     throw  new  Throwable ("根据传输的分类，未获取分类相关信息");
                  }
                  CodeRuleVO ruleVO = mdmEngineServiceI.getCodeRuleByClassifyFullInfo(classifyFullInfo);
                  if(ruleVO==null||StringUtils.isBlank(ruleVO.getOid())){
                     throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应规则");
                  }
                  DataObjectVO dataObjectVO = new DataObjectVO();
                  ApplyDatasVO applyDatasVO = new ApplyDatasVO();
                  applyDatasVO.setObject(addObjectList);
                  LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                  this.getConfigDatas(systemId, btmName, applyDatasVO, attrVOS, dataObjectVO);
                  CodeOrderDTO orderDTO = new CodeOrderDTO();
                  orderDTO.setCodeClassifyOid(codeClassify.getOid());//分类主键

                  log.info("end：规则获取完毕");
                  List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(null, ruleVO,classifyFullInfo);
                  log.info("end：码段获取完毕");

                  orderDTO.setSecDTOList(codeOrderSecDTOList);//分类码段
                  mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs,false);
                  finalUser = user;
               } catch (Throwable e) {
                  throw new Throwable("用户鉴权失败.");
               }
               List<CodeClassify> codeClassifyList = codeClassifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, btmName));
               if (CollectionUtils.isEmpty(codeClassifyList)) {
                  throw new Throwable("分类未查询到");
               }
               CodeClassify codeClassify = codeClassifyList.get(0);
               CodeClassifyTemplateVO templateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(codeClassify.getOid());
               if (templateVO == null || StringUtils.isBlank(templateVO.getOid())) {
                  throw new Throwable("根据传输的分类，未获取MDM系统中对应模板");
               }
               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<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 (Func.isNotEmpty(dataList)) {
                  dataList.stream().forEach(searchItemDataVO -> {
                     String itemCode = StringUtils.isNotBlank(searchItemDataVO.getPROJECTITEM()) ? searchItemDataVO.getPROJECTITEM() : searchItemDataVO.getMMODELCODE();//项目代号
                     dataVOMap.put(itemCode, searchItemDataVO);
                     itemCodeList.add(itemCode);
                  });
                  String tableName = "";
                  R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(codeClassify.getBtmTypeId());
                  if (!r.isSuccess()) {
                     throw new Throwable(r.getMsg());
                  }
                  BtmTypeVO btmTypeVO = r.getData();
                  if (btmTypeVO == null) {
                     throw new Throwable("根据业务类型未查询到业务类型对象！");
                  }
                  tableName = btmTypeVO.getTableName();
                  if (StringUtils.isBlank(tableName)) {
                     throw new Throwable("根据业务类型未查询到业务类型相关联的表");
                  }
                  StringBuffer sb = new StringBuffer();
                  sb.append(" select * from  ");
                  sb.append(tableName);
                  sb.append(" where 1=1");
                  sb.append(" and lastr=1 and lastv=1");
                  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());

               if(!CollectionUtils.isEmpty(editObjectList)){
                  DataObjectVO dataObjectVO = new DataObjectVO();
                  ApplyDatasVO applyDatasVO = new ApplyDatasVO();
                  LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                  CodeClassifyVO codeClassifyVO=new CodeClassifyVO();
                  BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassify, codeClassifyVO);
                  this.getConfigDatas(systemId, btmName, applyDatasVO, attrVOS, dataObjectVO);
                  mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,false);
                  //List<BaseModel> baseModelList=new ArrayList<>();
                  Map<String, BaseModel> baseModelMap = new HashMap<>();
                  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(), finalUser, "editstatus", editObjectList);
                     } else {
                        changeObjectToMap(value, "", finalUser, "create", addObjectList);
                     }
                  });
                  allObjectList.addAll(addObjectList);
                  allObjectList.addAll(editObjectList);
                  allDatasVO.setObject(allObjectList);
                  LinkedList<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS = new LinkedList<>();
                  if (!CollectionUtils.isEmpty(addObjectList)) {
                     //规则的主键需要去获取
                     CodeClassifyFullInfoBO classifyFullInfo = codeClassifyService.getClassifyFullInfo(codeClassify.getOid());
                     if (classifyFullInfo == null || classifyFullInfo.getCurrentClassifyVO() == null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())) {
                        log.info("classifyFullInfo:" + "根据传输的分类，未获取分类相关信息");
                        throw new Throwable("根据传输的分类，未获取分类相关信息");
                     }
                     CodeRuleVO ruleVO = mdmEngineServiceI.getCodeRuleByClassifyFullInfo(classifyFullInfo);
                     if (ruleVO == null || StringUtils.isBlank(ruleVO.getOid())) {
                        throw new Throwable("根据传输的分类，未获取MDM系统中对应规则");
                     }
                     DataObjectVO dataObjectVO = new DataObjectVO();
                     ApplyDatasVO applyDatasVO = new ApplyDatasVO();
                     applyDatasVO.setObject(addObjectList);
                     LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                     this.getConfigDatas(systemId, btmName, applyDatasVO, attrVOS, dataObjectVO);
                     CodeOrderDTO orderDTO = new CodeOrderDTO();
                     orderDTO.setCodeClassifyOid(codeClassify.getOid());//分类主键
                     //码段设置
                     List<SectionVO> section = new ArrayList<>();
                     SectionVO sectionVO = new SectionVO();
                     sectionVO.setValue(secValue);
                     sectionVO.setName(secName);
                     section.add(sectionVO);
                     log.info("end：规则获取完毕");
                     List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(section, ruleVO, classifyFullInfo);
                     log.info("end：码段获取完毕");
                     orderDTO.setSecDTOList(codeOrderSecDTOList);//分类码段
                     mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs, false);
                     allResultDataObjectDetailDOS.addAll(resultDataObjectDetailDOs);
                  }
                  //更新数据（更新状态）
                  if (!CollectionUtils.isEmpty(editObjectList)) {
                     DataObjectVO dataObjectVO = new DataObjectVO();
                     ApplyDatasVO applyDatasVO = new ApplyDatasVO();
                     applyDatasVO.setObject(editObjectList);
                     LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
                     CodeClassifyVO codeClassifyVO = new CodeClassifyVO();
                     BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassify, codeClassifyVO);
                     this.getConfigDatas(systemId, btmName, applyDatasVO, attrVOS, dataObjectVO);
                     mdmIOService.batchSyncEditDatas(codeClassifyVO, dataObjectVO, resultDataObjectDetailDOs, false);
                     allResultDataObjectDetailDOS.addAll(resultDataObjectDetailDOs);
                  }
                  Object paramObject = JSONObject.toJSON(allDatasVO);
                  paramString = Func.isEmpty(paramObject) ? "" : paramObject.toString();
                  Object backObject = JSONObject.toJSON(allResultDataObjectDetailDOS);
                  backString = Func.isEmpty(backObject) ? "" : backObject.toString();
               }
            } catch (Throwable e) {
               e.printStackTrace();
               log.error("查询失败--->" + e);
               success = false;
               backString = "查询失败--->" + e;
               msg = "查询失败--->" + e;
               throw new VciBaseException(e.getMessage());
            } finally {
               try {
                  //记录日志
                  this.saveLogs(systemId, systemId, paramString, backString, success, msg, "queryData");
               } catch (Throwable e) {
                  e.printStackTrace();
                  log.error(e.getMessage());
                  throw new VciBaseException(e.getMessage());
               }
            }
         }else{
            throw new Throwable("接口未返回信息");
         }
         catch (Throwable e){
            log.error("查询失败--->"+e);
      }catch (Throwable e1){
         e1.printStackTrace();
         log.error("查询失败--->" + e1);
         //paramString="";
         success = false;
         backString = "查询失败--->" + e1;
         msg = "查询失败--->" + e1;
         try {
            //记录日志
            this.saveLogs(systemId, systemId, paramString, backString, success, msg, "queryData");
         } catch (Throwable e) {
            e.printStackTrace();
            log.error(e.getMessage());
            throw new ServiceException(e.getMessage());
         }
         throw new ServiceException(e1.getMessage());
      }
   }

   /***
    * 记录日志信息
    * @param systemId
    * @param parmaData
    * @param result
    * @return
    */
   private  void saveLogs(String systemId,String systemName,String parmaData, String result,boolean isSucess,String msg,String operation){
      //记录日志信息
      DockingLog dockingLoge=new DockingLog();
      //String oid=redisService.getUUIDEveryDay();
      dockingLoge.setSystemCode(StringUtils.isBlank(systemId)?"-":systemId);//设置系统标识
      dockingLoge.setSystemName(StringUtils.isBlank(systemName)?"-":systemName);
      dockingLoge.setMsg(msg);//日志消息
      dockingLoge.setClassifyId("-");//分类编号
      dockingLoge.setClassifyName("-");//分类名称
      dockingLoge.setClassifyOid("-");//分类主键
      dockingLoge.setUniqueCode("-");//唯一标识
      dockingLoge.setSystemOid("-");//系统标识
//        dockingLogeDO.setName(operation);
      //dockingLogeDO.setOid(oid);//日志主键
      dockingLoge.setParamString(parmaData);//参数信息
      dockingLoge.setReturnString(result);//返回信息
      dockingLoge.setType(operation);//日志操作类型
      dockingLoge.setCreateTime(new Date());
      if(isSucess) {
         dockingLoge.setInterfaceStatus("true");//接口集成状态
      }else{
         dockingLoge.setInterfaceStatus("false");//接口集成状态
      }
      dockingLogeService.save(dockingLoge);
      log.info("集成推送数据,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
   }

   /***
    * 根据传入的参数信息校验码段规则
    */
@@ -410,6 +599,7 @@
      }
      return codeOrderSecDTOList;
   }

   /***
    * 读取属性映射配置信息
    * @param systemId
@@ -534,27 +724,30 @@
         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();//制造型号代号
    initProperty("mmodelCode","","mmodelCode",propList);
    String projectCode= searchItemDataVO.getProjectcode();//项目编码
    initProperty("projectcode","","projectCode",propList);
    String projectItem=searchItemDataVO.getProjectitem();//项目代号
    initProperty("projectitem","","projectItem",propList);
    String materialCode=searchItemDataVO.getMaterialcode();//产品编码
    initProperty("materialcode","","materialCode",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 mmodelCode=searchItemDataVO.getMMODELCODE();//制造型号代号
    initProperty("mmodelcode","",mmodelCode,propList);
    String projectCode= searchItemDataVO.getPROJECTCODE();//项目编码
    initProperty("projectcode","",projectCode,propList);
    String projectItem=searchItemDataVO.getPROJECTITEM();//项目代号
    initProperty("projectitem","",projectItem,propList);
    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；
    applyDataVO.setOperate(operation);
    applyDataVO.setCode(code);
    if(isenabled.equals(0)){
    if(isenabled.equals("0")){
       applyDataVO.setStatus(CodeDefaultLC.DISABLE.getValue());
    }else{
       applyDataVO.setStatus(CodeDefaultLC.RELEASED.getValue());
@@ -565,13 +758,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中数据，对比后插入dockingtask
    * @param type
@@ -589,94 +784,104 @@
      }
      Map<String ,List<DockingSystemConfig>> sysIntInfoDOMap = new HashMap<>();//key=classifyoid,value=list<map>
      for (DockingSystemConfig dockingSystemConfig:dockingSystemConfigList){
         List<DockingSystemConfig> dockingSystemList = sysIntInfoDOMap.get(dockingSystemConfig.getClassifyOid());
         if(dockingSystemList==null){
            dockingSystemList = new ArrayList<>();
         }
         dockingSystemList.add(dockingSystemConfig);
         sysIntInfoDOMap.put(dockingSystemConfig.getClassifyOid(),dockingSystemList);
      }
      //根据类型去查询需要集成的分类或者数据
      LambdaQueryWrapper<DockingData> queryWrapper = Wrappers.<DockingData>lambdaQuery();
      queryWrapper.eq(DockingData::getSendFlag,"false");
      if(type==2){
         queryWrapper.eq(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
      }else {
         queryWrapper.notIn(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
      }
      List<DockingData> dataList = dockingDataService.list(queryWrapper);

      for (DockingData mapi:dataList){
         WebUtil.setPersistence(false);
         String dataoid = mapi.getOid();//data对象的oid
         String classifyoid = mapi.getClassifyOid();
         String id = mapi.getId();
         String uniquecode = mapi.getUniqueCode();
         String btmid = mapi.getBtmId();
         String btmoid = mapi.getBtmOid();
         String sendtype = mapi.getSendType();
         String classifyid = mapi.getClassifyId();
         String classifyname = mapi.getClassifyName();
         String curentClassOid=null;
         if(type==2){
            curentClassOid=btmoid;
         }else{
            curentClassOid=classifyoid;
         }
         List<DockingSystemConfig> effectiveSysIntInfoVOs=new ArrayList<>();
         //根据当前数据的id，查询获取哪些系统需要做集成
         List<CodeClassify> parentLeveDO= codeClassifyService.selectAllLevelParentByOid(curentClassOid);
         if(CollectionUtils.isEmpty(parentLeveDO)){
            continue;//说明这个分类被删掉了，不做处理
         }
         Map<String, CodeClassify> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));

         oidCodeclassifyDOMap.keySet().forEach(oid->{
            if(sysIntInfoDOMap.containsKey(oid)){
               List<DockingSystemConfig> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
               effectiveSysIntInfoVOs.addAll(sysIntInfoDOS);
         String classifyOid= dockingSystemConfig.getClassifyOid();
         String codeclassifOid=codeClassifyService.selectLeafByPid(classifyOid);
         List<String> codeList= VciBaseUtil.str2List(codeclassifOid);
         codeList.stream().forEach(oid -> {
            List<DockingSystemConfig> dockingSystemList = sysIntInfoDOMap.get(oid);
            if(Func.isEmpty(dockingSystemList)){
               dockingSystemList=new ArrayList<>();
            }
            dockingSystemList.add(dockingSystemConfig);
            sysIntInfoDOMap.put(oid,dockingSystemList);
         });
         //如果校验的系统接口信息不存在，则数据不不往信息里推送
         if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
            continue;
         }
         List<DockingTask> dockingTask_insert = new ArrayList<>();
         for (DockingSystemConfig sysIntInfoVOi:effectiveSysIntInfoVOs){
            DockingTask dockingTask = new DockingTask();
            dockingTask.setOid(VciBaseUtil.getPk());
            dockingTask.setSendFlag(SEND_FLAG_FALSE);
            dockingTask.setId(id);//编码
            dockingTask.setUniqueCode(uniquecode);
            dockingTask.setBtmOid(btmoid);//数据oid
            dockingTask.setBtmId(btmid);//数据业务类型id
            dockingTask.setClassifyId(classifyid);//数据在分类id
            dockingTask.setClassifyOid(classifyoid);//数据所在分类oid
            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
            dockingTask.setSystemCode(sysIntInfoVOi.getSysBaseId());//系统编码
            dockingTask.setSystemName(sysIntInfoVOi.getSysBaseName());//系统name
            dockingTask_insert.add(dockingTask);
         }

         if(dockingTask_insert.size()!=0) {
            dockingTaskService.saveBatch(dockingTask_insert);
         }
         //dockingTaskDaoI.updateByPrimaryKey方法报错了，所以手写了这个
         boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
         if(!u){
            log.error("集成data分解任务失败！dataoid:"+dataoid);
            continue;
         }
      }
      sysIntInfoDOMap.forEach((classifyOid,effectiveSysIntInfoVOs)->{
         //根据类型去查询需要集成的分类或者数据
         LambdaQueryWrapper<DockingData> queryWrapper = Wrappers.<DockingData>lambdaQuery();
         queryWrapper.eq(DockingData::getSendFlag,"false");
         if(type==2){
            queryWrapper.eq(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY);
         }else {
            queryWrapper.ne(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY);
            queryWrapper.eq(DockingData::getClassifyOid,classifyOid);
         }
         List<DockingData> dataList = dockingDataService.list(queryWrapper);
         for (DockingData mapi:dataList){
            WebUtil.setPersistence(false);
            String dataoid = mapi.getOid();//data对象的oid
            String dataClassifyOid = mapi.getClassifyOid();
            String id = mapi.getId();
            String uniquecode = mapi.getUniqueCode();
            String btmid = mapi.getBtmId();
            String btmoid = mapi.getBtmOid();
            String sendtype = mapi.getSendType();
            String classifyid = mapi.getClassifyId();
            String classifyname = mapi.getClassifyName();
            String curentClassOid=null;
            if(!dataClassifyOid.equals(classifyOid)){
               continue;
            }
            /*if(type==2){
               curentClassOid=btmoid;
            }else{
               curentClassOid=classifyoid;
            }*/
            /*//根据当前数据的id，查询获取哪些系统需要做集成
            List<CodeClassify> parentLeveDO= codeClassifyService.selectAllLevelParentByOid(curentClassOid);
            if(CollectionUtils.isEmpty(parentLeveDO)){
               continue;//说明这个分类被删掉了，不做处理
            }
            Map<String, CodeClassify> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));

            oidCodeclassifyDOMap.keySet().forEach(oid->{
               if(sysIntInfoDOMap.containsKey(oid)){
                  List<DockingSystemConfig> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
                  effectiveSysIntInfoVOs.addAll(sysIntInfoDOS);
               }
            });
            //如果校验的系统接口信息不存在，则数据不不往信息里推送
            if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
               continue;
            }*/
            List<DockingTask> dockingTask_insert = new ArrayList<>();
            for (DockingSystemConfig sysIntInfoVOi:effectiveSysIntInfoVOs){
               DockingTask dockingTask = new DockingTask();
               dockingTask.setOid(VciBaseUtil.getPk());
               dockingTask.setSendFlag(SEND_FLAG_FALSE);
               dockingTask.setId(id);//编码
               dockingTask.setUniqueCode(uniquecode);
               dockingTask.setBtmOid(btmoid);//数据oid
               dockingTask.setBtmId(btmid);//数据业务类型id
               dockingTask.setClassifyId(classifyid);//数据在分类id
               dockingTask.setClassifyOid(dataClassifyOid);//数据所在分类oid
               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
               dockingTask.setSystemCode(sysIntInfoVOi.getSysBaseId());//系统编码
               dockingTask.setSystemName(sysIntInfoVOi.getSysBaseName());//系统name
               dockingTask_insert.add(dockingTask);
            }

            if(dockingTask_insert.size()!=0) {
               dockingTaskService.saveBatch(dockingTask_insert);
            }
            //dockingTaskDaoI.updateByPrimaryKey方法报错了，所以手写了这个
            boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
            if(!u){
               log.error("集成data分解任务失败！dataoid:"+dataoid);
               continue;
            }
         }
      });

   }

   /***
@@ -687,7 +892,7 @@
      for (DockingTask dockingTask:dockingTaskList){
         //每个task一个事务，开启
         String paramString="";
         String sendString="";
         Object sendString="";
         String backString="";
         //查询系统接口信息,ip method,dataType
         String systeminfooid = dockingTask.getSysInfoOid();//sysininfo 的oid
@@ -721,8 +926,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());
@@ -739,15 +944,16 @@
         }
      }
   }

   /***
    * 发送编码主数据
    */
   private void sendpushDataForService (List<DockingTask> dockingTaskS){
   private void sendpushDataForService(List<DockingTask> dockingTaskS){
      //每个task依次执行推送
      for (DockingTask dockingTask:dockingTaskS){
         //每个task一个事务，开启
         String paramString="";
         String sendString="";
         Object sendString="";
         String backString="";
         try {
            //查询系统接口信息,ip method,dataType
@@ -763,16 +969,35 @@
            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<>();
            if (r == null) {
               JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid);
               data = (Map) josni;
            // TODO: 回收编码的情况，会出现数据已经回收，但是事务还未执行的情况，
            //  导致取不到码值，所以这儿通过查询码值表中存储的已回收的业务数据信息，解析出来
            if (!r.isSuccess() || Func.isEmpty(r.getData())) {
               List<CodeAllCode> codeAllCodes = codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getId, dockingTask.getId()));
               CodeAllCode codeAllCode = codeAllCodes.get(0);
               BaseModel baseModel = JSONObject.parseObject(codeAllCode.getBusinessData(), BaseModel.class);
               Map<String, Object> objectMap = VciBaseUtil.objectToMap(baseModel);
               for (Map.Entry<String,Object> entry : objectMap.entrySet()){
                  if(entry.getKey().equals("data") && Func.isNotEmpty(entry.getValue())){
                     Map<String, Object> dataMap = (Map<String,Object>)((JSONObject) entry.getValue());
                     for(Map.Entry<String,Object> dataEntry : dataMap.entrySet()){
                        String v = String.valueOf(dataEntry.getValue());
                        data.put(dataEntry.getKey().toLowerCase(Locale.ROOT), v == null ? "" : v);
                     }
                  }else{
                     String key = entry.getKey().toLowerCase(Locale.ROOT);
                     String value = String.valueOf(entry.getValue());
                     data.put(key, value == null ? "" : value);
                  }
               }
               /*JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid);
               data = (Map) josni;*/
            } else {
               data = r.getData().get(0);
            }
            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);
@@ -791,12 +1016,14 @@
            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","");
               if(StringUtils.isBlank(code)) {//如果是集团码，没有领取到集团码则任务不结束等待集团码申请后再通过定时器调用集团码段
               if(StringUtils.isBlank(code)) {
                  //如果是推送集团码，没有领取到集团码则任务不结束等待集团码申请后再通过定时器调用集团码段
                  dockingTask.setDescription("等待集团申请集团码");
                  // TODO：可能会出现未获取到集团码，但是又立马执行了回收，此时这条任务就永远无法结束,所以这儿判断只要是集团码为空，并且是回收的就关闭推送这条任务
                  dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE);
                  dockingTask.setLastModifyTime(new Date());
                  dockingTaskService.updateById(dockingTask);
@@ -821,7 +1048,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());
@@ -837,24 +1065,25 @@
         }
      }
   }

   /***
    * 调用接口
    * @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 {
         boolean usedFlag= dockingSystemConfig.getUsedFlag().equals("true")?true:false;
         if(!usedFlag){
            throw  new Throwable("接口已经停用！");
            throw new Throwable("接口已经停用！");
         }
         String type = dockingSystemConfig.getInterfaceType().toLowerCase(Locale.ROOT);//get/post/webserver/corba
         String paramType = dockingSystemConfig.getParamType();//xml/json
@@ -879,17 +1108,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);
@@ -987,10 +1221,11 @@
         }
      }
   }

   /***
    * 查询需要集成的业务数据任务
    */
   private void sendpushDataForService (){
   private void sendpushDataForService(){
      initSysadmin();
      //查询哪些任务还没有执行完成
      //VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
@@ -1010,7 +1245,7 @@
    */
   private void sendpushClsfForService(){
      initSysadmin();
   /*   //查询哪些任务还没有执行完成
      /*   //查询哪些任务还没有执行完成
      VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
      queryWrapper.addQueryMap("sendFlag",MdmDuckingConstant.SEND_FLAG_FALSE);
      queryWrapper.addQueryMap("btmId",DOCKING_DEFAULT_CLASSIFY.toUpperCase(Locale.ROOT));
@@ -1023,6 +1258,7 @@
      List<DockingTask> dockingTaskDOS = dockingTaskService.list(queryWrapper);
      sendpushClsfForService(dockingTaskDOS);
   }

   public void initSysadmin(){
      SessionInfo sessionInfo = new SessionInfo();
      sessionInfo.setUserId("sysAdmin");
@@ -1032,6 +1268,7 @@
      sessionInfo.setUserSecret(UserSecretEnum.PRIVACY.getValue()+"");
      WebUtil.setSessionInfo(sessionInfo);
   }

   /**
    * dockingdata根据oid修改sendflag
    * @param oid
@@ -1047,5 +1284,6 @@
      }
      return u;
   }

}