From 04a319eb80c1556af1aa726b6b89a882b14641e0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 15:15:01 +0800
Subject: [PATCH] 接口整理
---
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index dd8115f..547c405 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -1,15 +1,21 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BikesMapper;
-import com.doumee.dao.business.model.Bikes;
+import com.doumee.dao.business.join.BikesJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.web.response.BikeLogDTO;
+import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.service.business.BikesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +32,8 @@
@Autowired
private BikesMapper bikesMapper;
+ @Autowired
+ private BikesJoinMapper bikesJoinMapper;
@Override
public String create(Bikes bikes) {
@@ -85,6 +93,24 @@
}
@Override
+ public PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap) {
+ IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Bikes> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.orderByAsc(Bikes::getSiteId,Bikes::getLockId);
+ queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
+ .leftJoin(Sites.class,Sites::getId,Bikes::getSiteId)
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId())
+ .isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode)
+ .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode);
+ queryWrapper.selectAll(Bikes.class)
+ .selectAs(BaseParam::getName,Bikes::getParamName)
+ .selectAs(Sites::getName,Bikes::getSiteName) ;
+ return PageData.from(bikesJoinMapper.selectJoinPage(page, Bikes.class, queryWrapper));
+ }
+ @Override
public PageData<Bikes> findPage(PageWrap<Bikes> pageWrap) {
IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Bikes> queryWrapper = new QueryWrapper<>();
--
Gitblit v1.9.3