From 10d86aa74f50336a469385be2b2d14410438a234 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期二, 24 六月 2025 18:22:44 +0800
Subject: [PATCH] 更改

---
 src/test/java/com/gs/xky/XkyApplicationTests.java |  159 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 135 insertions(+), 24 deletions(-)

diff --git a/src/test/java/com/gs/xky/XkyApplicationTests.java b/src/test/java/com/gs/xky/XkyApplicationTests.java
index a127cb1..7c2e4e0 100644
--- a/src/test/java/com/gs/xky/XkyApplicationTests.java
+++ b/src/test/java/com/gs/xky/XkyApplicationTests.java
@@ -1,59 +1,170 @@
 package com.gs.xky;
 
 import com.alibaba.fastjson.JSON;
-import com.gs.xky.config.*;
+import com.gs.xky.config.ApiResponse;
+import com.gs.xky.config.BodyParam;
+import com.gs.xky.config.DataAcquisitionConfiguration;
+import com.gs.xky.config.XkyCommonParam;
+import com.gs.xky.dto.BarcodeDeliveryNo;
+import com.gs.xky.dto.XkyDetail;
 import com.gs.xky.dto.XkyEntity;
-import com.gs.xky.service.ApiService;
+import com.gs.xky.entity.MesInvItemArn;
+import com.gs.xky.service.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.io.IOException;
+import java.util.List;
 
 @SpringBootTest
 class XkyApplicationTests {
 
 
     @Autowired
+    private XkyService xkyService;
+
+    @Autowired
     private ApiService apiService;
+
+    @Autowired
+    private MesStaffService staffService;
+
+    @Autowired
+    private DeliveryNoticeService deliveryNoticeService;
+
+    @Autowired
+    private TblBarcodeInformationService barcodeInformationService;
+
+    @Autowired
+    private MesInvItemArnService invItemArnService;
+    @Autowired
+    private PurchaseService service;
+    @Autowired
+    private DingtalkInfoService dingtalkInfoService;
 
     @Test
     void contextLoads() throws IOException {
 
-        long currentTimeMillis = System.currentTimeMillis();
+        List<MesInvItemArn> itemArnMinus = invItemArnService.getItemArnMinus();
 
-        ApiCommonParam apiParam = new ApiCommonParam();
-        apiParam.setAppKey(DataAcquisitionConfiguration.TEST_APP_KEY);//鍙戞惡瀹簯鎻愪緵鐨刟ppKey
-        apiParam.setVersion("1.0");//鎺ュ彛鐗堟湰
-        apiParam.setOperateCompanyCode(DataAcquisitionConfiguration.TEST_COMPANY_CODE);//鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
-        apiParam.setOwnerCompanyCode(DataAcquisitionConfiguration.TEST_COMPANY_CODE);//鏁版嵁鎵�灞炲叕鍙哥紪鐮�,闈為泦鍥㈠叕鍙搁粯璁よ祴鍊间负鎿嶄綔鍏徃
-        apiParam.setTimestamps(currentTimeMillis / 1000);//褰撳墠鏃堕棿瀵瑰簲鐨勬椂闂存埑锛堢鏁帮級
+        deliveryNoticeService.processMesInvItemArnStatusAsync(itemArnMinus);
 
-        String appSecret = DataAcquisitionConfiguration.TEST_APP_SECRET;//鎼哄浜戞彁渚涚殑appSecret
+    }
 
-        String sign = SignUtils.buildCurrentSign(JSON.toJSONString(apiParam), appSecret);
-        apiParam.setSign(sign);
+    @Test
+    public void getDeviceRealTimeData() throws IOException {
+        xkyService.GetSaveDetail();
+    }
+
+    @Test
+    void cs() throws IOException {
+
+        String str = "2225060624DY;";
 
 
-        // 璁$畻浜斿垎閽熷墠鐨勬椂闂存埑
-        long startDate = currentTimeMillis - (65 * 60 * 1000); // 5 鍒嗛挓 = 5 * 60 * 1000 姣
+        String[] split = str.split(";");
+
+        for (String s : split) {
+            XkyCommonParam param = XkyCommonParam.GetInit();
+
+            // 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
+            BodyParam bodyParam = new BodyParam();
+
+            bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
+            bodyParam.setDeliveryNo(s);
+
+            param.setBody(bodyParam);
+
+            ApiResponse<XkyDetail> detail = apiService.sendListRequest(param, XkyDetail.class, "https://openapi.xiekeyun.com/delivery/getDetail.json");
+
+            XkyDetail deliveryNo = detail.getData();
+
+            if (deliveryNo == null) {
+                System.out.println("涓虹┖鐨勯�佽揣鍗曞彿" + s);
+                return;
+            }
+
+            if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
+                XkyEntity xkyEntity = new XkyEntity();
+                xkyEntity.setDeliveryNo(deliveryNo.getDeliveryNo());
+                xkyService.remove1(xkyEntity);
+            } else if ("1".equals(deliveryNo.getStatus()) && ("2".equals(deliveryNo.getLogisticsStatus()) || "1".equals(deliveryNo.getLogisticsStatus()))) {
+                XkyDetail detail1 = deliveryNo;
+                deliveryNoticeService.saveDeliveryNotice(detail1);
+                List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
+                barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
+                if ("2".equals(deliveryNo.getLogisticsStatus())) {
+                    deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
+                }
+            }
+        }
+    }
+
+    private List<BarcodeDeliveryNo> GetBarcodeInformation(String deliveryNo) throws IOException {
+        XkyCommonParam param = XkyCommonParam.GetInit();
 
         // 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
         BodyParam bodyParam = new BodyParam();
-        bodyParam.setStartDate(startDate);
-        bodyParam.setEndDate(currentTimeMillis);
-        bodyParam.setErpCode("Z106");
-        bodyParam.setStatus(new int[]{1});
-        bodyParam.setLogisticsStatus(2);
 
-        XkyCommonParam param = new XkyCommonParam();
-        param.setCommonParam(apiParam);
+        bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
+        bodyParam.setDeliveryNo(deliveryNo);
+
         param.setBody(bodyParam);
 
 
-        ApiResponse<XkyEntity> xkyEntityApiResponse = apiService.sendListRequest(param, XkyEntity.class, "https://openapi.xiekeyun.com/delivery/getNoList.json");
+        ApiResponse<BarcodeDeliveryNo> noList = apiService.sendListRequest(param, BarcodeDeliveryNo.class, "https://openapi.xiekeyun.com/barcode/byDeliveryNo.json");
 
-        System.out.println(JSON.toJSONString(xkyEntityApiResponse));
+        return noList.getDataList();
     }
 
