blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2024-12-23 119baa8e4d47b8af6117dd0bbe35fd1755504ee1 
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java


@@ -72,12 +72,15 @@


    public List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId) {


        List<EdgStorageCageVO> storageCageVOS = this.selectJoinList(EdgStorageCageVO.class, new MPJLambdaWrapper<EdgStorageCage>()


                .selectAll(EdgStorageCage.class)


                .selectCollection(EdgStorageCageDetails.class,EdgStorageCageVO::getDetails)


                .selectCollection(EdgStorageCageDetails.class, EdgStorageCageVO::getDetails)


                .leftJoin(EdgStorageCageDetails.class, on -> on


                .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)


                .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)


                .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))


                .eq(EdgStorageCage::getDeviceId, deviceId));


                        .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)


                        .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)


                        .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))


                .eq(EdgStorageCage::getDeviceId, deviceId)


                .orderByAsc(EdgStorageCage::getSlot)


                .orderByAsc(EdgStorageCageDetails::getId)


        );


        return storageCageVOS;


    }