From 250e2cd3c6b63605d2d23d496884ff18fac5e536 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 23 十二月 2024 17:15:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 42 ++++++++++++--
/dev/null | 78 --------------------------
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 1
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 11 ++-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java | 2
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 1
6 files changed, 44 insertions(+), 91 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
index 207e536..8d822d8 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -1,6 +1,7 @@
package com.mes.engineering.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -105,5 +106,6 @@
/**
* 闄よ啘鏂瑰紡
*/
+ @TableField(exist = false)
private Integer filmRemove;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index e1dc32f..0d97557 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,11 +38,8 @@
@Service
public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
- @Autowired
+ @Resource
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
- @Autowired
- UpPattenUsageMapper upPattenUsageMapper;
-
@Autowired
DamageService damageService;
@@ -72,7 +70,10 @@
*/
@Override
public List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId) {
- List<EdgStorageCageVO> storageCageVOS = this.selectJoinList(EdgStorageCageVO.class, new MPJLambdaWrapper<EdgStorageCage>().leftJoin(EdgStorageCageDetails.class, on -> on
+ List<EdgStorageCageVO> storageCageVOS = this.selectJoinList(EdgStorageCageVO.class, new MPJLambdaWrapper<EdgStorageCage>()
+ .selectAll(EdgStorageCage.class)
+ .selectCollection(EdgStorageCageDetails.class,EdgStorageCageVO::getDetails)
+ .leftJoin(EdgStorageCageDetails.class, on -> on
.eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index c603a6e..c64cf0c 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -50,25 +50,23 @@
@Scheduled(fixedDelay = 1000)
public void CacheGlassOneTasks() {
- CacheGlassTasksChild(EDG_STORAGE_DEVICE_ONE_TASK, "cacheGlassOne", 1, 5);
+ CacheGlassTasksChild("cacheGlassOne", 1);
}
@Scheduled(fixedDelay = 1000)
public void CacheGlassTwoTasks() {
- CacheGlassTasksChild(EDG_STORAGE_DEVICE_TWO_TASK, "cacheGlassTwo", 2, 6);
+ CacheGlassTasksChild("cacheGlassTwo", 2);
}
- private void CacheGlassTasksChild(String tableName, String webSocketName, int deviceId, int stationCell) {
+ private void CacheGlassTasksChild(String webSocketName, int deviceId) {
JSONObject jsonObject = new JSONObject();
- List<CutDrawingVO> currentCutDrawings = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
- jsonObject.append("currentCutTerritory", currentCutDrawings);
//鍗у缂撳瓨绗煎唴淇℃伅
List<EdgStorageCageVO> edgStorageCageVOS = edgStorageCageService.selectEdgStorageCagesByDeviceId(deviceId);
jsonObject.append("EdgStorageCageinfos", edgStorageCageVOS);
//鑾峰彇姝ｅ湪鏁村舰涓殑浠诲姟
EdgStorageDeviceTaskHistory taskHistory = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getDeviceId,deviceId)
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, deviceId)
.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
.orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 1"));
jsonObject.append("taskMessage", taskHistory);
@@ -91,6 +89,38 @@
}
@Scheduled(fixedDelay = 1000)
+ public void currentCutDrawingOneTask() {
+ currentCutDrawingTaskChild("currentCutDrawingOne", 1, 5);
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void currentCutDrawingTwoTask() {
+ currentCutDrawingTaskChild("currentCutDrawingTwo", 2, 6);
+ }
+
+ public void currentCutDrawingTaskChild(String webSocketName, int deviceId, int stationCell) {
+ JSONObject jsonObject = new JSONObject();
+ List<CutDrawingVO> currentCutDrawings = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
+ jsonObject.append("currentCutTerritory", currentCutDrawings);
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(webSocketName);
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ } else {
+ log.info("Home is closed");
+ }
+ }
+ }
+ }
+
+ @Scheduled(fixedDelay = 1000)
public void CacheGlassTaskss() {
JSONObject jsonObject = new JSONObject();
//纾ㄨ竟淇℃伅
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index 0a72184..bdab52c 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -8,7 +8,6 @@
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.pp.service.OptimizeProjectService;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.Result;
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
deleted file mode 100644
index 78d3318..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.mes.engineering.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author wu
- * @since 2024-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class Engineering implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 宸ョ▼琛╥d
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ョ▼鍙�
- */
- private String engineerId;
-
- /**
- * 璁惧
- */
- private Integer stationCell;
-
-
-
- /**
- * 宸ョ▼鍚嶇О
- */
- private String engineerName;
-
- /**
- * 骞冲潎鍒╃敤鐜�
- */
- private double avgAvailability;
-
- /**
- * 鏈夋晥鍒╃敤鐜�
- */
- private double validAvailability;
-
- /**
- * 灏剧墖鍒╃敤鐜�
- */
- private double lastAvailability;
-
- /**
- * 鐘舵��
- */
- private Integer state;
-
- /**
- * 灏忕墖鎬绘暟
- */
- private Integer glassTotal;
-
- /**
- * 灏忕墖鎬婚潰绉�
- */
- private double glassTotalArea;
-
- /**
- * 璁″垝鍘熺墖鎬绘暟
- */
- private Integer planPatternTotal;
-
- /**
- * 璁″垝鍘熺墖鎬婚潰绉�
- */
- private double planPatternTotalArea;
-
- /**
- * 瀹為檯鍘熺墖鎬绘暟
- */
- private Integer realityPatternTotal;
-
- /**
- * 瀹為檯鍘熺墖鎬婚潰绉�
- */
- private double realityPatternTotalArea;
-
- /**
- * 鑶滅郴id
- */
- private String filmsId;
-
- /**
- * 澶囨敞
- */
- private String notes;
-
- /**
- * 闄よ啘鏂瑰紡
- */
- @TableField(exist = false)
- private Integer filmRemove;
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java
deleted file mode 100644
index 5b214f1..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/OptimizeEngineering.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.mes.engineering.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author SNG-010
- */
-@Setter
-@Getter
-public class OptimizeEngineering {
-
- // Getter methods
- // Setter methods
- /**
- * 宸ョ▼鍙�
- */
- private String projectNo;
-
- /**
- * 宸ョ▼鍚�
- */
- private String projectName;
-
- /**
- * 骞冲潎鍒╃敤鐜�
- */
- private double avgCutPct;
-
- /**
- * 鏈夋晥鍒╃敤鐜�
- */
- private double validCutPct;
-
- /**
- * 灏剧墖鍒╃敤鐜�
- */
- private double lastCutPct;
-
- /**
- * 鐘舵��
- */
- private Integer state;
-
- /**
- * 灏忕墖鎬绘暟
- */
- private Integer glassTotal;
- /**
- * 灏忕墖鎬婚潰绉�
- */
- private double glassTotalArea;
- /**
- * 璁″垝鍘熺墖鎬绘暟
- */
- private Integer rawStockQty;
- /**
- * 璁″垝鍘熺墖鎬婚潰绉�
- */
- private double rawStockArea;
- /**
- * 瀹為檯鍘熺墖鎬绘暟
- */
- private Integer actualStockQty;
- /**
- * 瀹為檯鍘熺墖鎬婚潰绉�
- */
- private double actualStockArea;
- /**
- * 鑶滅郴
- */
- private String glassType;
- /**
- * 澶囨敞
- */
- private String remark;
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index 1fa6eec..47ff42e 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -20,7 +20,6 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
/**
--
Gitblit v1.8.0