From d2d069b2fdb68b37c9f850b9798882d383c2fd51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 312 +++++++++++++++++++++++++++++++--------------------
1 files changed, 190 insertions(+), 122 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 b1568b9..19c36b7 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,10 +1,11 @@
package com.ycl.platform.service.impl;
+import annotation.DataScope;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.base.BaseSelect;
-import com.ycl.platform.base.CheckIndex;
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;
@@ -15,14 +16,12 @@
import com.ycl.platform.service.ICheckIndexFaceService;
import com.ycl.platform.service.ICheckIndexVideoService;
import com.ycl.platform.service.ICheckScoreService;
-import com.ycl.system.Result;
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 com.ycl.utils.poi.ExcelUtil;
-import constant.CheckConstants;
-import enumeration.general.CheckScoreType;
import enumeration.general.PublishType;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
@@ -30,27 +29,23 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import pojo.ExcelExp;
-import utils.DateUtils;
import utils.poi.ExcelUtilManySheet;
import java.io.IOException;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* 鑰冩牳绉垎鏄庣粏Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2024-04-22
*/
@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
@@ -67,15 +62,16 @@
private ICheckIndexVideoService indexVideoService;
@Autowired
private ISysDeptService deptService;
+
/**
- * 鏌ヨ鑰冩牳绉垎
- *
+ * 鏌ヨ鑰冩牳绉垎鎸囨爣
+ *
* @param id 鑰冩牳绉垎涓婚敭
* @return 鑰冩牳绉垎
*/
@Override
- public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO) {
Long checkScoreId = checkScoreIndexDTO.getId();
CheckScoreDetailVO checkScoreDetailVO = new CheckScoreDetailVO();
@@ -86,7 +82,7 @@
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);
@@ -94,20 +90,28 @@
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];
+
+ ScoreIndexDTO scoreIndexDTO = new ScoreIndexDTO()
+ .setTableName(tableName)
+ .setDeptId(checkScore.getDeptId())
+ .setDate(checkScoreIndexDTO.getDate())
+ .setQuarter(checkScoreIndexDTO.getQuarter());
+ scoreIndexDTO.setParams(checkScoreIndexDTO.getParams());
+ scoreIndexDTO.setExamineTag(checkScore.getExamineTag());
//鑾峰綋鏈堜唤
- String date = checkScoreIndexDTO.getDate();
- if(StringUtils.isEmpty(date)){
+ if (StringUtils.isEmpty(scoreIndexDTO.getDate()) && CollectionUtils.isEmpty(checkScoreIndexDTO.getQuarter())) {
//濡傛灉鏌ヨ鏉′欢涓嶅惈鍙傛暟锛屾煡璇㈢Н鍒嗗搴斿垱寤烘椂闂�
Date createTime = checkScore.getCreateTime();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
- date = formatter.format(createTime);
+ scoreIndexDTO.setDate(formatter.format(createTime));
}
- List<Map> map = scoreMapper.selectScoreIndex(tableName,checkScore.getDeptId(),date);
- scoreMap.put("tableData",checkRules);
- scoreMap.put("dataMap",map);
+ List<Map> map = scoreMapper.selectScoreIndex(scoreIndexDTO);
+
+ scoreMap.put("tableData", checkRules);
+ scoreMap.put("dataMap", map);
checkScoreDetailVO.setCheckRuleList(templateRuleList);
checkScoreDetailVO.setScoreMap(scoreMap);
@@ -117,31 +121,83 @@
/**
* 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
- *
+ *
* @param checkScore 鑰冩牳绉垎
* @return 鑰冩牳绉垎
*/
@Override
- public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore)
- {
- //TODO:鏁版嵁鏉冮檺
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore) {
+ //鍖哄幙鍙兘鐪嬪凡鍙戝竷
+ roleControl(checkScore);
+
+ // 鑾峰彇鏁版嵁鏃ユ湡鏃堕棿
+ Calendar calendar = Calendar.getInstance();
+ getCheckScore(checkScore, calendar);
+
+ // 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
+ if (LocalDateTime.now().getDayOfMonth() == 1) {
+ calendar.add(Calendar.DAY_OF_MONTH, -1);
+ }
+
+ List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore);
+
+ // 濡傛灉鏁版嵁涓虹┖锛屽垯鏌ヨ涔嬪墠鐨勬暟鎹�
+ if (checkScores.isEmpty()) {
+ CheckScore one = new LambdaQueryChainWrapper<>(baseMapper).select(CheckScore::getCreateTime).last("order by create_time desc limit 1").one();
+ if (Objects.nonNull(one)) {
+ calendar.setTime(one.getCreateTime());
+ getCheckScore(checkScore, calendar);
+ checkScores = scoreMapper.selectCheckScoreMap(checkScore);
+ }
+ }
+ return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+ }
+
+ private void getCheckScore(CheckScore checkScore, Calendar calendar) {
+ // 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;
+ }
+ }
+
+ /**
+ * 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
+ *
+ * @param checkScore 鑰冩牳绉垎
+ * @return 鑰冩牳绉垎
+ */
+ @Override
+ @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);
- Map<Long, List<CheckScore>> deptMap = checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
- return deptMap;
+ return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
+
/**
* 鍖哄幙璇︽儏
*
@@ -149,61 +205,13 @@
* @return 鑰冩牳绉垎
*/
@Override
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<CheckScore> page(CheckScore checkScore) {
- //TODO:鏁版嵁鏉冮檺
+ //鍖哄幙鍙兘鐪嬪凡鍙戝竷
+ roleControl(checkScore);
return scoreMapper.selectCheckScoreList(checkScore);
}
-
- /**
- * 鏂板鑰冩牳绉垎
- *
- * @param checkScore 鑰冩牳绉垎
- * @return 缁撴灉
- */
- @Override
- public int insertCheckScore(CheckScore checkScore)
- {
- checkScore.setCreateTime(DateUtils.getNowDate());
- return scoreMapper.insertCheckScore(checkScore);
- }
-
- /**
- * 淇敼鑰冩牳鏄庣粏
- *
- * @param checkScore 鑰冩牳绉垎鏄庣粏
- * @return 缁撴灉
- */
- @Override
- public int updateCheckScore(CheckScore checkScore)
- {
-
- return scoreMapper.updateCheckScore(checkScore);
- }
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳绉垎
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳绉垎涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteCheckScoreByIds(Long[] ids)
- {
- return scoreMapper.deleteCheckScoreByIds(ids);
- }
-
- /**
- * 鍒犻櫎鑰冩牳绉垎淇℃伅
- *
- * @param id 鑰冩牳绉垎涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteCheckScoreById(Long id)
- {
- return scoreMapper.deleteCheckScoreById(id);
- }
/**
* 鍙戝竷鑰冩牳绉垎淇℃伅
*
@@ -212,7 +220,7 @@
*/
@Override
public int publishCheckScore(CheckScoreDTO checkScoreDTO) {
- if(CollectionUtils.isEmpty(checkScoreDTO.getId())){
+ if (CollectionUtils.isEmpty(checkScoreDTO.getId())) {
return 0;
}
PublishType publishType = null;
@@ -234,71 +242,131 @@
* @return 鑰冩牳绉垎
*/
@Override
- public void exportIndex(HttpServletResponse response,CheckScore checkScoreDTO) throws IOException {
+ public void exportIndex(HttpServletResponse response, CheckScore checkScoreDTO) throws IOException {
String date = checkScoreDTO.getDate();
+ Integer examineTag = null;
//濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
- if(StringUtils.isEmpty(date)) {
+ if (StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())) {
CheckScore checkScore = getById(checkScoreDTO.getId());
Date createTime = checkScore.getCreateTime();
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
- date = simpleDateFormat.format(createTime);
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
+ date = formatter.format(createTime);
+ examineTag = checkScore.getExamineTag();
}
/** 瀵间笁寮爏heet */
//杞﹁締
CheckIndexCar checkIndexCar = new CheckIndexCar();
checkIndexCar.setDate(date);
+ checkIndexCar.setQuarter(checkScoreDTO.getQuarter());
+ if (examineTag != null) {
+ checkIndexCar.setExamineTag(Short.parseShort(examineTag + ""));
+ }
List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
- ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁",checkIndexCars,CheckIndexCar.class);
+ ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCars, CheckIndexCar.class);
//浜鸿劯
CheckIndexFace checkIndexFace = new CheckIndexFace();
checkIndexFace.setDate(date);
+ checkIndexFace.setQuarter(checkScoreDTO.getQuarter());
+ if (examineTag != null) {
+ checkIndexFace.setExamineTag(Short.parseShort(examineTag + ""));
+ }
List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
- ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁",checkIndexFaces,CheckIndexFace.class);
+ ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaces, CheckIndexFace.class);
//瑙嗛
CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
checkIndexVideo.setDate(date);
+ checkIndexVideo.setQuarter(checkScoreDTO.getQuarter());
+ if (examineTag != null) {
+ checkIndexVideo.setExamineTag(Short.parseShort(examineTag + ""));
+ }
List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
- ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁",checkIndexVideos,CheckIndexVideo.class);
+ ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁", checkIndexVideos, CheckIndexVideo.class);
List<ExcelExp> mysheet = new ArrayList<>();
mysheet.add(e1);
mysheet.add(e2);
mysheet.add(e3);
ExcelUtilManySheet<List<ExcelExp>> util = new ExcelUtilManySheet<>(mysheet);
- util.exportExcelManySheet(response,mysheet);
+ util.exportExcelManySheet(response, mysheet);
- //瀵煎崟sheet鐨勬柟寮�
-// switch (CheckScoreType.fromValue(examineCategory)){
-// case CHECK_SCORE_TYPE_CAR:
-// //鏌ヨ溅杈�
-// List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(new CheckIndexCar());
-// export(response, depts, checkIndexCars,CheckIndexCar.class);
-// break;
-// case CHECK_SCORE_TYPE_FACE:
-// // 鏌ヤ汉鑴�
-// List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(new CheckIndexFace());
-// export(response, depts, checkIndexFaces,CheckIndexFace.class);
-// break;
-// case CHECK_SCORE_TYPE_VIDEO:
-// // 鏌ヨ棰�
-// List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(new CheckIndexVideo());
-// export(response, depts, checkIndexVideos,CheckIndexVideo.class);
-// break;
-// }
}
- private <T extends CheckIndex> void export(HttpServletResponse response, List<BaseSelect> depts, List<T> checkIndexes,Class<T> checkIndexClass) {
- //鏆傛椂娌＄敤锛屽鏋滄暟鎹繃澶э紝鍦╯erver灞傜炕璇戯紝閬垮厤杩炶〃
- checkIndexes.forEach(checkIndex->{
- Optional<BaseSelect> first = depts.stream().filter(baseSelect -> checkIndex.getDeptId().equals(Long.valueOf(baseSelect.getId()+""))).findFirst();
- if(first.isPresent()){
- checkIndex.setDeptName(first.get().getValue());
+ private void roleControl(CheckScore 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:publish")) {
+ Map<String, Object> params = checkScore.getParams();
+ params.put("publish", PublishType.PUBLISHED.getCode());
+ }
}
- });
-
- ExcelUtil<T> util = new ExcelUtil<T>(checkIndexClass);
- util.exportExcel(response, checkIndexes, "鑰冩牳绉垎鏄庣粏鏁版嵁");
-
+ }
}
+
+ @Override
+ public List<Map<String, Object>> home() {
+ return baseMapper.home();
+ }
+
+
+ @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);
+ }
+
+ // /**
+// * 鏂板鑰冩牳绉垎
+// *
+// * @param checkScore 鑰冩牳绉垎
+// * @return 缁撴灉
+// */
+// @Override
+// public int insertCheckScore(CheckScore checkScore)
+// {
+// checkScore.setCreateTime(DateUtils.getNowDate());
+// return scoreMapper.insertCheckScore(checkScore);
+// }
+//
+// /**
+// * 淇敼鑰冩牳鏄庣粏
+// *
+// * @param checkScore 鑰冩牳绉垎鏄庣粏
+// * @return 缁撴灉
+// */
+// @Override
+// public int updateCheckScore(CheckScore checkScore)
+// {
+//
+// return scoreMapper.updateCheckScore(checkScore);
+// }
+//
+// /**
+// * 鎵归噺鍒犻櫎鑰冩牳绉垎
+// *
+// * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳绉垎涓婚敭
+// * @return 缁撴灉
+// */
+// @Override
+// public int deleteCheckScoreByIds(Long[] ids)
+// {
+// return scoreMapper.deleteCheckScoreByIds(ids);
+// }
+//
+// /**
+// * 鍒犻櫎鑰冩牳绉垎淇℃伅
+// *
+// * @param id 鑰冩牳绉垎涓婚敭
+// * @return 缁撴灉
+// */
+// @Override
+// public int deleteCheckScoreById(Long id)
+// {
+// return scoreMapper.deleteCheckScoreById(id);
+// }
}
--
Gitblit v1.8.0