From ff9fc9d9fa53a0c9aacd9d5d4a9533114ee8b790 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 03 四月 2025 20:53:09 +0800
Subject: [PATCH] SRM增加log日志
---
src/main/java/com/gs/xky/service/XkyService.java | 30 ++++-----
src/main/resources/application.yml | 14 ++++
src/test/java/com/gs/xky/XkyApplicationTests.java | 78 +++++++++++++++++--------
3 files changed, 78 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/gs/xky/service/XkyService.java b/src/main/java/com/gs/xky/service/XkyService.java
index c16e49f..b907d43 100644
--- a/src/main/java/com/gs/xky/service/XkyService.java
+++ b/src/main/java/com/gs/xky/service/XkyService.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.gs.xky.config.ApiResponse;
@@ -13,6 +14,8 @@
import com.gs.xky.dto.XkyEntity;
import com.gs.xky.entity.*;
import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,9 +27,8 @@
@RequiredArgsConstructor
public class XkyService {
+ private static final Logger log = LoggerFactory.getLogger(XkyService.class);
private final ApiService apiService;
-
-
private final DeliveryNoticeService deliveryNoticeService;
private final TblBarcodeInformationService barcodeInformationService;
@@ -40,49 +42,45 @@
public void GetSaveDetail() throws IOException {
long currentTimeMillis = System.currentTimeMillis();
+ long startDate = currentTimeMillis - (20 * 60 * 1000); // 璁＄畻 20 鍒嗛挓鍓嶇殑鏃堕棿鎴�
XkyCommonParam param = XkyCommonParam.GetInit();
-
- // 璁＄畻浜斿垎閽熷墠鐨勬椂闂存埑
- long startDate = currentTimeMillis - (20 * 60 * 1000); // 1 鍒嗛挓 = 1 * 60 * 1000 姣
-
- // 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
BodyParam bodyParam = new BodyParam();
bodyParam.setStartDate(startDate);
bodyParam.setEndDate(currentTimeMillis);
bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
bodyParam.setStatus(new int[]{1, 6});
-// bodyParam.setLogisticsStatus(2);
-
param.setBody(bodyParam);
+
+ // 璁板綍璇锋眰鍙傛暟鏃ュ織
+ log.info("銆怗etSaveDetail 璇锋眰鍙傛暟銆戞椂闂�: {}, 鍙傛暟: {}", currentTimeMillis, JSONUtil.toJsonStr(param));
ApiResponse<XkyEntity> noList = apiService.sendListRequest(param, XkyEntity.class, "https://openapi.xiekeyun.com/delivery/getNoList.json");
-// List<String> deliveryNoList = noList.getDataList().stream().map(XkyEntity::getDeliveryNo).collect(Collectors.toList());
+ // 璁板綍杩斿洖鏁版嵁鏃ュ織
+ log.info("銆怗etSaveDetail 鍝嶅簲鏁版嵁銆戞椂闂�: {}, 杩斿洖: {}", currentTimeMillis, JSONUtil.toJsonStr(noList));
List<XkyEntity> deliveryNoList = noList.getDataList();
-
if (CollUtil.isEmpty(deliveryNoList)) {
+ log.info("銆怗etSaveDetail銆戣繑鍥炲垪琛ㄤ负绌猴紝璺宠繃澶勭悊");
return;
}
deliveryNoList.forEach(deliveryNo -> {
try {
-
if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
-
+ log.info("銆怗etSaveDetail銆戠Щ闄ら�佽揣鍗�: {}", deliveryNo.getDeliveryNo());
remove(deliveryNo);
-
} else if ("1".equals(deliveryNo.getStatus()) && "2".equals(deliveryNo.getLogisticsStatus())) {
+ log.info("銆怗etSaveDetail銆戝鐞嗛�佽揣鍗�: {}", deliveryNo.getDeliveryNo());
XkyDetail detail = getDetail(deliveryNo.getDeliveryNo());
deliveryNoticeService.saveDeliveryNotice(detail);
List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
-
deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
}
-
} catch (IOException e) {
+ log.error("銆怗etSaveDetail 澶勭悊寮傚父銆戦�佽揣鍗�: {}, 寮傚父: {}", deliveryNo.getDeliveryNo(), e.getMessage(), e);
throw new RuntimeException(e);
}
});
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 288fd59..23d7f85 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,7 +5,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: oracle.jdbc.OracleDriver
- url: jdbc:oracle:thin:@192.168.1.104:1521/ORCL
+ url: jdbc:oracle:thin:@122.226.249.238:5936/ORCL
username: zmz_prd
password: zmzprd
druid:
@@ -38,4 +38,14 @@
map-underscore-to-camel-case: true
jdbc-type-for-null: 'null'
type-aliases-package: com.gs.xky.entity.*
- mapper-locations: classpath:mapper/*.xml
\ No newline at end of file
+ mapper-locations: classpath:mapper/*.xml
+
+logging:
+ level:
+ root: info
+ com.gs.xky.service.XkyService: debug # 鎸囧畾 XkyService 璁板綍 debug 绾у埆鐨勬棩蹇�
+ file:
+ name: logs/xky_service.log # 鎸囧畾鏃ュ織鏂囦欢璺緞
+ pattern:
+ file: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+ console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
diff --git a/src/test/java/com/gs/xky/XkyApplicationTests.java b/src/test/java/com/gs/xky/XkyApplicationTests.java
index 5cf4208..695790a 100644
--- a/src/test/java/com/gs/xky/XkyApplicationTests.java
+++ b/src/test/java/com/gs/xky/XkyApplicationTests.java
@@ -1,20 +1,18 @@
package com.gs.xky;
-import cn.hutool.core.collection.ListUtil;
-import com.alibaba.fastjson2.JSON;
-import com.gs.xky.config.*;
-import com.gs.xky.dto.EmployeeInfo;
+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.service.ApiService;
-import com.gs.xky.service.MesStaffService;
-import com.gs.xky.service.XkyService;
+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;
-import java.util.stream.Collectors;
@SpringBootTest
class XkyApplicationTests {
@@ -28,6 +26,12 @@
@Autowired
private MesStaffService staffService;
+
+ @Autowired
+ private DeliveryNoticeService deliveryNoticeService;
+
+ @Autowired
+ private TblBarcodeInformationService barcodeInformationService;
@Test
void contextLoads() throws IOException {
@@ -43,13 +47,35 @@
BodyParam bodyParam = new BodyParam();
bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
- bodyParam.setDeliveryNo("22250212VVWU");
+ bodyParam.setDeliveryNo("22250403DE7H");
param.setBody(bodyParam);
- ApiResponse<XkyDetail> noList = apiService.sendListRequest(param, XkyDetail.class, "https://openapi.xiekeyun.com/delivery/getDetail.json");
+ ApiResponse<XkyDetail> detail = apiService.sendListRequest(param, XkyDetail.class, "https://openapi.xiekeyun.com/delivery/getDetail.json");
- System.out.println(JSON.toJSONString(noList.getData()));
+ XkyDetail deliveryNo = detail.getData();
+ deliveryNoticeService.saveDeliveryNotice(deliveryNo);
+ List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
+ barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
+
+ deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
+ }
+
+ private List<BarcodeDeliveryNo> GetBarcodeInformation(String deliveryNo) throws IOException {
+ XkyCommonParam param = XkyCommonParam.GetInit();
+
+ // 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
+ BodyParam bodyParam = new BodyParam();
+
+ bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
+ bodyParam.setDeliveryNo(deliveryNo);
+
+ param.setBody(bodyParam);
+
+
+ ApiResponse<BarcodeDeliveryNo> noList = apiService.sendListRequest(param, BarcodeDeliveryNo.class, "https://openapi.xiekeyun.com/barcode/byDeliveryNo.json");
+
+ return noList.getDataList();
}
@Test
@@ -74,26 +100,26 @@
@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);
- });
+// 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 IOException {
String str = "{\"state\":\"500\",\"msg\":\"{\\\"Result\\\":{\\\"ResponseStatus\\\":{\\\"ErrorCode\\\":500,\\\"IsSuccess\\\":false,\\\"Errors\\\":[{\\\"FieldName\\\":null,\\\"Message\\\":\\\"鏄庣粏淇℃伅绗�1琛岀殑鐢熶骇閫氱煡鍗曞�间负:銆�127147銆戜笉瀛樺湪锛沑\\\r\\\\n\\\",\\\"DIndex\\\":0}],\\\"SuccessEntitys\\\":[],\\\"SuccessMessages\\\":[],\\\"MsgCode\\\":11},\\\"Id\\\":\\\"\\\",\\\"Number\\\":\\\"\\\",\\\"NeedReturnData\\\":[{}]}}\"}";
-
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3