From cb5be3f2bb73cea7def3d0bb9ab5d5d409d2f9df Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 18 四月 2024 14:19:41 +0800
Subject: [PATCH] cachegalss误删文件恢复
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
index a65d212..c81b5ec 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
@@ -1,18 +1,15 @@
package com.mes.component;
import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
-import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import com.mes.edgstoragetask.service.TaskCacheService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.temperingglass.service.TemperingGlassInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,20 +37,20 @@
JSONObject jsonObject = new JSONObject();
try {
Thread.sleep(300);
- boolean bigStorageCageFullAlarm=false;
+ boolean bigStorageCageFullAlarm = false;
String plcD01FeedReq = "0";
String plcD04FeedReq = "0";
String plcFeedGlassid = "111";
- String plcFeedReqLine="0";
- if("1".equals(plcD01FeedReq)){
- plcFeedReqLine="1";
- }else {
+ String plcFeedReqLine = "0";
+ if ("1".equals(plcD01FeedReq)) {
+ plcFeedReqLine = "1";
+ } else {
//plc浠诲姟鍙戦�佸瓧0
}
- if("1".equals(plcD04FeedReq)){
- plcFeedReqLine="2";
- }else {
+ if ("1".equals(plcD04FeedReq)) {
+ plcFeedReqLine = "2";
+ } else {
//plc浠诲姟鍙戦�佸瓧0
}
@@ -61,25 +58,25 @@
log.info("1銆丳lc杩涚墖璇锋眰鏃�");
BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid);
- log.info("2銆佹牴鎹幓鐠僫d鑾峰彇鐜荤拑淇℃伅"+glassInfo);
+ log.info("2銆佹牴鎹幓鐠僫d鑾峰彇鐜荤拑淇℃伅" + glassInfo);
BigStorageCageDetails SlotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
if (SlotInfo != null) {
- int taskType=taskCacheService.judgeTasktype();
- log.info("3銆佹煡璇换鍔¤〃鍒ゆ柇褰撳墠浠诲姟绫诲瀷涓轰笂杞︾瓑鍒拌繕鏄笂杞﹀惎鍔�"+taskType);
- bigStorageCageFeedTaskService.addFeedTask(SlotInfo,Integer.parseInt(plcFeedReqLine),taskType);
+ int taskType = taskCacheService.judgeTasktype();
+ log.info("3銆佹煡璇换鍔¤〃鍒ゆ柇褰撳墠浠诲姟绫诲瀷涓轰笂杞︾瓑鍒拌繕鏄笂杞﹀惎鍔�" + taskType);
+ bigStorageCageFeedTaskService.addFeedTask(SlotInfo, Integer.parseInt(plcFeedReqLine), taskType);
log.info("4銆佹坊鍔犱换鍔″埌浠诲姟琛�");
//plc浠诲姟鍙戦�佸瓧1
- bigStorageCageFullAlarm=false;
- }else{
+ bigStorageCageFullAlarm = false;
+ } else {
//鐞嗙墖绗肩垎绗兼姤璀�
- bigStorageCageFullAlarm=true;
+ bigStorageCageFullAlarm = true;
}
- }else{
- List<BigStorageCageFeedTask> bigStorageCageFeedTaskList=bigStorageCageFeedTaskService.querybigStorageCageFeedTask(1);
- log.info("5銆佹煡璇换鍔¤〃鏄惁鏈夊凡缁忓畬鎴愮殑杩涚墖浠诲姟"+bigStorageCageFeedTaskList.size());
- for (BigStorageCageFeedTask bigStorageCageFeedTask:bigStorageCageFeedTaskList
- ) {
- BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();
+ } else {
+ List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskService.querybigStorageCageFeedTask(1);
+ log.info("5銆佹煡璇换鍔¤〃鏄惁鏈夊凡缁忓畬鎴愮殑杩涚墖浠诲姟" + bigStorageCageFeedTaskList.size());
+ for (BigStorageCageFeedTask bigStorageCageFeedTask : bigStorageCageFeedTaskList
+ ) {
+ BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
bigStorageCageDetails.setId(bigStorageCageFeedTask.getId());
bigStorageCageDetails.setState(1);
bigStorageCageDetailsService.updateById(bigStorageCageDetails);
@@ -93,12 +90,12 @@
String plcOutReq = "0";
boolean result = false;
if ("1".equals(plcOutReq)) {
- result=bigStorageCageService.outGlass();
- log.info("8銆佸嚭鐗囪姹傛椂璋冪敤鍑虹墖鎺ュ彛"+result);
+ result = bigStorageCageService.outGlass();
+ log.info("8銆佸嚭鐗囪姹傛椂璋冪敤鍑虹墖鎺ュ彛" + result);
if (result == true) {
//plc浠诲姟鍙戦�佸瓧1
}
- }else{
+ } else {
bigStorageCageOutTaskService.updateOutTask();
//plc浠诲姟鍙戦�佸瓧0
}
--
Gitblit v1.8.0