From 31a3c52f16927cb0a37d4a4fefb1ab2442e4cbf9 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 22 十月 2024 16:00:51 +0800
Subject: [PATCH] 钢化完整版图后端新增字段，更改数据结构，前端页面获取数据更改，新增装载率
---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 4 +-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 53 ++++++++++++++++++++------
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 2
UI-Project/src/views/NewPage.vue | 6 ++-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml | 3 -
7 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/UI-Project/src/views/NewPage.vue b/UI-Project/src/views/NewPage.vue
index 6245536..5419719 100644
--- a/UI-Project/src/views/NewPage.vue
+++ b/UI-Project/src/views/NewPage.vue
@@ -8,7 +8,7 @@
<el-card style="flex: 1;margin-left: 400px;margin-top: 50px;margin-right: 10px;width: 1100px;" height="900" v-loading="loading">
<div v-for="(row, rowIndex) in divsData" :key="rowIndex" class="row">
<div v-for="(rect, colIndex) in row" :key="colIndex" class="div-container">
- <div style="text-align: center;">鐐夊彿锛歿{ getAdjustedRectsForRow(rowIndex)[0].layout_id }}</div>
+ <div style="text-align: center;">鐐夊彿锛歿{ getAdjustedRectsForRow(rowIndex)[0].layout_id }} ---- 瑁呰浇鐜囷細{{ getAdjustedRectsForRow(rowIndex)[0].olLayoutRate }}</div>
<el-scrollbar height="550px" width="1000px" style="background-color: #e9e9eb;">
<div style="position: relative;width: 100%;height: 100%;">
<div
@@ -78,6 +78,8 @@
const response = await request.post(`/cacheGlass/taskCache/temperingTerritory?current=${current.value}`);
if (response.code === 200) {
rawData.value = response.data;
+ console.log(response.data);
+
processData(rawData.value);
}
} catch (error) {
@@ -95,7 +97,7 @@
const rowIndex = divsData.value;
adjustedRectsPerRow.value = divsData.value.map(() => []);
divsData.value.forEach((row, rowIndex) => {
- const rawRowData = rawData.value[rowIndex];
+ const rawRowData = rawData.value[rowIndex].listGlass;
if (rawRowData) {
adjustedRectsPerRow.value[rowIndex] = rawRowData.map(rect => {
let adjustedWidth, adjustedHeight,newX,widtha,heighta;
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index 3c25501..afc41fc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -36,7 +36,7 @@
* @param current
* @return
*/
- List<List<Map<String, Object>>> selectTemperingTerritory(String current);
+ List<Map<String, Object>> selectTemperingTerritory(String current);
/**
* 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 887a74d..16a8ff2 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -36,7 +36,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -53,27 +55,28 @@
@Slf4j
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
- @Autowired
+ @Resource
UpPattenUsageMapper upPattenUsageMapper;
- @Autowired
+ @Resource
EngineeringMapper engineeringMapper;
- @Autowired
+ @Resource
OptimizeDetailMapper optimizeDetailMapper;
- @Autowired
+ @Resource
OptimizeHeatDetailMapper optimizeHeatDetailMapper;
- @Autowired
+ @Resource
EdgStorageCageMapper edgStorageCageMapper;
- @Autowired
+
+ @Resource
GlassInfoMapper glassInfoMapper;
@Autowired
TaskCacheService taskCacheService;
- @Autowired
+ @Resource
DamageMapper damageMapper;
@Autowired
@@ -308,12 +311,13 @@
* @return
*/
@Override
- public List<List<Map<String, Object>>> selectTemperingTerritory(String current) {
+ public List<Map<String, Object>> selectTemperingTerritory(String current) {
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
List<Map<String, Object>> resultCutTerritory = optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
.selectAll(OptimizeHeatDetail.class)
.selectAs(OptimizeProject::getLoadWidth, "olWidth")
.selectAs(OptimizeProject::getLoadLength, "olHeight")
+ .selectAs(OptimizeHeatLayout::getLayoutRate, "olLayoutRate")
.leftJoin(OptimizeHeatLayout.class, on -> on
.eq(OptimizeHeatLayout::getProjectNo, OptimizeHeatDetail::getProjectNo)
.eq(OptimizeHeatLayout::getLayoutId, OptimizeHeatDetail::getLayoutId))
@@ -322,16 +326,41 @@
.eq(OptimizeHeatDetail::getProjectNo, current)
.gt(OptimizeHeatDetail::getLayoutId, 0)
);
-
+ //杩欓噷灏辨槸 鎸夌増鍥惧彿鍒嗙粍 [{layout_id:"1",width:200,height:300...},{layout_id:"2",width:300,height:300...}]
Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("layout_id").toString()));
-// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
- List<List<Map<String, Object>>> result = new ArrayList<>();
+ //鎸夌増鍥惧彿鎺掑簭
+
+ List<Map<String, Object>> result = new ArrayList<>();//杩斿洖缁撴灉
for (int i = 1; i <= groupBy.keySet().size(); i++) {
String key = i + "";
if (key != null) {
- result.add(groupBy.get(key));
+ List<Map<String, Object>> galssInfo=groupBy.get(key);//褰撳墠閽㈠寲鐗堝浘鍐呯幓鐠冨皬鐗囬泦鍚�
+ if(!galssInfo.isEmpty()){
+ Map<String, Object> item=new HashMap<>();//鏂版牸寮忕紪鎺�
+ //浠ヤ笅涓哄悓灞� {key:"groupBy.get(key)",olLayoutRate:"灏忕墖闆嗗悎"}
+ // {key:"groupBy.get(key)",olLayoutRate:[{},{},{},{}]}
+
+
+ item.put("listGlass",groupBy.get(key));
+ item.put("LayoutId",key);
+ item.put("olWidth",galssInfo.get(0).get("olWidth").toString());
+ item.put("olHeight",galssInfo.get(0).get("olHeight").toString());
+ item.put("olLayoutRate",galssInfo.get(0).get("olLayoutRate").toString());
+ result.add(item);
+ }else{
+ log.info("褰撳墠閽㈠寲鐗堝浘涓嶅瓨鍦ㄥ皬鐗囨暟鎹妫�鏌ワ紝鐗堝浘鍙�:{}"+key);
+ return null ;
+ }
}
}
+// List<List<Map<String, Object>>> result = new ArrayList<>();//杩斿洖缁撴灉
+//
+// for (int i = 1; i <= groupBy.keySet().size(); i++) {
+// String key = i + "";
+// if (key != null) {
+// result.add(groupBy.get(key));
+// }
+// }
return result;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index 8e0191c..49dacf1 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -100,7 +100,7 @@
public static String engineerId = "";
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void plcHomeEdgTask() {
Date startDate = new Date();
log.info("鏈浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index a5a966a..9911a6f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -36,7 +36,7 @@
@PostMapping("/temperingTerritory")
@ResponseBody
public Result temperingTerritory(String current) {
- List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectTemperingTerritory(current);
+ List<Map<String, Object>> h = edgStorageCageDetailsService.selectTemperingTerritory(current);
return Result.build(200, "鎴愬姛", h);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index 49869da..542ed74 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: cz
+ active: fei
application:
name: cacheGlass
liquibase:
@@ -15,7 +15,6 @@
mes:
threshold: 3
ratio: 10
- cache: # 鍗у紡鐞嗙墖鏈�澶у昂瀵�
cache: # 鍗у紡鐞嗙墖鏈�澶у昂瀵�
cacheWidth: 3600
cacheHeight: 3000
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index 93f0fda..61259b4 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -49,7 +49,7 @@
@Autowired
TaskCacheServiceImpl taskCacheServiceImpl;
- @Autowired
+ @Resource
OptimizeDetailMapper optimizeDetailMapper;
@Autowired
GlassInfoService glassInfoService;
@@ -144,7 +144,7 @@
@Test
public void testEngineerTerritory() {
- List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
+ List<Map<String, Object>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
log.info("閽㈠寲宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
}
--
Gitblit v1.8.0