~zhoushihao/YiWuProject.git

			@@ -21,6 +21,7 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			@@ -37,11 +38,8 @@
			@Service
			public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {

			@Autowired
			@Resource
			EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
			@Autowired
			UpPattenUsageMapper upPattenUsageMapper;

			@Autowired
			DamageService damageService;

			@@ -72,11 +70,17 @@
			*/
			@Override
			public List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId) {
			List<EdgStorageCageVO> storageCageVOS = this.selectJoinList(EdgStorageCageVO.class, new MPJLambdaWrapper<EdgStorageCage>().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));
			List<EdgStorageCageVO> storageCageVOS = this.selectJoinList(EdgStorageCageVO.class, new MPJLambdaWrapper<EdgStorageCage>()
			.selectAll(EdgStorageCage.class)
			.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)
			.orderByAsc(EdgStorageCage::getSlot)
			.orderByAsc(EdgStorageCageDetails::getId)
			);
			return storageCageVOS;
			}