From 8cd9885418c811542c28434da5b1805a4a690092 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:47:38 +0800
Subject: [PATCH] 视频点位在线接口
---
ycl-common/src/main/java/constant/CheckConstants.java | 2
ycl-server/src/main/java/com/ycl/task/HKTask.java | 26 +-
ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml | 11
ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java | 13 +
ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java | 8
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/VideoOnlineParam.java | 40 +++++
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 5
ycl-common/src/main/java/constant/ApiConstants.java | 13 +
/dev/null | 97 ------------
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 5
ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java | 6
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 35 ++++
ycl-server/src/main/java/com/ycl/task/UYTask.java | 37 ++--
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java | 121 +++++++++++++++
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 4
15 files changed, 267 insertions(+), 156 deletions(-)
diff --git a/ycl-common/src/main/java/constant/ApiConstants.java b/ycl-common/src/main/java/constant/ApiConstants.java
index 05e6849..abaa992 100644
--- a/ycl-common/src/main/java/constant/ApiConstants.java
+++ b/ycl-common/src/main/java/constant/ApiConstants.java
@@ -8,8 +8,8 @@
public final static String HKSuccessCode = "0";
public final static String UYSuccessCodeStr = "200";
public final static Integer UYSuccessCode = 200;
- public final static Integer pageNo = 1;
- public final static Integer pageSize = 20000;
+ public final static Integer PageNo = 1;
+ public final static Integer PageSize = 20000;
//璇锋眰鍙傛暟dataType-鍗″彛杩囪溅
public final static Integer HK_DataType_CAR = 1;
//璇锋眰鍙傛暟dataType-浜鸿劯鏁版嵁
@@ -51,4 +51,13 @@
public final static Integer UY_RecordStatus_Integrity = 1;
public final static Integer UY_RecordStatus_Interval = 0;
public final static Integer UY_RecordStatus_Abnormal = -1;
+
+ //浼樹簯鐐逛綅鍦ㄧ嚎鐘舵��
+ public final static Integer UY_OnlineStatus_All = 2;
+ public final static Integer UY_OnlineStatus_Online = 1;
+ public final static Integer UY_OnlineStatus_Offline = -1;
+ public final static Integer UY_OnlineStatus_Unknown = 0;
+ //鑷础琛屾斂缂栫爜
+ public final static String AreaNo = "5103";
+
}
diff --git a/ycl-common/src/main/java/constant/CheckConstants.java b/ycl-common/src/main/java/constant/CheckConstants.java
index b6c52e9..dc6ddd3 100644
--- a/ycl-common/src/main/java/constant/CheckConstants.java
+++ b/ycl-common/src/main/java/constant/CheckConstants.java
@@ -12,7 +12,7 @@
public static final Short Rule_Category_Face = 3;
//鐪佸巺
- public static final Short Examine_Tag_City = 0;
+ public static final Short Examine_Tag_Province = 0;
//鍖哄幙
public static final Short Examine_Tag_County = 1;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java
deleted file mode 100644
index 110dc3c..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.ycl.platform.domain.param.UY;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 鐐逛綅鍦ㄧ嚎鍙傛暟
- *
- * @author gonghl
- * @since 2024/7/1 涓嬪崍 4:52
- */
-
-@Data
-@Accessors(chain = true)
-public class OnlineParam {
-
- /**
- * 琛屾斂鍖哄煙缂栫爜
- */
- private String arealayerno;
-
- private Object[] dbConditionItems;
-
- /**
- * 鍔ㄦ�佹潯浠讹紝json 鏍煎紡
- */
- private String dynamicConditionJson;
-
- /**
- * 鎺掑簭瀛楁
- */
- private String sortFiled;
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/VideoOnlineParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/VideoOnlineParam.java
new file mode 100644
index 0000000..1f64323
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/VideoOnlineParam.java
@@ -0,0 +1,40 @@
+package com.ycl.platform.domain.param.UY;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 鐐逛綅鍦ㄧ嚎鍙傛暟
+ *
+ * @author gonghl
+ * @since 2024/7/1 涓嬪崍 4:52
+ */
+
+@Data
+@Accessors(chain = true)
+public class VideoOnlineParam {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+ /**
+ * 琛屾斂鍖哄垝缂栫爜
+ */
+ private String arealayerno;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 2/1/-1/0 鍏ㄩ儴/鍦ㄧ嚎/绂荤嚎/鏈煡
+ */
+ private Integer status;
+ /**
+ * icmp鐘舵�� 2/1/-1/0 鍏ㄩ儴/鍦ㄧ嚎/绂荤嚎/鏈煡
+ */
+ private Integer icmpStatus;
+
+ private String field;
+
+ private String order;
+
+ private List dynamicCondition;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
deleted file mode 100644
index 0f0fb90..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.ycl.platform.domain.result.UY;
-
-import com.ycl.platform.domain.result.BaseResult;
-import lombok.Data;
-import org.springframework.data.mongodb.core.index.TextIndexed;
-import org.springframework.data.mongodb.core.mapping.Document;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 鐐逛綅鍦ㄧ嚎鐜�
- *
- * @author gonghl
- * @since 2024-4-19 11:37:30
- */
-@Data
-@Document(collection = "uy_online")
-public class OnlineResult extends BaseResult {
-
- /**
- * 琛屾斂鍖哄垝缂栫爜
- */
- private String arealayernoCode;
-
- /**
- * 琛屾斂鍖哄垝鍚嶇О
- */
- @TextIndexed
- private String arealayernoName;
-
- /**
- * 璇婃柇鏃ユ湡
- */
- private String diagDate;
-
- /**
- * 缁熻绾害
- */
- private String dim;
-
- /**
- * icmp绂荤嚎鏁�
- */
- private Integer icmpOfflineNum;
-
- /**
- * icmp鍦ㄧ嚎鏁�
- */
- private Integer icmpOnlineNum;
-
- /**
- * icmp鍦ㄧ嚎鐜囷紝鏍煎紡涓虹櫨鍒嗘瘮瀛楃涓诧紝濡� "99.9%"
- */
- private String icmpOnlineRate;
-
- /**
- * icmp璇婃柇鎬绘暟
- */
- private Integer icmpTotalNum;
-
- /**
- * 绂荤嚎鏁�
- */
- private Integer offlineNum;
-
- /**
- * 鍦ㄧ嚎鏁�
- */
- private Integer onlineNum;
-
- /**
- * 鍦ㄧ嚎鐜囷紝鏍煎紡涓虹櫨鍒嗘瘮瀛楃涓诧紝濡� "99.9%"
- */
- private String onlineRate;
-
- /**
- * 椤电爜
- */
- private Integer pageNum;
-
- /**
- * 鍒嗛〉澶у皬
- */
- private Integer pageSize;
-
- /**
- * 鎺掑簭灞炴��
- */
- private String sortFiled;
-
- /**
- * 璇婃柇鎬绘暟
- */
- private Integer totalNum;
-
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java
new file mode 100644
index 0000000..620c8ba
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java
@@ -0,0 +1,121 @@
+package com.ycl.platform.domain.result.UY;
+
+import com.ycl.platform.domain.result.BaseResult;
+import lombok.Data;
+import org.springframework.data.mongodb.core.index.TextIndexed;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐐逛綅鍦ㄧ嚎鐜�
+ *
+ * @author gonghl
+ * @since 2024-4-19 11:37:30
+ */
+@Data
+@Document(collection = "uy_online")
+public class VideoOnlineResult extends BaseResult {
+
+ /**
+ * 琛屾斂鍖哄垝缂栫爜
+ */
+ private String arealayerPath;
+ /**
+ * 琛屾斂鍖哄垝缂栫爜
+ */
+ private String arealayerno;
+ /**
+ * 琛屾斂鍖哄垝鍚嶇О
+ */
+ @TextIndexed
+ private String arealayerName;
+
+ /**
+ * 瑙ｇ爜鐘舵�佺爜
+ */
+ private Integer decodingCode;
+
+ /**
+ * 璁惧id
+ */
+ private Integer deviceId;
+ /**
+ * 璁惧鍚嶇О
+ */
+ private String deviceName;
+ /**
+ * icmp寤惰繜
+ */
+ private Double icmpDelay;
+ /**
+ * icmp鐘舵�� 2/1/-1/0 鍏ㄩ儴/鍦ㄧ嚎/绂荤嚎/鏈煡
+ */
+ private Integer icmpStatus;
+ /**
+ * 鏈�杩慽cmp鏃堕棿
+ */
+ private Date icmpTime;
+ /**
+ * 鍏抽敭甯ф椂寤�
+ */
+ private Integer ifmDelay;
+ /**
+ * ip鍦板潃
+ */
+ private String ipAddr;
+ /**
+ * 鏈�杩戞寔缁绾挎晠闅滄鏁�
+ */
+ private Integer olErrEverduring;
+ /**
+ *
+ */
+ private Date olErrEverduringFirstTime;
+ /**
+ * 绱绂荤嚎鏁呴殰娆℃暟
+ */
+ private Integer olErrTotal;
+ /**
+ * 绱绂荤嚎鏁呴殰鐜�
+ */
+ private String olErrTotalRate;
+ /**
+ * 宸℃娆℃暟
+ */
+ private Integer olTotal;
+ /**
+ * sip鐘舵�佺爜
+ */
+ private Integer sipCode;
+ /**
+ * 淇′护鏃跺欢
+ */
+ private Integer sipDelay;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 2/1/-1/0 鍏ㄩ儴/鍦ㄧ嚎/绂荤嚎/鏈煡
+ */
+ private Integer status;
+ /**
+ * 鐪佸巺鏍囩
+ */
+ private String tagStr;
+ /**
+ * 鐪佸巺鏍囩
+ */
+ private List<String> tags;
+ /**
+ * 绉熸埛id
+ */
+ private Integer tenantId;
+ /**
+ * 瑙嗛娴佹椂寤�
+ */
+ private Integer videoDelay;
+ /**
+ *
+ */
+ private Date vqdTime;
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
index f372bb3..1b36b5b 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -136,7 +136,7 @@
// 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
Optional<T> existingIndex = checkIndexList.stream()
.filter(index -> key.equals(index.getDeptId().toString()) &&
- (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(index.getExamineTag())
+ (key.startsWith("Province_") ? CheckConstants.Examine_Tag_Province.equals(index.getExamineTag())
: CheckConstants.Examine_Tag_County.equals(index.getExamineTag())))
.findFirst();
@@ -146,7 +146,7 @@
try {
checkIndex = clazz.getDeclaredConstructor().newInstance();
checkIndex.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
- checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
+ checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_Province : CheckConstants.Examine_Tag_County);
checkIndex.setCreateTime(new Date());
} catch (Exception e) {
checkIndex = null;
diff --git a/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
new file mode 100644
index 0000000..2ae0bfb
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
@@ -0,0 +1,13 @@
+package com.ycl.calculate;
+
+import com.ycl.platform.domain.result.UY.QueryVqdResult;
+
+import java.util.List;
+
+public class PlatformOnlineCalculation extends IndexCalculationServe implements CalculationStrategy<QueryVqdResult> {
+
+ @Override
+ public void calculate(List<QueryVqdResult> list) {
+
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
index dac89b9..1e30c0e 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
@@ -82,9 +82,9 @@
List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
- CheckIndexVideo CheckIndexVideo = createOrUpdateCheckIndexFace(deptId, stats, checkIndexVideoList);
- if (CheckIndexVideo != null) {
- checkIndexVideos.add(CheckIndexVideo);
+ CheckIndexVideo checkIndexVideo = createOrUpdateCheckIndexVideo(deptId, stats, checkIndexVideoList);
+ if (checkIndexVideo != null) {
+ checkIndexVideos.add(checkIndexVideo);
}
}
});
@@ -114,7 +114,7 @@
/**
* 瑙嗛鐐逛綅鍦ㄧ嚎鐜�
*/
- private CheckIndexVideo createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexVideo> checkIndexVideoList) {
+ private CheckIndexVideo createOrUpdateCheckIndexVideo(String key, AreaStats stats, List<CheckIndexVideo> checkIndexVideoList) {
CheckIndexVideo checkIndexVideo = getCheckIndex(key, checkIndexVideoList, CheckIndexVideo.class);
if (checkIndexVideo == null) {
return null;
diff --git a/ycl-server/src/main/java/com/ycl/feign/UYClient.java b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
index 3610c41..6112da1 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson2.JSONObject;
import com.ycl.platform.domain.param.UY.*;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.stereotype.Component;
@@ -35,8 +34,8 @@
* @param onlineParam 璇锋眰鍙傛暟
* @return 鏌ヨ鍦ㄧ嚎缁熻鍒楄〃
*/
- @GetMapping("/openapi/v1/report/online/list")
- JSONObject onlineList(@SpringQueryMap OnlineParam onlineParam);
+ @GetMapping("/videomon/api/v1/app/onlineMonitor/list")
+ JSONObject videoOnline(@SpringQueryMap VideoOnlineParam onlineParam);
/**
* 褰曞儚鍙敤
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java
index 0f775cb..1a2a23c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java
@@ -10,6 +10,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* 骞冲彴鍦ㄧ嚎鐜� Mapper 鎺ュ彛
*
@@ -31,7 +33,7 @@
*/
IPage getPage(IPage page, @Param("query") DataCenterQuery query);
- //缁熻绂荤嚎鏃堕暱
- Integer sumOffTime(@Param("startDate")String startDate,@Param("endDate")String endDate);
+ //鏄ㄦ棩鏁版嵁
+ List<PlatformOnlineVO> sumYesterday(@Param("startDate")String startDate, @Param("endDate")String endDate);
}
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 52a33c8..48fcd04 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -45,7 +45,7 @@
public void vehicleDeviceInspectionTask() {
log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
- param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
+ param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
JSONObject jsonObject = hkClient.vehicleDeviceInspection(param);
List<VehicleDeviceInspectionResult> list = getDataList(jsonObject, VehicleDeviceInspectionResult.class, "杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(list)) {
@@ -64,7 +64,7 @@
public void faceDeviceInspectionTask() {
log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
- param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
+ param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
JSONObject jsonObject = hkClient.faceDeviceInspection(param);
List<FaceDeviceInspectionResult> list = getDataList(jsonObject, FaceDeviceInspectionResult.class, "浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(list)) {
@@ -86,7 +86,7 @@
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).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
JSONObject carJsonObject = hkClient.snapshotDataMonitor(carParam);
List<SnapshotDataMonitorResult> carList = getDataList(carJsonObject, SnapshotDataMonitorResult.class, "杞﹁締鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹�");
if (!CollectionUtils.isEmpty(carList)) {
@@ -102,7 +102,7 @@
/** 浜鸿劯鏁版嵁 */
SnapshotDataMonitorParam faceParam = new SnapshotDataMonitorParam();
- faceParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
+ faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
JSONObject faceJsonObject = hkClient.snapshotDataMonitor(carParam);
List<SnapshotDataMonitorResult> faceList = getDataList(faceJsonObject, SnapshotDataMonitorResult.class, "浜鸿劯鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
@@ -124,7 +124,7 @@
log.info("寮�濮嬫墽琛岄噰闆嗚澶囧睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
//浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
MonitoringDetailParam param = new MonitoringDetailParam();
- param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
+ param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
JSONObject jsonObject = hkClient.monitorDetail(param);
List<MonitoringDetailResult> faceList = getDataList(jsonObject, MonitoringDetailResult.class, "閲囬泦璁惧灞炴�х洃娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
@@ -144,7 +144,7 @@
log.info("寮�濮嬫墽琛屽崱鍙ｅ睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
CrossDetailParam param = new CrossDetailParam();
- param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
+ param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
JSONObject jsonObject = hkClient.crossDetail(param);
List<CrossDetailResult> faceList = getDataList(jsonObject, CrossDetailResult.class, "鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
@@ -164,7 +164,7 @@
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).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
JSONObject jsonObject = hkClient.dataIntegrityMonitoring(param);
List<DataIntegrityMonitoringResult> faceList = getDataList(jsonObject, DataIntegrityMonitoringResult.class, "鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
@@ -184,7 +184,7 @@
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).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
JSONObject jsonObject = hkClient.attrRecognitionMonitor(param);
List<AttrRecognitionMonitorResult> faceList = getDataList(jsonObject, AttrRecognitionMonitorResult.class, "灞炴�ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
@@ -206,7 +206,7 @@
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
/** 杞﹁締鏁版嵁 */
SnapshotDelayMonitorParam carParam = new SnapshotDelayMonitorParam();
- carParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
JSONObject carJsonObject = hkClient.snapshotDelayMonitor(carParam);
List<SnapshotDelayMonitorResult> carList = getDataList(carJsonObject, SnapshotDelayMonitorResult.class, "杞﹁締鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹�");
if (!CollectionUtils.isEmpty(carList)) {
@@ -222,7 +222,7 @@
/** 浜鸿劯鏁版嵁 */
SnapshotDelayMonitorParam faceParam = new SnapshotDelayMonitorParam();
- faceParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
+ faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
JSONObject faceJsonObject = hkClient.snapshotDelayMonitor(faceParam);
List<SnapshotDelayMonitorParam> faceList = getDataList(faceJsonObject, SnapshotDelayMonitorParam.class, "浜鸿劯鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
@@ -244,7 +244,7 @@
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).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
JSONObject jsonObject = hkClient.picAccessMonitor(param);
List<PicAccessResult> faceList = getDataList(jsonObject, PicAccessResult.class, "鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(faceList)) {
@@ -263,7 +263,7 @@
log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
VehicleDeviceSamplingParam param = new VehicleDeviceSamplingParam();
- param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
+ param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
JSONObject jsonObject = hkClient.vehicleDeviceSampling(param);
List<VehicleDeviceSamplingResult> faceList = getDataList(jsonObject, VehicleDeviceSamplingResult.class, "浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(faceList)) {
@@ -283,7 +283,7 @@
public void faceDeviceSamplingTask() {
log.info("寮�濮嬫墽琛屼汉鑴歌澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
- param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
+ param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
JSONObject jsonObject = hkClient.faceDeviceSampling(param);
List<FaceDeviceSamplingResult> faceList = getDataList(jsonObject, FaceDeviceSamplingResult.class, "浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(faceList)) {
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index f301921..7028c1a 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -88,8 +88,8 @@
//涓�鏈轰竴妗ｅ悎鏍肩巼
log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
MonitorQualifyParam param = new MonitorQualifyParam();
- param.setPageNum(ApiConstants.pageNo);
- param.setPageSize(ApiConstants.pageSize);
+ param.setPageNum(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.PageSize);
JSONObject jsonObject = uyClient.monitorQualify(param);
if (jsonObject != null) {
log.info("鏁版嵁鏍煎紡" + jsonObject);
@@ -118,43 +118,44 @@
log.info("缁撴潫涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
}
- //鍥惧儚鐩戞祴璇婃柇缁撴灉
- public void queryVqdResultTask() {
- //鐐逛綅鍦ㄧ嚎鐜�
+ //鐐逛綅鍦ㄧ嚎鐜�
+ public void videoOnlineTask() {
//瑙嗛鍥惧儚璐ㄩ噺
- log.info("寮�濮嬫墽琛屽浘鍍忕洃娴嬭瘖鏂粨鏋滄暟鎹悓姝�");
- QueryVqdParam param = new QueryVqdParam();
- param.setTenantId(tenantId);
- param.setApikey(apikey);
- param.setAccesskey(accesskey);
- JSONObject jsonObject = uyClient.queryVqdResult(param);
+ log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�");
+ VideoOnlineParam param = new VideoOnlineParam();
+ param.setPageNum(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.PageSize);
+ param.setArealayerno(ApiConstants.AreaNo);
+ param.setStatus(ApiConstants.UY_OnlineStatus_All);
+ param.setIcmpStatus(ApiConstants.UY_OnlineStatus_All);
+ JSONObject jsonObject = uyClient.videoOnline(param);
if (jsonObject != null) {
log.info("鏁版嵁鏍煎紡" + jsonObject);
Integer statusCode = jsonObject.getInteger("statusCode");
if (ApiConstants.UYSuccessCode.equals(statusCode)) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
- List<QueryVqdResult> records = data.getList("records", QueryVqdResult.class);
+ List<VideoOnlineResult> records = data.getList("records", VideoOnlineResult.class);
if (!CollectionUtils.isEmpty(records)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, QueryVqdResult.class);
+ DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", data);
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", jsonObject);
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", jsonObject);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉璇锋眰澶辫触{}", jsonObject);
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉璇锋眰澶辫触{}", jsonObject);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖");
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖");
}
- log.info("缁撴潫鎵ц鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁鍚屾");
+ log.info("缁撴潫鎵ц鐐逛綅鍦ㄧ嚎鏁版嵁鍚屾");
}
//褰曞儚鍙敤
diff --git a/ycl-server/src/main/java/com/ycl/task/VideoTask.java b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
index 1fbec55..827d57a 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -3,23 +3,32 @@
import com.ycl.calculate.CalculationStrategy;
import com.ycl.factory.IndexCalculationFactory;
+import com.ycl.platform.domain.entity.CheckIndexVideo;
import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
import com.ycl.platform.domain.result.UY.QueryVqdResult;
+import com.ycl.platform.domain.vo.PlatformOnlineVO;
+import com.ycl.platform.mapper.CheckIndexVideoMapper;
import com.ycl.platform.mapper.PlatformOnlineMapper;
import com.ycl.platform.service.PlatformOnlineService;
+import com.ycl.system.mapper.SysDeptMapper;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import constant.CalculationStrategyConstants;
+import constant.CheckConstants;
+import enumeration.general.AreaDeptEnum;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 瑙嗛璁＄畻鑰冩牳鎸囨爣浠诲姟
@@ -32,6 +41,10 @@
private MongoTemplate mongoTemplate;
@Autowired
private PlatformOnlineMapper platformOnlineMapper;
+ @Autowired
+ private CheckIndexVideoMapper videoMapper;
+ @Autowired
+ private SysDeptMapper deptMapper;
public void siteOnlineTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
@@ -64,9 +77,25 @@
public void platformOnlineTask() {
//璁＄畻骞冲彴鍦ㄧ嚎鐜�
//鎷垮埌浠婃棩绂荤嚎鏃堕暱鏁版嵁
- Integer time = platformOnlineMapper.sumOffTime(DateUtils.getMouthStart(new Date()), DateUtils.getMouthEnd(new Date()));
- int num = (time / 60) % 30;
- double score = Math.max(1 - num * 0.1,0);
+ List<PlatformOnlineVO> list = platformOnlineMapper.sumYesterday(DateUtils.getMouthStart(new Date()), DateUtils.getMouthEnd(new Date()));
+
+// int num = (time / 60) % 30;
+// double score = Math.max(1 - num * 0.1, 0);
+// List<CheckIndexVideo> checkIndexVideos = videoMapper.selectToday(DateUtils.getDate());
+// List<Long> deptIds = deptMapper.selectByParentId(207L);
+// Map<String, CheckIndexVideo> map = new HashMap<>();
+// for (Long deptId : deptIds) {
+// CheckIndexVideo video = new CheckIndexVideo();
+// video.setExamineTag(CheckConstants.Examine_Tag_County);
+// map.put(deptId + "", video);
+// CheckIndexVideo provinceVideo = new CheckIndexVideo();
+// provinceVideo.setExamineTag(CheckConstants.Examine_Tag_Province);
+// map.put("Province_" + deptId, new CheckIndexVideo());
+// }
+// map.forEach((deptId, video) -> {
+//
+// });
+
}
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
index 94c67ad..d52330e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
@@ -12,12 +12,6 @@
<result column="create_time" property="createTime" />
</resultMap>
-
-
-
-
-
-
<select id="getById" resultMap="BaseResultMap">
SELECT
TPO.platform_name,
@@ -52,4 +46,9 @@
</if>
</select>
+
+ <select id="sumYesterday" resultMap="BaseResultMap">
+ select * from t_platform_online
+ where create_date between #{startDate} and #{endDate}
+ </select>
</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 3a1ea2f..878f8d0 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -92,9 +92,4 @@
</if>
</where>
</select>
-
- <select id="sumOffTime" resultType="java.lang.Integer">
- select sum(today_outline_sed) from t_platform_online
- where create_date between #{startDate} and #{endDate}
- </select>
</mapper>
--
Gitblit v1.8.0