From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 90 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 25 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..1bfd82a 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
@@ -10,6 +10,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.dao.business.LocksMapper;
import com.doumee.dao.business.SitesMapper;
import com.doumee.dao.business.model.Locks;
@@ -21,15 +22,16 @@
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.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -52,6 +54,7 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
@Override
public String create(Sites sites) {
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -64,6 +67,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绔欑偣缂栧彿宸插瓨鍦�");
}
Sites insert = new Sites();
+ insert.setId(sites.getCode());
insert.setCreateDate(new Date());
insert.setCreator(principal.getId());
insert.setEditDate(new Date());
@@ -72,10 +76,10 @@
insert.setInfo(sites.getInfo());
insert.setName(sites.getName());
insert.setCode(sites.getCode());
- insert.setStatus(sites.getStatus());
+ insert.setStatus(Constants.ZERO);
insert.setLockNum(sites.getLockNum());
insert.setIp(sites.getIp());
- sitesMapper.insert(sites);
+ sitesMapper.insert(insert);
return sites.getId();
}
@@ -101,7 +105,15 @@
@Override
public void updateById(Sites sites) {
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper<Sites> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Sites::getCode,sites.getCode());
+ Sites count = sitesMapper.selectOne(wrapper);
+ if (Objects.nonNull(count) && !count.getId().equals(sites.getId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绔欑偣缂栧彿宸插瓨鍦�");
+ }
Sites update = new Sites();
+ update.setId(sites.getId());
update.setCreateDate(new Date());
update.setEditor(principal.getId());
update.setName(sites.getName());
@@ -128,7 +140,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 +178,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 +212,25 @@
}
@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(l.bike_code) from locks l where l.site_id = sites.id and l.bike_code IS NOT NULL and l.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::getName,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)));
+ if(Constants.formatIntegerNum(s.getAllLockNum()) >0){
+ s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),2,BigDecimal.ROUND_HALF_UP));
+ }else{
+ s.setRate(new BigDecimal(0.0));
+ }
});
}
@@ -215,20 +238,37 @@
}
@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());
+ public void siteReservesNotice() throws Exception{
+ QueryWrapper<Sites> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select(" *, " +
+ " (select count(r.id) from locks r where r.site_id = sites.id) as all_lock_num ," +
+ "(select count(l.bike_code) from locks l where l.site_id = sites.id and l.bike_code IS NOT NULL and l.bike_code !='' ) as bikeCount");
+ queryWrapper.lambda().eq(Sites::getStatus,Constants.ZERO);
+ queryWrapper.lambda().eq(Sites::getIsdeleted,Constants.ZERO);
+ queryWrapper.lambda().orderByAsc(Sites::getCode);
+ List<Sites> sitesList = sitesMapper.selectList(queryWrapper);
+ if (!CollectionUtils.isEmpty(sitesList)){
+ for (Sites s:sitesList) {
+ if(Constants.formatIntegerNum(s.getAllLockNum())<=Constants.ZERO){
+ continue;
+ }
+ BigDecimal warnMin = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.WARN_MIN).getCode());
+ BigDecimal warnMax = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.WARN_MAX).getCode());
+ BigDecimal rata = new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100L));
+ if(rata.compareTo(warnMax)>Constants.ZERO){
+ //鍙戦�侀拤閽夐�氱煡
+ DingDingNotice.reservesNotice(StringUtils.isBlank(s.getName())?s.getId() + " - 鏈煡" :s.getId() + " - " + s.getName(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode(),Constants.ZERO,warnMax);
+ }else if(rata.compareTo(warnMin)<Constants.ZERO){
+ //鍙戦�侀拤閽夐�氱煡
+ DingDingNotice.reservesNotice(StringUtils.isBlank(s.getName())?s.getId() + " - 鏈煡" :s.getId() + " - " + s.getName(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode(),Constants.ONE,warnMin);
+ }
+ }
+ }
- return PageData.from(sitesMonitorDTO);
}
}
--
Gitblit v1.9.3