From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 九月 2025 10:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/web/src/main/java/com/doumee/jtt808/web/endpoint/JT808Endpoint.java | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/jtt808/web/endpoint/JT808Endpoint.java b/server/web/src/main/java/com/doumee/jtt808/web/endpoint/JT808Endpoint.java
index 7e657ae..c565b42 100644
--- a/server/web/src/main/java/com/doumee/jtt808/web/endpoint/JT808Endpoint.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/endpoint/JT808Endpoint.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Bikes;
+import com.doumee.jtt808.web.service.Jtt808Service;
import com.doumee.service.business.BikesService;
import io.github.yezhihao.netmc.core.annotation.Async;
import io.github.yezhihao.netmc.core.annotation.AsyncBatch;
@@ -35,7 +36,7 @@
public class JT808Endpoint {
@Autowired
- private BikesService bikesService;
+ private Jtt808Service jtt808Service;
private static final Logger log = LoggerFactory.getLogger(JT808Endpoint.class);
@@ -129,25 +130,8 @@
*/
@AsyncBatch(poolSize = 2, maxElements = 4000, maxWait = 1000)
@Mapping(types = 浣嶇疆淇℃伅姹囨姤, desc = "浣嶇疆淇℃伅姹囨姤")
- public void T0200(List<T0200> list) {
- for(T0200 m : list){
- Bikes bike = new Bikes();
- bike.setDeviceSn(m.getClientId());
- if(m.getLatitude()!=0){
- bike.setLatitude(new BigDecimal(m.getLatitude()).divide(new BigDecimal(1000000),2,BigDecimal.ROUND_HALF_UP));
- }
- if(m.getLongitude()!=0){
- bike.setLongitude(new BigDecimal(m.getLongitude()).divide(new BigDecimal(1000000),2,BigDecimal.ROUND_HALF_UP));
- }
- bike.setHeartDate(DateUtil.getDateFromLocalDateTime(m.getDeviceTime()));
- if(m.getAttributes()!=null ){
- Battery battery= (Battery) m.getAttributes().get(AttributeKey.Battery);
- if(battery !=null && battery.getVoltage()!=null){
- bike.setVoltage(new BigDecimal(battery.getVoltage()));
- }
- }
- bikesService.updateByJtt(bike);
- }
+ public void T0200(List<T0200> list) throws Exception {
+ jtt808Service.updateBikesInfo(list);
System.out.println(JSONObject.toJSONString(list)
);
}
--
Gitblit v1.9.3