Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java

@@ -1,6 +1,7 @@
package com.vci.ubcs.code.applyjtcodeservice.feigh;

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.toolkit.Wrappers;
@@ -12,12 +13,14 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.util.SaveLogUtil;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -79,6 +82,8 @@
   @Autowired(required = false)
   private IMdmEngineClient mdmEngineClient;

   private final SaveLogUtil saveLogUtil;

   /***
    * 申请集团编码
    * @return
@@ -119,9 +124,6 @@
      }
   }

   /*
    * 主数据业务服务
    */
   /**
    * 获取集团集团码，赋值到主数据
    * @param dockingReturnStoreVO
@@ -133,7 +135,6 @@
      log.info("获取集团集团码，赋值到主数据 start");
      try {
         Map<String,List<BaseModel>> editObjectMap = new HashMap<>();

         List<DockingPreApplyForm> dockingPreApplyFormList = new ArrayList();
         //String classId = javaObject.getClassId();
         //String sysName = javaObject.getSysName();
@@ -170,6 +171,8 @@
            } else if ("9".equals(formState)) {
               msg = "审核中";
            }
            // 如果返回了审查意见就用返回的
            msg = Func.isNotBlank(mainData.getExamineOpinion()) ? msg+"，意见："+mainData.getExamineOpinion():msg;
            jcontent.put("applyId", applyId);
            jcontent.put("formState", formState);
            jcontent.put("customCoding", customCoding);
@@ -182,6 +185,7 @@
            DockingPreApplyForm dockingPreApplyForm = oldDockingPreApplyFormList.get(0);
            dockingPreApplyForm.setMsg(msg);
            dockingPreApplyForm.setCode("1");
            dockingPreApplyForm.setLastModifyTime(new Date());
            if (res) {
               dockingPreApplyForm.setGroupCode(customCoding);
            }
@@ -220,9 +224,11 @@
         if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
            dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
         }
         saveLogUtil.operateLog("申请单结果返回",false, JSON.toJSONString(dockingReturnStoreVO.getMainData()));
      }catch (Throwable e){
         e.printStackTrace();
          return R.fail("集团码集成赋值失败，原因："+e.getMessage());
         saveLogUtil.operateLog("申请单结果返回",true,"错误信息："+e.getMessage()+"\n"+ JSON.toJSONString(dockingReturnStoreVO.getMainData()));
         return R.fail("集团码集成赋值失败，原因："+e.getMessage());
      }
      log.info("获取集团集团码，赋值到主数据 end");
      return R.success("集团码赋值成功");
@@ -307,8 +313,7 @@
    * @param jclassObject
    * @throws Throwable
    */
   private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
      throws Throwable {
   private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list) throws Throwable {
      String nodeLinkName = jclassObject.getNodeLinkName();
      try {
         String jclassId =StringUtils.isBlank(jclassObject.getId())?"":jclassObject.getId();