【数据资产】

数据港接口调用

@@ -21,4 +21,6 @@ public class DataPortConfig {
     private String requestUri;
     private String requestUri;
     private String operatorRegisterUri;
     private String operatorRegisterUri;
     private String enterpriseRegisterUri;
     private String enterpriseRegisterUri;
+    private String operatorUpdateUri;
+    private String enterpriseUpdateUri;
 }
 }

@@ -4,7 +4,8 @@ import com.csbr.cloud.common.entity.CsbrUpdate;
 import com.csbr.cloud.common.response.CommonRes;
 import com.csbr.cloud.common.response.CommonRes;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
 import com.csbr.qingcloud.portal.domain.vo.*;
 import com.csbr.qingcloud.portal.domain.vo.*;
-import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
+import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
 import com.csbr.qingcloud.portal.service.DataPortService;
 import com.csbr.qingcloud.portal.service.DataPortService;
 import com.csbr.qingcloud.portal.service.DemandService;
 import com.csbr.qingcloud.portal.service.DemandService;
@@ -136,13 +137,16 @@ public class DemandController {
     private MfEnterpriseService mfEnterpriseService;
     private MfEnterpriseService mfEnterpriseService;
 
 
     @Resource
     @Resource
+    private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService;
+
+    @Resource
     private DataPortService dataPortService;
     private DataPortService dataPortService;
 
 
     @GetMapping("/test")
     @GetMapping("/test")
     public CommonRes getToken(@RequestParam String guid) {
     public CommonRes getToken(@RequestParam String guid) {
-        MfEnterprise entity = mfEnterpriseService.getById(guid);
-        dataPortService.operatorRegister(entity);
-        dataPortService.enterpriseRegister(entity);
+        MfEnterpriseChangeApprove entity = mfEnterpriseChangeApproveService.getById(guid);
+        dataPortService.enterpriseUpdate(entity);
+        dataPortService.operatorUpdate(entity);
         return CommonRes.success(Boolean.TRUE);
         return CommonRes.success(Boolean.TRUE);
     }
     }
     
     

@@ -2,6 +2,7 @@ package com.csbr.qingcloud.portal.service.impl;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.csbr.cloud.common.enums.RedisKeyEnum;
 import com.csbr.cloud.common.enums.RedisKeyEnum;
+import com.csbr.cloud.common.util.CsbrBeanUtil;
 import com.csbr.cloud.distributelock.util.RedisUtil;
 import com.csbr.cloud.distributelock.util.RedisUtil;
 import com.csbr.qingcloud.portal.config.DataPortConfig;
 import com.csbr.qingcloud.portal.config.DataPortConfig;
 import com.csbr.qingcloud.portal.domain.vo.dataPort.EnterpriseRegisterRQVO;
 import com.csbr.qingcloud.portal.domain.vo.dataPort.EnterpriseRegisterRQVO;
@@ -16,7 +17,6 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
@@ -43,26 +43,41 @@ public class DataPortServiceImpl implements DataPortService {
     @Resource
     @Resource
     private RedisUtil redisUtil;
     private RedisUtil redisUtil;
 
 
+    @Resource
+    private CsbrBeanUtil csbrBeanUtil;
+
     @Override
     @Override
     public void operatorRegister(MfEnterprise entity) {
     public void operatorRegister(MfEnterprise entity) {
+        log.info("======经办人用户注册开始======");
         OperatorRegisterRQVO operatorRegisterRQVO = beforeOperator(entity);
         OperatorRegisterRQVO operatorRegisterRQVO = beforeOperator(entity);
         dataPortConnectUtil.postByAuthKey(operatorRegisterRQVO, dataPortConfig.getOperatorRegisterUri());
         dataPortConnectUtil.postByAuthKey(operatorRegisterRQVO, dataPortConfig.getOperatorRegisterUri());
+        log.info("======经办人用户注册结束======");
     }
     }
 
 
     @Override
     @Override
     public void operatorUpdate(MfEnterpriseChangeApprove entity) {
     public void operatorUpdate(MfEnterpriseChangeApprove entity) {
-
+        log.info("======经办人用户更新开始======");
+        MfEnterprise mfEnterprise = csbrBeanUtil.convert(entity, MfEnterprise.class);
+        OperatorRegisterRQVO operatorRegisterRQVO = beforeOperator(mfEnterprise);
+        dataPortConnectUtil.postByAuthKey(operatorRegisterRQVO, dataPortConfig.getOperatorUpdateUri());
+        log.info("======经办人用户更新结束======");
     }
     }
 
 
     @Override
     @Override
     public void enterpriseRegister(MfEnterprise entity) {
     public void enterpriseRegister(MfEnterprise entity) {
+        log.info("======法人用户注册开始======");
         EnterpriseRegisterRQVO enterpriseRegisterRQVO = beforeEnterprise(entity);
         EnterpriseRegisterRQVO enterpriseRegisterRQVO = beforeEnterprise(entity);
         dataPortConnectUtil.postByAuthKey(enterpriseRegisterRQVO, dataPortConfig.getEnterpriseRegisterUri());
         dataPortConnectUtil.postByAuthKey(enterpriseRegisterRQVO, dataPortConfig.getEnterpriseRegisterUri());
+        log.info("======法人用户注册结束======");
     }
     }
 
 
     @Override
     @Override
     public void enterpriseUpdate(MfEnterpriseChangeApprove entity) {
     public void enterpriseUpdate(MfEnterpriseChangeApprove entity) {
-
+        log.info("======法人用户更新开始======");
+        MfEnterprise mfEnterprise = csbrBeanUtil.convert(entity, MfEnterprise.class);
+        EnterpriseRegisterRQVO enterpriseRegisterRQVO = beforeEnterprise(mfEnterprise);
+        dataPortConnectUtil.postByAuthKey(enterpriseRegisterRQVO, dataPortConfig.getEnterpriseUpdateUri());
+        log.info("======法人用户更新结束======");
     }
     }
 
 
     /**
     /**
@@ -90,7 +105,7 @@ public class DataPortServiceImpl implements DataPortService {
         operatorRegisterRQVO.setEnterpriseCode(entity.getSocialCreditCode());
         operatorRegisterRQVO.setEnterpriseCode(entity.getSocialCreditCode());
         OperatorSubordinateRQVO operatorSubordinateRQVO = new OperatorSubordinateRQVO();
         OperatorSubordinateRQVO operatorSubordinateRQVO = new OperatorSubordinateRQVO();
         operatorSubordinateRQVO.setEnterpriseName(entity.getTenantName());
         operatorSubordinateRQVO.setEnterpriseName(entity.getTenantName());
-        operatorSubordinateRQVO.setBusinessLicense(getUrl(entity.getBusinessLicenseJson()));
+        operatorSubordinateRQVO.setBusinessLicense(getName(entity.getBusinessLicenseJson()));
         operatorRegisterRQVO.setExtendInfo(operatorSubordinateRQVO);
         operatorRegisterRQVO.setExtendInfo(operatorSubordinateRQVO);
         return operatorRegisterRQVO;
         return operatorRegisterRQVO;
     }
     }
@@ -129,7 +144,7 @@ public class DataPortServiceImpl implements DataPortService {
         extendInfo.setBusinessScope(entity.getBusinessLicenseScope());
         extendInfo.setBusinessScope(entity.getBusinessLicenseScope());
         extendInfo.setIndustryCategory(industryDicMap.get(entity.getIndustry()));
         extendInfo.setIndustryCategory(industryDicMap.get(entity.getIndustry()));
         extendInfo.setIndustryCategory2(industryDicMap.get(entity.getIndustrySmallcode()));
         extendInfo.setIndustryCategory2(industryDicMap.get(entity.getIndustrySmallcode()));
-        extendInfo.setBusinessLicense(getUrl(entity.getBusinessLicenseJson()));
+        extendInfo.setBusinessLicense(getName(entity.getBusinessLicenseJson()));
         enterpriseRegisterRQVO.setExtendInfo(extendInfo);
         enterpriseRegisterRQVO.setExtendInfo(extendInfo);
         return enterpriseRegisterRQVO;
         return enterpriseRegisterRQVO;
     }
     }
@@ -157,4 +172,14 @@ public class DataPortServiceImpl implements DataPortService {
         }
         }
         return JSON.parseObject(businessLicenseJson).getString("url");
         return JSON.parseObject(businessLicenseJson).getString("url");
     }
     }
+
+    private String getName(String businessLicenseJson) {
+        if (StringUtils.isEmpty(businessLicenseJson)) {
+            return null;
+        }
+        if (businessLicenseJson.contains("[")) {
+            return JSON.parseArray(businessLicenseJson).getJSONObject(0).getString("name");
+        }
+        return JSON.parseObject(businessLicenseJson).getString("name");
+    }
 }
 }
\ No newline at end of file

@@ -103,7 +103,7 @@ public class DataPortConnectUtil {
     }
     }
 
 
     /**
     /**
-     * 调用数据港接口
+     * 调用数据港接口(authKey调用)
      * @return
      * @return
      */
      */
     public Object postByAuthKey(Object obj, String uri) {
     public Object postByAuthKey(Object obj, String uri) {
@@ -125,4 +125,27 @@ public class DataPortConnectUtil {
         return dataPortRes.getData();
         return dataPortRes.getData();
     }
     }
 
 
+    /**
+     * 调用数据港接口(Authorization调用)
+     * @return
+     */
+    public Object postByAuthorization(Object obj, String uri) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Content-Type", "application/json");
+        headers.set("Authorization", getToken());
+
+        HttpEntity<Object> request = new HttpEntity<>(obj, headers);
+        DataPortRes dataPortRes = restTemplate.postForObject(
+                dataPortConfig.getRequestUri() + uri
+                , request, DataPortRes.class);
+
+        if (ObjectUtils.isEmpty(dataPortRes)) {
+            throw new CsbrSystemException(SystemError.DATA_GET_ERROR, "调用数据港接口失败.");
+        }
+        if (200 != dataPortRes.getCode() && 201 != dataPortRes.getCode()) {
+            throw new CsbrSystemException(SystemError.DATA_GET_ERROR, dataPortRes.getMessage());
+        }
+        return dataPortRes.getData();
+    }
+
 }
 }
\ No newline at end of file