From ec79cbc1db61ccd9431fe096a6858609d47a63b3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 28 十月 2023 15:59:31 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 20 ++++++++++++++++++--
server/services/src/main/java/com/doumee/service/business/SitesService.java | 4 +---
3 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 44151a4..b6fa337 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -8,6 +8,7 @@
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
+import com.doumee.service.business.SitesService;
import com.doumee.service.business.WxBillService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,9 +42,12 @@
@Autowired
private GoodsorderService goodsorderService;
-
@Autowired
private MemberRidesService memberRidesService;
+
+ @Autowired
+ private SitesService sitesService;
+
/**
* @throws Exception
*/
@@ -76,6 +80,18 @@
log.info("=====================寮�濮嬫瘡澶╄嚜鍔ㄧ粨绠�=======================");
memberRidesService.autoRefreshLockStatus();
log.info("=====================缁撴潫姣忓ぉ鑷姩缁撶畻=======================");
-
}
+
+
+ /**
+ * 绔欑偣杞﹁締婊℃灦鐜囬璀�
+ * @throws Exception
+ */
+ @Scheduled(fixedDelay = 1000L * 60L * 5L)
+ public void siteReserves() throws Exception {
+ log.info("=====================寮�濮� 绔欑偣杞﹁締婊℃灦鐜囬璀�=======================");
+ sitesService.siteReservesNotice();;
+ log.info("=====================缁撴潫 绔欑偣杞﹁締婊℃灦鐜囬璀�=======================");
+ }
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/SitesService.java b/server/services/src/main/java/com/doumee/service/business/SitesService.java
index 20d0712..cb77062 100644
--- a/server/services/src/main/java/com/doumee/service/business/SitesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/SitesService.java
@@ -103,10 +103,8 @@
/**
* 绔欑偣棰勮
- * @param siteId
- * @throws Exception
*/
- void siteReservesNotice(String siteId) throws Exception;
+ void siteReservesNotice() throws Exception;
/**
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 804bfcd..ef8af52 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
@@ -30,6 +30,7 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -235,7 +236,37 @@
}
@Override
- public void siteReservesNotice(String siteId) throws Exception {
+ 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);
+ if(rata.compareTo(warnMax)>Constants.ZERO){
+ //鍙戦�侀拤閽夐�氱煡
+ DingDingNotice.reservesNotice(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(s.getName(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode(),Constants.ONE,warnMin);
+ }
+ }
+ }
+
}
}
--
Gitblit v1.9.3