From 44051709072ff59407c9ce4592abe15d76c6128d Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 19 四月 2024 16:57:22 +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 | 11 +++++------
1 files changed, 5 insertions(+), 6 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 b337c2d..e863425 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,6 +1,7 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,10 +26,8 @@
* @since 2024-04-07
*/
@Service
-public class EdgStorageCageServiceImpl extends ServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
+public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
- @Autowired
- EdgStorageCageMapper edgStorageCageMapper;
@Autowired
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
@Autowired
@@ -37,7 +36,7 @@
@Override
//鏌ヨ绗煎唴绌烘牸
public List<Map> selectCacheEmpty(){
- List<Map> map=edgStorageCageMapper.selectJoinList(
+ List<Map> map=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")
@@ -62,7 +61,7 @@
@Override
//鐞嗙墖缂撳瓨璇︽儏
public List<Map> selectEdgStorageCages(){
- List<Map> map=edgStorageCageMapper.selectJoinList(
+ List<Map> map=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")
@@ -73,7 +72,7 @@
@Override
//淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){
- edgStorageCageMapper.updateById(edgStorageCage);
+ baseMapper.updateById(edgStorageCage);
return true;
}
--
Gitblit v1.8.0