From f0a6462c539e217186d6fee31dfec6d2aba2e92a Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 22 四月 2025 09:09:32 +0800
Subject: [PATCH] 点位在线率
---
ycl-common/src/main/java/constant/PointOnlineHeaders.java | 14 +
ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java | 19 +
ycl-server/src/main/java/com/ycl/utils/MongoUtil.java | 12 +
ycl-common/src/main/java/constant/TableNameConstants.java | 12 +
ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java | 2
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 386 +++++++++++++++++++++++++++++++++++++++++++++---
ycl-common/src/main/java/constant/RecordingAvailabilityHeaders.java | 2
ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java | 17 +
ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java | 7
9 files changed, 435 insertions(+), 36 deletions(-)
diff --git a/ycl-common/src/main/java/constant/PointOnlineHeaders.java b/ycl-common/src/main/java/constant/PointOnlineHeaders.java
new file mode 100644
index 0000000..9d3e974
--- /dev/null
+++ b/ycl-common/src/main/java/constant/PointOnlineHeaders.java
@@ -0,0 +1,14 @@
+package constant;
+
+public class PointOnlineHeaders {
+ public static final String no = "鍥芥爣鐮�";
+ public static final String name = "璁惧鍚�";
+ public static final String ip = "IP";
+ public static final String onlineStr = "璁惧鐘舵��";
+ public static final String pingOnlineStr = "鏈�杩慞ing鐩戞祴鐘舵��";
+ public static final String checkCount = "褰撴棩鐩戞祴娆℃暟";
+ public static final String offLineCount = "褰撴棩绂荤嚎娆℃暟";
+ public static final String offLineTimeStr = "绂荤嚎鏃堕棿鐐�";
+ public static final String mongoCreateTime = "鐩戞祴鏃堕棿";
+
+}
diff --git a/ycl-common/src/main/java/constant/RecordingAvailability.java b/ycl-common/src/main/java/constant/RecordingAvailabilityHeaders.java
similarity index 92%
rename from ycl-common/src/main/java/constant/RecordingAvailability.java
rename to ycl-common/src/main/java/constant/RecordingAvailabilityHeaders.java
index 1dbfd35..f0717dc 100644
--- a/ycl-common/src/main/java/constant/RecordingAvailability.java
+++ b/ycl-common/src/main/java/constant/RecordingAvailabilityHeaders.java
@@ -1,6 +1,6 @@
package constant;
-public class RecordingAvailability {
+public class RecordingAvailabilityHeaders {
public final static String arealayername = "琛屾斂鍖哄煙";
public final static String arealayerno = "琛屾斂鍖哄煙ID";
diff --git a/ycl-common/src/main/java/constant/TableNameConstants.java b/ycl-common/src/main/java/constant/TableNameConstants.java
new file mode 100644
index 0000000..d325259
--- /dev/null
+++ b/ycl-common/src/main/java/constant/TableNameConstants.java
@@ -0,0 +1,12 @@
+package constant;
+
+import lombok.Data;
+
+@Data
+public class TableNameConstants {
+ public final static String COLUMN_NAME_VIDEO = "uy_record_meta_d_sum";
+ public final static String COLUMN_NAME_FACE_POINT = "t_monitor_online_FACE";
+
+ public final static String COLUMN_NAME_CAR_POINT = "t_monitor_online_CAR";
+ public final static String COLUMN_NAME_VIDEO_POINT = "t_monitor_online_VIDEO";
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index d7527f6..615996a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -199,12 +199,23 @@
dataCenterService.recordingAvailabilityExport(response, query);
}
- @PostMapping("/pointOnline/export")
- public void pointOnlineExport(HttpServletResponse response,DataCenterQuery query) throws IOException {
+ @PostMapping("/pointOnlineVideo/export")
+ public void pointOnlineVideoExport(HttpServletResponse response,DataCenterQuery query) throws IOException {
query.setTime();
- dataCenterService.pointOnlineExport(response,query);
+ dataCenterService.pointOnlineVideoExport(response,query);
}
+ @PostMapping("/pointOnlineCar/export")
+ public void pointOnlineCarExport(HttpServletResponse response,DataCenterQuery query) throws IOException {
+ query.setTime();
+ dataCenterService.pointOnlineCarExport(response,query);
+ }
+
+ @PostMapping("/pointOnlineFace/export")
+ public void pointOnlineFaceExport(HttpServletResponse response,DataCenterQuery query) throws IOException {
+ query.setTime();
+ dataCenterService.pointOnlineFaceExport(response,query);
+ }
/**
* 瑙嗛锛氬鍑洪噸鐐圭偣浣嶆爣娉ㄦ纭巼
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
index 6ff60ac..995bad3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
@@ -2,6 +2,7 @@
import com.ycl.system.Result;
import com.ycl.system.domain.group.Add;
+import constant.TableNameConstants;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import org.springframework.validation.annotation.Validated;
@@ -13,6 +14,8 @@
import com.ycl.platform.service.DynamicColumnService;
import com.ycl.platform.domain.form.DynamicColumnForm;
import org.springframework.web.bind.annotation.*;
+
+import static constant.TableNameConstants.COLUMN_NAME_VIDEO;
/**
* 鍔ㄦ�佸垪 鍓嶇鎺у埗鍣�
@@ -69,22 +72,28 @@
return dynamicColumnService.addByTableName(tableName,form);
}
- private final static String COLUMN_NAME_VIDEO = "uy_record_meta_d_sum";
- private final static String COLUMN_NAME_POINT = "";
+
@PutMapping("/updateByTableName")
@ApiOperation(value = "淇敼", notes = "淇敼")
public Result updateByTableName(@RequestParam @NotNull(message = "璺緞鍚嶄笉鑳戒负绌�")String pathName, @RequestBody @NotEmpty(message = "鏁版嵁涓虹┖锛屾棤娉曚繚瀛�") List<DynamicColumnForm> columnList){
String tableName = getTableNameByPathNane(pathName);
+ if ("".equals(tableName)){
+ return null;
+ }
return dynamicColumnService.updateByTableName(tableName,columnList);
}
private String getTableNameByPathNane(String pathName) {
String tableName = "";
if ("褰曞儚鍙敤鐜�".equals(pathName)){
- tableName = COLUMN_NAME_VIDEO;
- }else if("鐐逛綅鍦ㄧ嚎鐜�".equals(pathName)){
- tableName = COLUMN_NAME_POINT;
+ tableName = TableNameConstants.COLUMN_NAME_VIDEO;
+ }else if("杞﹁締鐐逛綅鍦ㄧ嚎鐜�".equals(pathName)){
+ tableName = TableNameConstants.COLUMN_NAME_CAR_POINT;
+ }else if("浜鸿劯鐐逛綅鍦ㄧ嚎鐜�".equals(pathName)){
+ tableName = TableNameConstants.COLUMN_NAME_FACE_POINT;
+ }else if("瑙嗛鐐逛綅鍦ㄧ嚎鐜�".equals(pathName)){
+ tableName = TableNameConstants.COLUMN_NAME_VIDEO_POINT;
}
return tableName;
}
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 0bde438..a01b82d 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
@@ -24,7 +24,10 @@
void recordingAvailabilityExport(HttpServletResponse response,DataCenterQuery query) throws IOException;
- void pointOnlineExport(HttpServletResponse response,DataCenterQuery query) throws IOException ;
+ void pointOnlineFaceExport(HttpServletResponse response,DataCenterQuery query) throws IOException ;
+ void pointOnlineVideoExport(HttpServletResponse response, DataCenterQuery query) throws IOException;
+
+ void pointOnlineCarExport(HttpServletResponse response, DataCenterQuery query) throws IOException;
Result updateDynamicValue(UpdateDynamicValueForm form);
@@ -299,4 +302,6 @@
Result faceAvailabilityOfLargeImg(DataCenterQuery query);
Result videoImageResourceSecurity(DataCenterQuery query);
+
+
}
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 65358a2..9d9f588 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -2,8 +2,6 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -11,8 +9,6 @@
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import com.ycl.platform.domain.entity.*;
-import com.ycl.platform.domain.excel.RecordingAvailabilityExport;
-import com.ycl.platform.domain.excel.TMonitorExp;
import com.ycl.platform.domain.form.UpdateDynamicValueForm;
import com.ycl.platform.domain.query.DataCenterQuery;
import com.ycl.platform.domain.result.HK.*;
@@ -22,22 +18,17 @@
import com.ycl.platform.domain.vo.DataCenter.MonitorQualifyResultVO;
import com.ycl.platform.domain.vo.DataCenter.SnapClockVO;
import com.ycl.platform.domain.vo.DynamicColumnVO;
-import com.ycl.platform.domain.vo.PointDetailVO;
-import com.ycl.platform.domain.vo.home.HomeFaceVO;
import com.ycl.platform.mapper.DynamicColumnMapper;
import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.service.*;
import com.ycl.system.Result;
-import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import com.ycl.utils.MongoUtil;
import com.ycl.utils.StringUtils;
import com.ycl.utils.bean.BeanUtils;
import com.ycl.utils.poi.ExcelUtil;
-import constant.ApiConstants;
-import constant.CheckConstants;
-import constant.RecordingAvailability;
+import constant.*;
import enumeration.general.AreaDeptEnum;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
@@ -49,7 +40,6 @@
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.data.mongodb.core.query.TextCriteria;
import org.springframework.stereotype.Service;
import java.io.IOException;
@@ -95,28 +85,28 @@
query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
}
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
- List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName("uy_record_meta_d_sum");
//缈昏瘧琛屾斂鍖哄煙
resultList.forEach(item -> {
String areaCode = item.getArealayername().substring(0, 6);
AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
});
+ List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_VIDEO);
Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
- //鎻愰偅瀹跺浐瀹氳〃澶�
+ //鍥哄畾琛ㄥご
LinkedHashSet<String> headers = new LinkedHashSet<>();
- headers.add(RecordingAvailability.arealayername);
- headers.add(RecordingAvailability.arealayerno);
- headers.add(RecordingAvailability.createTime);
- headers.add(RecordingAvailability.deviceId);
- headers.add(RecordingAvailability.missDuration);
- headers.add(RecordingAvailability.platId);
- headers.add(RecordingAvailability.recordDuration);
- headers.add(RecordingAvailability.recordStatusText);
- headers.add(RecordingAvailability.statTime);
+ headers.add(RecordingAvailabilityHeaders.arealayername);
+ headers.add(RecordingAvailabilityHeaders.arealayerno);
+ headers.add(RecordingAvailabilityHeaders.createTime);
+ headers.add(RecordingAvailabilityHeaders.deviceId);
+ headers.add(RecordingAvailabilityHeaders.missDuration);
+ headers.add(RecordingAvailabilityHeaders.platId);
+ headers.add(RecordingAvailabilityHeaders.recordDuration);
+ headers.add(RecordingAvailabilityHeaders.recordStatusText);
+ headers.add(RecordingAvailabilityHeaders.statTime);
List<String> headersList = new LinkedList<>();
- List<String> dynamicsHeaders = dynamicColumnMapper.getHeader("uy_record_meta_d_sum");
+ List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_VIDEO);
//娣诲姞鍔ㄦ�佽〃澶�
if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) {
@@ -168,8 +158,342 @@
}
@Override
- public void pointOnlineExport(HttpServletResponse response,DataCenterQuery query) throws IOException {
+ public void pointOnlineFaceExport(HttpServletResponse response, DataCenterQuery params) throws IOException {
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ //鏌ヤ汉鑴歌澶�
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*"));
+ //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+ 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);
+ MongoUtil.setNoPage(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)) {
+ //鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟)
+ if (offLineTime.size() > 1) {
+ offLineTime = offLineTime.subList(0, 2);
+ }
+ item.setOffLineTimeStr(offLineTime);
+ }
+ });
+ List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_FACE_POINT);
+ Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
+ //鍥哄畾琛ㄥご
+ LinkedHashSet<String> headers = new LinkedHashSet<>();
+ headers.add(PointOnlineHeaders.no);
+ headers.add(PointOnlineHeaders.name);
+ headers.add(PointOnlineHeaders.ip);
+ headers.add(PointOnlineHeaders.onlineStr);
+ headers.add(PointOnlineHeaders.pingOnlineStr);
+ headers.add(PointOnlineHeaders.checkCount);
+ headers.add(PointOnlineHeaders.offLineCount);
+ headers.add(PointOnlineHeaders.offLineTimeStr);
+ headers.add(PointOnlineHeaders.mongoCreateTime);
+ List<String> headersList = new LinkedList<>();
+ List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_FACE_POINT);
+
+ //娣诲姞鍔ㄦ�佽〃澶�
+ if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) {
+ //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
+ headersList.addAll(dynamicsHeaders);
+ headers.addAll(headersList);
+ }
+
+ List<List<Object>> data = new ArrayList<>();
+ for (TMonitorResult result : resultList){
+ List<Object> row = new ArrayList<>();
+ row.add(result.getNo());
+ row.add(result.getName());
+ row.add(result.getIp());
+ row.add(result.getOnlineStr());
+ row.add(result.getPingOnlineStr());
+ row.add(result.getCheckCount());
+ row.add(result.getOffLineCount());
+ if (CollectionUtils.isEmpty(result.getOffLineTimeStr())){
+ row.add(null);
+ }else {
+ row.add(result.getOffLineTimeStr().toString());
+ }
+ row.add(result.getMongoCreateTime());
+ //娣诲姞鍔ㄦ�佸垪鏁版嵁
+ for (String header : headersList){
+ boolean flag = false;
+ List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getNo());
+ if (!CollectionUtils.isEmpty(columnVOS)) {
+ for (DynamicColumnVO columnVO : columnVOS) {
+ if (header.equals(columnVO.getLabelValue())) {
+ row.add(columnVO.getColumnValue());
+ flag = true;
+ }
+ }
+ }
+ //娌℃壘鍒扮敤绌轰覆鍗犱綅
+ if (!flag) row.add("");
+ }
+ data.add(row);
+ }
+
+ List<List<String>> headList = new ArrayList<>();
+ for (String header : headers) {
+ headList.add(Collections.singletonList(header));
+ }
+
+ EasyExcel.write(response.getOutputStream())
+ .head(headList) // 璁剧疆琛ㄥご
+ .sheet("浜鸿劯鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .doWrite(data); // 鍐欏叆鏁版嵁
+ }
+
+ @Override
+ public void pointOnlineVideoExport(HttpServletResponse response, DataCenterQuery params) throws IOException {
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query 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);
+ MongoUtil.setNoPage(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> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_VIDEO_POINT);
+ Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
+ //鍥哄畾琛ㄥご
+ LinkedHashSet<String> headers = new LinkedHashSet<>();
+ headers.add(PointOnlineHeaders.no);
+ headers.add(PointOnlineHeaders.name);
+ headers.add(PointOnlineHeaders.ip);
+ headers.add(PointOnlineHeaders.onlineStr);
+ headers.add(PointOnlineHeaders.pingOnlineStr);
+ headers.add(PointOnlineHeaders.checkCount);
+ headers.add(PointOnlineHeaders.offLineCount);
+ headers.add(PointOnlineHeaders.offLineTimeStr);
+ headers.add(PointOnlineHeaders.mongoCreateTime);
+
+ List<String> headersList = new LinkedList<>();
+ List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_VIDEO_POINT);
+
+ //娣诲姞鍔ㄦ�佽〃澶�
+ if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) {
+ //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
+ headersList.addAll(dynamicsHeaders);
+ headers.addAll(headersList);
+ }
+
+ List<List<Object>> data = new ArrayList<>();
+ for (TMonitorResult result : resultList){
+ List<Object> row = new ArrayList<>();
+ row.add(result.getNo());
+ row.add(result.getName());
+ row.add(result.getIp());
+ row.add(result.getOnlineStr());
+ row.add(result.getPingOnlineStr());
+ row.add(result.getCheckCount());
+ row.add(result.getOffLineCount());
+ if (CollectionUtils.isEmpty(result.getOffLineTimeStr())){
+ row.add(null);
+ }else {
+ row.add(result.getOffLineTimeStr().toString());
+ }
+ row.add(result.getMongoCreateTime());
+ //娣诲姞鍔ㄦ�佸垪鏁版嵁
+ for (String header : headersList){
+ boolean flag = false;
+ List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getNo());
+ if (!CollectionUtils.isEmpty(columnVOS)) {
+ for (DynamicColumnVO columnVO : columnVOS) {
+ if (header.equals(columnVO.getLabelValue())) {
+ row.add(columnVO.getColumnValue());
+ flag = true;
+ }
+ }
+ }
+ //娌℃壘鍒扮敤绌轰覆鍗犱綅
+ if (!flag) row.add("");
+ }
+ data.add(row);
+ }
+
+ List<List<String>> headList = new ArrayList<>();
+ for (String header : headers) {
+ headList.add(Collections.singletonList(header));
+ }
+
+ EasyExcel.write(response.getOutputStream())
+ .head(headList) // 璁剧疆琛ㄥご
+ .sheet("瑙嗛鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .doWrite(data); // 鍐欏叆鏁版嵁
+
+
+ }
+
+ @Override
+ public void pointOnlineCarExport(HttpServletResponse response, DataCenterQuery params) throws IOException {
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ //鏌ヨ溅杈嗚澶�
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
+ //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+ 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);
+ //鍒嗛〉鏁伴噺
+ //绯荤粺ping鐨勭粨鏋�
+ 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)) {
+ //鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟)
+ if (offLineTime.size() > 1) {
+ offLineTime = offLineTime.subList(0, 2);
+ }
+ item.setOffLineTimeStr(offLineTime);
+ }
+ });
+ List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_CAR_POINT);
+ Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
+ //鍥哄畾琛ㄥご
+ LinkedHashSet<String> headers = new LinkedHashSet<>();
+ headers.add(PointOnlineHeaders.no);
+ headers.add(PointOnlineHeaders.name);
+ headers.add(PointOnlineHeaders.ip);
+ headers.add(PointOnlineHeaders.onlineStr);
+ headers.add(PointOnlineHeaders.pingOnlineStr);
+ headers.add(PointOnlineHeaders.checkCount);
+ headers.add(PointOnlineHeaders.offLineCount);
+ headers.add(PointOnlineHeaders.offLineTimeStr);
+ headers.add(PointOnlineHeaders.mongoCreateTime);
+
+ List<String> headersList = new LinkedList<>();
+ List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_CAR_POINT);
+
+ //娣诲姞鍔ㄦ�佽〃澶�
+ if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) {
+ //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
+ headersList.addAll(dynamicsHeaders);
+ headers.addAll(headersList);
+ }
+
+ List<List<Object>> data = new ArrayList<>();
+ for (TMonitorResult result : resultList){
+ List<Object> row = new ArrayList<>();
+ row.add(result.getNo());
+ row.add(result.getName());
+ row.add(result.getIp());
+ row.add(result.getOnlineStr());
+ row.add(result.getPingOnlineStr());
+ row.add(result.getCheckCount());
+ row.add(result.getOffLineCount());
+ if (CollectionUtils.isEmpty(result.getOffLineTimeStr())){
+ row.add(null);
+ }else {
+ row.add(result.getOffLineTimeStr().toString());
+ }
+ row.add(result.getMongoCreateTime());
+ //娣诲姞鍔ㄦ�佸垪鏁版嵁
+ for (String header : headersList){
+ boolean flag = false;
+ List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getNo());
+ if (!CollectionUtils.isEmpty(columnVOS)) {
+ for (DynamicColumnVO columnVO : columnVOS) {
+ if (header.equals(columnVO.getLabelValue())) {
+ row.add(columnVO.getColumnValue());
+ flag = true;
+ }
+ }
+ }
+ //娌℃壘鍒扮敤绌轰覆鍗犱綅
+ if (!flag) row.add("");
+ }
+ data.add(row);
+ }
+
+ List<List<String>> headList = new ArrayList<>();
+ for (String header : headers) {
+ headList.add(Collections.singletonList(header));
+ }
+
+ EasyExcel.write(response.getOutputStream())
+ .head(headList) // 璁剧疆琛ㄥご
+ .sheet("杞﹁締鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .doWrite(data); // 鍐欏叆鏁版嵁
}
@Override
@@ -238,6 +562,7 @@
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("鏈煡");
@@ -260,7 +585,12 @@
}
item.setOffLineTimeStr(offLineTime);
}
+ //娣诲姞鍔ㄦ�佹暟鎹�
+ List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo());
+ item.setDynamicColumnList(list);
});
+
+
params.setDeptTag(-1);
params.setDeviceType(1);
@@ -956,7 +1286,7 @@
AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
- List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable("uy_record_meta_d_sum",item.getId());
+ List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO,item.getId());
item.setDynamicColumnList(list);
});
@@ -1712,6 +2042,9 @@
}
item.setOffLineTimeStr(offLineTime);
}
+ //娣诲姞鍔ㄦ�佹暟鎹�
+ List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_CAR_POINT,item.getNo());
+ item.setDynamicColumnList(list);
});
// 缁熻璁惧鏁伴噺
@@ -2583,6 +2916,9 @@
}
item.setOffLineTimeStr(offLineTime);
}
+ //娣诲姞鍔ㄦ�佹暟鎹�
+ List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_FACE_POINT,item.getNo());
+ item.setDynamicColumnList(list);
});
params.setDeptTag(-1);
params.setDeviceType(3);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java
index 82e0c4d..42297a4 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java
@@ -132,9 +132,11 @@
@Override
public Result removeById(String id) {
baseMapper.deleteById(id);
+ //todo 鍒犻櫎瀛楁瀵瑰簲鍊�
return Result.ok("鍒犻櫎鎴愬姛");
}
+
/**
* 鍒楄〃
* @return
diff --git a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
index 0072d2c..fb4494c 100644
--- a/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/MongoUtil.java
@@ -114,7 +114,17 @@
query.with(Sort.by(Sort.Order.desc(timeFiled))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
}
-
+ /**
+ * 鏋勯�犳暟鎹腑蹇冩悳绱㈢殑鏉′欢
+ *
+ * @param query 鏌ヨ鏉′欢
+ * @param timeFiled 鏃堕棿瀛楁鏄摢涓�涓�
+ * @param params 璇锋眰鍙傛暟
+ */
+ public static void setNoPage(Query query,DataCenterQuery params, String timeFiled) {
+ // 鎺掑簭鍒嗛〉
+ query.with(Sort.by(Sort.Order.desc(timeFiled))).skip(params.getSkipNum());
+ }
/**
* 鏋勯�犳暟鎹腑蹇冩悳绱㈢殑鏉′欢
*
--
Gitblit v1.8.0