Merge branch 'feature/eidt_gsclientTask' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/GetGsClientTask.java

@@ -5,14 +5,13 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dxhy.order.baseservice.config.BaseServiceConfig;
 import com.dxhy.order.constant.OrderInfoContentEnum;
 import com.dxhy.order.constant.OrderInfoEnum;
-import com.dxhy.order.consumer.dao.GsClientMapper;
 import com.dxhy.order.consumer.modules.order.model.GsClient;
 import com.dxhy.order.consumer.modules.order.service.OrderCommonService;
 import com.dxhy.order.consumer.openapi.protocol.po.EsOutput;
 import com.dxhy.order.consumer.openapi.protocol.po.IsInput;
 import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam;
 import com.dxhy.order.consumer.openapi.protocol.po.PoCommonResponseParam;
-
+import com.dxhy.order.consumer.openapi.service.GsClientService;
 import com.dxhy.order.utils.HttpUtils;
 import com.dxhy.order.utils.JsonUtils;
 import com.xxl.job.core.biz.model.ReturnT;
@@ -20,7 +19,6 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
@@ -41,8 +39,9 @@ public class GetGsClientTask {
     private BaseServiceConfig baseServiceConfig;
     @Resource
     private OrderCommonService apiInvoiceCommonMapperService;
+
     @Resource
-    private GsClientMapper gsClientMapper;
+    private GsClientService gsClientService;
 
     @XxlJob("/getGsClient")
     public ReturnT<String> execute(String s) {
@@ -54,6 +53,7 @@ public class GetGsClientTask {
             String[] clientSplit = poClient.split(",");
             for(int i=0;i<clientSplit.length;i++){
                 String client = clientSplit[i];
+                try {
                     IsInput isInput = new IsInput();
                     isInput.setSYSID(OrderInfoEnum.SYS_SIGN_FP.getKey());
                     isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_GSCLIENT.getKey());
@@ -85,11 +85,12 @@ public class GetGsClientTask {
                     }else {
                         log.error("{}client:{},获取公司client出错:{}",LOGGER_MSG,client,zmessage);
                     }
+                } catch (Exception e) {
+                    //捕获异常 不抛出 一个公司的client出错不能影响其他的
+                    log.error("{}client:{},获取公司client出现异常:{}",LOGGER_MSG,client,e.getMessage());
+                }
             }
-            log.info("{}删除gs_client表数据",LOGGER_MSG);
+            gsClientService.updateGsClient(list);
-            gsClientMapper.deleteAll();
-            log.info("{}插入gs_client表",LOGGER_MSG);
-            gsClientMapper.insertList(list);
             long endTime = System.currentTimeMillis();
             log.info("{}任务结束，耗时:{}", LOGGER_MSG, endTime - startTime);
         } catch (Exception e) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/GsClientService.java

@@ -0,0 +1,15 @@
+package com.dxhy.order.consumer.openapi.service;
+
+import com.dxhy.order.consumer.modules.order.model.GsClient;
+
+import java.util.List;
+
+/**
+ * @title: GsClientService
+ * @Author: wrr
+ * @Date: 2023/11/2 15:49
+ * @Description:
+ */
+public interface GsClientService {
+    void updateGsClient(List<GsClient> list);
+}

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/GsClientServiceImpl.java

@@ -0,0 +1,35 @@
+package com.dxhy.order.consumer.openapi.service.impl;
+
+import com.dxhy.order.consumer.dao.GsClientMapper;
+import com.dxhy.order.consumer.modules.order.model.GsClient;
+import com.dxhy.order.consumer.openapi.service.GsClientService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @title: GsClientServiceImpl
+ * @Author: wrr
+ * @Date: 2023/11/2 15:52
+ * @Description:
+ */
+@Service
+@Slf4j
+public class GsClientServiceImpl implements GsClientService {
+    private static final String LOGGER_MSG = "(SAP获取公司clientService)";
+
+    @Resource
+    private GsClientMapper gsClientMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateGsClient(List<GsClient> list) {
+        log.info("{}删除gs_client表数据",LOGGER_MSG);
+        gsClientMapper.deleteAll();
+        log.info("{}插入gs_client表",LOGGER_MSG);
+        gsClientMapper.insertList(list);
+    }
+}