From fea22e82e7e49691f6e0c20a29b228d0ab3173e9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 29 十月 2025 17:08:38 +0800
Subject: [PATCH] 修改问题
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 146 +++++++++++++++++++++++++++++++++---------------
1 files changed, 99 insertions(+), 47 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 e649db4..a778877 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;
@@ -41,6 +42,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.InetAddress;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
@@ -145,66 +147,87 @@
/**
* 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
- *
+ * 杩欓噷鏄剧ず褰撳ぉ鐨勬垚缁╁鏋滄病鏈夊綋澶╂垚缁╁垯鏄剧ず鏈�鍚庝竴娆℃垚缁�
* @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);
-
+ log.error("鎵撳嵃锛歿}",checkScores);
// 濡傛灉鏁版嵁涓虹┖锛屽垯鏌ヨ涔嬪墠鐨勬暟鎹�
- 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);
}
}
- //鍒嗘暟淇濈暀涓�浣嶅皬鏁�
- checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
- return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+ checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(4, RoundingMode.HALF_UP)));
+ Map<Long, List<CheckScore>> map = checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+ for (Map.Entry<Long, List<CheckScore>> entry : map.entrySet()) {
+ List<CheckScore> tempList = getCheckScores(entry);
+ // 杩唬缁撴潫鍚庯紝灏嗘柊鍏冪礌娣诲姞鍒板師濮嬪垪琛ㄤ腑
+ entry.getValue().addAll(tempList);
+ }
+ return map;
}
- 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 List<CheckScore> getCheckScores(Map.Entry<Long, List<CheckScore>> entry) {
+ List<CheckScore> tempList = new ArrayList<>(); // 涓存椂瀛樺偍闇�瑕佹坊鍔犵殑鍏冪礌
+
+ boolean hasFace = false;
+ boolean hasCar = false;
+ for (int i =0;i <entry.getValue().size();i++) {
+ CheckScore checkScore = entry.getValue().get(i);
+ if (checkScore.getExamineCategory() == 2){
+ hasCar = true;
+ }else if (checkScore.getExamineCategory() == 3){
+ hasFace = true;
+ }
}
+ if (!hasCar){
+ CheckScore car = new CheckScore();
+ car.setExamineCategory((short) 2);
+ car.setScore(new BigDecimal("0.000"));
+ tempList.add(car);
+ }
+ if (!hasFace){
+ CheckScore face = new CheckScore();
+ face.setExamineCategory((short) 3);
+ face.setScore(new BigDecimal("0.000"));
+ tempList.add(face);
+ }
+
+ return tempList;
+ }
+
+ 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 + ""));
}
/**
@@ -522,7 +545,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);
}
@@ -539,28 +566,53 @@
@Override
public Map<String, Map<String, Object>> dashboard(DashboardQuery dashboardQuery) {
Date now = new Date();
+
+// Calendar cal = Calendar.getInstance();
+//
+//// 2. 璁剧疆涓轰粖骞�10鏈�12鍙� 00:00:00锛堟竻闄ゆ椂鍒嗙锛岄伩鍏嶅綋鍓嶆椂闂村共鎵帮級
+// cal.set(Calendar.MONTH, Calendar.OCTOBER); // 10鏈堬紙鐢ㄥ父閲忔洿鐩磋锛岄伩鍏嶈0鍩猴級
+//// cal.set(Calendar.MONTH, 9); // 涔熷彲浠ョ敤鏁板瓧9锛堜笉鎺ㄨ崘锛屽彲璇绘�у樊锛�
+// cal.set(Calendar.DAY_OF_MONTH, 12); // 鏃ユ湡璁句负12鍙�
+// cal.set(Calendar.HOUR_OF_DAY, 12); // 灏忔椂璁句负0锛�24灏忔椂鍒讹級
+// cal.set(Calendar.MINUTE, 0); // 鍒嗛挓璁句负0
+// cal.set(Calendar.SECOND, 0); // 绉掕涓�0
+// cal.set(Calendar.MILLISECOND, 0); // 姣璁句负0
+//
+//// 3. 杞垚Date瀵硅薄
+// Date now = cal.getTime();
+
+
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);
+ DecimalFormat decimalFormat = new DecimalFormat("0.00%");
+ // 璁剧疆鍥涜垗浜斿叆妯″紡
+ decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
//鍒濆鍖栧悇涓尯鍘挎暟鎹�
Map<String, Map<String, Object>> resultMap = new HashMap<>();
for (AreaDeptEnum value : AreaDeptEnum.values()) {
Map<String, Object> map = new HashMap<>();
- map.put("video", 0);
- map.put("car", 0);
- map.put("face", 0);
+ map.put("video", "0.00%");
+ map.put("car","0.00%");
+ map.put("face", "0.00%");
resultMap.put(value.getName(), map);
}
//濉厖鍚勪釜鍖哄幙鏁版嵁
for (CheckScore checkScore : dashboard) {
Map<String, Object> map = resultMap.get(checkScore.getDeptName());
+ BigDecimal score = checkScore.getScore();
+ // 鏍稿績閫昏緫锛氬師濮媠core 脳10 鈫� 淇濈暀涓や綅灏忔暟 鈫� 鎷兼帴鐧惧垎鍙�
+ BigDecimal scoreMultiplied = score.multiply(new BigDecimal("100"));
+ BigDecimal scoreWithTwoDecimals = scoreMultiplied.setScale(2, RoundingMode.HALF_UP); // 淇濈暀涓や綅灏忔暟锛�46.16
+ String formattedScore = scoreWithTwoDecimals + "%"; // 鎷兼帴鐧惧垎鍙凤細46.16%
+
if (CheckConstants.Rule_Category_Video.equals(checkScore.getExamineCategory())) {
- map.put("video", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ map.put("video", formattedScore);
} else if (CheckConstants.Rule_Category_Car.equals(checkScore.getExamineCategory())) {
- map.put("car", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ map.put("car", formattedScore);
} else if (CheckConstants.Rule_Category_Face.equals(checkScore.getExamineCategory())) {
- map.put("face", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ map.put("face",formattedScore);
}
resultMap.put(checkScore.getDeptName(), map);
}
--
Gitblit v1.8.0