server/jtt808_parent/jtt808-server/src/test/java/org/yzh/client/ClientTest.java
@@ -1,6 +1,7 @@ package org.yzh.client; import io.github.yezhihao.netmc.session.Session; import io.swagger.models.auth.In; import org.yzh.client.netty.ClientConfig; import org.yzh.client.netty.HandlerMapping; import org.yzh.client.netty.TCPClient; @@ -28,7 +29,7 @@ public static final ClientConfig jtConfig = new ClientConfig.Builder() // .setIp("server.demo.natool.cn") // .setPort(31146) .setIp("127.0.0.1") .setIp("64a6882b1b1d7823.natapp.cc") .setPort(7611) .setMaxFrameLength(2 + 21 + 1023 * 2 + 1 + 2) .setDelimiters(new byte[]{0x7e}) @@ -212,11 +213,11 @@ alarmBSD.setFileTotal(4); alarmBSD.setReserved(4); Map<Long, Object> attributes = new TreeMap<>(); attributes.put(Long.valueOf(AlarmADAS.key), alarmADAS); attributes.put(Long.valueOf(AlarmDSM.key), alarmDSM); attributes.put(Long.valueOf(AlarmTPMS.key), alarmTPMS); attributes.put(Long.valueOf(AlarmBSD.key), alarmBSD); Map<Integer, Object> attributes = new TreeMap<>(); attributes.put(Integer.valueOf(AlarmADAS.key), alarmADAS); attributes.put(Integer.valueOf(AlarmDSM.key), alarmDSM); attributes.put(Integer.valueOf(AlarmTPMS.key), alarmTPMS); attributes.put(Integer.valueOf(AlarmBSD.key), alarmBSD); message.setAttributes(attributes); } server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -96,8 +96,14 @@ if(StringUtils.isBlank(m.getDeviceSn() )){ return; } Bikes bikes = bikesJoinMapper.selectOne(new MPJLambdaWrapper<Bikes>() .eq(Bikes::getDeviceSn,String.format("%012s",m.getDeviceSn())) String tSn = m.getDeviceSn(); if(tSn.length() <12){ for (int i = 0; i < 12-tSn.length(); i++) { tSn = "0"+tSn; } } Bikes bikes = bikesJoinMapper.selectOne(new QueryWrapper<Bikes>().lambda() .eq(Bikes::getDeviceSn,tSn) .eq(Bikes::getIsdeleted,Constants.ZERO) .eq(Bikes::getType,Constants.ONE) .last("limit 1")); server/web/src/main/java/com/doumee/jtt808/web/endpoint/JT808Endpoint.java
@@ -134,10 +134,10 @@ 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)); bike.setLatitude(new BigDecimal(m.getLatitude()).divide(new BigDecimal(1000000),8,BigDecimal.ROUND_HALF_UP)); } if(m.getLongitude()!=0){ bike.setLongitude(new BigDecimal(m.getLongitude()).divide(new BigDecimal(1000000),2,BigDecimal.ROUND_HALF_UP)); bike.setLongitude(new BigDecimal(m.getLongitude()).divide(new BigDecimal(1000000),8,BigDecimal.ROUND_HALF_UP)); } bike.setHeartDate(DateUtil.getDateFromLocalDateTime(m.getDeviceTime())); if(m.getAttributes()!=null ){
