From 2d0358932cd63ed46778be72d126fc8d766a27a8 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 18 九月 2024 16:15:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
index 10dbb2d..eea2804 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -39,50 +39,61 @@
private RedisUtil redisUtil;
private JSONObject jsonObject = new JSONObject();
+
public void queryDataSource1() throws InterruptedException {
- List<Double> carPostion=new ArrayList<>();
+ List<Double> carPostion = new ArrayList<>();
carPostion.add(0.25);
carPostion.add(0.5);
- jsonObject.append("carPostion",carPostion);
+ jsonObject.append("carPostion", carPostion);
//鐣岄潰灞曠ず绗煎瓙淇℃伅
jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail());
//杩涚墖浠诲姟鏁版嵁
- List<BigStorageCageDetails> bigStorageCageDetailsFeedTask=bigStorageCageDetailsService.selectFeedTask();
+ List<BigStorageCageDetails> bigStorageCageDetailsFeedTask = bigStorageCageDetailsService.selectFeedTask();
jsonObject.append("bigStorageCageDetailsFeedTask", bigStorageCageDetailsFeedTask);
//鍑虹墖浠诲姟鏁版嵁
- List<BigStorageCageDetails> bigStorageCageDetailsOutTask=bigStorageCageDetailsService.selectOutTask();
+ List<BigStorageCageDetails> bigStorageCageDetailsOutTask = bigStorageCageDetailsService.selectOutTask();
jsonObject.append("bigStorageCageDetailsOutTask", bigStorageCageDetailsOutTask);
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
- List<Map<String, Object>> bigStorageCageUsage=bigStorageCageService.selectBigStorageCageUsage();
+ List<Map<String, Object>> bigStorageCageUsage = bigStorageCageService.selectBigStorageCageUsage();
jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
//鐞嗙墖绗艰〃鏍间俊鎭�
jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll());
//閽㈠寲寮�鍏�
- boolean temperingSwitch=false;
- if(redisUtil.getCacheObject("temperingSwitch")==null){
+ boolean temperingSwitch = false;
+ if (redisUtil.getCacheObject("temperingSwitch") == null) {
redisUtil.setCacheObject("temperingSwitch", false);
- }else{
- temperingSwitch=redisUtil.getCacheObject("temperingSwitch");
+ } else {
+ temperingSwitch = redisUtil.getCacheObject("temperingSwitch");
}
jsonObject.append("temperingSwitch", temperingSwitch);
+
+ //褰撳墠鎸囧畾宸ョ▼
+ String temperingengineerId = "";
+ if (redisUtil.getCacheObject("temperingengineerId") == null) {
+ redisUtil.setCacheObject("temperingengineerId", temperingengineerId);
+ } else {
+ temperingengineerId = redisUtil.getCacheObject("temperingengineerId");
+ }
+ jsonObject.append("temperingengineerId", temperingengineerId);
}
public void queryDataSource2() throws InterruptedException {
//鍑虹墖闃熷垪
- List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list(
+ List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(
new LambdaQueryWrapper<TemperingGlassInfo>()
- .inSql(TemperingGlassInfo::getEngineerId,"select distinct engineer_id from tempering_glass_info where state<4")
+ .inSql(TemperingGlassInfo::getEngineerId, "select distinct engineer_id from tempering_glass_info where state<4")
);
jsonObject.append("temperingGlassInfoList", temperingGlassInfoList);
}
+
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
@@ -117,13 +128,13 @@
}
@Scheduled(fixedDelay = 1000)
- public void temperingIsRun(){
+ public void temperingIsRun() {
JSONObject jsonObject = new JSONObject();
//杩涚墖浠诲姟鏁版嵁
- List<BigStorageCageDetails> bigStorageCageDetailsFeedTask=bigStorageCageDetailsService.selectFeedTask();
+ List<BigStorageCageDetails> bigStorageCageDetailsFeedTask = bigStorageCageDetailsService.selectFeedTask();
jsonObject.append("bigStorageCageDetailsFeedTask", bigStorageCageDetailsFeedTask);
//鍑虹墖浠诲姟鏁版嵁
- List<BigStorageCageDetails> bigStorageCageDetailsOutTask=bigStorageCageDetailsService.selectOutTask();
+ List<BigStorageCageDetails> bigStorageCageDetailsOutTask = bigStorageCageDetailsService.selectOutTask();
jsonObject.append("bigStorageCageDetailsOutTask", bigStorageCageDetailsOutTask);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
if (sendwServer != null) {
--
Gitblit v1.8.0