From e0688c4b328fb01ec4e61156d57ae9efaaf754d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 17 十月 2023 17:12:11 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index ded5f6d..8ba5bf2 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -21,13 +21,13 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.util.Date;
@@ -128,7 +128,7 @@
@Override
public Sites findOne(Sites sites) {
QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
- return sitesMapper.selectOne(wrapper);
+ return sitesMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -166,10 +166,10 @@
queryWrapper.lambda().eq(Sites::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Sites::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Sites::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Sites::getCode, pageWrap.getModel().getCode());
+ queryWrapper.lambda().like(Sites::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Sites::getStatus, pageWrap.getModel().getStatus());
@@ -200,14 +200,22 @@
}
@Override
- public PageData<SitesMonitorDTO> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap) {
-
- IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- Page<SitesMonitorDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorDTO(page, pageWrap.getModel().getCode(), pageWrap.getModel().getName());
+ public PageData<Sites> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap) {
+// IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ IPage<Sites> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<Sites> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.select("*,(select count(r.id) from locks r where r.site_id = sites.id) as all_lock_num" +
+ ",(select count(r.bike_code) from locks r where r.site_id = sites.id and r.bike_code is null and r.bike_code !='' ) as bikeCount");
+// Page<SitesMonitorDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorDTO(page, pageWrap.getModel().getCode(), pageWrap.getModel().getName());
+ queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Sites::getCode,pageWrap.getModel().getCode());
+ queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Sites::getCode,pageWrap.getModel().getName());
+ queryWrapper.lambda().orderByAsc(Sites::getCode);
+ IPage<Sites> sitesMonitorDTO = sitesMapper.selectPage(page, queryWrapper);
if (!CollectionUtils.isEmpty(sitesMonitorDTO.getRecords())){
sitesMonitorDTO.getRecords().forEach(s->{
- s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getLocalCount()).setScale(2)));
+ s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),2));
});
}
@@ -217,18 +225,5 @@
@Override
public void siteReservesNotice(String siteId) throws Exception {
- }
-
- @Override
- public PageData<SitesMonitorBikeDTO> getSitesMonitorBikeDTO(PageWrap<SitesMonitorDTO> pageWrap) {
- IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- Page<SitesMonitorBikeDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorBikeDTO(page,
- pageWrap.getModel().getCode(),
- pageWrap.getModel().getName(),
- pageWrap.getModel().getLockCode(),
- pageWrap.getModel().getHasBike());
-
-
- return PageData.from(sitesMonitorDTO);
}
}
--
Gitblit v1.9.3