From 3b21b61d28097c72811ce5a0a6a72b7722c68b1d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 二月 2025 11:21:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
index ad6648b..f0138dd 100644
--- a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
@@ -8,12 +8,14 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.dingding.DingDingNotice;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.PositionUtil;
import com.doumee.core.utils.StringTools;
import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.join.BikesJoinMapper;
import com.doumee.dao.business.join.GoodsorderJoinMapper;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.join.RefundJoinMapper;
@@ -29,6 +31,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ConcurrentReferenceHashMap;
@@ -50,12 +53,18 @@
@Service
public class Jtt808Service {
+ @Value("${tencent.map.remoteHost}")
+ private String mapHost;
+ @Value("${tencent.map.appKey}")
+ private String mapKey;
@Autowired
private MessageManager messageManager;
@Autowired
private GoodsorderService goodsorderService;
@Autowired
private BikesMapper bikesMapper;
+ @Autowired
+ private BikesJoinMapper bikesJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -274,8 +283,12 @@
}
}
- public void updateBikesInfo(List<T0200> list) {
+ public void updateBikesInfo(List<T0200> list) throws Exception{
Date date = new Date();
+ BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LOW_VOLTAGE).getCode());
+ String ddToken = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode();
+ String ddRobotCode = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode();
+ String ddChatToken = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode();
for(T0200 m : list){
Bikes bike = new Bikes();
bike.setDeviceSn(m.getClientId());
@@ -316,6 +329,17 @@
.set(Bikes::getSiteId,site ==null?null:site.getId())
.set( Bikes::getHeartDate,date)
.eq(Bikes::getId,bikes.getId()));
+
+ if(bikes.getVoltage().compareTo(lowVoltage)>=Constants.ZERO
+ && bike.getVoltage().compareTo(lowVoltage)<Constants.ZERO){
+ //鍙戦�侀拤閽夐�氱煡
+ DingDingNotice.lowVoltageNotice(bikes.getCode(),
+ PositionUtil.getTxMapAddrByLatAndLng(Double.valueOf(bike.getLatitude().toString()),Double.valueOf(bike.getLongitude().toString()),mapHost,mapKey)
+ ,Objects.nonNull(site)?site.getName():null,
+ ddToken,
+ ddRobotCode,
+ ddChatToken);
+ }
}
}
@@ -498,7 +522,7 @@
.eq(Goodsorder::getStatus,Constants.ONE)
.eq(MemberRides::getIsdeleted,Constants.ZERO)
.eq(MemberRides::getType,Constants.ONE)
- .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING)
+ .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey())
.apply(" NOW() >= t.create_date + INTERVAL '2 hours' ")
);
@@ -531,11 +555,6 @@
goodsorder.setEditor(null);
goodsorderService.dealCloseGoodsorderBiz( goodsorder,Constants.REFUND_TYPE.NORMAL.getKey(),memberRides);
}
-
-
-
-
-
}
--
Gitblit v1.9.3