From 41ea6e1f40bf50eda5afde34b4b8c167209fc90e Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:39:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor(buildpackage):=20=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9B=BF?=
=?UTF-8?q?=E4=BB=A3=E8=AE=A1=E7=AE=97=E6=97=B6=E9=97=B4=E5=81=8F=E7=A7=BB?=
=?UTF-8?q?=E9=87=8F-=20=E5=9C=A8=20ConsignmachiningIn=E3=80=81Consignmach?=
=?UTF-8?q?iningInReturn=E3=80=81ProxyPurchaseReturn=E3=80=81ProxyPurchase?=
=?UTF-8?q?WarehousOrder=20=E5=92=8C=20ProxyPurchaseWarehousWarehouse=20?=
=?UTF-8?q?=E7=B1=BB=E4=B8=AD=EF=BC=8C=E5=B0=86=20offsetTimeTime.offsetTim?=
=?UTF-8?q?e()=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20offsetTimeTime.getCurrentDa?=
=?UTF-8?q?teRange()=20-=20=E5=9C=A8=20OffsetTimeTime=20=E7=B1=BB=E4=B8=AD?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=20getCurrentDateRange=20=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4-=20=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugin/outsourc/ConsignmachiningIn.java | 2 +-
.../outsourc/ConsignmachiningInReturn.java | 2 +-
.../plugin/purchase/ProxyPurchaseReturn.java | 2 +-
.../purchase/ProxyPurchaseWarehousOrder.java | 2 +-
.../ProxyPurchaseWarehousWarehouse.java | 2 +-
.../plugin/lets/util/OffsetTimeTime.java | 14 ++++++++
.../ProxyPurchaseWarehousOrderTest.java | 4 +--
.../ProxyPurchaseWarehousWarehouseTest.java | 2 +-
.../plugin/lets/util/OffsetTimeTimeTest.java | 34 +++++++++++++++++++
9 files changed, 56 insertions(+), 8 deletions(-)
create mode 100644 buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/OffsetTimeTimeTest.java
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java
index 6a02660a..cc74c9a2 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java
@@ -173,7 +173,7 @@ public class ConsignmachiningIn extends PluginBaseEntity {
} else {
if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(PROD_FILED)) {
//默认被定时器执行，实时执行，计算时间偏移量
- StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime();
+ StartAndEndVo startAndEndVo = offsetTimeTime.getCurrentDateRange();
startImplement(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time());
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
index 92b862c5..575ff30e 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
@@ -174,7 +174,7 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
} else {
if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(PROD_FILED)) {
//默认被定时器执行，实时执行，计算时间偏移量
- StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime();
+ StartAndEndVo startAndEndVo = offsetTimeTime.getCurrentDateRange();
startImplementByTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time());
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
index 3e9bc337..dc187d9a 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
@@ -171,7 +171,7 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
} else {
if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(PROD_FILED)) {
//默认被定时器执行，实时执行，计算时间偏移量
- StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime();
+ StartAndEndVo startAndEndVo = offsetTimeTime.getCurrentDateRange();
startImplement(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time());
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java
index 7c6ec951..41f76321 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java
@@ -168,7 +168,7 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity {
} else {
if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(PROD_FILED)) {
//默认被定时器执行，实时执行，计算时间偏移量
- StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime();
+ StartAndEndVo startAndEndVo = offsetTimeTime.getCurrentDateRange();
startImplementByTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time());
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
index 162f93df..fe58e3cd 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
@@ -169,7 +169,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity {
} else {
if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(PROD_FILED)) {
//默认被定时器执行，实时执行，计算时间偏移量
- StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime();
+ StartAndEndVo startAndEndVo = offsetTimeTime.getCurrentDateRange();
startImplementByTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time());
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OffsetTimeTime.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OffsetTimeTime.java
index dd3e37b0..824c0d2d 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OffsetTimeTime.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OffsetTimeTime.java
@@ -48,6 +48,20 @@ public class OffsetTimeTime {
return startAndEndVo;
}
+ /**
+ * 2025年1月6日 10:31:33 获取当前时间范围，比如当前时间2025年1月6日 10:31:43，则时间范围2025年1月6日 00:00:00~2025年1月6日 23:59:59
+ */
+ public StartAndEndVo getCurrentDateRange() {
+ Date currentDate = new Date();
+ String startTimeStr = DateUtil.format(currentDate, "yyyy-MM-dd") + " 00:00:00";
+ String endTimeStr = DateUtil.format(currentDate, "yyyy-MM-dd") + " 23:59:59";
+
+ StartAndEndVo startAndEndVo = new StartAndEndVo();
+ startAndEndVo.setStart_time(startTimeStr);
+ startAndEndVo.setEnd_time(endTimeStr);
+ return startAndEndVo;
+ }
+
/**
* 计算时间间隔
*
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java
index 9a433fab..6f34e1cf 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java
@@ -27,9 +27,9 @@ public class ProxyPurchaseWarehousOrderTest {
@Test
public void startImplementByCode() {
try {
- proxyPurchaseWarehousOrder.startImplementByCode("LETS-PO2024103100000038");
+// proxyPurchaseWarehousOrder.startImplementByCode("LETS-PO2024122300000003");
-// proxyPurchaseWarehousOrder.startImplementByTime("2024-10-24 16:41:11", "2024-10-24 16:41:12");
+ proxyPurchaseWarehousOrder.startImplementByTime("2024-12-23 15:32:39", "2024-12-23 15:32:39");
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java
index 74241c20..783c5b6c 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java
@@ -26,6 +26,6 @@ public class ProxyPurchaseWarehousWarehouseTest {
@Test
public void startImplementByCode() {
- proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2024110100000118");
+ proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2024123100000770");
}
}
\ No newline at end of file
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/OffsetTimeTimeTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/OffsetTimeTimeTest.java
new file mode 100644
index 00000000..ed267a2a
--- /dev/null
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/OffsetTimeTimeTest.java
@@ -0,0 +1,34 @@
+package com.hzya.frame.plugin.lets.util;
+
+import com.alibaba.fastjson.JSON;
+import com.hzya.frame.WebappApplication;
+import com.hzya.frame.plugin.lets.queryvo.StartAndEndVo;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.*;
+
+/**
+ * @Author：liuyang
+ * @Package：com.hzya.frame.plugin.lets.util
+ * @Project：kangarooDataCenterV3
+ * @name：OffsetTimeTimeTest
+ * @Date：2025/1/6 10:33
+ * @Filename：OffsetTimeTimeTest
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = WebappApplication.class)
+public class OffsetTimeTimeTest {
+
+ @Autowired
+ private OffsetTimeTime offsetTimeTime;
+
+ @Test
+ public void getCurrentDateRange() {
+ StartAndEndVo currentDateRange = offsetTimeTime.getCurrentDateRange();
+ System.out.println(JSON.toJSONString(currentDateRange));
+ }
+}
\ No newline at end of file