From a0e79a5c2830f15cca6ce0dc30a5955395054cc7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 14 二月 2025 16:02:45 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 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..6aed1e4 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;
@@ -122,6 +127,10 @@
update.setNeedNotice(sites.getNeedNotice());
sitesMapper.updateById(update);
}
+ @Override
+ public void updateByMqtt(Sites sites) {
+ sitesMapper.updateById(sites);
+ }
@Override
public void updateByIdInBatch(List<Sites> sitess) {
@@ -176,9 +185,9 @@
}
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();
}
@@ -248,6 +257,27 @@
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
public PageData<Sites> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap) {
@@ -296,13 +326,17 @@
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());
}
}
}
--
Gitblit v1.9.3