From d7aaa1eae5335b38ba1e8e9a465ef9099bc334c5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:53:56 +0800
Subject: [PATCH] jtt808初始化
---
server/platform/src/main/resources/logback-spring.xml | 1 -
server/jtt808_parent/jtt808-server/src/test/java/org/yzh/client/ClientTest.java | 3 ++-
server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java | 10 +++++-----
server/services/src/main/java/com/doumee/core/utils/PositionUtil.java | 15 ++++++++++++++-
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/server/jtt808_parent/jtt808-server/src/test/java/org/yzh/client/ClientTest.java b/server/jtt808_parent/jtt808-server/src/test/java/org/yzh/client/ClientTest.java
index 112027c..7323ab8 100644
--- a/server/jtt808_parent/jtt808-server/src/test/java/org/yzh/client/ClientTest.java
+++ b/server/jtt808_parent/jtt808-server/src/test/java/org/yzh/client/ClientTest.java
@@ -26,10 +26,11 @@
public static final JTMessageAdapter messageAdapter = new JTMessageAdapter("org.yzh.protocol");
// tcp://server.demo.natool.cn:19392
+// dmtest.ahapp.net:7611
public static final ClientConfig jtConfig = new ClientConfig.Builder()
// .setIp("server.demo.natool.cn")
// .setPort(31146)
- .setIp("64a6882b1b1d7823.natapp.cc")
+ .setIp("dmtest.ahapp.net")
.setPort(7611)
.setMaxFrameLength(2 + 21 + 1023 * 2 + 1 + 2)
.setDelimiters(new byte[]{0x7e})
diff --git a/server/platform/src/main/resources/logback-spring.xml b/server/platform/src/main/resources/logback-spring.xml
index b6c041a..7638955 100644
--- a/server/platform/src/main/resources/logback-spring.xml
+++ b/server/platform/src/main/resources/logback-spring.xml
@@ -27,7 +27,6 @@
<totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
</appender>
-
<appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
diff --git a/server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java b/server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java
index 6db6cd0..59cf41b 100644
--- a/server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java
+++ b/server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java
@@ -98,16 +98,16 @@
if(StringUtils.isBlank(bikeCode)){
return;
}
- desc.replace("{杞﹁締缂栧彿}",bikeCode);
+ desc= desc.replace("{杞﹁締缂栧彿}",bikeCode);
if(StringUtils.isNotBlank(place)){
- desc.replace("{瀹氫綅浣嶇疆}",place);
+ desc= desc.replace("{瀹氫綅浣嶇疆}",place);
}else{
- desc.replace("{瀹氫綅浣嶇疆}","鏈煡");
+ desc=desc.replace("{瀹氫綅浣嶇疆}","鏈煡");
}
if(StringUtils.isNotBlank(siteName)){
- desc.replace("{绔欑偣鍚嶇О}",siteName);
+ desc= desc.replace("{绔欑偣鍚嶇О}",siteName);
}else{
- desc.replace("{绔欑偣鍚嶇О}","鏈煡");
+ desc=desc.replace("{绔欑偣鍚嶇О}","鏈煡");
}
sendNoticeNew(desc,token,robotCode,chatToken);
}
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 98f387a..d311bd5 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
import com.doumee.dao.business.web.request.LocaltionDTO;
import java.awt.geom.GeneralPath;
@@ -38,7 +39,19 @@
}
return null;
}
- /**
+
+ 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}]";
+ 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.39, 31.71551600,array));
+ }
+ /* "latitude": 31.71551600,
+ "longitude": 117.39,
+ */ /**
* 鍒ゆ柇鍧愭爣鐐规槸鍚﹀湪澶氳竟褰㈠尯鍩熷唴
*
* @param pointLon 瑕佸垽鏂殑鐐圭殑缁忓害
--
Gitblit v1.9.3