fix(jg):西安数据导入接口修改

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -298,6 +298,7 @@ public class XiAnDataDockServiceImpl {
             if (this.checkEquCodeUniqueness(data.getEquCode())){
                 data.setOriginalEquCode(data.getEquCode());
                 data.setEquCodeType("2");
+                data.setEquCode("");
             }
         } else {
             data.setEquCode("");

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -116,7 +116,17 @@ public class DataDockServiceImpl {
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public boolean xiAnSaveEquipmentData(List<Map<String, Object>> equLists) {
-        CompletableFuture.allOf(equLists.stream().map(equ -> CompletableFuture.runAsync(() -> saveEquipmentDataInTransaction(equ, "jg_his_xa", null))).toArray(CompletableFuture[]::new)).join();
+        String appKey = RequestContext.getAppKey();
+        String product = RequestContext.getProduct();
+        String token = RequestContext.getToken();
+        CompletableFuture.allOf(
+                equLists.stream().map(equ -> CompletableFuture.runAsync(() -> {
+                    RequestContext.setAppKey(appKey);
+                    RequestContext.setProduct(product);
+                    RequestContext.setToken(token);
+                    saveEquipmentDataInTransaction(equ, "jg_his_xa", null);
+                })).toArray(CompletableFuture[]::new)
+        ).join();
         return Boolean.TRUE;
     }
 
@@ -350,17 +360,17 @@ public class DataDockServiceImpl {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        // 提取 companyCode
-        String companyCode = Optional.ofNullable(equ.get("equCodeType"))
-                .filter(type -> Objects.equals(type, 1)).flatMap(type -> Optional.ofNullable(equ.get("equCode"))
-                        .map(String::valueOf).map(String::trim)
-                        .filter(code -> code.length() >= 9)
-                        .map(code -> code.substring(3, 9)))
-                .orElse("");
+        String companyCode = "1".equals(equ.get("equCodeType"))
+                ? String.valueOf(equ.get("equCode"))
+                : String.valueOf(equ.get("originalEquCode"));
 
+        companyCode = companyCode.trim();
+        if (companyCode.length() > 9) {
+            companyCode = companyCode.substring(4, 10);
+        }
         // 直接获取公司名称
         String companyName = countyMap.get(companyCode);
-        if (companyName != null) {
+        if (companyName != null && !companyName.trim().isEmpty()) {
             supervisionInfo.setOrgBranchCode(companyCode);
             supervisionInfo.setOrgBranchName(companyName);
         } else {