From 031caa5cb14a709702f942aede37f6403d436650 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 27 十一月 2025 08:10:23 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++++----
src/main/java/com/zy/common/service/CommonService.java | 5 +++--
src/main/java/com/zy/asrs/task/SensorWarningScheduler.java | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 48d5316..99c0711 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -235,8 +235,8 @@
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(10D); // 浼樺厛绾�
wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+// wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+// wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -470,8 +470,8 @@
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
wrkMast.setIoPri(10D);
- wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
- wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
+// wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
+// wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
wrkMast.setIoPri(10.0D);//浼樺厛绾�
diff --git a/src/main/java/com/zy/asrs/task/SensorWarningScheduler.java b/src/main/java/com/zy/asrs/task/SensorWarningScheduler.java
index a8d3f02..c5e9e71 100644
--- a/src/main/java/com/zy/asrs/task/SensorWarningScheduler.java
+++ b/src/main/java/com/zy/asrs/task/SensorWarningScheduler.java
@@ -16,12 +16,12 @@
@Autowired
private BasSensorService sensorService;
- @Scheduled(cron = "0/3 * * * * ?")
+// @Scheduled(cron = "0/3 * * * * ?")
private void warning(){
List<BasSensor> basSensors = sensorService.selectList(new EntityWrapper<>(new BasSensor()));
for (BasSensor basSensor : basSensors) {
if ((basSensor.getTemperature() < 15 || basSensor.getTemperature() > 25) || basSensor.getHumidity() > 60){
- log.info(basSensor.getLocation() + "娓╂箍搴﹀紓甯�,娓╁害:" + basSensor.getTemperature() + ",婀垮害:" + basSensor.getHumidity());
+// log.info(basSensor.getLocation() + "娓╂箍搴﹀紓甯�,娓╁害:" + basSensor.getTemperature() + ",婀垮害:" + basSensor.getHumidity());
}
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 27f3b06..45d913c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,6 +1,7 @@
package com.zy.common.service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -140,7 +141,7 @@
StartupDto startupDto = new StartupDto();
-// // 鑾峰彇鐩爣绔�
+ // 鑾峰彇鐩爣绔�
// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", locMast.getCrnNo());
// StaDesc staDesc = staDescService.selectOne(wrapper);
// if (Cools.isEmpty(staDesc)) {
@@ -160,7 +161,7 @@
// 杩斿洖dto
startupDto.setWorkNo(workNo);
startupDto.setCrnNo(locMast.getCrnNo());
- startupDto.setSourceStaNo(sourceStaNo);
+// startupDto.setSourceStaNo(sourceStaNo);
startupDto.setLocNo(locNo);
return startupDto;
}
--
Gitblit v1.9.1