From 5dccf0dc687dfef1c91936af3cea06fe0609b918 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 十二月 2024 17:31:11 +0800
Subject: [PATCH] osd时间bug、离线工单bug等
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 127 +++++++++++++++++++++++++++++++++---------
1 files changed, 100 insertions(+), 27 deletions(-)
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 1ef0de4..755d7c4 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
@@ -7,6 +7,7 @@
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.excel.TMonitorExp;
import com.ycl.platform.domain.excel.VideoDailyExp;
import com.ycl.platform.domain.excel.VideoTotalExp;
import com.ycl.platform.domain.form.VideoExportForm;
@@ -40,6 +41,7 @@
import com.ycl.system.service.ISysConfigService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.StringUtils;
+import com.ycl.utils.poi.ExcelUtil;
import constant.ApiConstants;
import constant.CheckConstants;
import enumeration.general.AreaDeptEnum;
@@ -134,7 +136,7 @@
for (TMonitorVO monitor : monitors) {
if (!CollectionUtils.isEmpty(voList)) {
for (WorkOrderVO workOrderVO : voList) {
- if (monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
+ if (monitor.getWorkOrderNo() != null && monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
monitor.setUnitContact(workOrderVO.getUnitContact());
monitor.setUnitContactPhone(workOrderVO.getUnitContactPhone());
monitor.setYwPeopleName(workOrderVO.getYwPeopleName());
@@ -416,7 +418,7 @@
@Override
public void exportVideoTotal(HttpServletResponse response, VideoExportForm exportForm) throws IOException {
//榛樿鏌ユ墍鏈夐儴闂�
- if(CollectionUtils.isEmpty(exportForm.getDeptIds())){
+ if (CollectionUtils.isEmpty(exportForm.getDeptIds())) {
List<Integer> deptIds = new ArrayList<>();
for (AreaDeptEnum value : AreaDeptEnum.values()) {
deptIds.add(value.getDeptId());
@@ -464,7 +466,7 @@
long count = onlines.stream()
.filter(item -> ApiConstants.UY_OnlineSite_Online.equals(item.getOnline()))
.count();
- videoExp.setOnline(Integer.valueOf(count+""));
+ videoExp.setOnline(Integer.valueOf(count + ""));
videoExp.setOffline(videoExp.getTotal() - videoExp.getOnline());
}
//璁剧疆瀛樺偍鎯呭喌
@@ -509,7 +511,7 @@
@Override
public void exportVideoOnline(HttpServletResponse response, VideoExportForm exportForm) throws IOException, NoSuchFieldException, IllegalAccessException {
//榛樿鏌ユ墍鏈夐儴闂�
- if(CollectionUtils.isEmpty(exportForm.getDeptIds())){
+ if (CollectionUtils.isEmpty(exportForm.getDeptIds())) {
List<Integer> deptIds = new ArrayList<>();
for (AreaDeptEnum value : AreaDeptEnum.values()) {
deptIds.add(value.getDeptId());
@@ -524,7 +526,7 @@
List<Integer> pointIds = tMonitorResults.stream().map(TMonitorResult::getPointId).collect(Collectors.toList());
List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
//琛ュ厖鍔ㄦ�佸垪鏁版嵁
- if(!CollectionUtils.isEmpty(dynamics)) {
+ if (!CollectionUtils.isEmpty(dynamics)) {
Map<Integer, List<DynamicColumnVO>> map = dynamics.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
for (TMonitorResult tMonitorResult : tMonitorResults) {
Integer pointId = tMonitorResult.getPointId();
@@ -553,7 +555,7 @@
videoDailyExp.setArea(areaDeptEnum == null ? "鏈煡" : areaDeptEnum.getName());
StringBuilder tag = new StringBuilder("" + (result.getProvinceTag() ? "鐪佸巺銆�" : "") + (result.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") + (result.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") + (result.getDeptTag() ? "閮ㄧ骇銆�" : ""));
//鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
- if(!CollectionUtils.isEmpty(result.getDynamicColumnList())){
+ if (!CollectionUtils.isEmpty(result.getDynamicColumnList())) {
List<DynamicColumnVO> dynamicColumnList = result.getDynamicColumnList();
for (DynamicColumnVO dynamicColumnVO : dynamicColumnList) {
tag.append(dynamicColumnVO.getColumnValue()).append("銆�");
@@ -585,7 +587,7 @@
@Override
public void exportVideoRecord(HttpServletResponse response, VideoExportForm exportForm) throws IOException, NoSuchFieldException, IllegalAccessException {
//榛樿鏌ユ墍鏈夐儴闂�
- if(CollectionUtils.isEmpty(exportForm.getDeptIds())){
+ if (CollectionUtils.isEmpty(exportForm.getDeptIds())) {
List<Integer> deptIds = new ArrayList<>();
for (AreaDeptEnum value : AreaDeptEnum.values()) {
deptIds.add(value.getDeptId());
@@ -600,7 +602,7 @@
List<Integer> pointIds = tMonitorResults.stream().map(TMonitorResult::getPointId).collect(Collectors.toList());
List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
//琛ュ厖鍔ㄦ�佸垪鏁版嵁
- if(!CollectionUtils.isEmpty(dynamics)) {
+ if (!CollectionUtils.isEmpty(dynamics)) {
Map<Integer, List<DynamicColumnVO>> map = dynamics.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
for (TMonitorResult tMonitorResult : tMonitorResults) {
Integer pointId = tMonitorResult.getPointId();
@@ -608,7 +610,16 @@
}
}
List<String> deviceIds = tMonitorResults.stream().map(BaseResult::getNo).collect(Collectors.toList());
- Query query = getQuery(deviceIds, exportForm.getMonth());
+ // 灏嗗勾鏈堝瓧绗︿覆瑙ｆ瀽涓篩earMonth瀵硅薄
+ YearMonth yearMonth = YearMonth.parse(exportForm.getMonth());
+ // 鑾峰彇褰撴湀鐨勭涓�澶�
+ LocalDate start = yearMonth.atDay(1);
+ // 鑾峰彇涓嬩釜鏈堢殑绗竴澶╋紙閫氳繃鍔犱笂1涓湀骞惰缃棩涓�1锛�
+ YearMonth nextMonth = yearMonth.plusMonths(1);
+ LocalDate end = nextMonth.atDay(1);
+ //鑾峰彇杩欎釜鏈堜唤鐨勯儴闂ㄦ暟鎹紝褰曞儚鐢变簬鏄墠涓�澶╃殑鎵�浠ヤ笉鐢╟reateTime瀛楁
+ Query query = new Query(Criteria.where("statTime").gte(start).lt(end));
+ query.addCriteria(Criteria.where("no").in(deviceIds));
//鏈堜唤姣忔棩褰曞儚绾挎暟鎹�
List<RecordMetaDSumResult> recordResult = mongoTemplate.find(query, RecordMetaDSumResult.class);
//鍏ㄩ噺琛�
@@ -629,7 +640,7 @@
videoDailyExp.setArea(areaDeptEnum == null ? "鏈煡" : areaDeptEnum.getName());
StringBuilder tag = new StringBuilder("" + (result.getProvinceTag() ? "鐪佸巺銆�" : "") + (result.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") + (result.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") + (result.getDeptTag() ? "閮ㄧ骇銆�" : ""));
//鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
- if(!CollectionUtils.isEmpty(result.getDynamicColumnList())){
+ if (!CollectionUtils.isEmpty(result.getDynamicColumnList())) {
List<DynamicColumnVO> dynamicColumnList = result.getDynamicColumnList();
for (DynamicColumnVO dynamicColumnVO : dynamicColumnList) {
tag.append(dynamicColumnVO.getColumnValue()).append("銆�");
@@ -661,7 +672,7 @@
@Override
public void exportVideoLoseTime(HttpServletResponse response, VideoExportForm exportForm) throws NoSuchFieldException, IllegalAccessException, IOException {
//榛樿鏌ユ墍鏈夐儴闂�
- if(CollectionUtils.isEmpty(exportForm.getDeptIds())){
+ if (CollectionUtils.isEmpty(exportForm.getDeptIds())) {
List<Integer> deptIds = new ArrayList<>();
for (AreaDeptEnum value : AreaDeptEnum.values()) {
deptIds.add(value.getDeptId());
@@ -676,7 +687,7 @@
List<Integer> pointIds = tMonitorResults.stream().map(TMonitorResult::getPointId).collect(Collectors.toList());
List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
//琛ュ厖鍔ㄦ�佸垪鏁版嵁
- if(!CollectionUtils.isEmpty(dynamics)) {
+ if (!CollectionUtils.isEmpty(dynamics)) {
Map<Integer, List<DynamicColumnVO>> map = dynamics.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
for (TMonitorResult tMonitorResult : tMonitorResults) {
Integer pointId = tMonitorResult.getPointId();
@@ -684,7 +695,16 @@
}
}
List<String> deviceIds = tMonitorResults.stream().map(BaseResult::getNo).collect(Collectors.toList());
- Query query = getQuery(deviceIds, exportForm.getMonth());
+ // 灏嗗勾鏈堝瓧绗︿覆瑙ｆ瀽涓篩earMonth瀵硅薄
+ YearMonth yearMonth = YearMonth.parse(exportForm.getMonth());
+ // 鑾峰彇褰撴湀鐨勭涓�澶�
+ LocalDate start = yearMonth.atDay(1);
+ // 鑾峰彇涓嬩釜鏈堢殑绗竴澶╋紙閫氳繃鍔犱笂1涓湀骞惰缃棩涓�1锛�
+ YearMonth nextMonth = yearMonth.plusMonths(1);
+ LocalDate end = nextMonth.atDay(1);
+ //鑾峰彇杩欎釜鏈堜唤鐨勯儴闂ㄦ暟鎹紝褰曞儚鐢变簬鏄墠涓�澶╃殑鎵�浠ヤ笉鐢╟reateTime瀛楁
+ Query query = new Query(Criteria.where("statTime").gte(start).lt(end));
+ query.addCriteria(Criteria.where("no").in(deviceIds));
//鏈堜唤姣忔棩褰曞儚绾挎暟鎹�
List<RecordMetaDSumResult> recordResult = mongoTemplate.find(query, RecordMetaDSumResult.class);
//鍏ㄩ噺琛�
@@ -705,7 +725,7 @@
videoDailyExp.setArea(areaDeptEnum == null ? "鏈煡" : areaDeptEnum.getName());
StringBuilder tag = new StringBuilder("" + (result.getProvinceTag() ? "鐪佸巺銆�" : "") + (result.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") + (result.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") + (result.getDeptTag() ? "閮ㄧ骇銆�" : ""));
//鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
- if(!CollectionUtils.isEmpty(result.getDynamicColumnList())){
+ if (!CollectionUtils.isEmpty(result.getDynamicColumnList())) {
List<DynamicColumnVO> dynamicColumnList = result.getDynamicColumnList();
for (DynamicColumnVO dynamicColumnVO : dynamicColumnList) {
tag.append(dynamicColumnVO.getColumnValue()).append("銆�");
@@ -760,7 +780,7 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
Integer examineTag = monitorQuery.getExamineTag();
- Document matchConditions = new Document("mongoCreateTime", new Document("$gte", startDate).append("$lte", endDate));
+ Document matchConditions = new Document("statTime", new Document("$gte", startDate).append("$lte", endDate));
// 鏍规嵁examineTag鐨勫�煎姩鎬佹坊鍔犻澶栫殑鏉′欢
if (examineTag != null && examineTag.equals(1)) {
matchConditions.append("provinceTag", true);
@@ -770,7 +790,7 @@
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
new Document("$match", matchConditions),
- new Document("$group", new Document("_id", "$mongoCreateTime")
+ new Document("$group", new Document("_id", "$statTime")
.append("normalCount", new Document("$sum",
new Document("$cond", Arrays.asList(
new Document("$eq", Arrays.asList("$recordStatus", 1)),
@@ -815,7 +835,7 @@
new Document("$group", new Document("_id", "$mongoCreateTime")
.append("onlineCount", new Document("$sum",
new Document("$cond", Arrays.asList(
- new Document("$eq", Arrays.asList("$online",ApiConstants.UY_OnlineSite_Online)),
+ new Document("$eq", Arrays.asList("$online", ApiConstants.UY_OnlineSite_Online)),
1,
0
))
@@ -847,6 +867,60 @@
resultMap.put("baseLine", Integer.valueOf(sysDictData.getDictValue()));
}
return resultMap;
+ }
+
+ /**
+ * 鍒楄〃瀵煎嚭
+ *
+ * @param response
+ * @param tMonitor
+ */
+ @Override
+ public void export(HttpServletResponse response, TMonitorVO tMonitor) {
+ List<TMonitorExp> monitors = tMonitorMapper.exportTMonitorList(tMonitor);
+ //鑾峰彇鍔ㄦ�佸垪鏁版嵁
+ List<Integer> pointIds = monitors.stream().map(TMonitorExp::getPointId).collect(Collectors.toList());
+ List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
+ //琛ュ厖鍔ㄦ�佸垪鏁版嵁
+ if (!CollectionUtils.isEmpty(dynamics)) {
+ Map<Integer, List<DynamicColumnVO>> map = dynamics.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
+ for (TMonitorExp tMonitorResult : monitors) {
+ Integer pointId = tMonitorResult.getPointId();
+ tMonitorResult.setDynamicColumnList(map.get(pointId));
+ }
+ }
+ monitors.forEach(monitor -> {
+ String cameraFunType = monitor.getCameraFunType();
+ if (!StringUtils.isEmpty(cameraFunType)) {
+ String video = cameraFunType.replaceAll("1", "瑙嗛");
+ String car = video.replaceAll("2", "杞﹁締");
+ String type = car.replaceAll("3", "浜鸿劯");
+ monitor.setCameraFunType(type);
+ }
+ StringBuilder tag = new StringBuilder("" + (monitor.getProvinceTagVideo() ? "鐪佸巺瑙嗛銆�" : "") + (monitor.getProvinceTagCar() ? "鐪佸巺杞﹁締銆�" : "")+ (monitor.getProvinceTagFace() ? "鐪佸巺浜鸿劯銆�" : "")+ (monitor.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") + (monitor.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") + (monitor.getDeptTag() ? "閮ㄧ骇銆�" : ""));
+ //鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
+ if (!CollectionUtils.isEmpty(monitor.getDynamicColumnList())) {
+ List<DynamicColumnVO> dynamicColumnList = monitor.getDynamicColumnList();
+ for (DynamicColumnVO dynamicColumnVO : dynamicColumnList) {
+ tag.append(dynamicColumnVO.getColumnValue()).append("銆�");
+ }
+ }
+ // 鍒犻櫎瀛楃涓叉湯灏剧殑鈥溿�佲��
+ if (tag.toString().endsWith("銆�")) {
+ tag = new StringBuilder(tag.substring(0, tag.length() - 1));
+ }
+ monitor.setTag(tag.toString());
+ });
+ ExcelUtil<TMonitorExp> util = new ExcelUtil<>(TMonitorExp.class);
+ String sheetName = "";
+ if("1".equals(tMonitor.getCameraFunType())){
+ sheetName = "瑙嗛";
+ }else if("2".equals(tMonitor.getCameraFunType())){
+ sheetName = "杞﹁締";
+ }else if("3".equals(tMonitor.getCameraFunType())){
+ sheetName = "浜鸿劯";
+ }
+ util.exportExcel(response, monitors,sheetName);
}
@@ -902,7 +976,6 @@
results.add(homecarVO);
}
- //TODO锛氬湪绾夸慨鏀癸紝闇�瑕佹妸妫�娴嬫捣搴蜂紭浜戞娴嬬殑缁撴灉瀛樺叆mongo锛宮ongo鏌ョ偣浣嶅湪绾�
MongoCollection<Document> onlineCollection = database.getCollection("t_monitor_online");
// 鏋勫缓鍩烘湰鐨�$match鏉′欢
List<Document> onlineMatch = new ArrayList<>();
@@ -917,7 +990,7 @@
new Document("$group", new Document("_id", "$mongoCreateTime")
.append("onlineCount", new Document("$sum",
new Document("$cond", Arrays.asList(
- new Document("$eq", Arrays.asList("$online",ApiConstants.UY_OnlineSite_Online)),
+ new Document("$eq", Arrays.asList("$online", ApiConstants.UY_OnlineSite_Online)),
1,
0
))
@@ -1105,12 +1178,12 @@
for (TMonitorResult monitorResult : onlineResult) {
int dayOfMonth = monitorResult.getMongoCreateTime().getDayOfMonth();
String online = "";
- if(ApiConstants.UY_OnlineSite_Online.equals(monitorResult.getOnline())){
- online +="鍦ㄧ嚎";
- }else if(ApiConstants.UY_OnlineSite_Offline.equals(monitorResult.getOnline())){
- online +="绂荤嚎";
- }else {
- online +="鏈煡";
+ if (ApiConstants.UY_OnlineSite_Online.equals(monitorResult.getOnline())) {
+ online += "鍦ㄧ嚎";
+ } else if (ApiConstants.UY_OnlineSite_Offline.equals(monitorResult.getOnline())) {
+ online += "绂荤嚎";
+ } else {
+ online += "鏈煡";
}
//鍙嶅皠璧嬪�硷紝瀛楁缁熶竴瀹氫箟涓篸ay+1锛�2锛�3...
Field field = videoDailyExp.getClass().getDeclaredField("day" + dayOfMonth);
@@ -1124,7 +1197,7 @@
//涓�涓澶囧綋鏈堝湪绾挎儏鍐�
List<RecordMetaDSumResult> recordResults = records.stream().filter(online -> online.getNo().equals(result.getNo())).collect(Collectors.toList());
for (RecordMetaDSumResult recordResult : recordResults) {
- int dayOfMonth = recordResult.getMongoCreateTime().getDayOfMonth();
+ int dayOfMonth = DateUtils.getDayOfMonth(recordResult.getStatTime());
Integer status = recordResult.getRecordStatus();
String text = "";
if (ApiConstants.UY_RecordStatus_Interval.equals(status)) {
@@ -1146,7 +1219,7 @@
//涓�涓澶囧綋鏈堝湪绾挎儏鍐�
List<RecordMetaDSumResult> recordResults = records.stream().filter(online -> online.getNo().equals(result.getNo())).collect(Collectors.toList());
for (RecordMetaDSumResult recordResult : recordResults) {
- int dayOfMonth = recordResult.getMongoCreateTime().getDayOfMonth();
+ int dayOfMonth = DateUtils.getDayOfMonth(recordResult.getStatTime());
//鍙嶅皠璧嬪�硷紝瀛楁缁熶竴瀹氫箟涓篸ay+1锛�2锛�3...
Field field = videoDailyExp.getClass().getDeclaredField("day" + dayOfMonth);
field.setAccessible(true);
--
Gitblit v1.8.0