From 976cee4892eec261f6c2927e788e476e5cc5028e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 10 三月 2025 08:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 64 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 4 deletions(-)
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 ae9625e..4410f73 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
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.damage.entity.request.DamageRequest;
+import com.mes.damage.service.DamageService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
@@ -15,6 +17,7 @@
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import com.mes.uppattenusage.service.UpPattenUsageService;
+import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,6 +41,10 @@
OptimizeProjectMapper optimizeProjectMapper;
@Autowired
EngineeringService engineeringService;
+ @Autowired
+ DamageService damageService;
+ @Autowired
+ RedisUtil redisUtil;
@Override
public List<UpPattenUsage> prioritylist() {
//鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
@@ -51,6 +58,23 @@
return null;
}
+ }
+
+ @Override
+ public List<UpPattenUsage> selectLoadTask(Engineering cell) {
+ //鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
+ Engineering engineering = engineeringService.selectInitiates(1, cell.getStationCell());
+ //log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
+ if(engineering!=null){
+ LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
+ if (cell.getState() != null) {
+ wrapper.eq(UpPattenUsage::getState, cell.getState());
+ }
+ return this.list(wrapper);
+ } else {
+ return null;
+ }
}
@Override
@@ -106,9 +130,9 @@
String engineerId = upPattenUsage.get(0).getEngineeringId();
int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
if (count <=0){
+ //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
this.saveBatch(upPattenUsage);
}
- //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
}
@Override
@@ -135,6 +159,15 @@
log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper));
return this.getOne(wrapper);
}
+
+ @Override
+ public void deleteTask(String engineerId) {
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id",engineerId);
+ this.remove(wrapper);
+ }
+
+
@Override
public UpPattenUsage selectOverTask() {
@@ -164,13 +197,36 @@
}
@Override
- public List<Engineering> setRawGlassTaskRequest(Engineering request) {
- return null;
+ public String setRawGlassTaskRequest(Engineering request) {
+ // 璋冪敤 RedisUtil 淇濆瓨 loadGlass
+ if (request == null) {
+ redisUtil.deleteObject("loadGlassRequest");
+ } else {
+ redisUtil.setCacheObject("loadGlassRequest", request);
+ }
+ return "success";
}
+
+ @Override
+ public String setRawGlassTaskRequest2(Engineering request) {
+ // 璋冪敤 RedisUtil 淇濆瓨 loadGlass
+ if (request == null) {
+ redisUtil.deleteObject("loadGlassRequest2");
+ } else {
+ redisUtil.setCacheObject("loadGlassRequest2", request);
+ }
+ return "success";
+ }
+
public Object Engineering(Engineering request) {
return null;
}
-
+ @Override
+ public String identControls(DamageRequest request) {
+ //灏嗚瘑鍒牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
+ damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "涓婄墖鏈�", request.getState());
+ return "success";
+ }
}
--
Gitblit v1.8.0