From 61cae17b15d6a7d256e25ce42f0a4ef4163fd088 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 15:54:03 +0800
Subject: [PATCH] 1、删除未修改的大屏程序
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 103 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 85 insertions(+), 18 deletions(-)
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 ab9669a..85d6675 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
@@ -20,6 +20,8 @@
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.taskcache.entity.TaskCache;
@@ -64,6 +66,9 @@
WebSocketServer webServerService;
@Autowired
DamageService damageService;
+ @Autowired
+ EngineeringMapper engineeringMapper;
+
@Value("${mes.threshold}")
private int threshold;
@@ -120,12 +125,12 @@
out08Glassstate = "1";
}
-// taskRequestTypeValue = "3";
-// out08Glassstate = "1";
+// taskRequestTypeValue = "2";
+// out08Glassstate = "0";
// out10Glassstate = "1";
// currentSlot = "1";
// confirmationWrodValue = "0";
-// glassIdeValue = "P24110201|17|1";
+// glassIdeValue = "";
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佸垎鍒负锛欰09:{}銆丄10:{},褰撳墠鏍煎瓙鍙蜂负锛歿}",
taskRequestTypeValue, glassIdeValue, confirmationWrodValue, out08Glassstate, out10Glassstate, currentSlot);
@@ -144,6 +149,24 @@
return;
}
boolean result = edgStorageCageDetailsService.inToVerify(glassIdeValue);
+ if (!result) {
+ log.info("姝ょ幓鐠僫d宸茬粡杩涜繃");
+ return;
+ }
+ if (StringUtils.isNotBlank(glassIdeValue)) {
+ GlassInfo glassInfo = glassInfoService.getOne(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, glassIdeValue)
+ );
+ Engineering engineering = engineeringMapper.selectOne(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getEngineerId, glassInfo.getEngineerId())
+ );
+ if (engineering.getState() == 2) {
+ log.info("姝よ鍗曞凡绂佹鐢熶骇");
+ return;
+ }
+ }
if ("1".equals(taskRequestTypeValue) && result) {
log.info("2銆佽繘鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�,鎵爜閲嶅ID楠岃瘉銆愭湁閲嶅=false,鏃犻噸澶�=true銆戯細{}", result);
inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
@@ -391,8 +414,24 @@
endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
} else {
//鎸夌収鐘舵�佸垽鏂袱鏉＄嚎璧伴偅鏉＄嚎
- endcell = computerLineByState(out08Glassstate, out10Glassstate);
-
+ GlassInfo glassInfos = glassInfoService.getOne(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, glassId)
+ );
+ if (glassInfos != null) {
+ if (Math.max(glassInfos.getWidth(), glassInfos.getHeight()) > Integer.parseInt(firstLength)) {
+ if (out08Glassstate == 1) {
+ endcell = Const.A09_OUT_TARGET_POSITION;
+ } else {
+ log.info("褰撳墠鐜荤拑鍙兘璧板ぇ绾匡紝浣嗗ぇ绾挎湭绌洪棽鐜荤拑淇℃伅锛歿}", glassInfos);
+ return Boolean.FALSE;
+ }
+ } else {
+ endcell = computerLineByState(out08Glassstate, out10Glassstate);
+ }
+ } else {
+ endcell = computerLineByState(out08Glassstate, out10Glassstate);
+ }
if (out08Glassstate == 1 && out10Glassstate == 1) {
EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
@@ -415,19 +454,21 @@
wrapper.last("order by count(t.glass_id) desc limit 2");
List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(wrapper);
if (CollectionUtil.isEmpty(list)) {
+ log.info("绗煎瓙鍐呮病鏈夋壘鍒板悎閫傜殑鐜荤拑");
MPJQueryWrapper<GlassInfo> queryWrapper = new MPJQueryWrapper<GlassInfo>()
.selectAll(GlassInfo.class).eq("t.glass_id", glassId);
if (endcell == Const.A10_OUT_TARGET_POSITION) {
- queryWrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ queryWrapper.leftJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
"on t.glass_id = t1.glass_id and (t1.first_length between " + minTwoFirstLength + " and " + firstLength
+ " and t1.second_length between " + minTwoSecondLength + " and " + secondLength + ") ");
} else {
- queryWrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ queryWrapper.leftJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
"on t.glass_id = t1.glass_id and (t1.first_length >=" + minOneFirstLength + " and t1.second_length>=" + minOneSecondLength + ") ");
}
GlassInfo one = glassInfoService.getOne(queryWrapper);
+ log.info("鎵惧埌鍚堥�傜殑鐜荤拑" + one);
if (one != null) {
EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
BeanUtils.copyProperties(one, resultDetails);
@@ -475,6 +516,10 @@
}
}
}
+ }
+ if (endcell == Const.A09_OUT_TARGET_POSITION && Math.min(glassInfo.getWidth(), glassInfo.getHeight()) < Integer.parseInt(minOneFirstLength)) {
+ log.info("灏哄涓嶇鍚堟渶澶х嚎鏈�灏忓昂瀵竰}", glassInfo);
+ return Boolean.FALSE;
}
return saveOutGlassMessageBySlot(glassInfo, endcell, confirmationWrodAddress, glassId, currentSlot);
}
@@ -904,18 +949,17 @@
}
}
- @Scheduled(fixedDelay = 500)
+ @Scheduled(fixedDelay = 3000)
public void CacheGlassTasks() {
- JSONObject jsonObject = new JSONObject();
- List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
- jsonObject.append("currentCutTerritory", currentCutTerritorys);
- //log.info("鏈璇嗗埆鐗堝浘{},++++{}",engineerId,currentCutTerritorys);
- //鍗у缂撳瓨绗煎唴淇℃伅
- List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();
- jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos);
-
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
if (sendwServer != null) {
+ JSONObject jsonObject = new JSONObject();
+ List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
+ jsonObject.append("currentCutTerritory", currentCutTerritorys);
+ //log.info("鏈璇嗗埆鐗堝浘{},++++{}",engineerId,currentCutTerritorys);
+ //鍗у缂撳瓨绗煎唴淇℃伅
+ List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();
+ jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
@@ -931,7 +975,7 @@
}
}
- @Scheduled(fixedDelay = 500)
+ @Scheduled(fixedDelay = 3000)
public void cacheGlassIsRun() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
@@ -949,7 +993,7 @@
}
}
- @Scheduled(fixedDelay = 500)
+ @Scheduled(fixedDelay = 3000)
public void CacheGlassTaskss() {
JSONObject jsonObject = new JSONObject();
//log.info("鏈璇嗗埆鐗堝浘{},++++{}",engineerId,currentCutTerritorys);
@@ -973,4 +1017,27 @@
}
}
}
+
+// @Scheduled(fixedDelay = 1000)
+// public void largenScreen() {
+// JSONObject jsonObject = new JSONObject();
+//
+// ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
+// if (sendwServer != null) {
+// List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
+// jsonObject.append("pieChartVOS", pieChartVOS);
+// for (WebSocketServer webserver : sendwServer) {
+// if (webserver != null) {
+// webserver.sendMessage(jsonObject.toString());
+// List<String> messages = webserver.getMessages();
+// if (!messages.isEmpty()) {
+// // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+// webserver.clearMessages();
+// }
+// } else {
+// log.info("largenScreen is closed");
+// }
+// }
+// }
+// }
}
--
Gitblit v1.8.0