|
@@ -136,13 +136,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
|
|
|
@ApiOperation("反显设备名称")
|
|
|
@Override
|
|
|
- public R<Map<Long,String>> getDeviceNameList(DeviceInfoDto.DeviceIdDto dto){
|
|
|
+ public R<Map<Long, String>> getDeviceNameList(DeviceInfoDto.DeviceIdDto dto) {
|
|
|
LambdaQueryWrapper<DeviceInfo> lqw = new LambdaQueryWrapper<DeviceInfo>()
|
|
|
- .in(DeviceInfo::getDeviceId,dto.getDeviceId())
|
|
|
- .select(DeviceInfo::getDeviceId,DeviceInfo::getDeviceName);
|
|
|
+ .in(DeviceInfo::getDeviceId, dto.getDeviceId())
|
|
|
+ .select(DeviceInfo::getDeviceId, DeviceInfo::getDeviceName);
|
|
|
List<DeviceInfo> deviceInfoList = list(lqw);
|
|
|
- return R.ok(deviceInfoList.stream().collect(Collectors.toMap(DeviceInfo::getDeviceId, DeviceInfo::getDeviceName)));
|
|
|
+ return R.ok(deviceInfoList.stream().collect(Collectors.toMap(DeviceInfo::getDeviceId, DeviceInfo::getDeviceName)));
|
|
|
}
|
|
|
+
|
|
|
@Override
|
|
|
@ApiOperation("设备访问历史添加")
|
|
|
public R history(DeviceInfoDto.Obj obj) {
|
|
@@ -619,7 +620,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
}
|
|
|
|
|
|
|
|
|
- @ApiOperation("小程序商户设备搜索")
|
|
|
+ /**
|
|
|
+ * 小程序商户设备搜索
|
|
|
+ *
|
|
|
+ * @param page
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@Override
|
|
|
public R<PageBean<DeviceInfoDto.MerHomeSearchVO>> mercDeviceSearchPage(@RequestBody DeviceInfoDto.Page page) {
|
|
|
PageBean<DeviceInfoDto.MerHomeSearchVO> pageData = new PageBean<>();
|
|
@@ -674,7 +680,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
return R.ok(pageData);
|
|
|
}
|
|
|
|
|
|
- @ApiOperation("小程序商户设备详情-数据统计")
|
|
|
+ /**
|
|
|
+ * 小程序商户设备详情-数据统计
|
|
|
+ *
|
|
|
+ * @param dto
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@Override
|
|
|
public R<DeviceInfoDto.DeviceDataCountVO> dataCount(@RequestBody DeviceInfoDto.DeviceDataCountDTO dto) {
|
|
|
// 统计类型(1=经营数据,2=经营图表,3=温度图表,4=信号图表,5=商品管理)
|