From 8a9b0adc7fe0f72c4de8c8e5d14e282f5913d63d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 十二月 2024 14:48:36 +0800
Subject: [PATCH] 1、fixbug:笼内玻璃错乱问题解决 2、中空问题修复：避免多个线程拿到的空格相同 3、swagger名称显示
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 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 409cfb2..1f43e77 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
@@ -1,5 +1,6 @@
package com.mes.uppattenusage.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,10 +45,10 @@
//log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
if(engineering!=null){
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId());
+ wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
return this.list(wrapper);
- }else {
- return null;
+ } else {
+ return null;
}
}
@@ -55,7 +56,10 @@
@Override
public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId());
+ wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId());
+// .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
+// .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());
+
return this.list(wrapper);
}
@@ -96,23 +100,39 @@
@Override
public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
- this.saveBatch(upPattenUsage);
- //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+ if (CollectionUtil.isEmpty(upPattenUsage)){
+ return;
+ }
+ String engineerId = upPattenUsage.get(0).getEngineeringId();
+ int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
+ if (count <=0){
+ //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+ this.saveBatch(upPattenUsage);
+ }
}
@Override
public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {
upPattenUsage.setState(state);
- boolean updateSuccess=this.updateById(upPattenUsage);
- log.info("鏇存柊鐘舵�亄}",updateSuccess);
+ boolean updateSuccess = this.updateById(upPattenUsage);
+ log.info("鏇存柊鐘舵�亄}", updateSuccess);
//鏇存柊鐘舵��
}
@Override
- public UpPattenUsage selectedEngineering(String engineeringId) {
- QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
- wrapper.eq("engineering_id",engineeringId)
+ public UpPattenUsage selectedTaskEngineering(String engineeringId) {
+ return null;
+ }
+
+ @Override
+ public UpPattenUsage selectedEngineering(String engineerId) {
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id", engineerId)
+// .eq("station_cell", stationCell)
+// .eq("film_remove", filmRemove)
.last("limit 1");
+ log.info("鏌ヨ棰勮鍙傛暟");
+ log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper));
return this.getOne(wrapper);
}
@@ -138,10 +158,19 @@
@Override
public Boolean updateGlassState(UpPattenUsage upPattenUsage) {
UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("id",upPattenUsage.getId())
- .set("state",upPattenUsage.getState());
+ updateWrapper.eq("id", upPattenUsage.getId())
+ .set("state", upPattenUsage.getState());
return this.update(updateWrapper);
}
+ @Override
+ public List<Engineering> setRawGlassTaskRequest(Engineering request) {
+ return null;
+ }
+
+ public Object Engineering(Engineering request) {
+ return null;
+ }
+
}
--
Gitblit v1.8.0