From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 15:51:13 +0800
Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 102 ++++++++++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 53 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index 82c2ad2..57a706f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -30,6 +30,7 @@
import enumeration.general.PublishType;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -145,33 +146,35 @@
/**
* 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
- *
+ * 杩欓噷鏄剧ず褰撳ぉ鐨勬垚缁╁鏋滄病鏈夊綋澶╂垚缁╁垯鏄剧ず鏈�鍚庝竴娆℃垚缁�
* @param checkScore 鑰冩牳绉垎
* @return 鑰冩牳绉垎
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
- public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore) {
+ public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore query) {
+ CheckScore checkScore = new CheckScore();
+ BeanUtils.copyProperties(query,checkScore);
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
- // 鑾峰彇鏁版嵁鏃ユ湡鏃堕棿
- Calendar calendar = Calendar.getInstance();
- getCheckScore(checkScore, calendar);
+ // 杞崲鏁版嵁鏃ユ湡鏃堕棿銆佹爣绛�
+ getCheckScore(checkScore);
- // 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
- if (LocalDateTime.now().getDayOfMonth() == 1) {
- calendar.add(Calendar.DAY_OF_MONTH, -1);
- }
+// // 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
+// if (LocalDateTime.now().getDayOfMonth() == 1) {
+// calendar.add(Calendar.DAY_OF_MONTH, -1);
+// }
List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore);
// 濡傛灉鏁版嵁涓虹┖锛屽垯鏌ヨ涔嬪墠鐨勬暟鎹�
- if (checkScores.isEmpty()) {
+ if (CollectionUtils.isEmpty(checkScores) && (query.getStartDate() ==null || query.getStartDate() ==null)) {
CheckScore one = scoreMapper.getLast(checkScore);
if (Objects.nonNull(one)) {
- calendar.setTime(one.getCreateTime());
- getCheckScore(checkScore, calendar);
+ checkScore.setStartDate(one.getCreateTime());
+ checkScore.setEndDate(one.getCreateTime());
+ getCheckScore(checkScore);
checkScores = scoreMapper.selectCheckScoreMap(checkScore);
}
}
@@ -180,25 +183,16 @@
return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
- private void getCheckScore(CheckScore checkScore, Calendar calendar) {
- // 0.鐪佸巺鏈堝害 1.鐪佸巺瀛ｅ害 2.甯傚眬鏈堝害 3.甯傚眬瀛ｅ害 4.鍏畨閮ㄦ湀搴� 5.鍏畨閮ㄥ搴�
- switch (checkScore.getExamineTag()) {
- case 0, 2 ,4:
- checkScore.setEndDate(calendar.getTime());
- calendar.set(Calendar.DAY_OF_MONTH, 1);
- checkScore.setStartDate(calendar.getTime());
- if(checkScore.getExamineTag() == 0) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
- if(checkScore.getExamineTag() == 2) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
- if(checkScore.getExamineTag() == 4) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
- break;
- case 1, 3, 5:
- checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime());
- checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime());
- if(checkScore.getExamineTag() == 1) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
- if(checkScore.getExamineTag() == 3) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
- if(checkScore.getExamineTag() == 5) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
- break;
- }
+ private void getCheckScore(CheckScore checkScore) {
+ checkScore.setStartDate(DateUtils.getDayStart(checkScore.getStartDate()));
+ checkScore.setEndDate(DateUtils.getDayEnd(checkScore.getEndDate()));
+ // 0.鐪佸巺 1.甯傚眬 2.鍏畨閮�
+ if (checkScore.getExamineTag() == 0)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province + ""));
+ if (checkScore.getExamineTag() == 1)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County + ""));
+ if (checkScore.getExamineTag() == 2)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept + ""));
}
/**
@@ -305,15 +299,15 @@
@Override
public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
//娌℃湁鏍囩榛樿鍏ㄥ
- if(CollectionUtils.isEmpty(exportDTO.getExamineTags())){
- exportDTO.setExamineTags(Arrays.asList(0,1,2));
+ if (CollectionUtils.isEmpty(exportDTO.getExamineTags())) {
+ exportDTO.setExamineTags(Arrays.asList(0, 1, 2));
}
/** 瀵间笁寮爏heet */
//杞﹁締
List<CheckIndexCar> checkIndexCars = new ArrayList<>();
//杞﹁締鍜屼汉鑴告病鏈夊叕瀹夐儴
for (Integer examineTag : exportDTO.getExamineTags()) {
- if(examineTag ==2) continue;
+ if (examineTag == 2) continue;
CheckIndexCar checkIndexCar = new CheckIndexCar();
// checkIndexCar.setDate(date);
checkIndexCar.setQuarter(exportDTO.getQuarter());
@@ -322,9 +316,7 @@
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexCar);
checkIndexCar.setExamineTag(Short.valueOf(examineTag + ""));
- if (examineTag == 0) {
- checkIndexCar.setProvinceTag(Boolean.TRUE);
- }
+
checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar));
}
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -363,7 +355,7 @@
//浜鸿劯
List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
for (Integer examineTag : exportDTO.getExamineTags()) {
- if(examineTag ==2) continue;
+ if (examineTag == 2) continue;
CheckIndexFace checkIndexFace = new CheckIndexFace();
// checkIndexFace.setDate(date);
checkIndexFace.setQuarter(exportDTO.getQuarter());
@@ -372,9 +364,6 @@
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexFace);
checkIndexFace.setExamineTag(Short.valueOf(examineTag + ""));
- if (examineTag == 0) {
- checkIndexFace.setProvinceTag(Boolean.TRUE);
- }
checkIndexFaces.addAll(indexFaceService.selectCheckIndexFaceList(checkIndexFace));
}
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -421,12 +410,6 @@
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexVideo);
checkIndexVideo.setExamineTag(Short.valueOf(examineTag + ""));
- if (examineTag == 0) {
- checkIndexVideo.setProvinceTag(Boolean.TRUE);
- }else if(examineTag ==2){
- //鍙湁瑙嗛鏈夊叕瀹夐儴鏁版嵁
- checkIndexVideo.setDeptTag(Boolean.TRUE);
- }
checkIndexVideos.addAll(indexVideoService.selectCheckIndexVideoList(checkIndexVideo));
}
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -527,7 +510,11 @@
@Override
public List<Map<String, Object>> home() {
- return baseMapper.home();
+ Date now = new Date();
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DATE, -7);
+ Date startTime = calendar.getTime();
+ return baseMapper.home(startTime,now);
}
@@ -544,20 +531,29 @@
@Override
public Map<String, Map<String, Object>> dashboard(DashboardQuery dashboardQuery) {
Date now = new Date();
- dashboardQuery.setStartTime(DateUtils.getMouthStart(now));
- dashboardQuery.setEndTime(DateUtils.getMouthEnd(now));
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ dashboardQuery.setStartTime(format.format(DateUtils.getDayStart(now)));
+ dashboardQuery.setEndTime(format.format(DateUtils.getDayEnd(now)));
List<CheckScore> dashboard = scoreMapper.dashboard(dashboardQuery);
//鍒濆鍖栧悇涓尯鍘挎暟鎹�
Map<String, Map<String, Object>> resultMap = new HashMap<>();
for (AreaDeptEnum value : AreaDeptEnum.values()) {
Map<String, Object> map = new HashMap<>();
- map.put("score", 0);
+ map.put("video", 0);
+ map.put("car", 0);
+ map.put("face", 0);
resultMap.put(value.getName(), map);
}
//濉厖鍚勪釜鍖哄幙鏁版嵁
for (CheckScore checkScore : dashboard) {
- Map<String, Object> map = new HashMap<>();
- map.put("score", checkScore.getScore().setScale(1,RoundingMode.HALF_UP));
+ Map<String, Object> map = resultMap.get(checkScore.getDeptName());
+ if (CheckConstants.Rule_Category_Video.equals(checkScore.getExamineCategory())) {
+ map.put("video", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ } else if (CheckConstants.Rule_Category_Car.equals(checkScore.getExamineCategory())) {
+ map.put("car", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ } else if (CheckConstants.Rule_Category_Face.equals(checkScore.getExamineCategory())) {
+ map.put("face", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ }
resultMap.put(checkScore.getDeptName(), map);
}
return resultMap;
--
Gitblit v1.8.0