From 0d243e7f5dc593cdc6e0608bb52cd635f8fc6982 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 19 九月 2025 11:59:44 +0800
Subject: [PATCH] 新需求
---
ycl-server/src/main/java/com/ycl/platform/mapper/DemeritRecordMapper.java | 15
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 6
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DemeritRecord.java | 30
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/screen/DemeritRecordVO.java | 36
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1577 ++++++++++++++++++++++++++--------------
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java | 3
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 2
ycl-server/src/main/java/com/ycl/task/DemeritRecordTask.java | 295 +++++++
ycl-server/src/main/java/com/ycl/platform/service/IDemeritRecordService.java | 26
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DemeritRecordQuery.java | 41 +
ycl-server/src/main/resources/mapper/zgyw/DemeritREcordMapper.xml | 40 +
ycl-common/src/main/java/enumeration/DataCenterMethodNameEnum.java | 22
ycl-server/src/main/java/com/ycl/platform/controller/DemeritRecordController.java | 30
ycl-server/src/main/java/com/ycl/platform/service/impl/DemeritRecordImpl.java | 72 +
ycl-common/src/main/java/enumeration/ConstructionTypeEnum.java | 25
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 37
ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java | 1
17 files changed, 1,689 insertions(+), 569 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/ConstructionTypeEnum.java b/ycl-common/src/main/java/enumeration/ConstructionTypeEnum.java
new file mode 100644
index 0000000..3d2de5f
--- /dev/null
+++ b/ycl-common/src/main/java/enumeration/ConstructionTypeEnum.java
@@ -0,0 +1,25 @@
+package enumeration;
+
+
+import lombok.Getter;
+
+/**
+ * zgyw
+ *
+ * @author : zxl
+ * @date : 2025-09-16 09:42
+ **/
+@Getter
+public enum ConstructionTypeEnum {
+ PHASE_ONE_TWO("涓�浜屾湡"),
+ PHASE_THREE("涓夋湡"),
+ PHASE_FOURTH("鍥涙湡"),
+ CHECK_ENTER_SICHUAN("鍏ュ窛鍗虫");
+
+ private String desc;
+
+
+ ConstructionTypeEnum(String desc) {
+ this.desc = desc;
+ }
+}
diff --git a/ycl-common/src/main/java/enumeration/DataCenterMethodNameEnum.java b/ycl-common/src/main/java/enumeration/DataCenterMethodNameEnum.java
new file mode 100644
index 0000000..e5e4926
--- /dev/null
+++ b/ycl-common/src/main/java/enumeration/DataCenterMethodNameEnum.java
@@ -0,0 +1,22 @@
+package enumeration;
+
+import lombok.Getter;
+
+@Getter
+public enum DataCenterMethodNameEnum {
+
+ VIDEO_POINT_ONLINE_RATE("瑙嗛锛氱偣浣嶅湪绾跨巼浼樺寲绾跨▼"),
+ DEPT_VIDEO_POINT_ONLINE_RATE("瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼浼樺寲绾跨▼"),
+ VIDEO_IMPORTANT_POINT_ONLINE_RATE("瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼浼樺寲绾跨▼"),
+ DEPT_VIDEO_AVAILABILITY_RATE("瑙嗛锛氶儴绾у綍鍍忓彲鐢ㄧ巼"),
+ VIDEO_AVAILABILITY_RATE("瑙嗛锛氬綍鍍忓彲鐢ㄧ巼"),
+
+ VIDEO_IMPORTANT_POINT_AVAILABILITY_RATE("瑙嗛锛氶噸鐐圭偣浣嶅綍鍍忓彲鐢ㄧ巼")
+ ;
+
+ private String desc;
+
+ DataCenterMethodNameEnum(String desc) {
+ this.desc = desc;
+ }
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DemeritRecord.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DemeritRecord.java
new file mode 100644
index 0000000..d327cd0
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DemeritRecord.java
@@ -0,0 +1,30 @@
+package com.ycl.platform.domain.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.platform.base.AbsEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * zgyw
+ * 褰曞儚鎵ｅ垎璁板綍
+ * @author : zxl
+ * @date : 2025-09-15 16:15
+ **/
+@Data
+@TableName("t_demerit_record")
+public class DemeritRecord extends AbsEntity {
+
+ @TableField("dept_id")
+ private Integer deptId;
+
+ @TableField("demerit")
+ private BigDecimal demerit;
+
+ @TableField("construction_type")
+ private String constructionType;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DemeritRecordQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DemeritRecordQuery.java
new file mode 100644
index 0000000..ac203e7
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DemeritRecordQuery.java
@@ -0,0 +1,41 @@
+package com.ycl.platform.domain.query;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.platform.base.AbsQuery;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * zgyw
+ * 鎵ｅ垎鎯呭喌闆嗗悎
+ * @author : zxl
+ * @date : 2025-09-15 16:28
+ **/
+@Data
+public class DemeritRecordQuery extends AbsQuery {
+
+ /**
+ * 鍖哄煙id
+ */
+ private String deptId;
+
+ /**
+ * 寤鸿绫诲瀷(涓�銆佷簩銆佷笁鏈熴�佸叆宸濆嵆妫�銆佽�佷汉鑴�)
+ */
+ private String constructionType;
+
+ /**
+ * 鏃�/鏈堝睍绀�
+ */
+ private String searchType;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date dayDate;
+ @JsonFormat(pattern = "yyyy-MM",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM")
+ private Date monthDate;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
index 756757c..7da59b2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
@@ -21,6 +21,9 @@
public class TMonitorVO extends BaseEntity {
private static final long serialVersionUID = 1L;
+
+ private String constructionType;
+
/**
* $column.columnComment
*/
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/screen/DemeritRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/screen/DemeritRecordVO.java
new file mode 100644
index 0000000..baa6ab2
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/screen/DemeritRecordVO.java
@@ -0,0 +1,36 @@
+package com.ycl.platform.domain.vo.screen;
+
+
+import com.ycl.platform.base.AbsVo;
+import lombok.Data;
+import java.math.BigDecimal;
+
+/**
+ * zgyw
+ *
+ * @author : zxl
+ * @date : 2025-09-15 16:20
+ **/
+@Data
+public class DemeritRecordVO extends AbsVo {
+
+ /**
+ * id
+ */
+ private Integer deptId;
+ /**
+ * 鍖哄悕
+ */
+ private String deptName;
+
+ /**
+ * 鍒嗗缓璁剧被鍨�
+ */
+ private String constructionType;
+
+ /**
+ * 鎵ｅ垎
+ */
+ private BigDecimal demerit;
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DemeritRecordController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DemeritRecordController.java
new file mode 100644
index 0000000..7066b70
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DemeritRecordController.java
@@ -0,0 +1,30 @@
+package com.ycl.platform.controller;
+
+
+import com.ycl.platform.domain.query.DemeritRecordQuery;
+import com.ycl.platform.service.IDemeritRecordService;
+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;
+
+/**
+ * zgyw
+ *
+ * @author : zxl
+ * @date : 2025-09-17 13:49
+ **/
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/demeritRecord")
+public class DemeritRecordController {
+ public final IDemeritRecordService demeritRecordService;
+
+ @GetMapping("/getPage")
+ public Result getPage(DemeritRecordQuery query){
+ return demeritRecordService.getDemeritRecordPage(query);
+ }
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index c32720a..664a73b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -43,6 +43,12 @@
private final WorkOrderService workOrderService;
+ @DeleteMapping("/delByIds")
+ public Result delByIds(@RequestBody List<String> ids){
+
+ return workOrderService.batchDeleteWorkOrder(ids);
+ }
+
@GetMapping("/process/{workOrderNo}")
@ApiOperation(value = "杩囩▼鍥�", notes = "杩囩▼鍥�")
@PreAuthorize("@ss.hasPermi('work:order:process')")
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DemeritRecordMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DemeritRecordMapper.java
new file mode 100644
index 0000000..baf2934
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DemeritRecordMapper.java
@@ -0,0 +1,15 @@
+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.DemeritRecord;
+import com.ycl.platform.domain.query.DemeritRecordQuery;
+import com.ycl.platform.domain.vo.screen.DemeritRecordVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface DemeritRecordMapper extends BaseMapper<DemeritRecord> {
+
+ IPage<DemeritRecordVO> getPage(@Param("query") DemeritRecordQuery query, IPage<DemeritRecordVO> page);
+}
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 c4666f0..746ba62 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
@@ -40,6 +40,7 @@
*/
Result videoPointOnlineRate(DataCenterQuery query);
+
/**
* 瑙嗛锛氱偣浣嶅湪绾跨巼
*
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IDemeritRecordService.java b/ycl-server/src/main/java/com/ycl/platform/service/IDemeritRecordService.java
new file mode 100644
index 0000000..4872737
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IDemeritRecordService.java
@@ -0,0 +1,26 @@
+package com.ycl.platform.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.entity.DemeritRecord;
+import com.ycl.platform.domain.query.DemeritRecordQuery;
+import com.ycl.platform.domain.vo.screen.DemeritRecordVO;
+import com.ycl.system.Result;
+
+import java.util.List;
+
+/**
+ * zgyw
+ *
+ * @author : zxl
+ * @date : 2025-09-15 16:26
+ **/
+public interface IDemeritRecordService extends IService<DemeritRecord> {
+
+ public Result getDemeritRecordPage(DemeritRecordQuery query);
+
+ void add(List<DemeritRecord> records);
+
+ Result delete(Integer id);
+}
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 331ec29..ff6e689 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
@@ -35,17 +35,21 @@
import com.ycl.utils.bean.BeanUtils;
import com.ycl.utils.poi.ExcelUtil;
import constant.*;
+import enumeration.DataCenterMethodNameEnum;
import enumeration.general.AreaDeptEnum;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.bson.Document;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.aggregation.*;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import java.io.IOException;
@@ -54,6 +58,9 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -75,7 +82,9 @@
private final ICheckIndexFaceService checkIndexFaceService;
private final DynamicColumnMapper dynamicColumnMapper;
-
+ @Qualifier("threadPoolTaskExecutor")
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
private final static String TIME_FIELD = "mongoCreateTime";
@@ -690,155 +699,439 @@
}
-
-
/**
- * 瑙嗛锛氱偣浣嶅湪绾跨巼
- *
- * @param params
- * @return
+ * 鍐呴儴绫伙細瀛樺偍缁熻缁撴灉锛堥伩鍏嶉浂鏁ｅ彉閲忎紶閫掞級
*/
- @Override
- public Result videoPointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("name", "no", "ip");
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- Query query = null;
- SysDept sysDept = getSysDeptByLoginUser();
- AreaDeptEnum areaDeptEnum = null;
- if (sysDept !=null){
- areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
- if (areaDeptEnum != null){
- query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+ private static class StatisticsResult {
+ int totalCount;
+ int onlineCount;
+ int offlineCount;
+ int unknownCount;
+ BigDecimal onlineRate;
- }else{
- query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- }
- }else {
- query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ public StatisticsResult(int totalCount, int onlineCount, int offlineCount, int unknownCount, BigDecimal onlineRate) {
+ this.totalCount = totalCount;
+ this.onlineCount = onlineCount;
+ this.offlineCount = offlineCount;
+ this.unknownCount = unknownCount;
+ this.onlineRate = onlineRate;
}
- //鏌ヨ棰戣澶�
- query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
- //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
- if (params.getOption() != null) {
- query.addCriteria(Criteria.where("online").is(params.getOption()));
- }
- Sort sort = Sort.by(
- Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
- Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
- );
- // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
- query.with(sort);
- //鍒嗛〉鏁伴噺
- long total = mongoTemplate.count(query, TMonitorResult.class);
- MongoUtil.setPage(query, params, TIME_FIELD);
- List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
-
- resultList.forEach(item -> {
- if (item.getPingOnline() == null) {
- item.setPingOnlineStr("鏈煡");
- } else if (item.getPingOnline()) {
- item.setPingOnlineStr("鍦ㄧ嚎");
- } else if (!item.getPingOnline()) {
- item.setPingOnlineStr("绂荤嚎");
- }
- if (1 == item.getOnline()) {
- item.setOnlineStr("鍦ㄧ嚎");
- } else if (-1 == item.getOnline()) {
- item.setOnlineStr("绂荤嚎");
- } else {
- item.setOnlineStr("鏈煡");
- }
- List<String> offLineTime = item.getOffLineTimeStr();
- if (!CollectionUtils.isEmpty(offLineTime)) {
- if (offLineTime.size() > 1) {
- offLineTime = offLineTime.subList(offLineTime.size() - 2, offLineTime.size());
+ }
+ /**
+ * 鍒楄〃鏁版嵁鏍煎紡鍖�
+ */
+ private void formatResultList(List<TMonitorResult> resultList,String tag) {
+ if(DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name().equals(tag)){
+ resultList.forEach(item -> {
+ // pingOnline 鐘舵�佽浆鎹�
+ if (item.getPingOnline() == null) {
+ item.setPingOnlineStr("鏈煡");
+ } else if (item.getPingOnline()) {
+ item.setPingOnlineStr("鍦ㄧ嚎");
+ } else {
+ item.setPingOnlineStr("绂荤嚎");
}
- item.setOffLineTimeStr(offLineTime);
- }
- //娣诲姞鍔ㄦ�佹暟鎹�
- List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo());
- item.setDynamicColumnList(list);
- });
+ // online 鐘舵�佽浆鎹�
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
+ }
- params.setDeptTag(-1);
- params.setDeviceType(1);
+ // 绂荤嚎鏃堕棿鎴柇锛堜繚鐣欐渶鍚�2鏉★級
+ List<String> offLineTime = item.getOffLineTimeStr();
+ if (!CollectionUtils.isEmpty(offLineTime) && offLineTime.size() > 1) {
+ item.setOffLineTimeStr(offLineTime.subList(offLineTime.size() - 2, offLineTime.size()));
+ }
- //鍗＄墖缁熻
- int totalCount = 0;
- int onlineCount = 0;
- int offlineCount = 0;
- int unknownCount = 0;
- //鏋勫缓鏉′欢
- List<Criteria> criteriaList = new ArrayList<>();
- // 娣诲姞鍥哄畾鏉′欢
- criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
- criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- if (areaDeptEnum != null){
- criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+ // 娣诲姞鍔ㄦ�佸垪鏁版嵁
+ List<DynamicColumnVO> dynamicColumns = dynamicColumnMapper.getDynamicColumnByTable(
+ TableNameConstants.COLUMN_NAME_VIDEO_POINT,
+ item.getNo()
+ );
+ item.setDynamicColumnList(dynamicColumns);
+ });
}
- // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
- if (params.getDataType() == 1) {
- criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
- } else if (params.getDataType() == 2) {
- criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ else if (DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name().equals(tag)
+ || DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name().equals(tag)){
+ resultList.forEach(item -> {
+ if (item.getPingOnline() == null) {
+ item.setPingOnlineStr("鏈煡");
+ } else if (item.getPingOnline()) {
+ item.setPingOnlineStr("鍦ㄧ嚎");
+ } else if (!item.getPingOnline()) {
+ item.setPingOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
+ }
+ });
}
- // 鏋勫缓match鎿嶄綔
- MatchOperation match = Aggregation.match(
- new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
- );
- GroupOperation group = Aggregation.group()
- .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
- .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
- .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
- // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
- Aggregation aggregation = Aggregation.newAggregation(match, group);
- // 鎵ц鑱氬悎鏌ヨ
- AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
- for (Map<String, Object> result : results.getMappedResults()) {
- offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
- unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
- onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
- totalCount = offlineCount + unknownCount + onlineCount;
- }
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (totalCount!=0) {
- onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
-// /** 鏌ヨ褰撳ぉ鍦ㄧ嚎鐜� */
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getSiteOnline)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
-// .list();
-//
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
-// }
- HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
- map.put("list", resultList);
- return Result.ok().data(map).total(total);
+
}
/**
- * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼
+ * 鍗＄墖缁熻璁＄畻
+ */
+ private StatisticsResult calculateStatistics(DataCenterQuery params, AreaDeptEnum areaDeptEnum,String tag) {
+ int totalCount = 0, onlineCount = 0, offlineCount = 0, unknownCount = 0;
+
+ // 璁＄畻鍦ㄧ嚎鐜�
+ BigDecimal onlineRate = BigDecimal.ZERO;
+ if (DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name().equals(tag)){
+ // 鏋勫缓缁熻鏉′欢
+ List<Criteria> criteriaList = new ArrayList<>();
+ criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+
+ // 鏉冮檺杩囨护
+ if (areaDeptEnum != null) {
+ criteriaList.add(Criteria.where("no").regex("^" + areaDeptEnum.getCode()));
+ }
+ // 鏁版嵁绫诲瀷杩囨护锛堢渷/閮ㄩ棬鏍囩锛�
+ if (params.getDataType() == 1) {
+ criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+ } else if (params.getDataType() == 2) {
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ }
+
+ // MongoDB 鑱氬悎鏌ヨ
+ MatchOperation match = Aggregation.match(new Criteria().andOperator(criteriaList.toArray(new Criteria[0])));
+ GroupOperation group = Aggregation.group()
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+
+ Aggregation aggregation = Aggregation.newAggregation(match, group);
+ AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class);
+
+ // 澶勭悊缁熻缁撴灉
+ for (Map<String, Object> result : results.getMappedResults()) {
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0);
+ totalCount = onlineCount + offlineCount + unknownCount;
+ }
+
+ if (totalCount != 0) {
+ onlineRate = new BigDecimal(onlineCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
+ }
+ }
+ else if (DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name().equals(tag)) {
+ // 鏋勫缓缁熻鏉′欢
+ List<Criteria> criteriaList = new ArrayList<>();
+ criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ //閮ㄧ骇瑙嗛鏍囩 宸紓鐐�
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ // 鏉冮檺杩囨护
+ if (areaDeptEnum != null) {
+ criteriaList.add(Criteria.where("no").regex("^" + areaDeptEnum.getCode()));
+ }
+ // 鏁版嵁绫诲瀷杩囨护锛堢渷/閮ㄩ棬鏍囩锛�
+ if (params.getDataType() == 1) {
+ criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+ } else if (params.getDataType() == 2) {
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ }
+
+ // MongoDB 鑱氬悎鏌ヨ
+ MatchOperation match = Aggregation.match(new Criteria().andOperator(criteriaList.toArray(new Criteria[0])));
+ GroupOperation group = Aggregation.group()
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+
+ Aggregation aggregation = Aggregation.newAggregation(match, group);
+ AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class);
+
+ // 澶勭悊缁熻缁撴灉
+ for (Map<String, Object> result : results.getMappedResults()) {
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0);
+ totalCount = onlineCount + offlineCount + unknownCount;
+ }
+
+
+ if (totalCount != 0) {
+ onlineRate = new BigDecimal(onlineCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
+ }
+
+ }
+ else if (DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name().equals(tag)){
+ // 鏋勫缓缁熻鏉′欢
+ List<Criteria> criteriaList = new ArrayList<>();
+ criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
+
+ // 鏉冮檺杩囨护
+ if (areaDeptEnum != null) {
+ criteriaList.add(Criteria.where("no").regex("^" + areaDeptEnum.getCode()));
+ }
+ // 鏁版嵁绫诲瀷杩囨护锛堢渷/閮ㄩ棬鏍囩锛�
+ if (params.getDataType() == 1) {
+ criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+ } else if (params.getDataType() == 2) {
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ }
+
+ // MongoDB 鑱氬悎鏌ヨ
+ MatchOperation match = Aggregation.match(new Criteria().andOperator(criteriaList.toArray(new Criteria[0])));
+ GroupOperation group = Aggregation.group()
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+
+ Aggregation aggregation = Aggregation.newAggregation(match, group);
+ AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class);
+
+ // 澶勭悊缁熻缁撴灉
+ for (Map<String, Object> result : results.getMappedResults()) {
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0);
+ totalCount = onlineCount + offlineCount + unknownCount;
+ }
+
+ if (totalCount != 0) {
+ onlineRate = new BigDecimal(onlineCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
+ }
+ }
+
+ return new StatisticsResult(totalCount, onlineCount, offlineCount, unknownCount, onlineRate);
+ }
+
+ /**
+ * 瑙嗛锛氱偣浣嶅湪绾跨巼浼樺寲绾跨▼
*
* @param params
* @return
*/
@Override
- public Result deptVideoPointOnlineRate(DataCenterQuery params) {
+ public Result videoPointOnlineRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("name", "no", "ip");
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- Query query = null;
+ final Query query;
SysDept sysDept = getSysDeptByLoginUser();
- AreaDeptEnum areaDeptEnum = null;
+ final AreaDeptEnum areaDeptEnum; // 澹版槑涓篺inal
+
+ if (sysDept != null) {
+
+ areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+ if (areaDeptEnum != null) {
+ query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(), params, TIME_FIELD, likeFileds, null, "no");
+ } else {
+ query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ }
+ } else {
+ //闇�瑕佸垵濮嬪寲 涓嶇劧涓嬫柟寮曞叆 澶氱嚎绋嬩細鎶ユ湭鍒濆鍖�
+ areaDeptEnum = null;
+ query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ }
+
+
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ if (params.getOption() != null) {
+ query.addCriteria(Criteria.where("online").is(params.getOption()));
+ }
+
+ Sort sort = Sort.by(
+ Sort.Order.asc("pingOnline"),
+ Sort.Order.desc("offLineCount")
+ );
+ query.with(sort);
+
+ long total = mongoTemplate.count(query, TMonitorResult.class);
+ //杩愯鍒嗛〉鏌ヨ绾跨▼
+ CompletableFuture<List<TMonitorResult>> listFuture = CompletableFuture.supplyAsync(() -> {
+ try {
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ //鏋勫缓鍒楄〃鏁版嵁
+ formatResultList(resultList,DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name());
+ return resultList;
+ } catch (Exception e) {
+ throw new CompletionException("瑙嗛璁惧鍒楄〃鏌ヨ澶辫触锛�" + e.getMessage(), e);
+ }
+ }, taskExecutor);
+ //杩愯缁熻绾跨▼
+ CompletableFuture<StatisticsResult> statsFuture = CompletableFuture.supplyAsync(() -> {
+ try {
+ return calculateStatistics(params, areaDeptEnum,DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name()); // 鐜板湪鍙畨鍏ㄥ紩鐢�
+ } catch (Exception e) {
+ throw new CompletionException("瑙嗛璁惧鐘舵�佺粺璁″け璐ワ細" + e.getMessage(), e);
+ }
+ }, taskExecutor);
+
+ try {
+ CompletableFuture.allOf(listFuture, statsFuture).join();
+ List<TMonitorResult> resultList = listFuture.get();
+ StatisticsResult statsResult = statsFuture.get();
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(
+ String.valueOf(statsResult.totalCount),
+ String.valueOf(statsResult.onlineCount),
+ String.valueOf(statsResult.offlineCount),
+ String.valueOf(statsResult.unknownCount),
+ this.remove0(statsResult.onlineRate)
+ ));
+ map.put("list", resultList);
+
+ return Result.ok().data(map).total(total);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return Result.error("鏌ヨ琚腑鏂紝璇风◢鍚庨噸璇�");
+ } catch (ExecutionException e) {
+ Throwable rootCause = e.getCause();
+ String errorMsg = rootCause != null ? rootCause.getMessage() : "瑙嗛璁惧鏁版嵁鏌ヨ澶辫触";
+ return Result.error(errorMsg);
+ }
+ }
+
+// @Override
+// public Result videoPointOnlineRate(DataCenterQuery params) {
+// List<String> likeFileds = Arrays.asList("name", "no", "ip");
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// Query query = null;
+// SysDept sysDept = getSysDeptByLoginUser();
+// AreaDeptEnum areaDeptEnum = null;
+// if (sysDept !=null){
+// areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+// if (areaDeptEnum != null){
+// query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+//
+// }else{
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+// }else {
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+//
+// //鏌ヨ棰戣澶�
+// query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+// //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+// if (params.getOption() != null) {
+// query.addCriteria(Criteria.where("online").is(params.getOption()));
+// }
+// Sort sort = Sort.by(
+// Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+// Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+// );
+// // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+// query.with(sort);
+// //鍒嗛〉鏁伴噺
+// long total = mongoTemplate.count(query, TMonitorResult.class);
+//
+//
+//
+// MongoUtil.setPage(query, params, TIME_FIELD);
+// List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+//
+// resultList.forEach(item -> {
+// if (item.getPingOnline() == null) {
+// item.setPingOnlineStr("鏈煡");
+// } else if (item.getPingOnline()) {
+// item.setPingOnlineStr("鍦ㄧ嚎");
+// } else if (!item.getPingOnline()) {
+// item.setPingOnlineStr("绂荤嚎");
+// }
+// if (1 == item.getOnline()) {
+// item.setOnlineStr("鍦ㄧ嚎");
+// } else if (-1 == item.getOnline()) {
+// item.setOnlineStr("绂荤嚎");
+// } else {
+// item.setOnlineStr("鏈煡");
+// }
+// List<String> offLineTime = item.getOffLineTimeStr();
+// if (!CollectionUtils.isEmpty(offLineTime)) {
+// if (offLineTime.size() > 1) {
+// offLineTime = offLineTime.subList(offLineTime.size() - 2, offLineTime.size());
+// }
+// item.setOffLineTimeStr(offLineTime);
+// }
+// //娣诲姞鍔ㄦ�佹暟鎹�
+// List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo());
+// item.setDynamicColumnList(list);
+// });
+//
+//
+// params.setDeptTag(-1);
+// params.setDeviceType(1);
+//
+// //鍗＄墖缁熻
+// int totalCount = 0;
+// int onlineCount = 0;
+// int offlineCount = 0;
+// int unknownCount = 0;
+// //鏋勫缓鏉′欢
+// List<Criteria> criteriaList = new ArrayList<>();
+// // 娣诲姞鍥哄畾鏉′欢
+// criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+// criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// if (areaDeptEnum != null){
+// criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+// }
+// // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+// if (params.getDataType() == 1) {
+// criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+// } else if (params.getDataType() == 2) {
+// criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+// }
+// // 鏋勫缓match鎿嶄綔
+// MatchOperation match = Aggregation.match(
+// new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+// );
+// GroupOperation group = Aggregation.group()
+// .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+// .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+// .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+// // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+// Aggregation aggregation = Aggregation.newAggregation(match, group);
+// // 鎵ц鑱氬悎鏌ヨ
+// AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+// for (Map<String, Object> result : results.getMappedResults()) {
+// offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+// unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+// onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
+// totalCount = offlineCount + unknownCount + onlineCount;
+// }
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (totalCount!=0) {
+// onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// HashMap<String, Object> map = new HashMap<>();
+// map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
+// map.put("list", resultList);
+// return Result.ok().data(map).total(total);
+// }
+ /**
+ * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼浼樺寲绾跨▼
+ *
+ * @param params
+ * @return
+ */
+ @Override
+ public Result deptVideoPointOnlineRate(DataCenterQuery params){
+ List<String> likeFileds =Arrays.asList("name","no","ip");
+ final Query query;
+ SysDept sysDept = getSysDeptByLoginUser();
+ final AreaDeptEnum areaDeptEnum;
if (sysDept !=null){
areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
if (areaDeptEnum != null){
@@ -848,9 +1141,9 @@
query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
}
}else {
+ areaDeptEnum = null;
query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
}
- //鏌ヨ棰戣澶�
query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
//涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
@@ -861,88 +1154,258 @@
query.with(Sort.by(Sort.Order.asc("pingOnline")));
//鍒嗛〉鏁伴噺
long total = mongoTemplate.count(query, TMonitorResult.class);
- MongoUtil.setPage(query, params, TIME_FIELD);
- List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
- resultList.forEach(item -> {
- if (item.getPingOnline() == null) {
- item.setPingOnlineStr("鏈煡");
- } else if (item.getPingOnline()) {
- item.setPingOnlineStr("鍦ㄧ嚎");
- } else if (!item.getPingOnline()) {
- item.setPingOnlineStr("绂荤嚎");
+
+ CompletableFuture<List<TMonitorResult>> listFuture = CompletableFuture.supplyAsync(() ->{
+ MongoUtil.setPage(query,params,TIME_FIELD);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ formatResultList(resultList,DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name());
+ return resultList;
+ },taskExecutor);
+
+ CompletableFuture<StatisticsResult> statsFuture = CompletableFuture.supplyAsync(()->{
+ try {
+ return calculateStatistics(params, areaDeptEnum,DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name()); // 鐜板湪鍙畨鍏ㄥ紩鐢�
+ } catch (Exception e) {
+ throw new CompletionException("瑙嗛璁惧鐘舵�佺粺璁″け璐ワ細" + e.getMessage(), e);
}
- if (1 == item.getOnline()) {
- item.setOnlineStr("鍦ㄧ嚎");
- } else if (-1 == item.getOnline()) {
- item.setOnlineStr("绂荤嚎");
- } else {
- item.setOnlineStr("鏈煡");
- }
- });
- // 缁熻璁惧鏁伴噺
- //鍗＄墖缁熻
- int totalCount = 0;
- int onlineCount = 0;
- int offlineCount = 0;
- int unknownCount = 0;
- //鏋勫缓鏉′欢
- List<Criteria> criteriaList = new ArrayList<>();
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- if (areaDeptEnum != null){
- criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+ },taskExecutor);
+
+ try {
+ CompletableFuture.allOf(listFuture, statsFuture).join();
+ List<TMonitorResult> resultList = listFuture.get();
+ StatisticsResult statsResult = statsFuture.get();
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(
+ String.valueOf(statsResult.totalCount),
+ String.valueOf(statsResult.onlineCount),
+ String.valueOf(statsResult.offlineCount),
+ String.valueOf(statsResult.unknownCount),
+ this.remove0(statsResult.onlineRate)
+ ));
+ map.put("list", resultList);
+
+ return Result.ok().data(map).total(total);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return Result.error("鏌ヨ琚腑鏂紝璇风◢鍚庨噸璇�");
+ } catch (ExecutionException e) {
+ Throwable rootCause = e.getCause();
+ String errorMsg = rootCause != null ? rootCause.getMessage() : "瑙嗛璁惧鏁版嵁鏌ヨ澶辫触";
+ return Result.error(errorMsg);
}
- // 娣诲姞鍥哄畾鏉′欢
- criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
- criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
- criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
- // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
- if (params.getDataType() == 1) {
- criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
- } else if (params.getDataType() == 2) {
- criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
- }
- // 鏋勫缓match鎿嶄綔
- MatchOperation match = Aggregation.match(
- new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
- );
- GroupOperation group = Aggregation.group()
- .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
- .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
- .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
- // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
- Aggregation aggregation = Aggregation.newAggregation(match, group);
- // 鎵ц鑱氬悎鏌ヨ
- AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
- for (Map<String, Object> result : results.getMappedResults()) {
- offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
- unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
- onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
- totalCount = offlineCount + unknownCount + onlineCount;
- }
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (totalCount!=0) {
- onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
-// params.setDeptTag(1);
-// params.setDeviceType(1);
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getMinistrySiteOnline)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistrySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
-// }
- HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
- map.put("list", resultList);
- return Result.ok().data(map).total(total);
}
+// @Override
+// public Result deptVideoPointOnlineRate(DataCenterQuery params) {
+// List<String> likeFileds = Arrays.asList("name", "no", "ip");
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// Query query = null;
+// SysDept sysDept = getSysDeptByLoginUser();
+// AreaDeptEnum areaDeptEnum = null;
+// if (sysDept !=null){
+// areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+// if (areaDeptEnum != null){
+// query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+//
+// }else{
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+// }else {
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+// //鏌ヨ棰戣澶�
+// query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+// query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
+// //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+// if (params.getOption() != null) {
+// query.addCriteria(Criteria.where("online").is(params.getOption()));
+// }
+// // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+// query.with(Sort.by(Sort.Order.asc("pingOnline")));
+// //鍒嗛〉鏁伴噺
+// long total = mongoTemplate.count(query, TMonitorResult.class);
+// MongoUtil.setPage(query, params, TIME_FIELD);
+// List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+// resultList.forEach(item -> {
+// if (item.getPingOnline() == null) {
+// item.setPingOnlineStr("鏈煡");
+// } else if (item.getPingOnline()) {
+// item.setPingOnlineStr("鍦ㄧ嚎");
+// } else if (!item.getPingOnline()) {
+// item.setPingOnlineStr("绂荤嚎");
+// }
+// if (1 == item.getOnline()) {
+// item.setOnlineStr("鍦ㄧ嚎");
+// } else if (-1 == item.getOnline()) {
+// item.setOnlineStr("绂荤嚎");
+// } else {
+// item.setOnlineStr("鏈煡");
+// }
+// });
+// // 缁熻璁惧鏁伴噺
+// //鍗＄墖缁熻
+// int totalCount = 0;
+// int onlineCount = 0;
+// int offlineCount = 0;
+// int unknownCount = 0;
+// //鏋勫缓鏉′欢
+// List<Criteria> criteriaList = new ArrayList<>();
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// if (areaDeptEnum != null){
+// criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+// }
+// // 娣诲姞鍥哄畾鏉′欢
+// criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+// criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+// criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+// // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+// if (params.getDataType() == 1) {
+// criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+// } else if (params.getDataType() == 2) {
+// criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+// }
+// // 鏋勫缓match鎿嶄綔
+// MatchOperation match = Aggregation.match(
+// new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+// );
+// GroupOperation group = Aggregation.group()
+// .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+// .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+// .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+// // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+// Aggregation aggregation = Aggregation.newAggregation(match, group);
+// // 鎵ц鑱氬悎鏌ヨ
+// AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+// for (Map<String, Object> result : results.getMappedResults()) {
+// offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+// unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+// onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
+// totalCount = offlineCount + unknownCount + onlineCount;
+// }
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (totalCount!=0) {
+// onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+//// params.setDeptTag(1);
+//// params.setDeviceType(1);
+//// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+//// .select(CheckIndexVideo::getMinistrySiteOnline)
+//// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+//// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+//// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+//// .list();
+//// BigDecimal onlineRate = BigDecimal.ZERO;
+//// if (CollectionUtils.isNotEmpty(videoList)) {
+//// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistrySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+//// BigDecimal count = BigDecimal.valueOf(videoList.size());
+//// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+//// }
+// HashMap<String, Object> map = new HashMap<>();
+// map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
+// map.put("list", resultList);
+// return Result.ok().data(map).total(total);
+// }
+
+// @Override
+// public Result videoImportantPointOnlineRate(DataCenterQuery params) {
+// List<String> likeFileds = Arrays.asList("name", "no", "ip");
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// Query query = null;
+// SysDept sysDept = getSysDeptByLoginUser();
+// AreaDeptEnum areaDeptEnum = null;
+// if (sysDept !=null){
+// areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+// if (areaDeptEnum != null){
+// query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+//
+// }else{
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+// }else {
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+// //鏌ヨ棰戣澶�
+// query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+// query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+// //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+// if (params.getOption() != null) {
+// query.addCriteria(Criteria.where("online").is(params.getOption()));
+// }
+// // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+// query.with(Sort.by(Sort.Order.asc("pingOnline")));
+// //鍒嗛〉鏁伴噺
+// long total = mongoTemplate.count(query, TMonitorResult.class);
+// MongoUtil.setPage(query, params, TIME_FIELD);
+// List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+// params.setDeptTag(3);
+// params.setDeviceType(1);
+// resultList.forEach(item -> {
+// if (item.getPingOnline() == null) {
+// item.setPingOnlineStr("鏈煡");
+// } else if (item.getPingOnline()) {
+// item.setPingOnlineStr("鍦ㄧ嚎");
+// } else if (!item.getPingOnline()) {
+// item.setPingOnlineStr("绂荤嚎");
+// }
+// if (1 == item.getOnline()) {
+// item.setOnlineStr("鍦ㄧ嚎");
+// } else if (-1 == item.getOnline()) {
+// item.setOnlineStr("绂荤嚎");
+// } else {
+// item.setOnlineStr("鏈煡");
+// }
+// });
+//
+// // 缁熻璁惧鏁伴噺
+// //鍗＄墖缁熻
+// int totalCount = 0;
+// int onlineCount = 0;
+// int offlineCount = 0;
+// int unknownCount = 0;
+// //鏋勫缓鏉′欢
+// List<Criteria> criteriaList = new ArrayList<>();
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// if (areaDeptEnum != null){
+// criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+// }
+// // 娣诲姞鍥哄畾鏉′欢
+// criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+// criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+// criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
+// // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+// if (params.getDataType() == 1) {
+// criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+// } else if (params.getDataType() == 2) {
+// criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+// }
+// // 鏋勫缓match鎿嶄綔
+// MatchOperation match = Aggregation.match(
+// new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+// );
+// GroupOperation group = Aggregation.group()
+// .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+// .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+// .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+// // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+// Aggregation aggregation = Aggregation.newAggregation(match, group);
+// // 鎵ц鑱氬悎鏌ヨ
+// AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+// for (Map<String, Object> result : results.getMappedResults()) {
+// offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+// unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+// onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
+// totalCount = offlineCount + unknownCount + onlineCount;
+// }
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (totalCount!=0) {
+// onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// HashMap<String, Object> map = new HashMap<>();
+// map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
+// map.put("list", resultList);
+// return Result.ok().data(map).total(total);
+// }
/**
* 瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼
*
@@ -950,12 +1413,12 @@
* @return
*/
@Override
- public Result videoImportantPointOnlineRate(DataCenterQuery params) {
+ public Result videoImportantPointOnlineRate(DataCenterQuery params){
List<String> likeFileds = Arrays.asList("name", "no", "ip");
//姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- Query query = null;
+ final Query query;
SysDept sysDept = getSysDeptByLoginUser();
- AreaDeptEnum areaDeptEnum = null;
+ final AreaDeptEnum areaDeptEnum;
if (sysDept !=null){
areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
if (areaDeptEnum != null){
@@ -965,6 +1428,7 @@
query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
}
}else {
+ areaDeptEnum = null;
query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
}
//鏌ヨ棰戣澶�
@@ -976,89 +1440,53 @@
}
// 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
query.with(Sort.by(Sort.Order.asc("pingOnline")));
- //鍒嗛〉鏁伴噺
long total = mongoTemplate.count(query, TMonitorResult.class);
- MongoUtil.setPage(query, params, TIME_FIELD);
- List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
- params.setDeptTag(3);
- params.setDeviceType(1);
- resultList.forEach(item -> {
- if (item.getPingOnline() == null) {
- item.setPingOnlineStr("鏈煡");
- } else if (item.getPingOnline()) {
- item.setPingOnlineStr("鍦ㄧ嚎");
- } else if (!item.getPingOnline()) {
- item.setPingOnlineStr("绂荤嚎");
- }
- if (1 == item.getOnline()) {
- item.setOnlineStr("鍦ㄧ嚎");
- } else if (-1 == item.getOnline()) {
- item.setOnlineStr("绂荤嚎");
- } else {
- item.setOnlineStr("鏈煡");
- }
- });
- // 缁熻璁惧鏁伴噺
- //鍗＄墖缁熻
- int totalCount = 0;
- int onlineCount = 0;
- int offlineCount = 0;
- int unknownCount = 0;
- //鏋勫缓鏉′欢
- List<Criteria> criteriaList = new ArrayList<>();
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- if (areaDeptEnum != null){
- criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+ CompletableFuture<List<TMonitorResult>> listFuture = CompletableFuture.supplyAsync(()->{
+ try {
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ //鏋勫缓鍒楄〃鏁版嵁
+ formatResultList(resultList,DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name());
+
+ return resultList;
+ } catch (Exception e) {
+ throw new CompletionException("瑙嗛璁惧鍒楄〃鏌ヨ澶辫触锛�" + e.getMessage(), e);
+ }
+ },taskExecutor);
+
+ CompletableFuture<StatisticsResult> statsFuture = CompletableFuture.supplyAsync(()->{
+ try {
+ return calculateStatistics(params, areaDeptEnum, DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name());
+ }catch (Exception e){
+ throw new CompletionException("瑙嗛璁惧鐘舵�佺粺璁″け璐ワ細" + e.getMessage(), e);
+ }
+ },taskExecutor);
+ try {
+ CompletableFuture.allOf(listFuture, statsFuture).join();
+ List<TMonitorResult> resultList = listFuture.get();
+ StatisticsResult statsResult = statsFuture.get();
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(
+ String.valueOf(statsResult.totalCount),
+ String.valueOf(statsResult.onlineCount),
+ String.valueOf(statsResult.offlineCount),
+ String.valueOf(statsResult.unknownCount),
+ this.remove0(statsResult.onlineRate)
+ ));
+ map.put("list", resultList);
+
+ return Result.ok().data(map).total(total);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return Result.error("鏌ヨ琚腑鏂紝璇风◢鍚庨噸璇�");
+ } catch (ExecutionException e) {
+ Throwable rootCause = e.getCause();
+ String errorMsg = rootCause != null ? rootCause.getMessage() : "瑙嗛璁惧鏁版嵁鏌ヨ澶辫触";
+ return Result.error(errorMsg);
}
- // 娣诲姞鍥哄畾鏉′欢
- criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
- criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
- criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
- // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
- if (params.getDataType() == 1) {
- criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
- } else if (params.getDataType() == 2) {
- criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
- }
- // 鏋勫缓match鎿嶄綔
- MatchOperation match = Aggregation.match(
- new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
- );
- GroupOperation group = Aggregation.group()
- .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
- .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
- .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
- // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
- Aggregation aggregation = Aggregation.newAggregation(match, group);
- // 鎵ц鑱氬悎鏌ヨ
- AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
- for (Map<String, Object> result : results.getMappedResults()) {
- offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
- unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
- onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
- totalCount = offlineCount + unknownCount + onlineCount;
- }
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (totalCount!=0) {
- onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getKeySiteOnline)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
-// }
- HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
- map.put("list", resultList);
- return Result.ok().data(map).total(total);
+
}
/**
@@ -1439,18 +1867,6 @@
if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getMonitorQualification)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorQualification).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
-// }
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
@@ -1601,104 +2017,222 @@
List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO,item.getId());
item.setDynamicColumnList(list);
-
});
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
- List<Integer> status = Arrays.asList(1, 0, -1);
+// // 缁熻鏁伴噺
+// MongoDatabase database = mongoTemplate.getDb();
+// MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
+//
+// List<Integer> status = Arrays.asList(1, 0, -1);
+// AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
+// List<String> resultCount = status.stream().map(item -> {
+// List<Document> dList = new ArrayList<>(2);
+//
+// dList.add(new Document("recordStatus", new Document("$eq", item)));
+// if(finalAreaDeptEnum != null){
+// dList.add(new Document("$and", Arrays.asList(
+// new Document("no", new Document("$in", noString)),
+// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// )));
+// }else {
+// dList.add(new Document("no", new Document("$in", noString)));
+// }
+//
+// setTag(params, dList);
+// Document filter = new Document("$and", dList);
+// // 鏋勫缓鑱氬悎绠￠亾
+// List<Document> pipeline = Arrays.asList(
+// new Document("$match", filter),
+// // $group 鍘婚噸
+// new Document("$group", new Document("_id", "$deviceId")),
+// new Document("$count", "uniqueDeviceIds")
+// );
+// // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+// AggregateIterable<Document> result = collection.aggregate(pipeline);
+// Integer uniqueDeviceIdCount = 0;
+// for (Document doc : result) {
+// uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+// break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+// }
+// return uniqueDeviceIdCount + "";
+// }).collect(Collectors.toList());
+//
+// //璁＄畻褰曞儚鍙敤鐜�
+// MongoDatabase databaes2 = mongoTemplate.getDb();
+// MongoCollection<Document> collection2 = databaes2.getCollection("uy_record_meta_d_sum");
+//
+// double finalRecordingMinTime = getSySMinTime();
+//
+// List<Document> documentList = new ArrayList<>(2);
+// if(finalAreaDeptEnum != null){
+// documentList.add(new Document("$and", Arrays.asList(
+// new Document("no", new Document("$in", noString)),
+// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// )));
+// }else {
+// documentList.add(new Document("no", new Document("$in", noString)));
+// }
+// // documentList.add(new Document("$and", Arrays.asList(
+// // new Document("no", new Document("$in", noString)),
+// // new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// // )));
+// setTag(params, documentList);
+// Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
+// documentList.add(recording);
+//
+// Document filter = new Document("$and", documentList);
+// // 鏋勫缓鑱氬悎绠￠亾
+// List<Document> pipeline = Arrays.asList(
+// new Document("$match", filter),
+// // $group 鍘婚噸
+// new Document("$group", new Document("_id", "$deviceId")),
+// new Document("$count", "uniqueDeviceIds")
+// );
+// AggregateIterable<Document> result = collection2.aggregate(pipeline);
+//
+//
+// Integer uniqueDeviceIdCount = 0;
+// for (Document doc : result) {
+// uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+// break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+// }
+// log.error("褰曞儚鍙敤鐜囨墦鍗帮細{}",uniqueDeviceIdCount);
+// int totalCount = 0;
+// for (String s : resultCount) {
+// totalCount += Integer.parseInt(s);
+// }
+// resultCount.add(0, totalCount + "");
+//
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// // 1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� |
+// if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
+// //resultCount.get(0)鏄�绘暟 uniqueDeviceIdCount鏄牴鎹郴缁熷弬鏁版煡璇㈠埌mongodb涓ぇ浜庣瓑浜� recordDuration瀛楁鐨勬�绘暟
+// onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// resultCount.add(this.remove0(onlineRate));
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", this.buildCount(areaDeptEnum,noString,params,DataCenterMethodNameEnum.VIDEO_AVAILABILITY_RATE.name()));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
+ }
+ public List<String> buildCount(AreaDeptEnum areaDeptEnum,List<String> noString,DataCenterQuery params,String tag){
+ MongoDatabase databaes= mongoTemplate.getDb();
+ MongoCollection<Document> collection = databaes.getCollection("uy_record_meta_d_sum");
AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
- List<String> resultCount = status.stream().map(item -> {
- List<Document> dList = new ArrayList<>(2);
-
- dList.add(new Document("recordStatus", new Document("$eq", item)));
- if(finalAreaDeptEnum != null){
- dList.add(new Document("$and", Arrays.asList(
- new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }else {
- dList.add(new Document("no", new Document("$in", noString)));
- }
-
- setTag(params, dList);
- Document filter = new Document("$and", dList);
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
-
- //璁＄畻褰曞儚鍙敤鐜�
- MongoDatabase databaes2 = mongoTemplate.getDb();
- MongoCollection<Document> collection2 = databaes2.getCollection("uy_record_meta_d_sum");
-
double finalRecordingMinTime = getSySMinTime();
+ // 2. 鏋勫缓鑱氬悎绠￠亾锛堟牳蹇冿細涓�娆＄閬撶粺璁℃墍鏈夋寚鏍囷級
+ List<Document> pipeline = new ArrayList<>();
- List<Document> documentList = new ArrayList<>(2);
- if(finalAreaDeptEnum != null){
- documentList.add(new Document("$and", Arrays.asList(
+ // 闃舵1锛�$match - 鍩虹杩囨护锛堝鐢ㄤ袱娆℃煡璇㈢殑鍏卞悓鏉′欢锛�
+ List<Document> baseFilterList = new ArrayList<>();
+ if (DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name().equals(tag)){
+ baseFilterList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
+ }
+ if (DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_AVAILABILITY_RATE.name().equals(tag)){
+ baseFilterList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+ }
+
+ // 鏉′欢1锛歯o鐨勮繃婊わ紙in + 鍙�夊墠缂�鍖归厤锛屽拰浣犲師浠ｇ爜閫昏緫涓�鑷达級
+ if (finalAreaDeptEnum != null) {
+ baseFilterList.add(new Document("$and", Arrays.asList(
new Document("no", new Document("$in", noString)),
new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
)));
- }else {
- documentList.add(new Document("no", new Document("$in", noString)));
+ } else {
+ baseFilterList.add(new Document("no", new Document("$in", noString)));
}
-// documentList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
-// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
-// )));
- setTag(params, documentList);
- Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
- documentList.add(recording);
-
- Document filter = new Document("$and", documentList);
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
+ setTag(params, baseFilterList);
+ Document matchStage = new Document("$match", new Document("$and", baseFilterList));
+ pipeline.add(matchStage);
+ // 闃舵2锛�$group - 鎸塪eviceId鍘婚噸锛屾爣璁板悇鏉′欢鏄惁婊¤冻
+ // --------------------------
+ // 閫昏緫锛氭瘡涓澶囧彧缁熻涓�娆★紝鐢�$cond鏍囪鈥滄槸鍚︾鍚堟煇鏉′欢鈥濓紙绗﹀悎=1锛屼笉绗﹀悎=0锛�
+ Document groupByDeviceStage = new Document("$group",
+ new Document("_id", "$deviceId") // 鎸夎澶嘔D鍒嗙粍锛堝幓閲嶆牳蹇冿級
+ // 鏍囪锛氳璁惧鏄惁婊¤冻 recordStatus=1
+ .append("status1Flag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$eq", Arrays.asList("$recordStatus", 1)), // 鍒ゆ柇鏉′欢
+ 1, // 绗﹀悎锛氳1
+ 0 // 涓嶇鍚堬細璁�0
+ ))
+ ))
+ // 鏍囪锛氳璁惧鏄惁婊¤冻 recordStatus=0
+ .append("status0Flag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$eq", Arrays.asList("$recordStatus", 0)),
+ 1,
+ 0
+ ))
+ ))
+ // 鏍囪锛氳璁惧鏄惁婊¤冻 recordStatus=-1
+ .append("statusMinus1Flag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$eq", Arrays.asList("$recordStatus", -1)),
+ 1,
+ 0
+ ))
+ ))
+ // 鏍囪锛氳璁惧鏄惁婊¤冻 missDuration 鈮� finalRecordingMinTime锛堝師绗簩娈垫煡璇㈡潯浠讹級
+ .append("missOkFlag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$lte", Arrays.asList("$missDuration", finalRecordingMinTime)),
+ 1,
+ 0
+ ))
+ ))
);
- AggregateIterable<Document> result = collection2.aggregate(pipeline);
+ pipeline.add(groupByDeviceStage);
+ // --------------------------
+ // 闃舵3锛�$group - 鍏ㄥ眬缁熻锛堢疮鍔犳墍鏈夎澶囩殑鏍囪锛屽緱鍒版渶缁堟暟閲忥級
+ // --------------------------
+ // 閫昏緫锛氭棤鍒嗙粍閿紙_id: null锛夛紝灏嗘墍鏈夎澶囩殑鏍囪绱姞锛屽緱鍒版�昏鏁�
+ Document groupGlobalStage = new Document("$group",
+ new Document("_id", null) // 鍏ㄥ眬鍒嗙粍锛堢粺璁℃墍鏈夎澶囷級
+ // 鍘熺涓�娈垫煡璇㈢粨鏋�1锛歴tatus=1鐨勮澶囨暟
+ .append("status1Count", new Document("$sum", "$status1Flag"))
+ // 鍘熺涓�娈垫煡璇㈢粨鏋�2锛歴tatus=0鐨勮澶囨暟
+ .append("status0Count", new Document("$sum", "$status0Flag"))
+ // 鍘熺涓�娈垫煡璇㈢粨鏋�3锛歴tatus=-1鐨勮澶囨暟
+ .append("statusMinus1Count", new Document("$sum", "$statusMinus1Flag"))
+ // 鍘熺浜屾鏌ヨ缁撴灉锛歮issDuration绗﹀悎鏉′欢鐨勮澶囨暟
+ .append("missOkCount", new Document("$sum", "$missOkFlag"))
+ );
+ pipeline.add(groupGlobalStage);
-
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+ // --------------------------
+ // 鎵ц鑱氬悎鏌ヨ锛屾彁鍙栨墍鏈夌粺璁＄粨鏋�
+ // --------------------------
+ AggregateIterable<Document> aggregateResult = collection.aggregate(pipeline);
+ Document statDoc = null;
+ for (Document doc : aggregateResult) { // 鍏ㄥ眬鍒嗙粍鍙細杩斿洖1鏉＄粨鏋�
+ statDoc = doc;
+ break;
}
- log.error("褰曞儚鍙敤鐜囨墦鍗帮細{}",uniqueDeviceIdCount);
- int totalCount = 0;
- for (String s : resultCount) {
- totalCount += Integer.parseInt(s);
- }
- resultCount.add(0, totalCount + "");
+ // 鍒濆鍖栭粯璁ゅ�硷紙閬垮厤绌烘寚閽堬級
+ int status1Count = 0, status0Count = 0, statusMinus1Count = 0, missOkCount = 0;
+ if (statDoc != null) {
+ status1Count = statDoc.getInteger("status1Count", 0);
+ status0Count = statDoc.getInteger("status0Count", 0);
+ statusMinus1Count = statDoc.getInteger("statusMinus1Count", 0);
+ missOkCount = statDoc.getInteger("missOkCount", 0);
+ }
+ int total = status1Count + status0Count + statusMinus1Count;
BigDecimal onlineRate = BigDecimal.ZERO;
-// 1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� |
- if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
- //resultCount.get(0)鏄�绘暟 uniqueDeviceIdCount鏄洿鍏风郴缁熷弬鏁版煡璇㈠埌mongodb涓ぇ浜庣瓑浜� recordDuration瀛楁鐨勬�绘暟
- onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+ if (total != 0) { // 鍙湁褰搕otal涓嶄负0鏃讹紝鎵嶈绠楁瘮鐜�
+ onlineRate = new BigDecimal(missOkCount)
+ .divide(new BigDecimal(total), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
}
- resultCount.add(this.remove0(onlineRate));
-
- HashMap<String, Object> map = new HashMap<>();
- map.put("count", resultCount);
- map.put("list", resultList);
- return Result.ok().data(map).total(total);
+ List<String> list = new ArrayList<>();
+ list.add(total +"");
+ list.add(status1Count +"");
+ list.add(status0Count +"");
+ list.add(statusMinus1Count +"");
+ list.add(this.remove0(onlineRate));
+ return list;
}
/**
@@ -1709,6 +2243,7 @@
*/
@Override
public Result deptVideoAvailabilityRate(DataCenterQuery params) {
+ List<String> noString = tMonitorMapper.getIdListVideo();
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
SysDept sysDept = getSysDeptByLoginUser();
AreaDeptEnum areaDeptEnum = null;
@@ -1723,10 +2258,15 @@
}else {
query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
}
+ if (CollectionUtils.isNotEmpty(noString)) { // 闃叉绌洪泦鍚堝紓甯�
+ query.addCriteria(Criteria.where("no").in(noString));
+ }
//涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
if (params.getOption() != null) {
query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
}
+ //鏂板閮ㄧ骇鍒ゆ柇
+ query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -1736,104 +2276,12 @@
AreaDeptEnum areaDeptEnumInfo = AreaDeptEnum.fromCode(areaCode);
if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName());
});
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
- List<Integer> status = Arrays.asList(1, 0, -1);
- AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
- List<String> resultCount = status.stream().map(item -> {
- List<Document> dList = new ArrayList<>(4);
- dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
- dList.add(new Document("recordStatus", new Document("$eq", item)));
- setTag(params, dList);
- if (finalAreaDeptEnum != null){
- dList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }
- Document filter = new Document("$and", dList);
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
-
- //璁＄畻閮ㄧ骇褰曞儚鍙敤鐜�
- MongoDatabase database2 = mongoTemplate.getDb();
- MongoCollection<Document> collection2 = database2.getCollection("uy_record_meta_d_sum");
- double finalRecordingMinTime = getSySMinTime();
-
- List<Document> documentList = new ArrayList<>(4);
- documentList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
- setTag(params, documentList);
- Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
- documentList.add(recording);
- if (finalAreaDeptEnum != null){
- documentList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }
- Document filter = new Document("$and", documentList);
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
- );
- AggregateIterable<Document> result = collection2.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- log.error("閮ㄧ骇褰曞儚鍙敤鐜噞}:",uniqueDeviceIdCount);
-
-
-
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getMinistryVideoAvailable)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistryVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
-// }
- //鍔犱竴涓�绘暟
- int totalCount = 0;
- for (String s : resultCount) {
- totalCount += Integer.parseInt(s);
- }
- resultCount.add(0, totalCount + "");
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
- onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
- resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", resultCount);
+ map.put("count", this.buildCount(areaDeptEnum,noString,params,DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name()));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
-
/**
* 瑙嗛锛氶噸鐐圭偣浣嶅綍鍍忓彲鐢ㄧ巼
*
@@ -1842,6 +2290,7 @@
*/
@Override
public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
+ List<String> noString = tMonitorMapper.getIdListVideo();
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
SysDept sysDept = getSysDeptByLoginUser();
AreaDeptEnum areaDeptEnum = null;
@@ -1857,10 +2306,14 @@
query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
}
query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+ if (CollectionUtils.isNotEmpty(noString)) { // 闃叉绌洪泦鍚堝紓甯�
+ query.addCriteria(Criteria.where("no").in(noString));
+ }
//涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
if (params.getOption() != null) {
query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
}
+
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -1871,96 +2324,84 @@
if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName());
});
// 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
- List<Integer> status = Arrays.asList(1, 0, -1);
- AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
- List<String> resultCount = status.stream().map(item -> {
- List<Document> dList = new ArrayList<>(4);
- dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
- dList.add(new Document("recordStatus", new Document("$eq", item)));
- setTag(params, dList);
- if (finalAreaDeptEnum != null){
- dList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }
- Document filter = new Document("$and", dList);
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
-
- //璁＄畻閲嶇偣鐐逛綅褰曞儚鍙敤鐜�
- MongoDatabase database2 = mongoTemplate.getDb();
- MongoCollection<Document> collection2 = database2.getCollection("uy_record_meta_d_sum");
- double finalRecordingMinTime = getSySMinTime();
-
- List<Document> documentList = new ArrayList<>(4);
- documentList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
- setTag(params, documentList);
- Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
- documentList.add(recording);
- if (finalAreaDeptEnum != null){
- documentList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }
- Document filter = new Document("$and", documentList);
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
- );
- AggregateIterable<Document> result = collection2.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- log.error("閲嶇偣鐐逛綅褰曞儚鍙敤鐜噞}:",uniqueDeviceIdCount);
-
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getKeyVideoAvailable)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// MongoDatabase database = mongoTemplate.getDb();
+// MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
+// List<Integer> status = Arrays.asList(1, 0, -1);
+// AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
+// List<String> resultCount = status.stream().map(item -> {
+// List<Document> dList = new ArrayList<>(4);
+// dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+// dList.add(new Document("recordStatus", new Document("$eq", item)));
+// setTag(params, dList);
+// if (finalAreaDeptEnum != null){
+// dList.add(new Document("$and", Arrays.asList(
+//// new Document("no", new Document("$in", noString)),
+// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// )));
+// }
+// Document filter = new Document("$and", dList);
+// // 鏋勫缓鑱氬悎绠￠亾
+// List<Document> pipeline = Arrays.asList(
+// new Document("$match", filter),
+// // $group 鍘婚噸
+// new Document("$group", new Document("_id", "$deviceId")),
+// new Document("$count", "uniqueDeviceIds")
+// );
+// // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+// AggregateIterable<Document> result = collection.aggregate(pipeline);
+// Integer uniqueDeviceIdCount = 0;
+// for (Document doc : result) {
+// uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+// break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+// }
+// return uniqueDeviceIdCount + "";
+// }).collect(Collectors.toList());
+//
+// //璁＄畻閲嶇偣鐐逛綅褰曞儚鍙敤鐜�
+// MongoDatabase database2 = mongoTemplate.getDb();
+// MongoCollection<Document> collection2 = database2.getCollection("uy_record_meta_d_sum");
+// double finalRecordingMinTime = getSySMinTime();
+//
+// List<Document> documentList = new ArrayList<>(4);
+// documentList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+// setTag(params, documentList);
+// Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
+// documentList.add(recording);
+// if (finalAreaDeptEnum != null){
+// documentList.add(new Document("$and", Arrays.asList(
+//// new Document("no", new Document("$in", noString)),
+// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// )));
// }
- //鍔犱竴涓�绘暟
- int totalCount = 0;
- for (String s : resultCount) {
- totalCount += Integer.parseInt(s);
- }
- resultCount.add(0, totalCount + "");
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
- onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
- resultCount.add(this.remove0(onlineRate));
+// Document filter = new Document("$and", documentList);
+// // 鏋勫缓鑱氬悎绠￠亾
+// List<Document> pipeline = Arrays.asList(
+// new Document("$match", filter),
+// // $group 鍘婚噸
+// new Document("$group", new Document("_id", "$deviceId")),
+// new Document("$count", "uniqueDeviceIds")
+// );
+// AggregateIterable<Document> result = collection2.aggregate(pipeline);
+// Integer uniqueDeviceIdCount = 0;
+// for (Document doc : result) {
+// uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+// break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+// }
+// log.error("閲嶇偣鐐逛綅褰曞儚鍙敤鐜噞}:",uniqueDeviceIdCount);
+//
+// //鍔犱竴涓�绘暟
+// int totalCount = 0;
+// for (String s : resultCount) {
+// totalCount += Integer.parseInt(s);
+// }
+// resultCount.add(0, totalCount + "");
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
+// onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", resultCount);
+ map.put("count", this.buildCount(areaDeptEnum,noString,params,DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_AVAILABILITY_RATE.name()));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DemeritRecordImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DemeritRecordImpl.java
new file mode 100644
index 0000000..3534966
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DemeritRecordImpl.java
@@ -0,0 +1,72 @@
+package com.ycl.platform.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.entity.DemeritRecord;
+import com.ycl.platform.domain.query.DataCenterQuery;
+import com.ycl.platform.domain.query.DemeritRecordQuery;
+import com.ycl.platform.domain.vo.WorkOrderVO;
+import com.ycl.platform.domain.vo.screen.DemeritRecordVO;
+import com.ycl.platform.mapper.DemeritRecordMapper;
+import com.ycl.platform.service.IDemeritRecordService;
+import com.ycl.system.Result;
+import com.ycl.system.page.PageUtil;
+import com.ycl.utils.DateUtils;
+import enumeration.general.AreaDeptEnum;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * zgyw
+ *
+ * @author : zxl
+ * @date : 2025-09-15 16:36
+ **/
+@Service
+@RequiredArgsConstructor
+public class DemeritRecordImpl extends ServiceImpl<DemeritRecordMapper, DemeritRecord> implements IDemeritRecordService {
+ private final DemeritRecordMapper demeritRecordMapper;
+
+ @Override
+ public Result getDemeritRecordPage(DemeritRecordQuery query) {
+
+ IPage<DemeritRecordVO> page = PageUtil.getPage(query, DemeritRecordVO.class);
+ baseMapper.getPage(query, page);
+
+ for (DemeritRecordVO demeritRecordVO : page.getRecords()) {
+ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(demeritRecordVO.getDeptId()));
+ if (areaDeptEnum != null){
+ demeritRecordVO.setDeptName(areaDeptEnum.getName());
+ }
+
+ }
+
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
+ @Override
+ public void add(List<DemeritRecord> record) {
+
+ }
+
+
+ @Override
+ public Result delete(Integer id) {
+
+
+ return null;
+ }
+
+
+}
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 625dd78..beebaa8 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
@@ -1161,6 +1161,8 @@
exportForm.setDeptIds(deptIds);
}
Query query = getQuery(exportForm);
+
+
//鏈堜唤姣忔棩鍦ㄧ嚎鏁版嵁
List<TMonitorResult> onlineResult = mongoTemplate.find(query, TMonitorResult.class);
// 浣跨敤 Collectors.toMap 鍘婚噸锛屼繚鐣欐瘡涓� No 鐨勭涓�涓亣鍒扮殑鍏冪礌
diff --git a/ycl-server/src/main/java/com/ycl/task/DemeritRecordTask.java b/ycl-server/src/main/java/com/ycl/task/DemeritRecordTask.java
new file mode 100644
index 0000000..fbd70f3
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/task/DemeritRecordTask.java
@@ -0,0 +1,295 @@
+package com.ycl.task;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.google.common.util.concurrent.AtomicDouble;
+import com.ycl.platform.domain.entity.DemeritRecord;
+import com.ycl.platform.domain.entity.Report;
+import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.platform.mapper.DemeritRecordMapper;
+import com.ycl.platform.mapper.ReportMapper;
+import com.ycl.platform.service.IDemeritRecordService;
+import com.ycl.utils.DateUtils;
+import enumeration.ConstructionTypeEnum;
+import enumeration.general.AreaDeptEnum;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+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 utils.StringUtils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * zgyw
+ *
+ * @author : zxl
+ * @date : 2025-09-15 17:32
+ **/
+
+@Slf4j
+@RequiredArgsConstructor
+@Component("demeritRecordTask")
+public class DemeritRecordTask {
+
+ private final MongoTemplate mongoTemplate;
+
+ private final ReportMapper reportMapper;
+
+ private static final ExecutorService executorService = new ThreadPoolExecutor(16,
+ 128,
+ 5000,
+ TimeUnit.SECONDS,
+ new ArrayBlockingQueue<>(1000),
+ new ThreadPoolExecutor.CallerRunsPolicy()
+ );
+ private final IDemeritRecordService demeritRecordService;
+
+ // 鎻愬彇鍏叡杩囨护鏂规硶
+ private Predicate<RecordMetaDSumResult> deviceNameStartsWith(String prefix) {
+ return result -> result.getDeviceName() != null && result.getDeviceName().startsWith(prefix);
+ }
+
+ private Predicate<RecordMetaDSumResult> deviceNameStartsWithAny(String... prefixes) {
+ return result -> result.getDeviceName() != null &&
+ Arrays.stream(prefixes).anyMatch(prefix -> result.getDeviceName().startsWith(prefix));
+ }
+
+ private DemeritRecord buildDemeritRecord(String constructionType,BigDecimal demerit,Integer deptId) {
+ DemeritRecord record = new DemeritRecord();
+ record.setConstructionType(constructionType);
+ record.setDemerit(demerit);
+ record.setDeptId(deptId);
+ return record;
+ }
+ private BigDecimal calculateTotalDeduction(List<RecordMetaDSumResult> records) {
+ BigDecimal total = BigDecimal.ZERO; // 鍗曠嚎绋嬪惊鐜紝鏃犻渶AtomicReference
+
+ for (RecordMetaDSumResult record : records) {
+ // 瀹夊叏澶勭悊绌哄�硷細鑻issDuration涓簄ull锛岄粯璁ゆ寜0鍒嗛挓澶勭悊
+ Double missDurationHours = record.getMissDuration();
+ double missDurationMinutes = Optional.ofNullable(missDurationHours)
+ .map(hours -> hours * 60.0) // 灏忔椂杞垎閽�
+ .orElse(0.0); // 绌哄�奸粯璁�0鍒嗛挓
+
+ // 璁＄畻鍗曟潯璁板綍鐨勬墸鍒�
+ BigDecimal deduction;
+ if (missDurationMinutes > 720) {
+ deduction = new BigDecimal("2.0");
+ } else if (missDurationMinutes > 240) {
+ deduction = new BigDecimal("1.5");
+ } else if (missDurationMinutes > 60) {
+ deduction = new BigDecimal("1.0");
+ } else if (missDurationMinutes > 30) {
+ deduction = new BigDecimal("0.5");
+ } else {
+ deduction = BigDecimal.ZERO;
+ }
+
+ // 绱姞鎬绘墸鍒嗭紙鏈�鍚庣粺涓�澶勭悊绮惧害锛岄伩鍏嶄腑闂村洓鑸嶄簲鍏ヨ宸級
+ total = total.add(deduction);
+ }
+
+ // 鏈�缁堢粺涓�淇濈暀1浣嶅皬鏁帮紝鍥涜垗浜斿叆
+ return total.setScale(1, RoundingMode.HALF_UP);
+ }
+
+ public void run(){
+ log.info("寮�濮嬫墽琛岃绠楁瘡鏃ユ墸鍒嗚褰曟儏鍐�");
+ //鑾峰緱mongodb涓墍鏈夊叏鏅殑璁惧
+ //mongodb鏌ヨ鏉′欢
+ Date today =new Date();
+// Calendar calendar = Calendar.getInstance();
+// calendar.setTime(today);
+// calendar.add(Calendar.DAY_OF_YEAR, -2); // 鍑忓幓2澶� 娴嬭瘯鐢�
+// Date twoDaysAgo = calendar.getTime();
+
+ //璁＄畻褰曞儚鍙敤鐜囧拰閲嶇偣褰曞儚鍙敤鐜�
+ Query query = new Query();
+ query.addCriteria(Criteria
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(today)).lt(DateUtils.getDayEnd(today)));
+ List<RecordMetaDSumResult> results = mongoTemplate.find(query, RecordMetaDSumResult.class);
+
+ log.info("鏃ユ湡:{},鏌ヨ鍑虹殑璁惧褰曞儚璁板綍鏁皗}",today,results.size());
+ //杩囨护鎺夐潪鍏ㄦ櫙鐨勮澶� 涓� 1鍒欎负缁嗚妭锛屽鏋滄槸0鍒欎负鍏ㄦ櫙
+ results.stream().filter(obj ->
+ {
+ String deviceId = obj.getDeviceId();
+ if (deviceId == null || deviceId.length() < 7) {
+ return false; // 鍘婚櫎鍏冪礌
+ }
+ // 鑾峰彇鍊掓暟绗竷浣嶇殑瀛楃
+ char seventhFromEnd = deviceId.charAt(deviceId.length() - 7);
+ return seventhFromEnd != '1'; //涓�1 鍒欎細 false 鍘婚櫎鎺�
+ });
+
+ log.info("杩囨护鍚庡墿浣欏叏鏅澶囨暟{}",results.size());
+ //鍙�冩牳LT_銆�(涓夋湡)
+ // DX_ 銆侊紙涓�浜屾湡锛�
+ // DX_R銆侊紙鍥涘尯浜鸿劯锛�
+ // DX_RS銆侊紙鍥涘尯浜鸿劯锛�
+ // 锛堥渶瑕佹帓闄X_R2銆丏X_RD銆丣_銆乀1銆乀3浠ュ強娌℃湁鍓嶇紑鐨勮澶囷級
+ List<String> prefixes = Arrays.asList("LT_", "DX_", "DX_R", "DX_RS");
+
+ results.stream()
+ .filter(result -> {
+ String deviceName = result.getDeviceName();
+ if (deviceName == null) {
+ return false;
+ }
+ return prefixes.stream().anyMatch(deviceName::startsWith);
+ })
+ .collect(Collectors.toList());
+
+ log.info("鍓╀綑鑰冩牳璁惧杩囨护鍚庤澶囨暟{}",results.size());
+
+ //杩囨护鎺夋姤澶囩殑璁惧
+ //鏌ヨ鍦ㄥ綋鍓嶆椂闂存湁鎶ュ鐨勬墍鏈夎澶囷紝
+ //鍥犱负褰曞儚鏁版嵁鐨勬椂闂�
+ List<String> deviceIds = new LambdaQueryChainWrapper<>(reportMapper)
+ .eq(Report::getStatus, 1)
+ .ge(Report::getBeginCreateTime, today)
+ .le(Report::getEndCreateTime, today)
+ .list().stream()
+ .collect(Collectors.toMap(
+ Report::getSerialNumber, // key: serialNumber
+ Function.identity(), // value: Report瀵硅薄鏈韩
+ (existing, replacement) ->
+ // 褰搆ey鍐茬獊鏃讹紝淇濈暀createTime鏇村ぇ鐨勶紙鏇存柊鐨勶級璁板綍
+ existing.getCreateTime().after(replacement.getCreateTime()) ? existing : replacement
+ ))
+ .values().stream()
+ .map(Report::getSerialNumber).collect(Collectors.toList());
+
+ Set<String> deviceIdSet = new HashSet<>(deviceIds);
+ log.info("鎶ュ璁惧鏁皗}",deviceIdSet.size());
+ results.stream()
+ .filter(result -> {
+ // 鑾峰彇褰撳墠瀵硅薄鐨刣eviceId
+ String resultDeviceId = result.getDeviceId();
+ // 杩囨护鏉′欢锛歞eviceId涓嶅湪闆嗗悎涓紙娉ㄦ剰澶勭悊null鍊硷紝閬垮厤NPE锛�
+ return resultDeviceId != null && !deviceIdSet.contains(resultDeviceId);
+ })
+ .collect(Collectors.toList());
+
+ log.info("鍓╀綑杩囨护鎶ュ鍚庤澶囨暟{}",results.size());
+
+ // 鎸夊尯鍩熷垝鍒� 缁勮鎴恗ap
+ results.forEach(item -> {
+ String areaCode = item.getArealayername().substring(0, 6);
+ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
+ if (areaDeptEnum != null) {
+ item.setArealayerno(areaDeptEnum.getCode());
+ }
+ });
+ //闇�瑕佹坊鍔犳暟鎹簱鐨勬暟鎹泦鍚�
+ List<DemeritRecord> demeritRecords = new ArrayList<>();
+
+ Map<String,List<RecordMetaDSumResult>> groupByArealayerno = results.stream()
+ .collect(Collectors.groupingBy(RecordMetaDSumResult::getArealayerno));
+
+ //寰幆鍒嗙粍鍚庣殑map
+ for (Map.Entry<String, List<RecordMetaDSumResult>> entry : groupByArealayerno.entrySet()) {
+ String arealayerno = entry.getKey();
+ log.info("寰幆鍖哄煙{}",arealayerno);
+ //鑾峰緱鍖�
+ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(arealayerno);
+ if (areaDeptEnum == null) {
+ log.info("鍖哄煙鏁版嵁寮傚父锛屽紓甯稿尯鍩熼敭鍊硷細{}",arealayerno);
+ return;
+ }
+
+ List<RecordMetaDSumResult> resultList = entry.getValue();
+ log.info("resultList:{}",resultList.size());
+ if (CollectionUtils.isNotEmpty(resultList)) {
+ // 瀵规瘡涓狶ist杩涜澶勭悊 鍒嗗缓绫诲瀷澶勭悊闆嗗悎
+ List<RecordMetaDSumResult> phase_one_two = resultList.stream()
+ .filter(deviceNameStartsWith("DX_"))
+ .collect(Collectors.toList());
+ log.info("涓�浜屾湡鑰冩牳璁板綍鏁皗}",phase_one_two.size());
+ List<RecordMetaDSumResult> phase_three = resultList.stream()
+ .filter(deviceNameStartsWith("LT_"))
+ .collect(Collectors.toList());
+ log.info("涓夋湡鑰冩牳璁板綍鏁皗}",phase_three.size());
+ List<RecordMetaDSumResult> phase_fourth = resultList.stream()
+ .filter(deviceNameStartsWithAny("DX_R", "DX_RS"))
+ .collect(Collectors.toList());
+ log.info("鍥涙湡鑰冩牳璁板綍鏁皗}",phase_fourth.size());
+ if (CollectionUtils.isNotEmpty(phase_one_two)){
+ BigDecimal phaseOneTwoDeduction = calculateTotalDeduction(phase_one_two);
+ DemeritRecord demeritRecordPhaseOneTwo = buildDemeritRecord(
+ ConstructionTypeEnum.PHASE_ONE_TWO.name(),
+ phaseOneTwoDeduction,
+ areaDeptEnum.getDeptId());
+ demeritRecords.add(demeritRecordPhaseOneTwo);
+ }else{
+ DemeritRecord phaseOneTwoDeduction = buildDemeritRecord(
+ ConstructionTypeEnum.PHASE_ONE_TWO.name(),
+ BigDecimal.ZERO,
+ areaDeptEnum.getDeptId());
+ demeritRecords.add(phaseOneTwoDeduction);
+ }
+
+
+ if (CollectionUtils.isNotEmpty(phase_three)){
+ BigDecimal phaseThreeDeduction = calculateTotalDeduction(phase_three);
+ DemeritRecord demeritRecordPhaseThree = buildDemeritRecord(
+ ConstructionTypeEnum.PHASE_THREE.name(),
+ phaseThreeDeduction,
+ areaDeptEnum.getDeptId());
+ demeritRecords.add(demeritRecordPhaseThree);
+ }else {
+ DemeritRecord phaseThreeDeduction = buildDemeritRecord(
+ ConstructionTypeEnum.PHASE_THREE.name(),
+ BigDecimal.ZERO,
+ areaDeptEnum.getDeptId());
+ demeritRecords.add(phaseThreeDeduction);
+ }
+ if (CollectionUtils.isNotEmpty(phase_fourth)){
+ BigDecimal phaseFourthDeduction = calculateTotalDeduction(phase_fourth);
+ DemeritRecord demeritRecordPhaseFourth = buildDemeritRecord(
+ ConstructionTypeEnum.PHASE_FOURTH.name(),
+ phaseFourthDeduction,
+ areaDeptEnum.getDeptId());
+ demeritRecords.add(demeritRecordPhaseFourth);
+ }else{
+ DemeritRecord phaseFourthDeduction = buildDemeritRecord(
+ ConstructionTypeEnum.PHASE_FOURTH.name(),
+ BigDecimal.ZERO,
+ areaDeptEnum.getDeptId());
+ demeritRecords.add(phaseFourthDeduction);
+ }
+
+ }
+
+
+
+ }
+
+ //澶勭悊瀹屾暟鎹彃鍏ユ暟鎹簱涓�
+ //鍏堝垹闄ら渶瑕佹彃鍏ユ椂闂存槸鍚﹀瓨鍦ㄦ暟鎹�
+
+ LambdaQueryWrapper<DemeritRecord> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.ge(DemeritRecord::getCreateTime,DateUtils.getDayStart(today))
+ .le(DemeritRecord::getCreateTime,DateUtils.getDayEnd(today));
+ demeritRecordService.remove(queryWrapper);
+ demeritRecordService.saveBatch(demeritRecords);
+
+ log.info("缁撴潫璁＄畻姣忔棩鎵ｅ垎璁板綍鎯呭喌锛氭彃鍏ユ暟鎹噺{},鏁版嵁淇℃伅:{}",demeritRecords.size(),demeritRecords);
+
+ }
+}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DemeritREcordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DemeritREcordMapper.xml
new file mode 100644
index 0000000..6382d56
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DemeritREcordMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.platform.mapper.DemeritRecordMapper">
+ <resultMap type="com.ycl.platform.domain.vo.screen.DemeritRecordVO" id="baseResult">
+ <result property="id" column="id"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="demerit" column="demerit"/>
+ <result property="createTime" column="create_time"/>
+ <result property="constructionType" column="construction_type"/>
+ </resultMap>
+
+
+ <select id="getPage" resultMap="baseResult">
+ select
+ ter.id,
+ ter.dept_id,
+ ter.create_time,
+ ter.construction_type,
+ ter.demerit
+ from t_demerit_record ter where ter.deleted = 0
+ <if test="query.deptId != null and query.deptId != ''">
+ AND ter.dept_id = #{query.deptId}
+ </if>
+ <if test="query.constructionType != null and query.constructionType != ''">
+ AND ter.construction_type = #{query.constructionType}
+ </if>
+ <!-- 鏃堕棿鑼冨洿绛涢�夛細鎸夋棩鏌ヨ -->
+ <if test="query.searchType == 'day' and query.dayDate != null">
+ AND ter.create_time >= #{query.dayDate} <!-- 褰撳ぉ00:00:00 -->
+ AND ter.create_time <DATE_ADD(#{query.dayDate}, INTERVAL 1 DAY) <!-- 娆℃棩00:00:00锛堜笉鍖呭惈锛� -->
+ </if>
+ <!-- 鏃堕棿鑼冨洿绛涢�夛細鎸夋湀鏌ヨ -->
+ <if test="query.searchType == 'month' and query.monthDate != null">
+ AND ter.create_time >= #{query.monthDate} <!-- 褰撴湀1鏃�00:00:00 -->
+ AND ter.create_time <DATE_ADD(LAST_DAY(#{query.monthDate}), INTERVAL 1 DAY) <!-- 涓嬫湀1鏃�00:00:00锛堜笉鍖呭惈锛� -->
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 4d3f316..c35f26a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -166,7 +166,25 @@
<if test="cameraDept != null and cameraDept != ''">and camera_dept = #{cameraDept}</if>
<if test="hybm != null and hybm != ''">and hybm = #{hybm}</if>
<if test="lxbm != null ">and lxbm = #{lxbm}</if>
-<!-- <if test="recovery != null ">and p.recovery = #{recovery}</if>-->
+ <if test="constructionType != null and constructionType != ''">
+ <choose>
+ <when test="constructionType == 'PHASE_ONE_TWO'">
+ and m.name LIKE 'DX_%'
+ </when>
+ <when test="constructionType == 'PHASE_THREE'">
+ and m.name LIKE 'LT_%'
+ </when>
+
+ <when test="constructionType == 'PHASE_FOURTH'">
+ and (
+ m.name LIKE 'DX_R%'
+ OR
+ m.name LIKE 'DX_RS%'
+ )
+ </when>
+ </choose>
+ </if>
+
${params.dataScope}
</where>
</select>
@@ -417,6 +435,23 @@
<if test="address != null">
and p.dept_id = #{address}
</if>
+ <if test="constructionType != null and constructionType != ''">
+ <choose>
+ <when test="constructionType == 'PHASE_ONE_TWO'">
+ and m.name LIKE 'DX_%'
+ </when>
+ <when test="constructionType == 'PHASE_THREE'">
+ and m.name LIKE 'LT_%'
+ </when>
+ <when test="constructionType == 'PHASE_FOURTH'">
+ and (
+ m.name LIKE 'DX_R%'
+ OR
+ m.name LIKE 'DX_RS%'
+ )
+ </when>
+ </choose>
+ </if>
${params.dataScope}
</where>
</select>
--
Gitblit v1.8.0