From 8ba5b88ffa394d06b81ae1802e5ebd075d34050a Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 21 三月 2025 09:56:53 +0800
Subject: [PATCH] 看板修改：按客户所需内容3.12号文件调整
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java | 86 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java
index fbdfe0d..365268e 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java
@@ -3,8 +3,10 @@
import cn.smallbun.screw.core.util.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.md.entity.KBBTJPDrawingBP;
import com.mes.md.entity.KBBTProgramsOperationLogBP;
import com.mes.md.entity.TaskingLog;
+import com.mes.md.mapper.KBBTJPDrawingBPMapper;
import com.mes.md.mapper.KBBTProgramsOperationLogBPMapper;
import com.mes.md.mapper.TaskingLogMapper;
import com.mes.md.service.TaskingLogService;
@@ -12,9 +14,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -31,12 +32,91 @@
@Autowired
KBBTProgramsOperationLogBPMapper kBBTProgramsOperationLogBPMapper;
+ @Autowired
+ KBBTJPDrawingBPMapper kBBTJPDrawingBPMapper;
public List<TaskingLog> findTaskingLog(){
return new ArrayList<TaskingLog>();
}
/**
+ * 鏌ヨ dayCount 澶� 瀹屽伐鏁伴噺-鍒嗙嚎璺�
+ */
+ @Override
+ public List<Map> selectTaskingLog(int dayCount) {
+ 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);
+ Date startDate = cal.getTime();
+
+ QueryWrapper<KBBTJPDrawingBP> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("CAST(CreateDate AS DATE) AS CreateDate,isNull(sum(task_quantity),0) as task_quantity_sum")
+ .gt("CreateDate",startDate).groupBy("CAST(CreateDate AS DATE)")
+ .orderByAsc("CAST(CreateDate AS DATE)");
+ List<Map> list=kBBTJPDrawingBPMapper.selectMaps((QueryWrapper)queryWrapper);
+
+ List<Map<String, Object>> listTasking1 = baseMapper.selectMaps(new QueryWrapper<TaskingLog>()
+ .select("operation_record,operation_mode,DATE_FORMAT(operation_record_time, '%Y-%m-%d') as operation_record_time,count(1) as count")
+ .eq("operation_record", "鏃嬭浆1")
+ .eq("operation_mode", "缁撴潫")
+ .gt("operation_record_time", startDate)
+ .groupBy("operation_record", "operation_mode", "DATE_FORMAT(operation_record_time, '%Y-%m-%d')")
+ .orderByAsc("DATE_FORMAT(operation_record_time, '%Y-%m-%d')"));
+ List<Map<String, Object>> listTasking2 = baseMapper.selectMaps(new QueryWrapper<TaskingLog>()
+ .select("operation_record,operation_mode,DATE_FORMAT(operation_record_time, '%Y-%m-%d') as operation_record_time,count(1) as count")
+ .eq("operation_record", "鏃嬭浆2")
+ .eq("operation_mode", "缁撴潫")
+ .gt("operation_record_time", startDate)
+ .groupBy("operation_record", "operation_mode", "DATE_FORMAT(operation_record_time, '%Y-%m-%d')")
+ .orderByAsc("DATE_FORMAT(operation_record_time, '%Y-%m-%d')"));
+ //log.info("瀹㈡埛琛ㄨ鍒掗噺锛歿},{},{}",list,listTasking1,listTasking2);
+ List<Map> Result=new ArrayList<>();
+ for (int i=0;i<dayCount;i++){
+ Date thisdate=cal.getTime();
+ cal.add(Calendar.DATE, 1);
+ Map thisMap=new HashMap<>();
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String dateString = sdf.format(thisdate);
+ thisMap.put("date",dateString);
+ if (listTasking1.size()>0&&listTasking1.get(0).get("operation_record_time").toString().equals(dateString)){
+
+ thisMap.put("line1",listTasking1.get(0).get("count"));
+ listTasking1.remove(0);
+ }else{
+ thisMap.put("line1",0);
+ }
+ if (listTasking2.size()>0&&listTasking2.get(0).get("operation_record_time").toString().equals(dateString)){
+ thisMap.put("line2",listTasking2.get(0).get("count"));
+ listTasking2.remove(0);
+ }else{
+ thisMap.put("line2",0);
+ }
+// if(list.size()>0){
+// log.info("瀵规瘮:{},{},{}",
+// list.get(0).get("CreateDate"),
+// dateString,
+// list.get(0).get("CreateDate").toString().equals(dateString));
+// }
+
+ if (list.size()>0&&list.get(0).get("CreateDate").toString().equals(dateString)){
+
+ thisMap.put("plan",list.get(0).get("task_quantity_sum"));
+ list.remove(0);
+ }else{
+ thisMap.put("plan",0);
+ }
+ Result.add(thisMap);
+ }
+
+ return Result;
+ }
+ /**
* 鍥炰紶鎶ュ伐鏁版嵁+ 璁惧鐜荤拑杩囩墖璁板綍缁� 涔濈墽
*/
@Override
--
Gitblit v1.8.0