From 8c8e78eac51fdc57942e1e348ba54d0116515408 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期三, 08 五月 2024 10:38:46 +0800
Subject: [PATCH] 修正plc读取代码方式
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index 4709fcf..2717685 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -16,6 +16,7 @@
import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
@@ -30,6 +31,7 @@
* @author zhoush
* @since 2024-04-07
*/
+@Slf4j
@Service
public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
@@ -43,14 +45,22 @@
* @return
*/
@Override
- public List<Map<String, Object>> selectCacheEmpty(){
- return baseMapper.selectJoinMaps(JoinWrappers.lambda(EdgStorageCage.class).selectAll(EdgStorageCage.class)
- .select(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight,EdgStorageCageDetails::getGlassId)
+ public List<EdgStorageCage> selectCacheEmpty(){
+ return baseMapper.selectJoinList(EdgStorageCage.class,new MPJLambdaWrapper<EdgStorageCage>()
+ .selectAll(EdgStorageCage.class)
.leftJoin(EdgStorageCageDetails.class,on->on
.eq(EdgStorageCageDetails::getDeviceId,EdgStorageCage::getDeviceId)
.eq(EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot))
.isNull(EdgStorageCageDetails::getSlot)
);
+
+// return baseMapper.selectJoinMaps(JoinWrappers.lambda(EdgStorageCage.class).selectAll(EdgStorageCage.class)
+// .select(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight,EdgStorageCageDetails::getGlassId)
+// .leftJoin(EdgStorageCageDetails.class,on->on
+// .eq(EdgStorageCageDetails::getDeviceId,EdgStorageCage::getDeviceId)
+// .eq(EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot))
+// .isNull(EdgStorageCageDetails::getSlot)
+// );
// return baseMapper.selectJoinMaps(new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
// .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
@@ -116,28 +126,28 @@
/**
*淇敼鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
- * @param edgStorageCage
+ * @param edgStorageCageId
* @param edgStorageCageDetails
* @return
*/
@Override
- public boolean updateEdgStorageCageDetails(EdgStorageCage edgStorageCage,EdgStorageCageDetails edgStorageCageDetails){
- EdgStorageCage edgItem=baseMapper.selectById(edgStorageCage.getId());
+ public boolean updateEdgStorageCageDetails(int edgStorageCageId,EdgStorageCageDetails edgStorageCageDetails){
+ EdgStorageCage edgItem=baseMapper.selectById(edgStorageCageId);
+ log.info("姝ｅ父"+edgItem);
EdgStorageCageDetails edgDItem=edgStorageCageDetailsMapper.selectById(edgStorageCageDetails.getId());
if (edgItem!=null){
- if(edgDItem==null){
- //绉婚櫎鐜荤拑
- EdgStorageCageDetails result=edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getId,edgStorageCageDetails.getId()));
+ //绉婚櫎
+ EdgStorageCageDetails result=edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot,edgStorageCageId));
+ if (result!=null){
result.setSlot(0);
edgStorageCageDetailsMapper.updateById(result);
- }else{
- //1.缁戝畾鏂扮殑鐜荤拑 2.鏇存崲鐜荤拑 涓婁竴鐗囨竻闄� 閲嶆柊缁戝畾
- EdgStorageCageDetails lastResult=edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot,edgStorageCage.getSlot()));
- lastResult.setSlot(0);
- edgStorageCageDetailsMapper.updateById(lastResult);
- EdgStorageCageDetails result=edgStorageCageDetailsMapper.selectById(edgStorageCageDetails.getId());
- result.setSlot(edgStorageCageDetails.getSlot());
- edgStorageCageDetailsMapper.updateById(result);
+ }
+ //娣诲姞
+ if(edgDItem!=null){
+ //鍙紶鏍煎瓙 锛氱Щ闄ょ幓鐠�
+ EdgStorageCageDetails newresult=edgStorageCageDetailsMapper.selectById(edgStorageCageDetails.getId());
+ newresult.setSlot(edgItem.getSlot());
+ edgStorageCageDetailsMapper.updateById(newresult);
}
}
return true;
--
Gitblit v1.8.0