From cbdcb828bd7ed3787990dceb65f3c6db7c806e16 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 13 八月 2024 09:40:51 +0800
Subject: [PATCH] 海康接口
---
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java | 14 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitorResourceParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java | 14 --
document/海康api.docx | 0
ycl-server/src/main/java/com/ycl/task/HKTask.java | 61 ++++++++--
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/BaseParam.java | 19 +++
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java | 14 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java | 14 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java | 14 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java | 14 --
ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java | 30 +++-
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java | 14 --
ycl-common/src/main/java/constant/ApiConstants.java | 1
/dev/null | 16 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java | 14 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java | 14 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java | 14 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java | 14 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java | 14 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java | 13 --
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 1
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java | 13 --
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java | 15 --
23 files changed, 107 insertions(+), 232 deletions(-)
diff --git "a/document/\346\265\267\345\272\267api.docx" "b/document/\346\265\267\345\272\267api.docx"
index de51927..c7f8091 100644
--- "a/document/\346\265\267\345\272\267api.docx"
+++ "b/document/\346\265\267\345\272\267api.docx"
Binary files differ
diff --git a/ycl-common/src/main/java/constant/ApiConstants.java b/ycl-common/src/main/java/constant/ApiConstants.java
index be1ac7b..f65fcb4 100644
--- a/ycl-common/src/main/java/constant/ApiConstants.java
+++ b/ycl-common/src/main/java/constant/ApiConstants.java
@@ -10,6 +10,7 @@
public final static Integer UYSuccessCode = 200;
public final static Integer PageNo = 1;
public final static Integer PageSize = 20000;
+ public final static Integer HKPageSize = 5000;
//璇锋眰鍙傛暟dataType-鍗″彛杩囪溅
public final static Integer HK_DataType_CAR = 1;
//璇锋眰鍙傛暟dataType-浜鸿劯鏁版嵁
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java
index bc5fed6..9655cce 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java
@@ -15,19 +15,7 @@
@Data
@Accessors(chain = true)
-public class AttrRecognitionParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class AttrRecognitionParam extends BaseParam{
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/BaseParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/BaseParam.java
new file mode 100644
index 0000000..8ee5e22
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/BaseParam.java
@@ -0,0 +1,19 @@
+package com.ycl.platform.domain.param.HK;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+public class BaseParam {
+ /**
+ * 鍒嗛〉
+ * 蹇呭～
+ */
+ private Integer pageNo;
+
+ /**
+ * 鍒嗛〉
+ * 蹇呭～
+ */
+ private Integer pageSize;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java
index f21174a..aa0abc4 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java
@@ -14,19 +14,7 @@
@Data
@Accessors(chain = true)
-public class CarDetectParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class CarDetectParam extends BaseParam{
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java
index 0ac7e1e..02d16ac 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java
@@ -14,19 +14,8 @@
@Data
@Accessors(chain = true)
-public class CodeByAreaParam {
+public class CodeByAreaParam extends BaseParam{
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
/**
* 1.閲囬泦璁惧 2.鍗″彛
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java
index fea7a60..aff97ee 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java
@@ -14,19 +14,7 @@
@Data
@Accessors(chain = true)
-public class CoordinateByAreaParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class CoordinateByAreaParam extends BaseParam{
/**
* 1.閲囬泦璁惧 2.鍗″彛
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java
index d8a2f40..c3feaea 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java
@@ -15,19 +15,7 @@
@Data
@Accessors(chain = true)
-public class CrossDetailParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class CrossDetailParam extends BaseParam{
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java
index db825be..67e2061 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java
@@ -15,19 +15,7 @@
@Data
@Accessors(chain = true)
-public class DataIntegrityMonitoringParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class DataIntegrityMonitoringParam extends BaseParam{
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java
index fad1c9f..61e7c11 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java
@@ -14,19 +14,7 @@
@Data
@Accessors(chain = true)
-public class FaceDetectParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNo;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class FaceDetectParam extends BaseParam{
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java
index b50aefd..558e153 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java
@@ -15,19 +15,7 @@
@Data
@Accessors(chain = true)
-public class FaceDeviceInspectionParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class FaceDeviceInspectionParam extends BaseParam {
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java
index 064d9b2..aeaed31 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java
@@ -15,19 +15,7 @@
@Data
@Accessors(chain = true)
-public class FaceDeviceSamplingParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class FaceDeviceSamplingParam extends BaseParam {
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/HKLoginParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/HKLoginParam.java
deleted file mode 100644
index b4ffe33..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/HKLoginParam.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.ycl.platform.domain.param.HK;
-
-import lombok.Data;
-
-@Data
-public class HKLoginParam {
- /**
- * 鐢ㄦ埛鍚�
- */
- private String userName;
- /**
- * 瀵嗙爜
- */
- private String password;
- /**
- * 璇锋眰鍦板潃
- */
- private String serviceUrl;
- /**
- *
- */
- private String imageCode;
- /**
- *
- */
- private String codeId;
- /**
- *
- */
- private Integer userType;
- /**
- * 璇█
- */
- private String lang;
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitorResourceParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitorResourceParam.java
index f0e0e5e..716ca26 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitorResourceParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitorResourceParam.java
@@ -11,7 +11,7 @@
*/
@Data
@Accessors(chain = true)
-public class MonitorResourceParam {
+public class MonitorResourceParam{
/**
* 鐩戞祴璧勬簮鍚嶇О銆傛ā绯婃煡璇�
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java
index 7832498..6d23295 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java
@@ -15,19 +15,8 @@
@Data
@Accessors(chain = true)
-public class MonitoringDetailParam {
+public class MonitoringDetailParam extends BaseParam{
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java
index 64cbae5..3674a57 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java
@@ -15,19 +15,7 @@
@Data
@Accessors(chain = true)
-public class PicAccessParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class PicAccessParam extends BaseParam {
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java
index 49f1b0f..2a3d758 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java
@@ -15,19 +15,7 @@
@Data
@Accessors(chain = true)
-public class SnapshotDataMonitorParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class SnapshotDataMonitorParam extends BaseParam {
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java
index a4250a2..426bb8d 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java
@@ -15,19 +15,7 @@
@Data
@Accessors(chain = true)
-public class SnapshotDelayMonitorParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class SnapshotDelayMonitorParam extends BaseParam {
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java
index 724f276..18d4db0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java
@@ -15,19 +15,7 @@
@Data
@Accessors(chain = true)
-public class VehicleDeviceInspectionParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
+public class VehicleDeviceInspectionParam extends BaseParam {
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java
index 9c13f7f..a2eb6a3 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java
@@ -15,20 +15,7 @@
@Data
@Accessors(chain = true)
-public class VehicleDeviceSamplingParam {
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageNO;
-
- /**
- * 鍒嗛〉
- * 蹇呭～
- */
- private Integer pageSize;
-
+public class VehicleDeviceSamplingParam extends BaseParam {
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
diff --git a/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java b/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
index b1f27b0..cb5ae8f 100644
--- a/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
+++ b/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
@@ -4,15 +4,18 @@
import com.alibaba.fastjson2.JSONObject;
import com.hikvision.artemis.sdk.ArtemisHttpUtil;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
+import com.ycl.platform.domain.param.HK.BaseParam;
import com.ycl.platform.domain.param.HK.FaceDetectParam;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.jar.JarEntry;
/**
* @author锛歺p
@@ -29,7 +32,7 @@
* @param resultType 鍝嶅簲缁撴灉鎺ユ敹绫�
* @return 璋冪敤缁撴灉
*/
- public static <T> List<T> sendAPI(String apiUrl, Object params, Class<T> resultType) {
+ public static <T> List<T> sendAPI(String apiUrl, BaseParam params, Class<T> resultType) {
// STEP1锛氳缃钩鍙板弬鏁帮紝鏍规嵁瀹為檯鎯呭喌,璁剧疆host appkey appsecret 涓変釜鍙傛暟.
ArtemisConfig.host = "51.92.65.49"; // 骞冲彴鐨刬p绔彛
@@ -53,22 +56,33 @@
// STEP5锛氱粍瑁呰姹傚弬鏁�
String body = JSON.toJSONString(params);
log.info("璇锋眰鍙傛暟:{}",body);
-
// STEP6锛氳皟鐢ㄦ帴鍙�
String result = null;// post璇锋眰application/json绫诲瀷鍙傛暟
- try {
+ List<T> dataList = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);
- } catch (Exception e) {
- log.error("鎺ュ彛锛氥�恵}銆戯紝璋冪敤澶辫触",apiUrl);
- e.printStackTrace();
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ if(jsonObject.getString("code") == null || !ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))){
+ log.error("璇锋眰澶辫触{}",result);
+ dataList = null;
+ break;
+ }
+ List<T> resultList = HkApiUtil.getDataList(JSONObject.parseObject(result), resultType);
+ if(CollectionUtils.isEmpty(resultList) || resultList.size()<ApiConstants.HKPageSize) {
+ dataList.addAll(resultList);
+ break;
+ }else {
+ dataList.addAll(resultList);
+ params.setPageNo(params.getPageNo()+1);
+ }
}
- return HkApiUtil.getDataList(JSONObject.parseObject(result), resultType);
+
+ return dataList;
}
//瑙ｆ瀽鏁版嵁
private static <T> List<T> getDataList(JSONObject jsonObject, Class<T> resultClass) {
if (jsonObject != null && ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
JSONObject data = jsonObject.getJSONObject("data");
if (data == null) {
return null;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index a6c611b..53ad1af 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -123,6 +123,7 @@
SysConfig important = configMapper.checkConfigKeyUnique("important.wordkorder.time");
SysConfig normal = configMapper.checkConfigKeyUnique("normal.wordkorder.alarm.time");
for (WorkOrder workOrder : waitAddList) {
+ //TODO锛歱oint涓虹┖
YwPoint point = pointMapping.get(workOrder.getSerialNumber());
workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index adb6cba..bdcda0d 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -44,7 +44,10 @@
public void vehicleDeviceInspectionTask() {
log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
+ param.setDataType(ApiConstants.HK_DataType_CAR);
List<VehicleDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehFullAmount/query", param, VehicleDeviceInspectionResult.class);
if (!CollectionUtils.isEmpty(list)) {
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -62,7 +65,9 @@
public void faceDeviceInspectionTask() {
log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
List<FaceDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceFullAmount/query", param, FaceDeviceInspectionResult.class);
if (!CollectionUtils.isEmpty(list)) {
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -83,7 +88,10 @@
log.info("寮�濮嬫墽琛屾姄鎷嶆暟鎹噺妫�娴嬬粨鏋滄暟鎹悓姝�");
/** 杞﹁締鏁版嵁 */
SnapshotDataMonitorParam carParam = new SnapshotDataMonitorParam();
- carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ carParam.setPageNo(ApiConstants.PageNo);
+ carParam.setPageSize(ApiConstants.HKPageSize);
+ carParam.setDate(DateUtils.getDate());
+ carParam.setDataType(ApiConstants.HK_DataType_CAR);
List<SnapshotDataMonitorResult> carList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", carParam, SnapshotDataMonitorResult.class);
if (!CollectionUtils.isEmpty(carList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -98,7 +106,10 @@
/** 浜鸿劯鏁版嵁 */
SnapshotDataMonitorParam faceParam = new SnapshotDataMonitorParam();
- faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
+ faceParam.setPageNo(ApiConstants.PageNo);
+ faceParam.setPageSize(ApiConstants.HKPageSize);
+ faceParam.setDate(DateUtils.getDate());
+ faceParam.setDataType(ApiConstants.HK_DataType_FACE);
List<SnapshotDataMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", faceParam, SnapshotDataMonitorResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -119,7 +130,9 @@
log.info("寮�濮嬫墽琛岄噰闆嗚澶囧睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
//浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
MonitoringDetailParam param = new MonitoringDetailParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
List<MonitoringDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/cameraExpDetailInfo/query", param, MonitoringDetailResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -138,7 +151,9 @@
log.info("寮�濮嬫墽琛屽崱鍙ｅ睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
CrossDetailParam param = new CrossDetailParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
List<CrossDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/crossExpDetailInfo/query", param, CrossDetailResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -157,7 +172,10 @@
log.info("寮�濮嬫墽琛屾暟鎹畬鏁存�х洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�
DataIntegrityMonitoringParam param = new DataIntegrityMonitoringParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
+ param.setDataType(ApiConstants.HK_DataType_CAR);
List<DataIntegrityMonitoringResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/attributeIntegrity/query", param, DataIntegrityMonitoringResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
@@ -177,7 +195,10 @@
log.info("寮�濮嬫墽琛屽睘鎬ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�
AttrRecognitionParam param = new AttrRecognitionParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
+ param.setDataType(ApiConstants.HK_DataType_CAR);
List<AttrRecognitionMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/attributeRecognition/query", param, AttrRecognitionMonitorResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
@@ -199,7 +220,10 @@
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
/** 杞﹁締鏁版嵁 */
SnapshotDelayMonitorParam carParam = new SnapshotDelayMonitorParam();
- carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ carParam.setPageNo(ApiConstants.PageNo);
+ carParam.setPageSize(ApiConstants.HKPageSize);
+ carParam.setDate(DateUtils.getDate());
+ carParam.setDataType(ApiConstants.HK_DataType_CAR);
List<SnapshotDelayMonitorResult> carList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", carParam, SnapshotDelayMonitorResult.class);
if (!CollectionUtils.isEmpty(carList)) {
@@ -215,7 +239,10 @@
/** 浜鸿劯鏁版嵁 */
SnapshotDelayMonitorParam faceParam = new SnapshotDelayMonitorParam();
- faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
+ faceParam.setPageNo(ApiConstants.PageNo);
+ faceParam.setPageSize(ApiConstants.HKPageSize);
+ faceParam.setDate(DateUtils.getDate());
+ faceParam.setDataType(ApiConstants.HK_DataType_FACE);
List<SnapshotDelayMonitorParam> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", faceParam, SnapshotDelayMonitorParam.class);
if (!CollectionUtils.isEmpty(faceList)) {
@@ -237,7 +264,10 @@
log.info("寮�濮嬫墽琛屽浘鐗囪闂洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
PicAccessParam param = new PicAccessParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
+ param.setDataType(ApiConstants.HK_DataType_CAR);
List<PicAccessResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/picAccessDetail/query", param, PicAccessResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
@@ -256,7 +286,10 @@
log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
VehicleDeviceSamplingParam param = new VehicleDeviceSamplingParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
+ param.setDataType(ApiConstants.HK_DataType_CAR);
List<VehicleDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehSampleAmount/query", param, VehicleDeviceSamplingResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
@@ -276,7 +309,9 @@
public void faceDeviceSamplingTask() {
log.info("寮�濮嬫墽琛屼汉鑴歌澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
List<FaceDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceSampleAmount/query", param, FaceDeviceSamplingResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
diff --git a/ycl-server/src/main/resources/activiti.cfg.xml b/ycl-server/src/main/resources/activiti.cfg.xml
deleted file mode 100644
index c281d4e..0000000
--- a/ycl-server/src/main/resources/activiti.cfg.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <!--dbcp鏁版嵁婧�-->
- <bean id="processEngineConfiguration" class="org.activiti.engine.impl.cfg.StandaloneProcessEngineConfiguration">
- <property name="jdbcDriver" value="com.mysql.jdbc.Driver"/>
- <property name="jdbcUrl" value="jdbc:mysql://42.193.1.25:3306/zgyw?nullCatalogMeansCurrent=true"/>
- <property name="jdbcUsername" value="root"/>
- <property name="jdbcPassword" value="321$YcYl@1970!"/>
- <property name="databaseSchemaUpdate" value="true"/>
- <property name="asyncExecutorActivate" value="false"/>
- <property name="mailServerHost" value="mail.my-corp.com"/>
- <property name="mailServerPort" value="5025"/>
- </bean>
-</beans>
\ No newline at end of file
--
Gitblit v1.8.0