From b5df1cee65f3e9dcf554efcd3f1642a8c79d1e76 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 30 九月 2024 02:12:24 +0800 Subject: [PATCH] 点位监测更换对象+存入mongo+提取utils --- ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 310 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 267 insertions(+), 43 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 0137fda..cca9a63 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 @@ -2,21 +2,23 @@ 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; @@ -24,19 +26,25 @@ 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.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.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -64,6 +72,8 @@ private ICheckIndexVideoService indexVideoService; @Autowired private ISysDeptService deptService; + @Autowired + private PlatformMapper platformMapper; /** * 鏌ヨ鑰冩牳绉垎鎸囨爣 @@ -82,10 +92,10 @@ Integer templateId = 0; //鏂逛究鍒囨崲鏀逛负锛氭牴鎹畇core鑰冩牳绫诲埆鍜宒to鑰冩牳鏍囩鏌ユā鏉胯鍒欏拰鏉冮噸,娉ㄦ剰鍚岀绫诲悓鏍囩鍙兘鏈変竴涓ā鏉� QueryWrapper<CheckTemplate> wrapper = new QueryWrapper<>(); - wrapper.eq("examine_tag",checkScoreIndexDTO.getExamineTag()); - wrapper.eq("examine_category",checkScore.getExamineCategory()); + wrapper.eq("examine_tag", checkScoreIndexDTO.getExamineTag()); + wrapper.eq("examine_category", checkScore.getExamineCategory()); Optional<CheckTemplate> first = templateMapper.selectList(wrapper).stream().findFirst(); - if(first.isPresent()){ + if (first.isPresent()) { CheckTemplate checkTemplate = first.get(); templateId = checkTemplate.getId(); } @@ -120,6 +130,8 @@ scoreIndexDTO.setDate(formatter.format(createTime)); } + //鏉冮檺鎺у埗 + roleControl(scoreIndexDTO); List<Map> map = scoreMapper.selectScoreIndex(scoreIndexDTO); scoreMap.put("tableData", checkRules); @@ -163,27 +175,34 @@ 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)); } private void getCheckScore(CheckScore checkScore, Calendar calendar) { - // 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛e害 3 甯傚眬瀛e害 + // 0.鐪佸巺鏈堝害 1.鐪佸巺瀛e害 2.甯傚眬鏈堝害 3.甯傚眬瀛e害 4.鍏畨閮ㄦ湀搴� 5.鍏畨閮ㄥ搴� switch (checkScore.getExamineTag()) { - case 0, 1: + 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 2, 3: + case 1, 3, 5: checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime()); checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime()); - checkScore.setExamineTag(checkScore.getExamineTag() == 2 ? 0 : 1); + 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; } } /** - * 鏌ヨ鑰冩牳绉垎鍗$墖鍒楄〃 + * 鏌ヨ鑰冩牳绉垎鍗$墖鎶樼嚎鍥� * * @param checkScore 鑰冩牳绉垎 * @return 鑰冩牳绉垎 @@ -207,6 +226,8 @@ 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)); } @@ -221,7 +242,9 @@ 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; } /** @@ -231,6 +254,7 @@ * @return 缁撴灉 */ @Override + @Transactional(rollbackFor = Exception.class) public int publishCheckScore(CheckScoreDTO checkScoreDTO) { if (CollectionUtils.isEmpty(checkScoreDTO.getId())) { return 0; @@ -243,8 +267,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; } /** @@ -254,55 +303,207 @@ * @return 鑰冩牳绉垎 */ @Override - public void exportIndex(HttpServletResponse response, CheckScore checkScoreDTO) throws IOException { - String date = checkScoreDTO.getDate(); + public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException { +// String date = exportDTO.getDate(); //濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂� - if (StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())) { - CheckScore checkScore = getById(checkScoreDTO.getId()); - Date createTime = checkScore.getCreateTime(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); - date = formatter.format(createTime); - } +// if (StringUtils.isEmpty(exportDTO.getDate()) && CollectionUtils.isEmpty(exportDTO.getQuarter())) { +// SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); +// if (exportDTO.getId() != null) { +// CheckScore checkScore = getById(exportDTO.getId()); +// Date createTime = checkScore.getCreateTime(); +// date = formatter.format(createTime); +// } else { +// //闃叉鍗$墖椤甸潰瀵煎嚭涓嶄紶scoreId锛屽鑷存姤閿� +// date = formatter.format(new Date()); +// } +// } /** 瀵间笁寮爏heet */ //杞﹁締 CheckIndexCar checkIndexCar = new CheckIndexCar(); - checkIndexCar.setDate(date); - checkIndexCar.setQuarter(checkScoreDTO.getQuarter()); - List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar); - for (CheckIndexCar indexCar : checkIndexCars) { - indexCar.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(indexCar.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳"); +// checkIndexCar.setDate(date); + checkIndexCar.setQuarter(exportDTO.getQuarter()); + checkIndexCar.setDeptId(exportDTO.getDeptId()); + checkIndexCar.setDeptIds(exportDTO.getDeptIds()); + //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯� + roleControl(checkIndexCar); + List<CheckIndexCar> checkIndexCars = new ArrayList<>(); + for (Integer examineTag : exportDTO.getExamineTags()) { + checkIndexCar.setExamineTag(Short.valueOf(examineTag + "")); + if (examineTag == 0) { + checkIndexCar.setExamineTagQuery(1); + } + checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar)); } - ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCars, CheckIndexCar.class); + //璁$畻骞冲潎鍊兼斁鍦╡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); - checkIndexFace.setQuarter(checkScoreDTO.getQuarter()); - List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace); - for (CheckIndexFace indexFace : checkIndexFaces) { - indexFace.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(indexFace.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳"); +// checkIndexFace.setDate(date); + checkIndexFace.setQuarter(exportDTO.getQuarter()); + checkIndexFace.setDeptId(exportDTO.getDeptId()); + checkIndexFace.setDeptIds(exportDTO.getDeptIds()); + //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯� + roleControl(checkIndexFace); + List<CheckIndexFace> checkIndexFaces = new ArrayList<>(); + for (Integer examineTag : exportDTO.getExamineTags()) { + checkIndexFace.setExamineTag(Short.valueOf(examineTag + "")); + if (examineTag == 0) { + checkIndexFace.setExamineTagQuery(1); + } + checkIndexFaces.addAll(indexFaceService.selectCheckIndexFaceList(checkIndexFace)); } - ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaces, CheckIndexFace.class); + //璁$畻骞冲潎鍊兼斁鍦╡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); - checkIndexVideo.setQuarter(checkScoreDTO.getQuarter()); - List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo); - for (CheckIndexVideo indexVideo : checkIndexVideos) { - indexVideo.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(indexVideo.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳"); +// checkIndexVideo.setDate(date); + checkIndexVideo.setQuarter(exportDTO.getQuarter()); + checkIndexVideo.setDeptId(exportDTO.getDeptId()); + checkIndexVideo.setDeptIds(exportDTO.getDeptIds()); + //鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯� + roleControl(checkIndexVideo); + List<CheckIndexVideo> checkIndexVideos = new ArrayList<>(); + for (Integer examineTag : exportDTO.getExamineTags()) { + checkIndexVideo.setExamineTag(Short.valueOf(examineTag + "")); + if (examineTag == 0) { + checkIndexVideo.setExamineTagQuery(1); + } + checkIndexVideos.addAll(indexVideoService.selectCheckIndexVideoList(checkIndexVideo)); } - ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁", checkIndexVideos, CheckIndexVideo.class); + //璁$畻骞冲潎鍊兼斁鍦╡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<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); } - private void roleControl(CheckScore checkScore) { + private void roleControl(CheckIndex checkIndex) { + 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 = 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()) { @@ -330,6 +531,29 @@ return scoreMapper.calculate(startDate, endDate, category); } + //澶у睆灞曠ず鑰冩牳寰楀垎 + @Override + public Map<String, Map<String, Object>> dashboard(DashboardQuery dashboardQuery) { + Date now = new Date(); + dashboardQuery.setStartTime(DateUtils.getMouthStart(now)); + dashboardQuery.setEndTime(DateUtils.getMouthEnd(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); + 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)); + resultMap.put(checkScore.getDeptName(), map); + } + return resultMap; + } + // /** // * 鏂板鑰冩牳绉垎 // * -- Gitblit v1.8.0