From 4ac87bb3275667c02bc60012ebb9fc1eeab6da5b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 17:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java | 8
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 49 ++
ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java | 12
ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java | 13
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 586 ++++++++++++++++++++++----
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 11
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 21
ycl-server/src/main/java/com/ycl/utils/MongoUtil.java | 32 +
ycl-pojo/src/main/java/com/ycl/platform/domain/query/HomeQuery.java | 31 +
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 20
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 34 +
ycl-server/src/main/java/com/ycl/platform/controller/HomeController.java | 42 +
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 17
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 19
ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java | 352 ++++++++++++++++
ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java | 28
16 files changed, 1,150 insertions(+), 125 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
index 69eb752..09bf614 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
@@ -18,4 +18,12 @@
@ApiModelProperty(value = "姣忛〉鏉℃暟", required = true)
private Long pageSize = 10L;
+ /**
+ * 鑾峰彇mongo鍒嗛〉skip璺宠繃鐨勬潯鏁�
+ *
+ * @return
+ */
+ public Long getSkipNum() {
+ return (pageNum - 1) * pageSize;
+ }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/HomeQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/HomeQuery.java
new file mode 100644
index 0000000..3fea4ee
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/HomeQuery.java
@@ -0,0 +1,31 @@
+package com.ycl.platform.domain.query;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author gonghl
+ * @since 2024/8/1 涓嬪崍 6:08
+ */
+
+@Data
+public class HomeQuery {
+
+ /**
+ * 鍗曚綅id
+ */
+ private Integer unitId;
+
+ /**
+ * 鏃ユ湡鑼冨洿
+ */
+ private List<Date> dateRange;
+
+ /**
+ * 鏃ユ湡绫诲瀷
+ */
+ private String dateType;
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index fb4899a..7e93b94 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -1,7 +1,17 @@
package com.ycl.platform.controller;
+import com.ycl.platform.domain.query.DataCenterQuery;
+import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.domain.result.UY.OneMachineFileResult;
+import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.platform.service.DataCenterService;
+import com.ycl.system.Result;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* 鏁版嵁涓績鎺ュ彛
@@ -9,10 +19,352 @@
* @author锛歺p
* @date锛�2024/8/1 16:40
*/
+@RequiredArgsConstructor
@RestController
@RequestMapping("/data/center")
public class DataCenterController {
+ private final DataCenterService dataCenterService;
+
+ /**
+ * 瑙嗛锛氱偣浣嶅湪绾跨巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoPointOnlineRate")
+ public Result videoPointOnlineRate(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoPointOnlineRate(query));
+ }
+
+ /**
+ * 瑙嗛锛氫竴鏈轰竴妗ｆ敞鍐岀巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoOneMachineDocumentRegister")
+ public Result videoOneMachineDocumentRegister(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoOneMachineDocumentRegister(query));
+ }
+
+ /**
+ * 瑙嗛锛氫竴鏈轰竴妗ｅ悎鏍肩巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoOneMachineDocumentQualified")
+ public Result videoOneMachineDocumentQualified(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoOneMachineDocumentQualified(query));
+ }
+
+ /**
+ * 瑙嗛锛氭。妗堣�冩牳姣�
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoAssessmentFileRatio")
+ public Result videoAssessmentFileRatio(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoAssessmentFileRatio(query));
+ }
+
+ /**
+ * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoAvailabilityRate")
+ public Result videoAvailabilityRate(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoAvailabilityRate(query));
+ }
+
+ /**
+ * 瑙嗛锛氶噸鐐圭偣浣嶅綍鍍忓彲鐢ㄧ巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoImportantPointAvailabilityRate")
+ public Result videoImportantPointAvailabilityRate(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoImportantPointAvailabilityRate(query));
+ }
+
+ /**
+ * 瑙嗛锛氭爣娉ㄦ纭巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoLabelingAccuracy")
+ public Result videoLabelingAccuracy(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoLabelingAccuracy(query));
+ }
+
+ /**
+ * 瑙嗛锛氶噸鐐圭偣浣嶆爣娉ㄦ纭巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoImportantPointLabelingAccuracy")
+ public Result videoImportantPointLabelingAccuracy(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoImportantPointLabelingAccuracy(query));
+ }
+
+ /**
+ * 瑙嗛锛氭牎鏃舵纭巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoCheckTimeAccuracy")
+ public Result videoCheckTimeAccuracy(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoCheckTimeAccuracy(query));
+ }
+
+ /**
+ * 瑙嗛锛氶噸鐐圭偣浣嶆牎鏃舵纭巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoImportantPointCheckTimeAccuracy")
+ public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoImportantPointCheckTimeAccuracy(query));
+ }
+
+ /**
+ * 瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoImportantPointOnlineRate")
+ public Result videoImportantPointOnlineRate(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoImportantPointOnlineRate(query));
+ }
+
+ /**
+ * 瑙嗛锛氶噸鐐规寚鎸ュ浘鍍忓湪绾跨巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoImportantPointImageOnlineRate")
+ public Result videoImportantPointImageOnlineRate(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.videoImportantPointImageOnlineRate(query));
+ }
+
+
+
+ /**
+ * 杞﹁締锛氳鍥惧簱瀵规帴绋冲畾鎬�
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehicleViewDockStable")
+ public Result vehicleViewDockStable(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehicleViewDockStable(query));
+ }
+
+ /**
+ * 杞﹁締锛氱偣浣嶅湪绾跨巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehiclePointOnlineRate")
+ public Result vehiclePointOnlineRate(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehiclePointOnlineRate(query));
+ }
+
+ /**
+ * 杞﹁締锛氫簰鑱旂綉鍗″彛璁惧鐩綍涓�鑷存��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehicleNetDeviceDirectoryConsistency")
+ public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehicleNetDeviceDirectoryConsistency(query));
+ }
+
+ /**
+ * 杞﹁締锛氳溅杈嗗崱鍙ｄ俊鎭噰闆嗗噯纭巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehicleCollectionConsistency")
+ public Result vehicleCollectionConsistency(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehicleCollectionConsistency(query));
+ }
+
+ /**
+ * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹畬鏁存��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehicleCollectionDataIntegrity")
+ public Result vehicleCollectionDataIntegrity(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehicleCollectionDataIntegrity(query));
+ }
+
+ /**
+ * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹噯纭��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehicleCollectionDataCaptured")
+ public Result vehicleCollectionDataCaptured(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehicleCollectionDataCaptured(query));
+ }
+
+ /**
+ * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨椂閽熷噯纭��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehicleClockAccuracy")
+ public Result vehicleClockAccuracy(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehicleClockAccuracy(query));
+ }
+
+ /**
+ * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹笂浼犲強鏃舵��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehicleTimelyUploadAccuracy")
+ public Result vehicleTimelyUploadAccuracy(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehicleTimelyUploadAccuracy(query));
+ }
+
+ /**
+ * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehicleUrlAccuracy")
+ public Result vehicleUrlAccuracy(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehicleUrlAccuracy(query));
+ }
+
+ /**
+ * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹ぇ鍥惧彲鐢ㄦ��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/vehicleBigImgAccuracy")
+ public Result vehicleBigImgAccuracy(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.vehicleBigImgAccuracy(query));
+ }
+
+
+
+
+
+
+
+
+
+ /**
+ * 浜鸿劯锛氳鍥惧簱瀵规帴绋冲畾鎬�
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/faceViewDockStable")
+ public Result faceViewDockStable(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.faceViewDockStable(query));
+ }
+
+ /**
+ * 浜鸿劯锛氱偣浣嶅湪绾跨巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/facePointOnlineRate")
+ public Result facePointOnlineRate(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.facePointOnlineRate(query));
+ }
+
+ /**
+ * 浜鸿劯锛氱洰褰曚竴鑷寸巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/faceDirectoryConsistency")
+ public Result faceDirectoryConsistency(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.faceDirectoryConsistency(query));
+ }
+
+ /**
+ * 浜鸿劯锛氫汉鑴稿崱鍙ｄ俊鎭噰闆嗗噯纭巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/faceCollectionConsistency")
+ public Result faceCollectionConsistency(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.faceCollectionConsistency(query));
+ }
+
+ /**
+ * 浜鸿劯锛氳澶囨姄鎷嶅浘鐗囧悎鏍兼��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/faceImgQualification")
+ public Result faceImgQualification(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.faceImgQualification(query));
+ }
+
+ /**
+ * 浜鸿劯锛氳澶囨姄鎷嶅浘鐗囨椂閽熷噯纭��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/faceCapturesImagesAccuracy")
+ public Result faceCapturesImagesAccuracy(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.faceCapturesImagesAccuracy(query));
+ }
+
+ /**
+ * 浜鸿劯锛氭姄鎷嶄汉鑴告暟鎹笂浼犲強鏃舵��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/faceTimelyUpload")
+ public Result faceTimelyUpload(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.faceTimelyUpload(query));
+ }
+
+ /**
+ * 浜鸿劯锛氫汉鑴稿崱鍙ｈ澶囨姄鎷嶆暟鎹ぇ鍥惧彲鐢ㄦ��
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/faceAvailabilityOfLargeImg")
+ public Result faceAvailabilityOfLargeImg(DataCenterQuery query) {
+ return Result.ok().data(dataCenterService.faceAvailabilityOfLargeImg(query));
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/HomeController.java b/ycl-server/src/main/java/com/ycl/platform/controller/HomeController.java
new file mode 100644
index 0000000..95a4ab3
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/HomeController.java
@@ -0,0 +1,42 @@
+package com.ycl.platform.controller;
+
+import com.ycl.platform.domain.query.HomeQuery;
+import com.ycl.platform.service.ITMonitorService;
+import com.ycl.platform.service.WorkOrderService;
+import com.ycl.platform.service.YwUnitService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import pojo.AjaxResult;
+
+/**
+ * @author gonghl
+ * @since 2024/8/1 涓嬪崍 5:41
+ */
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/home")
+public class HomeController {
+
+ private final YwUnitService ywUnitService;
+ private final ITMonitorService tMonitorService;
+ private final WorkOrderService workOrderService;
+
+ @GetMapping("/ywUnitList")
+ public AjaxResult ywUnitList() {
+ return AjaxResult.success(ywUnitService.all());
+ }
+
+ @GetMapping("/monitor")
+ public AjaxResult monitor(HomeQuery monitorQuery) {
+ return AjaxResult.success(tMonitorService.home(monitorQuery));
+ }
+
+ @GetMapping("/workOrder")
+ public AjaxResult workOrder(HomeQuery monitorQuery) {
+ return AjaxResult.success(workOrderService.home(monitorQuery));
+ }
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index 552305c..64d6023 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.query.HomeQuery;
import com.ycl.platform.domain.vo.TMonitorVO;
import java.util.List;
@@ -70,6 +71,11 @@
*/
Map<String, String> getVideoCount(TMonitor tMonitor);
+ /**
+ * 鑾峰彇鎭㈠寮傚父璁惧
+ * @param time 鏃堕棿
+ * @return 鏁版嵁
+ */
Map<String, String> recoveryException(String time);
/**
@@ -77,4 +83,11 @@
* @return 璁惧
*/
List<TMonitorVO> selectRecoveryMonitor(String time);
+
+ /**
+ * 棣栭〉鎶樼嚎鍥�
+ * @param monitorQuery 鏌ヨ鏉′欢
+ * @return 鏁版嵁
+ */
+ List<Map<String, Object>> home(HomeQuery monitorQuery);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
index e54598c..603fb4f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
@@ -1,20 +1,20 @@
package com.ycl.platform.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.platform.domain.entity.WorkOrder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
+import com.ycl.platform.domain.query.HomeQuery;
import com.ycl.platform.domain.query.ScreenQuery;
import com.ycl.platform.domain.query.WorkOrderQuery;
import com.ycl.platform.domain.vo.WorkOrderVO;
-import com.ycl.platform.domain.form.WorkOrderForm;
-import java.util.List;
-
-import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.domain.vo.YwPointJobVO;
import com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
/**
* 宸ュ崟 Mapper 鎺ュ彛
@@ -43,4 +43,11 @@
* @return
*/
ScreenWorkOrderVO screenWorkOrder(@Param("query") ScreenQuery query);
+
+ /**
+ * 棣栭〉缁熻鏁版嵁
+ * @param monitorQuery 鏌ヨ鏉′欢
+ * @return 鏁版嵁
+ */
+ List<Map<String, Object>> home(HomeQuery monitorQuery);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java b/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
index 06d1eed..3b86d92 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
@@ -2,8 +2,8 @@
import com.ycl.platform.domain.query.DataCenterQuery;
import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
-import com.ycl.platform.domain.vo.TMonitorVO;
import java.util.List;
@@ -22,7 +22,7 @@
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
- List<TMonitorVO> videoPointOnlineRate(DataCenterQuery query);
+ List<OneMachineFileResult> videoPointOnlineRate(DataCenterQuery query);
/**
* 瑙嗛锛氫竴鏈轰竴妗ｆ敞鍐岀巼
@@ -30,7 +30,7 @@
* @param query
* @return
*/
- List<TMonitorVO> videoOneMachineDocumentRegister(DataCenterQuery query);
+ List<OneMachineFileResult> videoOneMachineDocumentRegister(DataCenterQuery query);
/**
* 瑙嗛锛氫竴鏈轰竴妗ｅ悎鏍肩巼
@@ -38,7 +38,7 @@
* @param query
* @return
*/
- List<TMonitorVO> videoOneMachineDocumentQualified(DataCenterQuery query);
+ List<OneMachineFileResult> videoOneMachineDocumentQualified(DataCenterQuery query);
/**
* 瑙嗛锛氭。妗堣�冩牳姣�
@@ -46,7 +46,7 @@
* @param query
* @return
*/
- List<TMonitorVO> videoAssessmentFileRatio(DataCenterQuery query);
+ List<OneMachineFileResult> videoAssessmentFileRatio(DataCenterQuery query);
/**
* 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
@@ -71,7 +71,7 @@
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
- List<TMonitorVO> videoLabelingAccuracy(DataCenterQuery query);
+ List<OneMachineFileResult> videoLabelingAccuracy(DataCenterQuery query);
/**
* 瑙嗛锛氶噸鐐圭偣浣嶆爣娉ㄦ纭巼
@@ -80,7 +80,7 @@
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
- List<TMonitorVO> videoImportantPointLabelingAccuracy(DataCenterQuery query);
+ List<OneMachineFileResult> videoImportantPointLabelingAccuracy(DataCenterQuery query);
/**
* 瑙嗛锛氭牎鏃舵纭巼
@@ -89,7 +89,7 @@
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
- List<TMonitorVO> videoCheckTimeAccuracy(DataCenterQuery query);
+ List<OneMachineFileResult> videoCheckTimeAccuracy(DataCenterQuery query);
/**
* 瑙嗛锛氶噸鐐圭偣浣嶆牎鏃舵纭巼
@@ -98,7 +98,7 @@
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
- List<TMonitorVO> videoImportantPointCheckTimeAccuracy(DataCenterQuery query);
+ List<OneMachineFileResult> videoImportantPointCheckTimeAccuracy(DataCenterQuery query);
/**
* 瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼
@@ -107,7 +107,7 @@
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
- List<TMonitorVO> videoImportantPointOnlineRate(DataCenterQuery query);
+ List<OneMachineFileResult> videoImportantPointOnlineRate(DataCenterQuery query);
/**
* 瑙嗛锛氶噸鐐规寚鎸ュ浘鍍忓湪绾跨巼
@@ -116,7 +116,7 @@
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
- List<TMonitorVO> videoImportantPointImageOnlineRate(DataCenterQuery query);
+ List<OneMachineFileResult> videoImportantPointImageOnlineRate(DataCenterQuery query);
@@ -144,7 +144,7 @@
* @param query
* @return
*/
- List<TMonitorVO> vehicleNetDeviceDirectoryConsistency(DataCenterQuery query);
+ List<OneMachineFileResult> vehicleNetDeviceDirectoryConsistency(DataCenterQuery query);
/**
* 杞﹁締锛氳溅杈嗗崱鍙ｄ俊鎭噰闆嗗噯纭巼
@@ -225,7 +225,7 @@
* @return
*/
// TODO 鏇存崲鍝嶅簲缁撴灉
- List<TMonitorVO> facePointOnlineRate(DataCenterQuery query);
+ List<OneMachineFileResult> facePointOnlineRate(DataCenterQuery query);
/**
* 浜鸿劯锛氱洰褰曚竴鑷寸巼
@@ -233,7 +233,7 @@
* @param query
* @return
*/
- List<TMonitorVO> faceDirectoryConsistency(DataCenterQuery query);
+ List<OneMachineFileResult> faceDirectoryConsistency(DataCenterQuery query);
/**
* 浜鸿劯锛氫汉鑴稿崱鍙ｄ俊鎭噰闆嗗噯纭巼
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
index 5cfb83e..a021021 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.query.HomeQuery;
import com.ycl.platform.domain.vo.TMonitorVO;
import java.util.List;
@@ -71,5 +72,16 @@
*/
Map<String, String> getVideoCount(TMonitor tMonitor);
+ /**
+ * 鑾峰彇寮傚父鎭㈠瑙嗛璁惧缁熻鏁�
+ * @return 鏁版嵁
+ */
Map<String, String> recoveryException();
+
+ /**
+ * 鑾峰彇棣栭〉璁惧鎶樼嚎鍥�
+ * @param monitorQuery 鏌ヨ鏉′欢
+ * @return 鏁版嵁
+ */
+ Map<String, Object> home(HomeQuery monitorQuery);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index b0a89ce..3382741 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
+import com.ycl.platform.domain.query.HomeQuery;
import com.ycl.platform.domain.query.ScreenQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.system.Result;
import com.ycl.platform.domain.query.WorkOrderQuery;
import java.util.List;
+import java.util.Map;
/**
* 宸ュ崟 鏈嶅姟绫�
@@ -131,7 +133,7 @@
/**
* 鎵归噺涓嬪彂
- * @param ids id
+ * @param query 鏉′欢
* @return 缁撴灉
*/
Result selectedIdsDistribute(DistributeWorkOrderQuery query);
@@ -142,4 +144,11 @@
* @return
*/
Result screenWorkOrder(ScreenQuery query);
+
+ /**
+ * 棣栭〉鎶樼嚎鍥�
+ * @param monitorQuery 鏌ヨ鏉′欢
+ * @return 鏁版嵁
+ */
+ Map<String, Object> home(HomeQuery monitorQuery);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index c790715..21d675d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -1,6 +1,7 @@
package com.ycl.platform.service.impl;
import annotation.DataScope;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.dto.CheckScoreDTO;
import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
@@ -133,8 +134,26 @@
// 鑾峰彇鏁版嵁鏃ユ湡鏃堕棿
Calendar calendar = Calendar.getInstance();
+ getCheckScore(checkScore, calendar);
+
// 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); }
+
+ List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore);
+ // 濡傛灉鏁版嵁涓虹┖锛屽垯鏌ヨ涔嬪墠鐨勬暟鎹�
+ if (checkScores.isEmpty()) {
+ CheckScore one = new LambdaQueryChainWrapper<>(baseMapper).select(CheckScore::getCreateTime).last("order by create_time desc limit 1").one();
+ if (Objects.nonNull(one)) {
+ calendar.setTime(one.getCreateTime());
+ getCheckScore(checkScore, calendar);
+ checkScores = scoreMapper.selectCheckScoreMap(checkScore);
+ }
+ }
+ return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+ }
+
+ private void getCheckScore(CheckScore checkScore, Calendar calendar)
+ {
// 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛ｅ害 3 甯傚眬瀛ｅ害
switch (checkScore.getExamineTag()) {
case 0, 1:
@@ -148,7 +167,6 @@
checkScore.setExamineTag(checkScore.getExamineTag() == 2 ? 0 : 1);
break;
}
- return scoreMapper.selectCheckScoreMap(checkScore).stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index b9c0a83..9e70a0e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -2,16 +2,20 @@
import com.ycl.platform.domain.query.DataCenterQuery;
import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
-import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.service.DataCenterService;
+import com.ycl.utils.MongoUtil;
import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Sort;
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.data.mongodb.core.query.TextCriteria;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Objects;
/**
* 鏁版嵁涓績鎺ュ彛
@@ -25,143 +29,300 @@
private final MongoTemplate mongoTemplate;
+ private final static String TIME_FIELD = "mongoCreateTime";
+
/**
* 瑙嗛锛氱偣浣嶅湪绾跨巼
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<TMonitorVO> videoPointOnlineRate(DataCenterQuery query) {
-
- return null;
+ public List<OneMachineFileResult> videoPointOnlineRate(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氫竴鏈轰竴妗ｆ敞鍐岀巼
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<TMonitorVO> videoOneMachineDocumentRegister(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> videoOneMachineDocumentRegister(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氫竴鏈轰竴妗ｅ悎鏍肩巼
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<TMonitorVO> videoOneMachineDocumentQualified(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> videoOneMachineDocumentQualified(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氭。妗堣�冩牳姣�
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<TMonitorVO> videoAssessmentFileRatio(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> videoAssessmentFileRatio(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<RecordMetaDSumResult> videoAvailabilityRate(DataCenterQuery query) {
- return null;
+ public List<RecordMetaDSumResult> videoAvailabilityRate(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氶噸鐐圭偣浣嶅綍鍍忓彲鐢ㄧ巼
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<RecordMetaDSumResult> videoImportantPointAvailabilityRate(DataCenterQuery query) {
- return null;
+ public List<RecordMetaDSumResult> videoImportantPointAvailabilityRate(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氭爣娉ㄦ纭巼
*
- * @param query
+ * @param params
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<TMonitorVO> videoLabelingAccuracy(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> videoLabelingAccuracy(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氶噸鐐圭偣浣嶆爣娉ㄦ纭巼
*
- * @param query
+ * @param params
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<TMonitorVO> videoImportantPointLabelingAccuracy(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> videoImportantPointLabelingAccuracy(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氭牎鏃舵纭巼
*
- * @param query
+ * @param params
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<TMonitorVO> videoCheckTimeAccuracy(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> videoCheckTimeAccuracy(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氶噸鐐圭偣浣嶆牎鏃舵纭巼
*
- * @param query
+ * @param params
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<TMonitorVO> videoImportantPointCheckTimeAccuracy(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼
*
- * @param query
+ * @param params
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<TMonitorVO> videoImportantPointOnlineRate(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> videoImportantPointOnlineRate(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 瑙嗛锛氶噸鐐规寚鎸ュ浘鍍忓湪绾跨巼
*
- * @param query
+ * @param params
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<TMonitorVO> videoImportantPointImageOnlineRate(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> videoImportantPointImageOnlineRate(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
@@ -170,206 +331,433 @@
/**
* 杞﹁締锛氳鍥惧簱瀵规帴绋冲畾鎬�
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<SnapshotDataMonitorResult> vehicleViewDockStable(DataCenterQuery query) {
- //
- Criteria criteria = new Criteria().andOperator(
- Criteria.where("name").is("xp"),
- Criteria.where("age").lte(50)
- );
- List<SnapshotDataMonitorResult> ts = mongoTemplate.find(Query.query(criteria), SnapshotDataMonitorResult.class);
-
- return null;
+ public List<SnapshotDataMonitorResult> vehicleViewDockStable(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
+ return resultList;
}
/**
* 杞﹁締锛氱偣浣嶅湪绾跨巼
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<SnapshotDataMonitorResult> vehiclePointOnlineRate(DataCenterQuery query) {
- return null;
+ public List<SnapshotDataMonitorResult> vehiclePointOnlineRate(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
+ return resultList;
}
/**
* 杞﹁締锛氫簰鑱旂綉鍗″彛璁惧鐩綍涓�鑷存��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<TMonitorVO> vehicleNetDeviceDirectoryConsistency(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 杞﹁締锛氳溅杈嗗崱鍙ｄ俊鎭噰闆嗗噯纭巼
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<CrossDetailResult> vehicleCollectionConsistency(DataCenterQuery query) {
- return null;
+ public List<CrossDetailResult> vehicleCollectionConsistency(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
+ return resultList;
}
/**
* 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹畬鏁存��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<DataIntegrityMonitoringResult> vehicleCollectionDataIntegrity(DataCenterQuery query) {
- return null;
+ public List<DataIntegrityMonitoringResult> vehicleCollectionDataIntegrity(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class);
+ return resultList;
}
/**
* 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹噯纭��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<AttrRecognitionMonitorResult> vehicleCollectionDataCaptured(DataCenterQuery query) {
- return null;
+ public List<AttrRecognitionMonitorResult> vehicleCollectionDataCaptured(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
+ return resultList;
}
/**
* 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨椂閽熷噯纭��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<VehicleDeviceInspectionResult> vehicleClockAccuracy(DataCenterQuery query) {
- return null;
+ public List<VehicleDeviceInspectionResult> vehicleClockAccuracy(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
+ return resultList;
}
/**
* 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹笂浼犲強鏃舵��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<SnapshotDelayMonitorResult> vehicleTimelyUploadAccuracy(DataCenterQuery query) {
- return null;
+ public List<SnapshotDelayMonitorResult> vehicleTimelyUploadAccuracy(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
+ return resultList;
}
/**
* 杞﹁締锛氳溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<PicAccessResult> vehicleUrlAccuracy(DataCenterQuery query) {
- return null;
+ public List<PicAccessResult> vehicleUrlAccuracy(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
+ return resultList;
}
/**
* 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹ぇ鍥惧彲鐢ㄦ��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<VehicleDeviceSamplingResult> vehicleBigImgAccuracy(DataCenterQuery query) {
- return null;
+ public List<VehicleDeviceSamplingResult> vehicleBigImgAccuracy(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
+ return resultList;
}
/**
* 浜鸿劯锛氳鍥惧簱瀵规帴绋冲畾鎬�
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<SnapshotDataMonitorResult> faceViewDockStable(DataCenterQuery query) {
- return null;
+ public List<SnapshotDataMonitorResult> faceViewDockStable(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
+ return resultList;
}
/**
* 浜鸿劯锛氱偣浣嶅湪绾跨巼
*
- * @param query
+ * @param params
* @return
*/
// TODO 鏇存崲鍝嶅簲缁撴灉
@Override
- public List<TMonitorVO> facePointOnlineRate(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> facePointOnlineRate(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 浜鸿劯锛氱洰褰曚竴鑷寸巼
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<TMonitorVO> faceDirectoryConsistency(DataCenterQuery query) {
- return null;
+ public List<OneMachineFileResult> faceDirectoryConsistency(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ return resultList;
}
/**
* 浜鸿劯锛氫汉鑴稿崱鍙ｄ俊鎭噰闆嗗噯纭巼
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<CrossDetailResult> faceCollectionConsistency(DataCenterQuery query) {
- return null;
+ public List<CrossDetailResult> faceCollectionConsistency(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
+ return resultList;
}
/**
* 浜鸿劯锛氳澶囨姄鎷嶅浘鐗囧悎鏍兼��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<MonitoringDetailResult> faceImgQualification(DataCenterQuery query) {
- return null;
+ public List<MonitoringDetailResult> faceImgQualification(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
+ return resultList;
}
/**
* 浜鸿劯锛氳澶囨姄鎷嶅浘鐗囨椂閽熷噯纭��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<FaceDeviceInspectionResult> faceCapturesImagesAccuracy(DataCenterQuery query) {
- return null;
+ public List<FaceDeviceInspectionResult> faceCapturesImagesAccuracy(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
+ return resultList;
}
/**
* 浜鸿劯锛氭姄鎷嶄汉鑴告暟鎹笂浼犲強鏃舵��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<FaceDeviceInspectionResult> faceTimelyUpload(DataCenterQuery query) {
- return null;
+ public List<FaceDeviceInspectionResult> faceTimelyUpload(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
+ return resultList;
}
/**
* 浜鸿劯锛氫汉鑴稿崱鍙ｈ澶囨姄鎷嶆暟鎹ぇ鍥惧彲鐢ㄦ��
*
- * @param query
+ * @param params
* @return
*/
@Override
- public List<FaceDeviceSamplingResult> faceAvailabilityOfLargeImg(DataCenterQuery query) {
- return null;
+ public List<FaceDeviceSamplingResult> faceAvailabilityOfLargeImg(DataCenterQuery params) {
+ Query query = new Query();
+ // 鍏ㄦ枃绱㈠紩鏌ヨ
+ MongoUtil.fullText(query, params.getKeyword());
+ Criteria criteria = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteria.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ query.addCriteria(criteria);
+ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+ List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+ return resultList;
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 88610bb..a5188d2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -3,14 +3,17 @@
import annotation.DataScope;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.query.HomeQuery;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.system.service.ISysConfigService;
import com.ycl.utils.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -122,4 +125,22 @@
String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
return tMonitorMapper.recoveryException(time);
}
+
+ @Override
+ public Map<String, Object> home(HomeQuery monitorQuery) {
+ Map<String, Object> dataMap = new HashMap<>();
+ Map<String, Object> monthMap1 = new HashMap<>();
+ Map<String, Object> monthMap2 = new HashMap<>();
+ List<Map<String, Object>> home = baseMapper.home(monitorQuery);
+ if (ObjectUtils.isNotEmpty(home)) {
+ for (Map<String, Object> map : home) {
+ monthMap1.put(map.get("months").toString(), map.get("num1"));
+ monthMap2.put(map.get("months").toString(), map.get("num2"));
+ }
+ dataMap.put("name", home.get(0).get("name"));
+ dataMap.put("state", monthMap1);
+ dataMap.put("state2", monthMap2);
+ }
+ return dataMap;
+ }
}
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 32c27db..60d3cb8 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
@@ -9,13 +9,17 @@
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
+import com.ycl.platform.domain.query.HomeQuery;
import com.ycl.platform.domain.query.ScreenQuery;
import com.ycl.platform.domain.query.WorkOrderQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO;
-import com.ycl.platform.mapper.*;
+import com.ycl.platform.mapper.WorkOrderAuditingRecordMapper;
+import com.ycl.platform.mapper.WorkOrderDistributeRecordMapper;
+import com.ycl.platform.mapper.WorkOrderMapper;
+import com.ycl.platform.mapper.WorkOrderYwConditionRecordMapper;
import com.ycl.platform.service.NotifyService;
import com.ycl.platform.service.WorkOrderAuditingRecordService;
import com.ycl.platform.service.WorkOrderService;
@@ -31,8 +35,8 @@
import enumeration.general.UrgentLevelEnum;
import enumeration.general.WorkOrderDistributeWayEnum;
import enumeration.general.WorkOrderStatusEnum;
-import enumeration.general.*;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,9 +46,6 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
@@ -428,4 +429,27 @@
ScreenWorkOrderVO screen = baseMapper.screenWorkOrder(query);
return Result.ok().data(screen);
}
+
+ @Override
+ public Map<String, Object> home(HomeQuery monitorQuery) {
+ Map<String, Object> dataMap = new HashMap<>();
+ Map<String, Object> data1 = new HashMap<>();
+ Map<String, Object> data2 = new HashMap<>();
+ Map<String, Object> data3 = new HashMap<>();
+ List<Map<String, Object>> home = baseMapper.home(monitorQuery);
+ if (ObjectUtils.isNotEmpty(home)) {
+ for (Map<String, Object> map : home) {
+ if (Objects.nonNull(map.get("dateType")) && StringUtils.hasText(map.get("dateType").toString())) {
+ data1.put(map.get("dateType").toString(), map.get("num1"));
+ data2.put(map.get("dateType").toString(), map.get("num2"));
+ data3.put(map.get("dateType").toString(), map.get("num3"));
+ }
+ }
+ dataMap.put("name", home.get(0).get("name"));
+ }
+ dataMap.put("complete", data1);
+ dataMap.put("waiting", data2);
+ dataMap.put("pending", data3);
+ return dataMap;
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
new file mode 100644
index 0000000..4f88595
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
@@ -0,0 +1,32 @@
+package com.ycl.utils;
+
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.util.StringUtils;
+
+import java.lang.reflect.Field;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * mongo宸ュ叿绫�
+ *
+ * @author锛歺p
+ * @date锛�2024/8/2 15:18
+ */
+public class MongoUtil {
+
+ /**
+ * 鏋勯�犲叏鏂囩储寮曠殑鏉′欢
+ *
+ * @param query
+ * @param keyword
+ */
+ public static void fullText(Query query, String keyword) {
+ if (StringUtils.hasText(keyword)) {
+ TextCriteria criteria = TextCriteria.forDefaultLanguage().matching(keyword);
+ query.addCriteria(criteria);
+ }
+ }
+
+}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 687d7f7..38b6aad 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -243,4 +243,23 @@
]]>
</select>
+ <select id="home" resultType="java.util.Map">
+ SELECT
+ u.unit_name AS name,
+ CONCAT(MONTH(w.create_time), '鏈�') AS months,
+ COUNT(w.id) AS num1,
+ COUNT(m.id) - COUNT(w.id) AS num2
+ FROM
+ t_monitor m
+ LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
+ LEFT JOIN t_yw_unit u ON p.unit_id = u.id
+ LEFT JOIN t_work_order w ON p.id = w.point_id
+ WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL
+ <if test="dateRange != null and dateRange.size > 0">
+ AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN #{dateRange[0]} AND #{dateRange[1]}
+ </if>
+ GROUP BY months
+ ORDER BY months
+ </select>
+
</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 49748e8..59c1e98 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -90,4 +90,53 @@
t_work_order
</select>
+ <select id="home" resultType="java.util.Map">
+ <if test="dateType == 'month'">
+ -- 鏈堝伐鍗曟暟
+ SELECT
+ u.unit_name AS name,
+ CONCAT(MONTH(w.create_time), '鏈�') AS dateType,
+ COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) AS num1,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) AS num2,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) AS num3
+ FROM t_work_order w
+ LEFT JOIN t_yw_unit u ON w.unit_id = u.id
+ WHERE DATE_FORMAT(w.create_time, '%Y') = DATE_FORMAT(NOW(), '%Y')
+ AND w.deleted = 0 AND unit_id = #{unitId}
+ GROUP BY dateType
+ </if>
+
+ <if test="dateType == 'week'">
+ -- 鍛ㄥ伐鍗曟暟
+ SELECT
+ u.unit_name AS name,
+ CONCAT('鍛�', WEEKDAY(w.create_time)) AS dateType,
+ COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) AS num1,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) AS num2,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) AS num3
+ FROM t_work_order w
+ LEFT JOIN t_yw_unit u ON w.unit_id = u.id
+ WHERE
+ w.create_time BETWEEN DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY) AND DATE_ADD(CURDATE(), INTERVAL (6 - WEEKDAY(CURDATE())) DAY)
+ AND w.deleted = 0 AND unit_id = #{unitId}
+ GROUP BY dateType
+ </if>
+
+ <if test="dateType == 'day'">
+ -- 鏃ュ伐鍗曟暟
+ SELECT
+ u.unit_name AS name,
+ DATE_FORMAT(w.create_time, '%d') AS dateType,
+ COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) AS num1,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) AS num2,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) AS num3
+ FROM t_work_order w
+ LEFT JOIN t_yw_unit u ON w.unit_id = u.id
+ WHERE
+ DATE_FORMAT(w.create_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(CURDATE(), '%Y-%m-01') AND LAST_DAY(CURDATE())
+ AND w.deleted = 0 AND unit_id = #{unitId}
+ GROUP BY dateType
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0