-}
+    @Test
+    void cs1() throws IOException {
+//        DingTalkParam dingTalkParam = new DingTalkParam(0);
+//
+//        DingTalkResponse<EmployeeInfo> employeeInfoDingTalkResponse = apiService.sendListRequest(dingTalkParam, EmployeeInfo.class, "http://192.168.1.64/eHR/eHRExternalService/Service.ashx");
+//
+//        //閫犳ⅵ鑰咃紙娴欐睙锛夌鎶�鏈夐檺鍏徃 cUnitName
+//        //http://192.168.1.64/eHR
+//        List<EmployeeInfo> collect = employeeInfoDingTalkResponse.getData().stream().filter(s -> "閫犳ⅵ鑰咃紙娴欐睙锛夌鎶�鏈夐檺鍏徃".equals(s.getCUnitName())).collect(Collectors.toList());
+//        System.out.println(collect.size());
+//
+//        List<List<EmployeeInfo>> partition = ListUtil.partition(collect, 500);
+//
+//        partition.forEach(list -> {
+//            staffService.SaveStaff(list);
+//        });
+        XkyCommonParam param = XkyCommonParam.GetInit();
+        String jsonString = JSON.toJSONString(param);
+        System.out.println(jsonString);
+    }
+
+    @Test
+    void cs2() throws IOException {
+//        DingTalkParam dingTalkParam = new DingTalkParam(1);
+//
+//        DingTalkResponse<EmployeeInfo> employeeInfoDingTalkResponse = apiService.sendListRequest(dingTalkParam, EmployeeInfo.class, "http://192.168.1.64/eHR/eHRExternalService/Service.ashx");
+//
+//        //閫犳ⅵ鑰咃紙娴欐睙锛夌鎶�鏈夐檺鍏徃 cUnitName
+//        //http://192.168.1.64/eHR
+//        List<EmployeeInfo> collect = employeeInfoDingTalkResponse.getData().stream().filter(s -> "閫犳ⅵ鑰咃紙娴欐睙锛夌鎶�鏈夐檺鍏徃".equals(s.getCUnitName())).collect(Collectors.toList());
+//        System.out.println(collect.size());
+//
+//        List<List<EmployeeInfo>> partition = ListUtil.partition(collect, 100);
+//
+//        partition.forEach(list -> {
+//            staffService.UpdateStaff(list);
+//        });
+
+    }
+
+    @Test
+    void cs3() throws Exception {
+//        dingtalkInfoService.sendMessage("CGJY20250412166");
+
+//        XkyEntity xkyEntity = new XkyEntity();
+//        xkyEntity.setDeliveryNo("222505057541");
+//        xkyService.remove1(xkyEntity);
+
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.3