From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 517 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 434 insertions(+), 83 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 84cdd90..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
@@ -1,38 +1,52 @@
package com.ycl.platform.service.impl;
import annotation.DataScope;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.base.CheckIndex;
+import com.ycl.platform.domain.dto.CheckResultExportDTO;
import com.ycl.platform.domain.dto.CheckScoreDTO;
import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
import com.ycl.platform.domain.dto.ScoreIndexDTO;
import com.ycl.platform.domain.entity.*;
-import com.ycl.platform.domain.vo.CheckScoreDetailVO;
-import com.ycl.platform.mapper.CheckRuleMapper;
-import com.ycl.platform.mapper.CheckScoreMapper;
-import com.ycl.platform.mapper.CheckTemplateMapper;
-import com.ycl.platform.mapper.CheckTemplateRuleMapper;
+import com.ycl.platform.domain.query.DashboardQuery;
+import com.ycl.platform.domain.vo.*;
+import com.ycl.platform.mapper.*;
import com.ycl.platform.service.ICheckIndexCarService;
import com.ycl.platform.service.ICheckIndexFaceService;
import com.ycl.platform.service.ICheckIndexVideoService;
import com.ycl.platform.service.ICheckScoreService;
+import com.ycl.system.entity.BaseEntity;
import com.ycl.system.entity.SysRole;
+import com.ycl.system.entity.SysUser;
import com.ycl.system.service.ISysDeptService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
import com.ycl.utils.StringUtils;
+import constant.CheckConstants;
+import enumeration.general.AreaDeptEnum;
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;
import org.springframework.util.CollectionUtils;
import pojo.ExcelExp;
import utils.poi.ExcelUtilManySheet;
import java.io.IOException;
+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.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -43,8 +57,7 @@
*/
@Service
@Slf4j
-public class CheckScoreServiceImpl extends ServiceImpl<CheckScoreMapper, CheckScore> implements ICheckScoreService
-{
+public class CheckScoreServiceImpl extends ServiceImpl<CheckScoreMapper, CheckScore> implements ICheckScoreService {
@Autowired
private CheckScoreMapper scoreMapper;
@Autowired
@@ -61,6 +74,9 @@
private ICheckIndexVideoService indexVideoService;
@Autowired
private ISysDeptService deptService;
+ @Autowired
+ private PlatformMapper platformMapper;
+
/**
* 鏌ヨ鑰冩牳绉垎鎸囨爣
*
@@ -68,20 +84,29 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
- public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO) {
Long checkScoreId = checkScoreIndexDTO.getId();
CheckScoreDetailVO checkScoreDetailVO = new CheckScoreDetailVO();
//鏍规嵁id璇诲彇score
CheckScore checkScore = scoreMapper.selectCheckScoreById(checkScoreId);
+ Integer templateId = 0;
+ //鏂逛究鍒囨崲鏀逛负锛氭牴鎹畇core鑰冩牳绫诲埆鍜宒to鑰冩牳鏍囩鏌ユā鏉胯鍒欏拰鏉冮噸,娉ㄦ剰鍚岀绫诲悓鏍囩鍙兘鏈変竴涓ā鏉�
+ QueryWrapper<CheckTemplate> wrapper = new QueryWrapper<>();
+ wrapper.eq("examine_tag", checkScoreIndexDTO.getExamineTag());
+ wrapper.eq("examine_category", checkScore.getExamineCategory());
+ Optional<CheckTemplate> first = templateMapper.selectList(wrapper).stream().findFirst();
+ if (first.isPresent()) {
+ CheckTemplate checkTemplate = first.get();
+ templateId = checkTemplate.getId();
+ }
//璇诲彇瑙勫垯浠ュ強鏉冮噸
- List<CheckTemplateRule> templateRuleList = templateRuleMapper.selectListByTemplateId(checkScore.getTemplateId());
+ List<CheckTemplateRule> templateRuleList = templateRuleMapper.selectListByTemplateId(templateId);
List<CheckRule> checkRules = new ArrayList<>();
//璇诲彇妯℃澘瀵瑰簲鎵�鏈夎鍒�
- Map<String,Object> scoreMap = new HashMap<>();
+ Map<String, Object> scoreMap = new HashMap<>();
List<Integer> ruleIds = templateRuleList.stream().map(checkTemplateRule -> checkTemplateRule.getCheckRuleId())
.collect(Collectors.toList());
List<CheckRule> ruleIndex = ruleMapper.selectBatchIds(ruleIds);
@@ -89,26 +114,30 @@
checkRules.addAll(ruleIndex);
//鏍规嵁examineCategory 璇诲彇涓嶅悓index琛�
Short examineCategory = checkScore.getExamineCategory();
- String[] indexTableArr ={"","t_check_index_video","t_check_index_car","t_check_index_face"};
+ String[] indexTableArr = {"", "t_check_index_video", "t_check_index_car", "t_check_index_face"};
String tableName = indexTableArr[examineCategory];
- //鑾峰綋鏈堜唤
- String date = checkScoreIndexDTO.getDate();
- if(StringUtils.isEmpty(date)){
- //濡傛灉鏌ヨ鏉′欢涓嶅惈鍙傛暟锛屾煡璇㈢Н鍒嗗搴斿垱寤烘椂闂�
- Date createTime = checkScore.getCreateTime();
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
- date = formatter.format(createTime);
- }
ScoreIndexDTO scoreIndexDTO = new ScoreIndexDTO()
.setTableName(tableName)
.setDeptId(checkScore.getDeptId())
- .setDate(date);
+ .setDate(checkScoreIndexDTO.getDate())
+ .setQuarter(checkScoreIndexDTO.getQuarter());
scoreIndexDTO.setParams(checkScoreIndexDTO.getParams());
+ scoreIndexDTO.setExamineTag(checkScoreIndexDTO.getExamineTag());
+ //鑾峰綋鏈堜唤
+ if (StringUtils.isEmpty(scoreIndexDTO.getDate()) && CollectionUtils.isEmpty(checkScoreIndexDTO.getQuarter())) {
+ //濡傛灉鏌ヨ鏉′欢涓嶅惈鍙傛暟锛屾煡璇㈢Н鍒嗗搴斿垱寤烘椂闂�
+ Date createTime = checkScore.getCreateTime();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
+ scoreIndexDTO.setDate(formatter.format(createTime));
+ }
+
+ //鏉冮檺鎺у埗
+ roleControl(scoreIndexDTO);
List<Map> map = scoreMapper.selectScoreIndex(scoreIndexDTO);
- scoreMap.put("tableData",checkRules);
- scoreMap.put("dataMap",map);
+ scoreMap.put("tableData", checkRules);
+ scoreMap.put("dataMap", map);
checkScoreDetailVO.setCheckRuleList(templateRuleList);
checkScoreDetailVO.setScoreMap(scoreMap);
@@ -118,63 +147,116 @@
/**
* 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
- *
+ * 杩欓噷鏄剧ず褰撳ぉ鐨勬垚缁╁鏋滄病鏈夊綋澶╂垚缁╁垯鏄剧ず鏈�鍚庝竴娆℃垚缁�
* @param checkScore 鑰冩牳绉垎
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
- public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore query) {
+ CheckScore checkScore = new CheckScore();
+ BeanUtils.copyProperties(query,checkScore);
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
- // 鑾峰彇鏁版嵁鏃ユ湡鏃堕棿
- Calendar calendar = Calendar.getInstance();
- // 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
- if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); }
- // 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛ｅ害 3 甯傚眬瀛ｅ害
- switch (checkScore.getExamineTag()) {
- case 0, 1:
- checkScore.setEndDate(calendar.getTime());
- calendar.set(Calendar.DAY_OF_MONTH, 1);
- checkScore.setStartDate(calendar.getTime());
- break;
- case 2, 3:
- checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime());
- checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime());
- checkScore.setExamineTag(checkScore.getExamineTag() == 2 ? 0 : 1);
- break;
+ // 杞崲鏁版嵁鏃ユ湡鏃堕棿銆佹爣绛�
+ getCheckScore(checkScore);
+
+// // 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
+// if (LocalDateTime.now().getDayOfMonth() == 1) {
+// calendar.add(Calendar.DAY_OF_MONTH, -1);
+// }
+
+ List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore);
+ log.error("鎵撳嵃锛歿}",checkScores);
+ // 濡傛灉鏁版嵁涓虹┖锛屽垯鏌ヨ涔嬪墠鐨勬暟鎹�
+ if (CollectionUtils.isEmpty(checkScores) && (query.getStartDate() ==null || query.getStartDate() ==null)) {
+ CheckScore one = scoreMapper.getLast(checkScore);
+ if (Objects.nonNull(one)) {
+ checkScore.setStartDate(one.getCreateTime());
+ checkScore.setEndDate(one.getCreateTime());
+ getCheckScore(checkScore);
+ checkScores = scoreMapper.selectCheckScoreMap(checkScore);
+ }
}
- return scoreMapper.selectCheckScoreMap(checkScore).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 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 + ""));
}
/**
- * 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
+ * 鏌ヨ鑰冩牳绉垎鍗＄墖鎶樼嚎鍥�
*
* @param checkScore 鑰冩牳绉垎
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
- public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore) {
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
//鏌ヨ鎴愮哗
String date = checkScore.getDate();
- if(StringUtils.isEmpty(date)){
+ if (StringUtils.isEmpty(date)) {
//濡傛灉涓虹┖鏌ユ湰鏈堢殑鏁版嵁
Calendar now = Calendar.getInstance();
//鍙栨槰澶�
- now.add(Calendar.DATE, -1);
+ // now.add(Calendar.DATE, -1);
Date yesterday = now.getTime();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
date = simpleDateFormat.format(yesterday);
checkScore.setDate(date);
}
List<CheckScore> checkScores = scoreMapper.selectCheckScoreList(checkScore);
+ //鍒嗘暟淇濈暀涓�浣嶅皬鏁�
+ checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
@@ -185,11 +267,13 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<CheckScore> page(CheckScore checkScore) {
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
- return scoreMapper.selectCheckScoreList(checkScore);
+ List<CheckScore> scoreList = scoreMapper.selectCheckScoreList(checkScore);
+ scoreList.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
+ return scoreList;
}
/**
@@ -199,8 +283,9 @@
* @return 缁撴灉
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public int publishCheckScore(CheckScoreDTO checkScoreDTO) {
- if(CollectionUtils.isEmpty(checkScoreDTO.getId())){
+ if (CollectionUtils.isEmpty(checkScoreDTO.getId())) {
return 0;
}
PublishType publishType = null;
@@ -211,8 +296,33 @@
}
String code = publishType.getCode();
checkScoreDTO.setPublish(code);
-
- return scoreMapper.publishCheckScore(checkScoreDTO);
+ int i = scoreMapper.publishCheckScore(checkScoreDTO);
+ //鎺у埗index琛ㄧ殑鍙戝竷鐘舵��
+ List<Integer> ids = checkScoreDTO.getId();
+ QueryWrapper<CheckScore> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("id", ids);
+ List<CheckScore> scoreList = scoreMapper.selectList(queryWrapper);
+ //鏈�澶氫负3娆″惊鐜�
+ for (CheckScore checkScore : scoreList) {
+ Short examineCategory = checkScore.getExamineCategory();
+ if (CheckConstants.Rule_Category_Video.equals(examineCategory)) {
+ UpdateWrapper<CheckIndexVideo> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("publish", code);
+ updateWrapper.eq("id", checkScore.getIndexId());
+ indexVideoService.update(updateWrapper);
+ } else if (CheckConstants.Rule_Category_Car.equals(examineCategory)) {
+ UpdateWrapper<CheckIndexCar> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("publish", code);
+ updateWrapper.eq("id", checkScore.getIndexId());
+ indexCarService.update(updateWrapper);
+ } else if (CheckConstants.Rule_Category_Face.equals(examineCategory)) {
+ UpdateWrapper<CheckIndexFace> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("publish", code);
+ updateWrapper.eq("id", checkScore.getIndexId());
+ indexFaceService.update(updateWrapper);
+ }
+ }
+ return i;
}
/**
@@ -222,51 +332,292 @@
* @return 鑰冩牳绉垎
*/
@Override
- public void exportIndex(HttpServletResponse response,CheckScore checkScoreDTO) throws IOException {
- String date = checkScoreDTO.getDate();
- //濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
- if(StringUtils.isEmpty(date)) {
- CheckScore checkScore = getById(checkScoreDTO.getId());
- Date createTime = checkScore.getCreateTime();
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
- date = simpleDateFormat.format(createTime);
+ public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
+ //娌℃湁鏍囩榛樿鍏ㄥ
+ if (CollectionUtils.isEmpty(exportDTO.getExamineTags())) {
+ exportDTO.setExamineTags(Arrays.asList(0, 1, 2));
}
-
/** 瀵间笁寮爏heet */
//杞﹁締
- CheckIndexCar checkIndexCar = new CheckIndexCar();
- checkIndexCar.setDate(date);
- List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
- ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁",checkIndexCars,CheckIndexCar.class);
+ List<CheckIndexCar> checkIndexCars = new ArrayList<>();
+ //杞﹁締鍜屼汉鑴告病鏈夊叕瀹夐儴
+ for (Integer examineTag : exportDTO.getExamineTags()) {
+ if (examineTag == 2) continue;
+ CheckIndexCar checkIndexCar = new CheckIndexCar();
+// checkIndexCar.setDate(date);
+ checkIndexCar.setQuarter(exportDTO.getQuarter());
+ checkIndexCar.setDeptId(exportDTO.getDeptId());
+ checkIndexCar.setDeptIds(exportDTO.getDeptIds());
+ //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
+ roleControl(checkIndexCar);
+ checkIndexCar.setExamineTag(Short.valueOf(examineTag + ""));
+
+ checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar));
+ }
+ //璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
+ if (exportDTO.getAverage() != null && exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexCars)) {
+ //鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
+ List<CheckIndexCar> countyList = checkIndexCars.stream().filter(car -> CheckConstants.Examine_Tag_County.equals(car.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(countyList)) {
+ Map<Long, List<CheckIndexCar>> carMap = countyList.stream().collect(Collectors.groupingBy(CheckIndexCar::getDeptId));
+ List<CheckIndexCar> cars = new ArrayList<>();
+ carMap.forEach((deptId, list) -> {
+ CheckIndexCar car = CheckIndexCar.calculateAverage(list);
+ cars.add(car);
+ });
+ //鏍规嵁绉垎闄嶅簭
+ checkIndexCars.addAll(cars.stream().sorted(Comparator.comparing(CheckIndexCar::getScore).reversed()).collect(Collectors.toList()));
+ }
+ List<CheckIndexCar> provinceList = checkIndexCars.stream().filter(car -> CheckConstants.Examine_Tag_Province.equals(car.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(provinceList)) {
+ Map<Long, List<CheckIndexCar>> carMap = provinceList.stream().collect(Collectors.groupingBy(CheckIndexCar::getDeptId));
+ List<CheckIndexCar> cars = new ArrayList<>();
+ carMap.forEach((deptId, list) -> {
+ CheckIndexCar car = CheckIndexCar.calculateAverage(list);
+ cars.add(car);
+ });
+ //鏍规嵁绉垎闄嶅簭
+ checkIndexCars.addAll(cars.stream().sorted(Comparator.comparing(CheckIndexCar::getScore).reversed()).collect(Collectors.toList()));
+ }
+ }
+ List<CheckIndexCarVO> checkIndexCarVOS = new ArrayList<>();
+ for (CheckIndexCar indexCar : checkIndexCars) {
+ CheckIndexCarVO excelVo = CheckIndexCar.getExcelVo(indexCar);
+ checkIndexCarVOS.add(excelVo);
+ }
+ ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCarVOS, CheckIndexCarVO.class);
+
//浜鸿劯
- CheckIndexFace checkIndexFace = new CheckIndexFace();
- checkIndexFace.setDate(date);
- List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
- ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁",checkIndexFaces,CheckIndexFace.class);
+ List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
+ for (Integer examineTag : exportDTO.getExamineTags()) {
+ if (examineTag == 2) continue;
+ CheckIndexFace checkIndexFace = new CheckIndexFace();
+// checkIndexFace.setDate(date);
+ checkIndexFace.setQuarter(exportDTO.getQuarter());
+ checkIndexFace.setDeptId(exportDTO.getDeptId());
+ checkIndexFace.setDeptIds(exportDTO.getDeptIds());
+ //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
+ roleControl(checkIndexFace);
+ checkIndexFace.setExamineTag(Short.valueOf(examineTag + ""));
+ checkIndexFaces.addAll(indexFaceService.selectCheckIndexFaceList(checkIndexFace));
+ }
+ //璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
+ if (exportDTO.getAverage() != null && exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexFaces)) {
+ //鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
+ List<CheckIndexFace> countyList = checkIndexFaces.stream().filter(face -> CheckConstants.Examine_Tag_County.equals(face.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(countyList)) {
+ Map<Long, List<CheckIndexFace>> faceMap = countyList.stream().collect(Collectors.groupingBy(CheckIndexFace::getDeptId));
+ List<CheckIndexFace> faces = new ArrayList<>();
+ faceMap.forEach((deptId, list) -> {
+ CheckIndexFace face = CheckIndexFace.calculateAverage(list);
+ faces.add(face);
+ });
+ //鏍规嵁绉垎闄嶅簭
+ checkIndexFaces.addAll(faces.stream().sorted(Comparator.comparing(CheckIndexFace::getScore).reversed()).collect(Collectors.toList()));
+ }
+ List<CheckIndexFace> provinceList = checkIndexFaces.stream().filter(face -> CheckConstants.Examine_Tag_Province.equals(face.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(provinceList)) {
+ Map<Long, List<CheckIndexFace>> faceMap = provinceList.stream().collect(Collectors.groupingBy(CheckIndexFace::getDeptId));
+ List<CheckIndexFace> faces = new ArrayList<>();
+ faceMap.forEach((deptId, list) -> {
+ CheckIndexFace face = CheckIndexFace.calculateAverage(list);
+ faces.add(face);
+ });
+ //鏍规嵁绉垎闄嶅簭
+ checkIndexFaces.addAll(faces.stream().sorted(Comparator.comparing(CheckIndexFace::getScore).reversed()).collect(Collectors.toList()));
+ }
+ }
+ List<CheckIndexFaceVO> checkIndexFaceVOS = new ArrayList<>();
+ for (CheckIndexFace indexFace : checkIndexFaces) {
+ CheckIndexFaceVO excelVo = CheckIndexFace.getExcelVo(indexFace);
+ checkIndexFaceVOS.add(excelVo);
+ }
+ ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaceVOS, CheckIndexFaceVO.class);
+
//瑙嗛
- CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
- checkIndexVideo.setDate(date);
- List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
- ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁",checkIndexVideos,CheckIndexVideo.class);
+ List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
+ for (Integer examineTag : exportDTO.getExamineTags()) {
+ CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
+// checkIndexVideo.setDate(date);
+ checkIndexVideo.setQuarter(exportDTO.getQuarter());
+ checkIndexVideo.setDeptId(exportDTO.getDeptId());
+ checkIndexVideo.setDeptIds(exportDTO.getDeptIds());
+ //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
+ roleControl(checkIndexVideo);
+ checkIndexVideo.setExamineTag(Short.valueOf(examineTag + ""));
+ checkIndexVideos.addAll(indexVideoService.selectCheckIndexVideoList(checkIndexVideo));
+ }
+ //璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
+ if (exportDTO.getAverage() != null && exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexVideos)) {
+ //鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
+ List<CheckIndexVideo> countyList = checkIndexVideos.stream().filter(video -> CheckConstants.Examine_Tag_County.equals(video.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(countyList)) {
+ Map<Long, List<CheckIndexVideo>> videoMap = countyList.stream().collect(Collectors.groupingBy(CheckIndexVideo::getDeptId));
+ List<CheckIndexVideo> videos = new ArrayList<>();
+ videoMap.forEach((deptId, list) -> {
+ CheckIndexVideo video = CheckIndexVideo.calculateAverage(list);
+ videos.add(video);
+ });
+ //鏍规嵁绉垎闄嶅簭
+ checkIndexVideos.addAll(videos.stream().sorted(Comparator.comparing(CheckIndexVideo::getScore).reversed()).collect(Collectors.toList()));
+ }
+ List<CheckIndexVideo> provinceList = checkIndexVideos.stream().filter(video -> CheckConstants.Examine_Tag_Province.equals(video.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(provinceList)) {
+ Map<Long, List<CheckIndexVideo>> videoMap = provinceList.stream().collect(Collectors.groupingBy(CheckIndexVideo::getDeptId));
+ List<CheckIndexVideo> videos = new ArrayList<>();
+ videoMap.forEach((deptId, list) -> {
+ CheckIndexVideo video = CheckIndexVideo.calculateAverage(list);
+ videos.add(video);
+ });
+ //鏍规嵁绉垎闄嶅簭
+ checkIndexVideos.addAll(videos.stream().sorted(Comparator.comparing(CheckIndexVideo::getScore).reversed()).collect(Collectors.toList()));
+ }
+ List<CheckIndexVideo> deptList = checkIndexVideos.stream().filter(video -> CheckConstants.Examine_Tag_Dept.equals(video.getExamineTag())).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(deptList)) {
+ Map<Long, List<CheckIndexVideo>> videoMap = deptList.stream().collect(Collectors.groupingBy(CheckIndexVideo::getDeptId));
+ List<CheckIndexVideo> videos = new ArrayList<>();
+ videoMap.forEach((deptId, list) -> {
+ CheckIndexVideo video = CheckIndexVideo.calculateAverage(list);
+ videos.add(video);
+ });
+ //鏍规嵁绉垎闄嶅簭
+ checkIndexVideos.addAll(videos.stream().sorted(Comparator.comparing(CheckIndexVideo::getScore).reversed()).collect(Collectors.toList()));
+ }
+ }
+ List<CheckIndexVideoVO> checkIndexVideoVOS = new ArrayList<>();
+ for (CheckIndexVideo indexVideo : checkIndexVideos) {
+ CheckIndexVideoVO excelVo = CheckIndexVideo.getExcelVo(indexVideo);
+ checkIndexVideoVOS.add(excelVo);
+ }
+ ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁", checkIndexVideoVOS, CheckIndexVideoVO.class);
List<ExcelExp> mysheet = new ArrayList<>();
mysheet.add(e1);
mysheet.add(e2);
mysheet.add(e3);
+ //瑙勫垯鏄庣粏
+ List<RuleExcelVO> allRuleTemplate = templateRuleMapper.getAllRuleTemplate();
+ //鏁村悎鏁版嵁
+ List<RuleExcelVO> countyRuleList = allRuleTemplate.stream().filter(vo -> vo.getExamineTag().equals(Integer.parseInt(CheckConstants.Examine_Tag_County + ""))).collect(Collectors.toList());
+ List<RuleExcelVO> provinceRuleList = allRuleTemplate.stream().filter(vo -> vo.getExamineTag().equals(Integer.parseInt(CheckConstants.Examine_Tag_Province + ""))).collect(Collectors.toList());
+ //鐢ㄥ尯鍘胯鍒欏仛涓讳綋灞曠ず
+ for (RuleExcelVO countyRule : countyRuleList) {
+ countyRule.setCountyWeight(countyRule.getWeight());
+ //绛涢�夊悓绉嶈鍒欐潈閲�
+ for (RuleExcelVO provinceRule : provinceRuleList) {
+ if (provinceRule.getRuleId().equals(countyRule.getRuleId()) && provinceRule.getExamineCategory().equals(countyRule.getExamineCategory())) {
+ countyRule.setProvinceWeight(provinceRule.getWeight());
+ }
+ }
+ }
+ ExcelExp e4 = new ExcelExp("瑙勫垯鏄庣粏", countyRuleList, RuleExcelVO.class);
+ mysheet.add(e4);
ExcelUtilManySheet<List<ExcelExp>> util = new ExcelUtilManySheet<>(mysheet);
- util.exportExcelManySheet(response,mysheet);
+ util.exportExcelManySheet(response, mysheet);
}
- private void roleControl(CheckScore checkScore) {
+ private void roleControl(CheckIndex checkIndex) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
- SysRole sysRole = roles.get(0);
- if("zg_province".equals(sysRole.getRoleKey())){
- Map<String, Object> params = checkScore.getParams();
- params.put("publish",PublishType.PUBLISHED.getCode());
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ if (!user.isAdmin()) {
+ for (SysRole role : roles) {
+ if (role.getPermissions().contains("check:score:role:publish")) {
+ Map<String, Object> params = checkIndex.getParams();
+ params.put("publish", PublishType.PUBLISHED.getCode());
+ }
+ }
}
}
+ private void roleControl(BaseEntity checkScore) {
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ if (!user.isAdmin()) {
+ for (SysRole role : roles) {
+ if (role.getPermissions().contains("check:score:role:publish")) {
+ Map<String, Object> params = checkScore.getParams();
+ params.put("publish", PublishType.PUBLISHED.getCode());
+ }
+ }
+ }
+ }
+
+ @Override
+ public List<Map<String, Object>> home() {
+ Date now = new Date();
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DATE, -7);
+ Date startTime = calendar.getTime();
+ return baseMapper.home(startTime,now);
+ }
+
+
+ @Override
+ public List<Map<String, Object>> calculate(String category) {
+ Calendar calendar = Calendar.getInstance();
+ Date endDate = calendar.getTime();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ Date startDate = calendar.getTime();
+ return scoreMapper.calculate(startDate, endDate, category);
+ }
+
+ //澶у睆灞曠ず鑰冩牳寰楀垎
+ @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.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", formattedScore);
+ } else if (CheckConstants.Rule_Category_Car.equals(checkScore.getExamineCategory())) {
+ map.put("car", formattedScore);
+ } else if (CheckConstants.Rule_Category_Face.equals(checkScore.getExamineCategory())) {
+ map.put("face",formattedScore);
+ }
+ resultMap.put(checkScore.getDeptName(), map);
+ }
+ return resultMap;
+ }
// /**
// * 鏂板鑰冩牳绉垎
--
Gitblit v1.8.0