|
@@ -9,7 +9,6 @@ import com.genersoft.iot.vmp.extend.mapper.ExtendDeviceMapper;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
|
|
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -29,8 +28,8 @@ public class ExtendDeviceService extends ServiceImpl<ExtendDeviceMapper, ExtendD
|
|
|
lqw.like(StrUtil.isNotBlank(dto.getName()),ExtendDevice :: getName,dto.getName());
|
|
lqw.like(StrUtil.isNotBlank(dto.getName()),ExtendDevice :: getName,dto.getName());
|
|
|
lqw.like(StrUtil.isNotBlank(dto.getDeviceId()),ExtendDevice :: getDeviceId,dto.getDeviceId());
|
|
lqw.like(StrUtil.isNotBlank(dto.getDeviceId()),ExtendDevice :: getDeviceId,dto.getDeviceId());
|
|
|
lqw.like(StrUtil.isNotBlank(dto.getHostAddress()),ExtendDevice :: getHostAddress,dto.getHostAddress());
|
|
lqw.like(StrUtil.isNotBlank(dto.getHostAddress()),ExtendDevice :: getHostAddress,dto.getHostAddress());
|
|
|
- List<ExtendDevice> rsList = list(lqw);
|
|
|
|
|
lqw.orderByDesc(ExtendDevice :: getId);
|
|
lqw.orderByDesc(ExtendDevice :: getId);
|
|
|
|
|
+ List<ExtendDevice> rsList = list(lqw);
|
|
|
return new PageInfo<>(rsList);
|
|
return new PageInfo<>(rsList);
|
|
|
}
|
|
}
|
|
|
|
|
|