From 04dba6a17f836b5fbdf0eedff8a129c6785fd8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 18:25:00 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 3 +
server/web/src/main/java/com/doumee/jtt808/web/t808/T0A00_8A00.java | 2
server/jtt808_parent/jtt808-protocol/src/main/java/org/yzh/protocol/commons/transform/attribute/Battery.java | 4 +-
server/web/src/main/java/com/doumee/jtt808/web/t808/T0200.java | 2
server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java | 33 +++++++++++++---
server/services/src/main/resources/application-dev.yml | 3 +
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 4 +-
server/web/src/main/java/com/doumee/jtt808/web/t808/T8900.java | 2
server/services/src/main/java/com/doumee/core/utils/PositionUtil.java | 13 ++----
server/web/src/main/java/com/doumee/jtt808/web/controller/JT808Controller.java | 6 +-
server/web/src/main/java/com/doumee/jtt808/web/t808/T8103.java | 2
server/web/src/main/java/com/doumee/jtt808/web/t808/T0201_0500.java | 2
12 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/server/jtt808_parent/jtt808-protocol/src/main/java/org/yzh/protocol/commons/transform/attribute/Battery.java b/server/jtt808_parent/jtt808-protocol/src/main/java/org/yzh/protocol/commons/transform/attribute/Battery.java
index 24e98a9..26885aa 100644
--- a/server/jtt808_parent/jtt808-protocol/src/main/java/org/yzh/protocol/commons/transform/attribute/Battery.java
+++ b/server/jtt808_parent/jtt808-protocol/src/main/java/org/yzh/protocol/commons/transform/attribute/Battery.java
@@ -66,14 +66,14 @@
}
if(value!=null && value.length>4){
try {
- this.setVoltage((float) (Byte2NumberUtils.bytesToInteger(new byte[]{value[2],value[3]}) * 0.001));
+ this.setVoltage((float) (Byte2NumberUtils.bytesToInteger(new byte[]{value[2],value[3]}) * 0.01));
}catch (Exception e){
}
}
if(value!=null && value.length>6){
try {
- this.setChargeVoltage((float) (Byte2NumberUtils.bytesToInteger(new byte[]{value[4],value[4]}) * 0.001));
+ this.setChargeVoltage((float) (Byte2NumberUtils.bytesToInteger(new byte[]{value[4],value[4]}) * 0.01));
}catch (Exception e){
}
diff --git a/server/services/src/main/java/com/doumee/core/utils/PositionUtil.java b/server/services/src/main/java/com/doumee/core/utils/PositionUtil.java
index 2985e3c..bbfeaba 100644
--- a/server/services/src/main/java/com/doumee/core/utils/PositionUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/PositionUtil.java
@@ -150,19 +150,16 @@
}
}
public static void main(String[] args) {
- String str ="[{\"lat\": 31.71383446224521, \"lng\": 117.39342857107226, \"height\": 0}, " +
- "{\"lat\": 31.71393087373135, \"lng\": 117.39402357524818, \"height\": 0}, " +
- "{\"lat\": 31.713593433089077, \"lng\": 117.39433170240886, \"height\": 0}," +
- " {\"lat\": 31.713280450806966, \"lng\": 117.39358710879355, \"height\": 0}]";
+ String str ="[{\"lat\":31.732726766273103,\"lng\":117.37721605116087,\"height\":0},{\"lat\":31.72079687406289,\"lng\":117.39831914258241,\"height\":0},{\"lat\":31.714484720597493,\"lng\":117.39831914258241,\"height\":0},{\"lat\":31.71233192243245,\"lng\":117.39583137996954,\"height\":0},{\"lat\":31.71401037878662,\"lng\":117.3785457182995,\"height\":0}]";
TypeReference typeReference = new TypeReference<List<LocaltionDTO>>(){};
List<LocaltionDTO> array = JSONObject.parseObject(str, typeReference.getType());
if(array == null || array.size() ==0){
System.out.println("=================");
}
- System.out.println(isInPolygon( 117.393962,31.713690,array));
- AMap aMap = transform( 117.38823300, 31.71550000);
- System.out.println(aMap.getLatitude()+""+aMap.getLongitude());
- System.out.println(isInPolygon( aMap.getLongitude(),aMap.getLatitude(),array));
+ System.out.println(isInPolygon( 117.39387876,31.71365546,array));
+// AMap aMap = transform( 117.38823300, 31.71550000);
+// System.out.println(aMap.getLatitude()+""+aMap.getLongitude());
+// System.out.println(isInPolygon( aMap.getLongitude(),aMap.getLatitude(),array));
}
/* "latitude": 31.71553300,
"longitude": 117.39,
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index fed4866..73e444b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -468,11 +468,11 @@
@Override
public Integer getVoltageStatus(Bikes bikes){
//浣庣數閲忕數鍘�
- BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.LOW_VOLTAGE).getCode());
+ BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.LOW_BIKE_VOLTAGE).getCode());
if(Objects.isNull(bikes)||Objects.isNull(bikes.getVoltage())||Objects.isNull(lowVoltage)){
return 0;
}
- return bikes.getVoltage().compareTo(lowVoltage)>0?0:1;
+ return bikes.getVoltage().compareTo(lowVoltage)>=0?0:1;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 4437b8a..3058614 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -793,6 +793,9 @@
if(Objects.isNull(bike)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"璇锋壂鎻忔纭殑杞﹁締鐮侊細銆愭湭鏌ヨ鍒拌溅杈嗕俊鎭��");
}
+ if(!Constants.equalsInteger(bike.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ溅杈嗗凡琚攣瀹氬�熺敤锛岃灏濊瘯鏇存崲鍏朵粬杞﹁締锛�");
+ }
if(StringUtils.isBlank(bike.getParamId())){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"杞﹁締绫诲瀷寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
}
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index b9061a1..8bad4e1 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -57,6 +57,9 @@
keyPath: /usr/local/aliConfig/bike/apiclient_cert.p12
privateCertPath: /usr/local/aliConfig/bike/apiclient_cert.pem
privateKeyPath: /usr/local/aliConfig/bike/apiclient_key.pem
+# keyPath: d://apiclient_cert.p12
+# privateCertPath: d://apiclient_cert.pem
+# privateKeyPath: d://apiclient_key.pem
#鏈嶅姟鍟�-------------end---
existsSub: 1
appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
diff --git a/server/web/src/main/java/com/doumee/jtt808/web/controller/JT808Controller.java b/server/web/src/main/java/com/doumee/jtt808/web/controller/JT808Controller.java
index e573e36..d23617e 100644
--- a/server/web/src/main/java/com/doumee/jtt808/web/controller/JT808Controller.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/controller/JT808Controller.java
@@ -24,7 +24,7 @@
@Operation(summary = "8103 璁剧疆缁堢鍙傛暟")
@PostMapping("8103")
- public Mono<APIResult<T0001>> T8103(@RequestBody com.doumee.jtt808.t808.T8103 request) {
+ public Mono<APIResult<T0001>> T8103(@RequestBody com.doumee.jtt808.web.t808.T8103 request) {
return messageManager.requestR(request.build(), T0001.class);
}
@@ -234,13 +234,13 @@
@Operation(summary = "8900 鏁版嵁涓嬭閫忎紶")
@PostMapping("8900")
- public Mono<APIResult<T0001>> T8900(@RequestBody com.doumee.jtt808.t808.T8900 request) {
+ public Mono<APIResult<T0001>> T8900(@RequestBody com.doumee.jtt808.web.t808.T8900 request) {
return messageManager.requestR(request.build(), T0001.class);
}
@Operation(summary = "8A00 骞冲彴RSA鍏挜")
@PostMapping("8A00")
- public Mono<APIResult<T0A00_8A00>> T8A00(@RequestBody com.doumee.jtt808.t808.T0A00_8A00 request) {
+ public Mono<APIResult<T0A00_8A00>> T8A00(@RequestBody com.doumee.jtt808.web.t808.T0A00_8A00 request) {
return messageManager.requestR(request.build(), T0A00_8A00.class);
}
}
\ No newline at end of file
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 d4efb88..fcee3c4 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
@@ -151,7 +151,7 @@
if(bike.getSiteId() ==null){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇锋寜瑕佹眰鍓嶅線鍋滆溅鐐瑰仠杞︼紒");
}
- lockBikes(bike.getDeviceSn(),Constants.ZERO);//鍙戣捣鍏抽攣鎸囦护璇锋眰
+ lockBikes(bike.getDeviceSn(),Constants.ONE);//鍙戣捣鍏抽攣鎸囦护璇锋眰
backIds.add(rides.getId());
rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞�
rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣
@@ -171,6 +171,10 @@
goodsorder.setEditDate(date);
goodsorder.setEditor(null);
goodsorderService.dealCloseGoodsorderBiz( goodsorder,Constants.REFUND_TYPE.NORMAL.getKey(),memberRides);
+ //鏇存柊鐢靛姩杞﹁溅杈嗙姸鎬�
+ bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda().set(Bikes::getStatus,Constants.ZERO).eq(Bikes::getType,Constants.ONE)
+ .apply(" code in ( select m.bike_code from member_rides m where m.ordre_id = '"+goodsorder.getId()+"' ) ")
+ );
}
private Bikes getElecBikeByCode(String bikeCode) {
@@ -216,6 +220,9 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝"+(type ==0?"杞﹁締鍏抽攣":"杞﹁締寮�閿�")+"澶辫触锛岃绋嶅悗閲嶈瘯锛屾垨鑰呰仈绯诲洯鍖虹鐞嗕汉鍛橈紒");
}
}
+
+
+
/**
* 鏌ヨ鍋滆溅绔欑偣淇℃伅
@@ -279,6 +286,7 @@
Bikes bike = getElecBikeByCode(memberRides.getBikeCode());
//鏌ヨ鍋滆溅浣嶇疆鏄惁绗﹀悎鍋滆溅浣嶇疆瑙勮寖
checkPausePostionBiz(bike);
+ lockBikes(bike.getDeviceSn(),Constants.ONE);//鍙戣捣鍏抽攣鎸囦护璇锋眰
memberRides.setPauseDate(new Date());
memberRides.setEditDate(memberRides.getBackDate());
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey());
@@ -292,7 +300,7 @@
ruleType =Integer.parseInt( systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PAUSE_BIKE_TYPE).getCode());
}catch (Exception e){
}
- if(ruleType == 0){
+ if(ruleType == 1){
//濡傛灉浠呴檺浜庡洯鍖轰复鏃跺仠杞�
List<LocaltionDTO> array = new ArrayList<>();
try {
@@ -303,7 +311,7 @@
if(array == null || array.size() ==0){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝鍥尯杩愯惀鍖哄煙閰嶇疆鏈夎锛岃鑱旂郴鍥尯绠＄悊鍛樺鐞嗭紒");
}
- if( !PositionUtil.isInPolygon(bike.getLatitude().doubleValue(),bike.getLongitude().doubleValue(),array)){
+ if( !PositionUtil.isInPolygon(bike.getLongitude().doubleValue(),bike.getLatitude().doubleValue(),array)){
//濡傛灉鍦ㄥ仠杞︾偣鑼冨洿鍐咃紱
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇锋寜瑕佹眰鍦ㄥ洯鍖鸿繍钀ュ尯鍩熻寖鍥村唴鍋滆溅锛�");
}
@@ -403,6 +411,9 @@
//濡傛灉杞﹁締绫诲瀷鏄┖
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒");
}
+ if(!Constants.equalsInteger(bike.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ溅杈嗗凡琚攣瀹氬�熺敤锛岃灏濊瘯鏇存崲鍏朵粬杞﹁締锛�");
+ }
cacheOpenLock.put(openElecBikeRequest.getCode(), 1);
try {
//鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
@@ -434,7 +445,7 @@
//鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
isValidePricingType(bike,memberRides) ;
MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
- this.lockBikes(bike.getDeviceSn(),1);
+ this.lockBikes(bike.getDeviceSn(),0);
//瀛樺偍楠戣璁板綍
memberRides.setId(Constants.getUUID());
memberRides.setIsdeleted(Constants.ZERO);
@@ -492,7 +503,7 @@
//濡傛灉杞﹁締绫诲瀷鏄┖
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "杞﹀瀷淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- this.lockBikes(bike.getDeviceSn(),1);
+ this.lockBikes(bike.getDeviceSn(),0);
//鏇存柊楠戣鐘舵�佷负楠戣涓�
memberRides.setEditDate(memberRides.getBackDate());
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
@@ -587,7 +598,7 @@
.eq(Bikes::getIsdeleted,Constants.ZERO)
.eq(Bikes::getCode,rides.getBikeCode())
);
- lockBikes(bike.getDeviceSn(),Constants.ZERO);//鍙戣捣鍏抽攣鎸囦护璇锋眰
+ lockBikes(bike.getDeviceSn(),Constants.ONE);//鍙戣捣鍏抽攣鎸囦护璇锋眰
rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞�
rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣
rides.setBackDate(new Date());
@@ -605,6 +616,12 @@
goodsorder.setEditDate(date);
goodsorder.setEditor(null);
goodsorderService.dealCloseGoodsorderBiz( goodsorder,Constants.REFUND_TYPE.NORMAL.getKey(),memberRides);
+
+ //鏇存柊鐢靛姩杞﹁溅杈嗙姸鎬�
+ bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda().set(Bikes::getStatus,Constants.ZERO).eq(Bikes::getType,Constants.ONE)
+ .apply(" code in ( select m.bike_code from member_rides m where m.ordre_id = '"+goodsorder.getId()+"' ) ")
+ );
+
//鍙戦�佸皬绋嬪簭閫氱煡
Member member = memberMapper.selectById(goodsorder.getMemberId());
if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
@@ -617,5 +634,9 @@
+// public void test(double lat,double lng){
+// this.getBackSiteByPostion(lat,lng);
+// }
+
}
diff --git a/server/web/src/main/java/com/doumee/jtt808/t808/T0200.java b/server/web/src/main/java/com/doumee/jtt808/web/t808/T0200.java
similarity index 98%
rename from server/web/src/main/java/com/doumee/jtt808/t808/T0200.java
rename to server/web/src/main/java/com/doumee/jtt808/web/t808/T0200.java
index d7c9198..e14266b 100644
--- a/server/web/src/main/java/com/doumee/jtt808/t808/T0200.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/t808/T0200.java
@@ -1,4 +1,4 @@
-package com.doumee.jtt808.t808;
+package com.doumee.jtt808.web.t808;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.github.yezhihao.protostar.annotation.Field;
diff --git a/server/web/src/main/java/com/doumee/jtt808/t808/T0201_0500.java b/server/web/src/main/java/com/doumee/jtt808/web/t808/T0201_0500.java
similarity index 95%
rename from server/web/src/main/java/com/doumee/jtt808/t808/T0201_0500.java
rename to server/web/src/main/java/com/doumee/jtt808/web/t808/T0201_0500.java
index 87bba9a..1ee8a5a 100644
--- a/server/web/src/main/java/com/doumee/jtt808/t808/T0201_0500.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/t808/T0201_0500.java
@@ -1,4 +1,4 @@
-package com.doumee.jtt808.t808;
+package com.doumee.jtt808.web.t808;
import io.github.yezhihao.netmc.core.model.Response;
import io.github.yezhihao.protostar.annotation.Field;
diff --git a/server/web/src/main/java/com/doumee/jtt808/t808/T0A00_8A00.java b/server/web/src/main/java/com/doumee/jtt808/web/t808/T0A00_8A00.java
similarity index 97%
rename from server/web/src/main/java/com/doumee/jtt808/t808/T0A00_8A00.java
rename to server/web/src/main/java/com/doumee/jtt808/web/t808/T0A00_8A00.java
index a97cf61..237ea8d 100644
--- a/server/web/src/main/java/com/doumee/jtt808/t808/T0A00_8A00.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/t808/T0A00_8A00.java
@@ -1,4 +1,4 @@
-package com.doumee.jtt808.t808;
+package com.doumee.jtt808.web.t808;
import io.github.yezhihao.protostar.annotation.Field;
import io.github.yezhihao.protostar.annotation.Message;
diff --git a/server/web/src/main/java/com/doumee/jtt808/t808/T8103.java b/server/web/src/main/java/com/doumee/jtt808/web/t808/T8103.java
similarity index 99%
rename from server/web/src/main/java/com/doumee/jtt808/t808/T8103.java
rename to server/web/src/main/java/com/doumee/jtt808/web/t808/T8103.java
index 8040926..7a271c9 100644
--- a/server/web/src/main/java/com/doumee/jtt808/t808/T8103.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/t808/T8103.java
@@ -1,4 +1,4 @@
-package com.doumee.jtt808.t808;
+package com.doumee.jtt808.web.t808;
import io.github.yezhihao.netmc.util.AdapterMap;
import io.github.yezhihao.protostar.annotation.Field;
diff --git a/server/web/src/main/java/com/doumee/jtt808/t808/T8900.java b/server/web/src/main/java/com/doumee/jtt808/web/t808/T8900.java
similarity index 98%
rename from server/web/src/main/java/com/doumee/jtt808/t808/T8900.java
rename to server/web/src/main/java/com/doumee/jtt808/web/t808/T8900.java
index 1968bdd..4aac6ec 100644
--- a/server/web/src/main/java/com/doumee/jtt808/t808/T8900.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/t808/T8900.java
@@ -1,4 +1,4 @@
-package com.doumee.jtt808.t808;
+package com.doumee.jtt808.web.t808;
import io.github.yezhihao.protostar.annotation.Field;
import io.github.yezhihao.protostar.annotation.Message;
--
Gitblit v1.9.3