Merge remote-tracking branch 'origin/1103-edit_gsClient' into release

dxhy-core/src/main/java/com/dxhy/core/service/gsclient/GsClientService.java

@@ -0,0 +1,16 @@
+package com.dxhy.core.service.gsclient;
+
+import com.dxhy.core.entity.GsClient;
+
+import java.util.List;
+
+/**
+ * @title: GsClient
+ * @Author: wrr
+ * @Date: 2023/11/3 09:02
+ * @Description:
+ */
+public interface GsClientService {
+    void updateGsClient(List<GsClient> list);
+
+}

dxhy-core/src/main/java/com/dxhy/core/service/gsclient/GsClientServiceImpl.java

@@ -0,0 +1,33 @@
+package com.dxhy.core.service.gsclient;
+
+import com.dxhy.core.dao.GsClientMapper;
+import com.dxhy.core.entity.GsClient;
+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/3 09:03
+ * @Description:
+ */
+@Service
+@Slf4j
+public class GsClientServiceImpl implements GsClientService{
+    private static final String LOGGER_MSG = "pt(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);
+    }
+}

dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java

@@ -14,6 +14,7 @@ import com.dxhy.core.job.entity.SNSAPObject;
 import com.dxhy.core.job.entity.ScheduleJobEntity;
 import com.dxhy.core.job.service.InvoiceInterfaceService;
 import com.dxhy.core.job.service.ScheduleJobService;
+import com.dxhy.core.service.gsclient.GsClientService;
 import com.dxhy.core.util.HttpUtils;
 import com.dxhy.core.util.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -46,9 +47,6 @@ public class SdnyClientTask extends AbstractController {
     @Value("${po.password}")
     private String password;
 
-    @Resource
-    private GsClientMapper gsClientMapper;
-
     @Resource
     private InvoiceInterfaceService invoiceInterfaceService;
     @Resource
@@ -56,6 +54,9 @@ public class SdnyClientTask extends AbstractController {
     @Resource
     private ScheduleJobService scheduleJobService;
 
+    @Resource
+    private GsClientService gsClientService;
+
     /**
      * 核心线程池大小
      */
@@ -84,6 +85,7 @@ public class SdnyClientTask extends AbstractController {
                 // 需判断 设置不认证状态
                 String[] split = client.split(",");
                 for(int i = 0;i < split.length;i++) {
+                    try {
                         SNSAPObject object = new SNSAPObject();
                         object.setSYSID("FPXT");
                         object.setIFYWID("FI846");
@@ -117,15 +119,16 @@ public class SdnyClientTask extends AbstractController {
                         } else {
                             log.error("{}client:{},获取公司client出错:{}", LOGGER_MSG, "200", zmessage);
                         }
+                    } catch (Exception e) {
+                        //捕获异常 不抛出 一个公司的client出错不能影响其他的
+                        log.error("{}client:{},获取公司client出现异常:{}",LOGGER_MSG,client,e.getMessage());
+                    }
                 }
-                log.info("{}删除gs_client表数据", LOGGER_MSG);
+                //list中有可能存在已部分有异常的client的公司，因为这些公司是在异常发生之前存到list中的
-                gsClientMapper.deleteAll();
+                gsClientService.updateGsClient(list);
-                log.info("{}插入gs_client表", LOGGER_MSG);
-                gsClientMapper.insertList(list);
                 long endTime = System.currentTimeMillis();
                 log.debug("{}任务结束，耗时:{}", LOGGER_MSG, endTime - startTime);
 
-
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {