From e8d3676793d4194485afec7940aaf355af594901 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期四, 18 四月 2024 14:24:52 +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/EdgStorageCageDetailsServiceImpl.java | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java index 5925f22..817d3c3 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java @@ -1,10 +1,9 @@ package com.mes.edgstoragecage.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.query.MPJQueryWrapper; -import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper; import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; import com.mes.taskcache.mapper.HangzhouMesMapper; @@ -15,7 +14,7 @@ /** * <p> - * 鏈嶅姟瀹炵幇绫� + * 鏈嶅姟瀹炵幇绫� * </p> * * @author zhoush @@ -31,20 +30,24 @@ //鑾峰彇纾ㄨ竟鍓嶇紦瀛樼悊鐗囩淇℃伅 @Override - public List<Map> getEdgStorageInfos(){ - List<Map> map=edgStorageCageDetailsMapper.selectJoinList( - Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class) - .select("a.c","a.d") + public List<Map> getEdgStorageInfos() { + List<Map> map = edgStorageCageDetailsMapper.selectJoinList( + Map.class, new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class) + .select("a.c", "a.d") .leftJoin("ab a on t.id=a.id") - .le("a.id","1") + .le("a.id", "1") ); return map; - }; + } + + ; @Override - public List<Map> setEdgStorageInfos(){ + public List<Map> setEdgStorageInfos() { return hangzhouMesMapper.selectCachInfo(); - }; + } + + ; } -- Gitblit v1.8.0