From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 76 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 13 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 be5d97a..a27bae7 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
@@ -11,8 +11,10 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniUtilService;
+import com.doumee.dao.business.BikesMapper;
import com.doumee.dao.business.LocksMapper;
import com.doumee.dao.business.SitesMapper;
+import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.Sites;
import com.doumee.dao.business.web.request.SitesMonitorBikeDTO;
@@ -28,6 +30,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
@@ -50,6 +53,8 @@
@Autowired
private LocksMapper locksMapper;
+ @Autowired
+ private BikesMapper bikesMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -61,8 +66,9 @@
QueryWrapper<Sites> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(Sites::getCode,sites.getCode());
- Integer count = sitesMapper.selectCount(wrapper);
+ .eq(Sites::getCode,sites.getCode())
+ .eq(Sites::getIsdeleted,Constants.ZERO);
+ Long count = sitesMapper.selectCount(wrapper);
if (count > 0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绔欑偣缂栧彿宸插瓨鍦�");
}
@@ -75,7 +81,9 @@
insert.setIsdeleted(Constants.ZERO);
insert.setInfo(sites.getInfo());
insert.setName(sites.getName());
+ insert.setType(sites.getType());
insert.setCode(sites.getCode());
+ insert.setElectronicFence(sites.getElectronicFence());
insert.setStatus(Constants.ZERO);
insert.setLockNum(sites.getLockNum());
insert.setIp(sites.getIp());
@@ -118,9 +126,14 @@
update.setEditor(principal.getId());
update.setName(sites.getName());
update.setLockNum(sites.getLockNum());
+ update.setElectronicFence(sites.getElectronicFence());
update.setIp(sites.getIp());
update.setNeedNotice(sites.getNeedNotice());
sitesMapper.updateById(update);
+ }
+ @Override
+ public void updateByMqtt(Sites sites) {
+ sitesMapper.updateById(sites);
}
@Override
@@ -162,6 +175,7 @@
return ;
}
sites.setIsdeleted(Constants.ZERO);
+ sites.setType(Constants.ZERO);
sites.setStatus(Constants.ZERO);
QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
wrapper.lambda().orderByDesc(Sites::getLastLinkDate);
@@ -170,15 +184,16 @@
for(Sites site : siteList){
//鏃堕棿鏌ヨ繃閫氫俊寮傚父闃堝��
if(Constants.formatIntegerNum(site.getNeedNotice()) == Constants.ZERO
- && System.currentTimeMillis()-site.getLastLinkDate().getTime() > second*1000){
+ &&(site.getLastLinkDate() == null
+ || System.currentTimeMillis()-site.getLastLinkDate().getTime() > second*1000)){
errorList.add(site);
}
}
if(errorList.size()>0){
try {
- DingDingNotice.siteNoLink(errorList,
- systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
- systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode());
+ DingDingNotice.siteNoLink(errorList, systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode());
} catch (Exception e) {
e.printStackTrace();
}
@@ -232,6 +247,9 @@
if (pageWrap.getModel().getClientVersion() != null) {
queryWrapper.lambda().eq(Sites::getClientVersion, pageWrap.getModel().getClientVersion());
}
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(Sites::getType, pageWrap.getModel().getType());
+ }
/*for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -247,6 +265,27 @@
public long count(Sites sites) {
QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
return sitesMapper.selectCount(wrapper);
+ }
+ @Override
+ @Transactional
+ public void dealSiteLocks(Sites sites) {
+ if(StringUtils.isBlank(sites.getId()) || StringUtils.isBlank(sites.getClientVersion())){
+ return;
+ }
+ sites.setEditDate(new Date());
+ sitesMapper.updateById(sites);
+ String[] lockCods = new String[sites.getLockNum()];
+ if(Constants.formatIntegerNum(sites.getLockNum())>0){
+ for (int i = 1; i < sites.getLockNum()+1; i++) {
+ lockCods[i-1] = i+"";
+ }
+ }
+ locksMapper.delete(new UpdateWrapper<Locks>().lambda()
+ .eq(Locks::getSiteId,sites.getId())
+ .notIn(lockCods.length>0,Locks::getCode,lockCods));
+ bikesMapper.delete(new UpdateWrapper<Bikes>().lambda()
+ .eq(Bikes::getSiteId,sites.getId())
+ .notIn(lockCods.length>0,Bikes::getLockId,lockCods));
}
@Override
@@ -296,17 +335,28 @@
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);
+ Constants.ZERO,warnMax,
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode());
}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);
+ DingDingNotice.reservesNotice(StringUtils.isBlank(s.getName())?s.getId() + " - 鏈煡" :s.getId() + " - " + s.getName()
+ ,Constants.ONE,warnMin,
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode());
}
}
}
-
-
}
+
+ @Override
+ public List<Sites> getSiteList(Integer type){
+ return sitesMapper.selectList(new QueryWrapper<Sites>().lambda()
+ .eq(Sites::getIsdeleted,Constants.ZERO)
+ .eq(Sites::getStatus,Constants.ZERO)
+ .eq(Objects.nonNull(type),Sites::getType,type));
+ }
+
}
--
Gitblit v1.9.3