UI-Project/config.js
@@ -1,9 +1,9 @@ export default { serverUrl: "10.153.19.150:88/api", // serverUrl: "192.168.1.199:88/api", // serverUrl: "10.153.19.150:88/api", serverUrl: "192.168.1.199:88/api", // serverUrl: "127.0.0.1:88/api", serverUrl2: "10.153.19.150:88" // serverUrl2: "192.168.1.199:88" // serverUrl2: "10.153.19.150:88" serverUrl2: "192.168.1.199:88" // serverUrl2: "127.0.0.1:88" //serverUrl:"res.abeim.cn" UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@ // export const WebSocketHost = "192.168.1.199"; export const WebSocketHost = "10.153.19.150"; export const WebSocketHost = "192.168.1.199"; // export const WebSocketHost = "10.153.19.150"; // export const WebSocketHost = "127.0.0.1"; export const host = "88"; 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; 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); /** * 查询笼内版图差值范围内的 此尺寸玻璃 如无则按照 钢化版图序号 以及玻璃序号 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; }
@@ -100,7 +100,7 @@ public static String engineerId = ""; @Scheduled(fixedDelay = 1000) //@Scheduled(fixedDelay = 1000) public void plcHomeEdgTask() { Date startDate = new Date(); log.info("本次任务开始执行时间：{}", startDate); 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); }
@@ -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)); }
