From f2a5a09c879849110b42c46297ab4c080500e61d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 03 四月 2025 07:28:03 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 127 insertions(+), 1 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java
index cc89e77..86e2ad6 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/test/java/com/mes/DeviceInteractionModuleApplicationTest.java
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.smallbun.screw.core.util.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -24,7 +25,9 @@
import java.io.OutputStream;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -170,7 +173,7 @@
public void testSaoMa() {
try {
// 鍒涘缓TCP瀹㈡埛绔苟杩炴帴鍒版湇鍔″櫒
- String serverAddress = "192.168.1.8";
+ String serverAddress = "10.36.164.19";
int serverPort = 2001;
Socket clientSocket = new Socket(serverAddress, serverPort);
// 鍒涘缓杈撳叆娴佸拰杈撳嚭娴�
@@ -342,6 +345,129 @@
// log.info("鍐呭{}",KBBTJPDrawingBP);
}
+ //鍛ㄤ骇閲忔祴璇�
+ @Test
+ public void testDailyOutput() {
+ Map map=new HashMap();
+ map.put("dayCount",1);
+ int dayCount=0-Integer.valueOf(map.get("dayCount").toString());
+ Calendar cal = Calendar.getInstance();
+ //璁剧疆褰撳墠鏃堕棿
+ cal.setTime(new Date());
+ cal.add(Calendar.DATE, dayCount);
+
+ QueryWrapper<KBBTProgramsOperationLogBP> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("CreateDate,isNull(sum(task_quantity),0) as task_quantity_sum,isNull(sum(report_count),0) as report_count_sum")
+ .gt("CreateDate",cal.getTime()).groupBy("CreateDate");
+ List<KBBTProgramsOperationLogBP> list=kBBTJPDrawingBPMapper.selectMaps((QueryWrapper)queryWrapper);
+ log.info("鍐呭{}{}",list,cal.getTime());
+ }
+
+ //鏃ヤ骇閲忔祴璇�
+ @Test
+ public void testWeekOutput() {
+ Map map=new HashMap();
+ map.put("dayCount",1);
+ int dayCount=0-Integer.valueOf(map.get("dayCount").toString());
+ Calendar cal = Calendar.getInstance();
+ //璁剧疆褰撳墠鏃堕棿
+ cal.setTime(new Date());
+ cal.add(Calendar.DATE, dayCount);
+ QueryWrapper<KBBTProgramsOperationLogBP> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("CAST(CreateDate AS DATE) AS CreateDate,isNull(sum(task_quantity),0) as task_quantity_sum,isNull(sum(length*width*task_quantity)/1000000,0) as area_sum")
+ .gt("CreateDate",cal.getTime()).groupBy("CAST(CreateDate AS DATE)");
+ List<KBBTProgramsOperationLogBP> list=kBBTJPDrawingBPMapper.selectMaps((QueryWrapper)queryWrapper);
+ log.info("鍐呭{}{}",list,cal.getTime());
+ log.info("鍐呭{}",list);
+ }
+
+ //鏃ヤ骇閲忔湭瀹屾垚
+ @Test
+ public void testDayNotFinshOutput() {
+ Map map=new HashMap();
+ map.put("dayCount",1);
+ int dayCount=0-Integer.valueOf(map.get("dayCount").toString());
+ Calendar cal = Calendar.getInstance();
+ //璁剧疆褰撳墠鏃堕棿
+ cal.setTime(new Date());
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ cal.add(Calendar.DATE, dayCount);
+ QueryWrapper<KBBTJPDrawingBP> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("OrderNo,(sum(task_quantity-isNull(report_count,0))) as notComplete,sum(isNull((length*width*(task_quantity-isNull(report_count,0)))/1000000,0)) as area_sum").
+ gt("PlanDate",cal.getTime()).having("sum(task_quantity-isNull(report_count,0))>0")
+ .groupBy("OrderNo");
+ List<Map> list=kBBTJPDrawingBPMapper.selectMaps((QueryWrapper)queryWrapper);
+ log.info("鍐呭{}",list);
+ }
+ //鏃ヤ骇閲� 鍒嗙嚎 宸插畬鎴�
+ @Test
+ public void testDayss() {
+ List<Map> map=taskingLogService.selectTaskingLog(20);
+ log.info("鍐呭{}",map);
+ }
+ //鏃ヤ骇閲� 鍒嗙嚎 宸插畬鎴�
+ @Test
+ public void testDays() {
+ Map map=new HashMap();
+ map.put("dayCount",5);
+ int dayCount=Integer.valueOf(map.get("dayCount").toString());
+ Calendar cal = Calendar.getInstance();
+ //璁剧疆褰撳墠鏃堕棿
+ cal.setTime(new Date());
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ cal.add(Calendar.DATE, 0-dayCount);
+ //杩慸ayCount澶╃殑璁″垝鏁伴噺
+ QueryWrapper<KBBTJPDrawingBP> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("CAST(CreateDate AS DATE) AS CreateDate,isNull(sum(task_quantity),0) as task_quantity_sum")
+ .gt("CreateDate",cal.getTime()).groupBy("CAST(CreateDate AS DATE)").orderByAsc("CAST(CreateDate AS DATE)");
+ List<Map> list=kBBTJPDrawingBPMapper.selectMaps((QueryWrapper)queryWrapper);
+ //杩慸ayCount澶╃殑璁″垝鏁伴噺
+
+ List<String> dateList=new ArrayList<>();
+ Map<String,Object> mapList=new HashMap<>();
+ for (int i=0;i<dayCount;i++){
+ cal.add(Calendar.DATE, 1);
+ log.info("鍐呭{}",cal.getTime().toString());
+ dateList.add(cal.getTime().toString());//鏃ユ湡椤哄簭
+ Map<String,Object> item=new HashMap<>();
+ item.put("report_count_sum",0);
+ item.put("task_quantity_sum",0);
+ try {
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ Date d=df.parse(cal.getTime().toString());
+ item.put("CreateDate",d.toString());
+ }catch (Exception e){
+ log.info("寮傚父");
+ }
+
+ mapList.put(cal.getTime().toString(), item);//姣忎釜鏃ユ湡鐨勬暟鎹� -鍖归厤鐢�
+ }
+ //閬嶅巻鍖归厤
+ for (int i=0;i<list.size();i++){
+ cal.setTime((Date)list.get(i).get("CreateDate"));
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ mapList.put(cal.getTime().toString(), list.get(i));
+ }
+ //閬嶅巻椤哄簭
+ List result=new ArrayList();
+ for (int i=0;i<dateList.size();i++){
+
+ result.add(mapList.get(dateList.get(i)));
+ //log.info("缁撴灉{}",mapList.get(dateList.get(i)));
+ }
+ log.info("杩斿洖鍐呭{}",result);
+
+
+ }
--
Gitblit v1.8.0