From 43690d71e45668f9b63d84983f0af0dac0bc61c1 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Tue, 20 Jun 2023 09:47:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DepositoryController.java | 12 ++++++--- .../mapper/DepositoryRecordMapper.xml | 2 +- .../depository_manage/SomeTest.java | 27 +++++++++++++++++++ .../mapper/DepositoryRecordMapper.xml | 2 +- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index 031e68d9..d3cb2e17 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -427,7 +427,8 @@ public class DepositoryController { show_data.putAll((Map) result); } depository_data.put("data", show_data); - } else { + } + else { // 每天各仓库入库数目 while (it.hasNext()) { Object next = it.next(); @@ -598,7 +599,8 @@ public class DepositoryController { } - } else { + } + else { // 获取本周至今仓库的入/出库数量 Future futureForBarChartData = completionService.submit(new distributeTasks(depositoryAllNameAndId, type, 1, userByPort, depositoryName)); @@ -666,10 +668,13 @@ public class DepositoryController { Long format = DateUtil.DateTimeByDayToTimeStamp(formatter.format(instance.getTime())); days.add(format); } + // 反转日期 + Collections.reverse(days); // 定义线程 int threadSize = depositoryAllNameAndId.size(); ExecutorService exs = new ThreadPoolExecutor(threadSize, threadSize, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(threadSize)); + // 结果集 List> futureList = new ArrayList>(); // 1.定义CompletionService @@ -1341,7 +1346,8 @@ public class DepositoryController { map.put("data", doubleList); show_data.put(val, map); } - } else { + } + else { // 获取日期 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); int now = instance.get(Calendar.DAY_OF_WEEK) - 1 == 0 ? 7 : instance.get(Calendar.DAY_OF_WEEK) - 1; diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 99e92f88..6eed19ad 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -1710,7 +1710,7 @@ and aorstate = #{state} - and depositoryManagerTime between #{start} and #{end} + and applicantTime between #{start} and #{end} diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java index 1bf6cea7..95549ab8 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java @@ -10,6 +10,7 @@ import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.*; import com.dreamchaser.depository_manage.security.pool.HandlesOtherFunctionalThreadPool; import com.dreamchaser.depository_manage.security.pool.RedisPool; import com.dreamchaser.depository_manage.service.DepositoryRecordService; +import com.dreamchaser.depository_manage.utils.DateUtil; import com.dreamchaser.depository_manage.utils.Md5; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.dreamchaser.depository_manage.utils.QyWxXMLUtils; @@ -19,7 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.List; import java.util.Map; @@ -318,4 +321,28 @@ public class SomeTest { callback(approvalInfo); } + + + @Test + public void otherTest(){ + //获取获取系统的当前日历对象 + Calendar instance = Calendar.getInstance(); + int weekDay = instance.get(Calendar.DAY_OF_WEEK); + weekDay = weekDay - 1; + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + int now = instance.get(Calendar.DAY_OF_WEEK) - 1 == 0 ? 7 : instance.get(Calendar.DAY_OF_WEEK) - 1; + List days = new ArrayList<>(); // 周一至今的每天 + instance.add(Calendar.DATE, 1); + days.add(DateUtil.DateTimeByDayToTimeStamp(formatter.format(instance.getTime()))); + instance.add(Calendar.DATE, -1); + days.add(DateUtil.DateTimeByDayToTimeStamp(formatter.format(instance.getTime()))); + while (now - 1 > 0) { + now--; + instance.add(Calendar.DATE, -1); + Long format = DateUtil.DateTimeByDayToTimeStamp(formatter.format(instance.getTime())); + days.add(format); + } + System.out.println(days); + System.out.println(DateUtil.getLastTimeInterval()); + } } diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 99e92f88..6eed19ad 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -1710,7 +1710,7 @@ and aorstate = #{state} - and depositoryManagerTime between #{start} and #{end} + and applicantTime between #{start} and #{end}