From 9ccdf529fcc03b32ec1656c3b668b8bddd43ea5f Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 24 四月 2024 18:54:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 20 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 ee05420..4709fcf 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
@@ -1,8 +1,13 @@
package com.mes.edgstoragecage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
@@ -38,13 +43,20 @@
* @return
*/
@Override
- public List<Map> selectCacheEmpty(){
- return baseMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
- .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
- .isNull("escd.slot")
+ public List<Map<String, Object>> selectCacheEmpty(){
+ 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")
+// .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+// .isNull("escd.slot")
+// );
}
/**
@@ -52,14 +64,21 @@
* @return
*/
@Override
- public List<Map> selectCacheOut(){
- return upPattenUsageMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
- .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
- .isNotNull("escd.slot")
- .orderByAsc("escd.tempering_layout_id","escd.tempering_feed_sequence")
+ public List<Map<String, Object>> selectCacheOut(){
+
+ return upPattenUsageMapper.selectJoinMaps(JoinWrappers.lambda(UpPattenUsage.class).selectAll(UpPattenUsage.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 upPattenUsageMapper.selectJoinMaps(new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
+// .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+// .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+// .isNotNull("escd.slot")
+// .orderByAsc("escd.tempering_layout_id","escd.tempering_feed_sequence")
+// );
}
/**
@@ -67,23 +86,62 @@
* @return
*/
@Override
- public List<Map> selectEdgStorageCages(){
- return baseMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
- .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+ public List<Map<String, Object>> selectEdgStorageCages(){
+ return baseMapper.selectJoinMaps(JoinWrappers.lambda(EdgStorageCage.class)
+ .selectAll(EdgStorageCage.class)
+ .selectAs(EdgStorageCageDetails::getId,"esdId")
+ .select(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails::getWidth,EdgStorageCageDetails::getHeight,EdgStorageCageDetails::getId)
+ .leftJoin(EdgStorageCageDetails.class,on->on
+ .eq(EdgStorageCageDetails::getDeviceId,EdgStorageCage::getDeviceId)
+ .eq(EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot))
);
+// return baseMapper.selectJoinMaps(new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
+// .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+// .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+// );
}
/**
- * 淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
+ * 淇敼鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愬惎鐢�/绂佺敤銆�
* @param edgStorageCage
* @return
*/
@Override
public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){
- baseMapper.updateById(edgStorageCage);
+ EdgStorageCage edgItem=baseMapper.selectById(edgStorageCage.getId());
+ edgItem.setEnableState(edgStorageCage.getEnableState());
+ baseMapper.updateById(edgItem);
return true;
}
+ /**
+ *淇敼鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
+ * @param edgStorageCage
+ * @param edgStorageCageDetails
+ * @return
+ */
+ @Override
+ public boolean updateEdgStorageCageDetails(EdgStorageCage edgStorageCage,EdgStorageCageDetails edgStorageCageDetails){
+ EdgStorageCage edgItem=baseMapper.selectById(edgStorageCage.getId());
+ EdgStorageCageDetails edgDItem=edgStorageCageDetailsMapper.selectById(edgStorageCageDetails.getId());
+ if (edgItem!=null){
+ if(edgDItem==null){
+ //绉婚櫎鐜荤拑
+ EdgStorageCageDetails result=edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getId,edgStorageCageDetails.getId()));
+ 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);
+ }
+ }
+ return true;
+ }
+
+
}
--
Gitblit v1.8.0