|
|
@@ -52,9 +52,11 @@ public class WashDeviceServiceImpl extends MyBaseServiceImpl<WashDeviceMapper, W
|
|
|
.orderByAsc(WashDevice::getDeviceName)
|
|
|
.list();
|
|
|
var voList = new ArrayList<WashDeviceVo>();
|
|
|
- var currentUserId = StpUtil.getLoginIdAsLong();
|
|
|
+ //TODO 根据订单查询占用中的设备
|
|
|
+// var currentUserId = StpUtil.getLoginIdAsLong();
|
|
|
for (WashDevice washDevice : list) {
|
|
|
- var vo = new WashDeviceVo().setCurrentUserId(currentUserId);
|
|
|
+ var vo = new WashDeviceVo();
|
|
|
+// .setCurrentUserId(currentUserId);
|
|
|
BeanUtils.copyProperties(washDevice, vo);
|
|
|
vo.setShortId(KymCache.INSTANCE.getShortIdByProductKeyAndDeviceName(washDevice.getProductKey(), washDevice.getDeviceName()));
|
|
|
vo.setSeqName(KymCache.INSTANCE.getSeqNameByShortId(vo.getShortId()));
|
|
|
@@ -77,6 +79,7 @@ public class WashDeviceServiceImpl extends MyBaseServiceImpl<WashDeviceMapper, W
|
|
|
.eq(WashDevice::getProductKey, productKeyAndDeviceName[0])
|
|
|
.eq(WashDevice::getDeviceName, productKeyAndDeviceName[1])
|
|
|
.one();
|
|
|
+ //TODO 根据订单查询占用中的设备
|
|
|
var vo = new WashDeviceVo().setCurrentUserId(StpUtil.getLoginIdAsLong());
|
|
|
BeanUtils.copyProperties(washDevice, vo.setShortId(shortId));
|
|
|
return vo;
|