From 52cffc4ab8e9787a6f233295502c7c9788dddae1 Mon Sep 17 00:00:00 2001
From: fxl <473369119@qq.com>
Date: 星期二, 07 三月 2023 10:45:17 +0800
Subject: [PATCH] 3.7
---
src/main/java/com/hxzkoa/udp/Dell_display.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/hxzkoa/udp/Dell_display.java b/src/main/java/com/hxzkoa/udp/Dell_display.java
index df41a2f..8e5dad9 100644
--- a/src/main/java/com/hxzkoa/udp/Dell_display.java
+++ b/src/main/java/com/hxzkoa/udp/Dell_display.java
@@ -2,8 +2,10 @@
import java.awt.geom.Point2D;
import java.io.Console;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Vector;
import com.hxzkoa.json.tb_fence;
import com.hxzkoa.json.tb_map;
@@ -67,7 +69,7 @@
String[] dis = message.split(",");
// 3[tagid] 锛氭爣绛剧殑ID鍙凤紝鍞竴缂栧彿
String tagid = dis[2];
- System.out.print("dis:"+dis);
+ //System.out.print("dis:"+dis);
// 4鍖呭簭锛�0~255寰幆锛�
String baoxu = dis[3];
// 5鏃堕棿鎴筹紙杩欐潯鎶ユ枃鍙戝嚭鐨勬椂闂达級
@@ -108,7 +110,7 @@
.toBean(JSONObject.fromObject(re_warning_bw.get("result").toString()), tb_warning.class);
// 鍒ゆ柇鏍囩鏄惁瀛樺湪
- System.out.print("re_warning"+re_warning);
+ //System.out.print("re_warning"+re_warning);
tb_warning warning = new tb_warning();
if (re_tag != null) {
int powerint = Integer.parseInt(tag.getPower());
@@ -241,7 +243,7 @@
jsonObject = JSONObject.fromObject(tag);
JSONObject re_realAttendance_bw = HttpUtil.doPost(url_realAttendance_bw, jsonObject.toString(),
Config.getCharset());
- System.out.print(re_realAttendance_bw);
+ //System.out.print(re_realAttendance_bw);
if (re_realAttendance_bw!=null){
tb_realkaoqing realkaoqing = (tb_realkaoqing) JSONObject.toBean(
JSONObject.fromObject(re_realAttendance_bw.get("result").toString()), tb_realkaoqing.class);
@@ -299,7 +301,8 @@
boolean zai = IsInStartAndEndTime.belongCalendar(intime, startime, stoptime);// 鍒ゆ柇鏄惁鍦ㄥ洿鏍忕敓鏁堢殑鏃堕棿鍐�
// 鍦ㄥ洿鏍忕敓鏁堟椂闂村唴
if (zai) {
- boolean ispoly = IsPtInPoly.inPoly(point, fence.getPts());// 鍒ゆ柇ID鍧愭爣鏄惁鍦ㄥ洿鏍忓尯鍩熷唴
+ Vector<Point2D.Double> pts = new Vector<Point2D.Double>();
+ boolean ispoly = IsPtInPoly.inPoly(point, pts);// 鍒ゆ柇ID鍧愭爣鏄惁鍦ㄥ洿鏍忓尯鍩熷唴
// 濡傛灉鍦ㄨ�冨嫟鍖哄煙鍐�
if (ispoly) {
// 鍒ゆ柇鍦ㄤ笉鍦ㄥ疄鏃惰�冨嫟闆嗗悎涓�,濡傛灉涓嶅湪鍒欓渶瑕佹坊鍔犱竴鏉¤褰�
@@ -403,7 +406,8 @@
boolean zai = IsInStartAndEndTime.belongCalendar(intime, startime, stoptime);// 鍒ゆ柇鏄惁鍦ㄥ洿鏍忕敓鏁堢殑鏃堕棿鍐�
// 鍦ㄥ洿鏍忕敓鏁堟椂闂村唴
if (zai) {
- boolean ispoly = IsPtInPoly.inPoly(point, fence.getPts());// 鍒ゆ柇ID鍧愭爣鏄惁鍦ㄥ洿鏍忓尯鍩熷唴
+ Vector<Point2D.Double> pts = new Vector<Point2D.Double>();
+ boolean ispoly = IsPtInPoly.inPoly(point, pts);// 鍒ゆ柇ID鍧愭爣鏄惁鍦ㄥ洿鏍忓尯鍩熷唴
// 濡傛灉鍦ㄥ憡璀﹀尯鍩熷唴
if (ispoly) {
// 鍒ゆ柇鍦ㄤ笉鍦ㄥ疄鏃跺憡璀﹂泦鍚堜腑,濡傛灉涓嶅湪鍒欓渶瑕佹坊鍔犱竴鏉¤褰�
@@ -537,7 +541,8 @@
tb_xunjianbaobiao xunjianbaobiao = new tb_xunjianbaobiao();
// 鍒ゆ柇鏍囩鍧愭爣鏄惁鍦ㄧ敓鏁堢殑鍥存爮鍖哄煙鍐呭鏋滃湪鍒欐墽琛�
- if (IsPtInPoly.inPoly(point, tb_fenceList.get(i).getPts())) {
+ Vector<Point2D.Double> pts = new Vector<Point2D.Double>();
+ if (IsPtInPoly.inPoly(point, pts)) {
// 閫氳繃鍖哄煙鍚嶇О鎵惧埌璇ュ贰妫�鍖哄煙瀵硅薄
// Tb_xunjianset xjs =
--
Gitblit v1.10.0