From ad31fa93abe524baec2216f9b2f203acb8cc2d6a Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 29 七月 2024 11:48:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java | 168 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 146 insertions(+), 22 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java index c01bf8b..8fa5174 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java @@ -1,96 +1,220 @@ package com.ycl.platform.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.platform.domain.entity.CalculateReport; import com.ycl.platform.domain.entity.CheckIndexCar; +import com.ycl.platform.domain.entity.TMonitor; +import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult; +import com.ycl.platform.mapper.CalculateReportMapper; import com.ycl.platform.mapper.CheckIndexCarMapper; import com.ycl.platform.service.ICheckIndexCarService; +import com.ycl.platform.service.ITMonitorService; +import com.ycl.system.entity.SysDept; +import com.ycl.system.mapper.SysDeptMapper; +import constant.ApiConstants; +import constant.CheckConstants; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import utils.DateUtils; -import java.util.List; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 杞﹁締鎸囨爣姒傜巼鏁版嵁Service涓氬姟灞傚鐞� - * + * * @author ruoyi * @date 2024-04-29 */ @Service -public class CheckIndexCarServiceImpl implements ICheckIndexCarService -{ +@Slf4j +public class CheckIndexCarServiceImpl extends ServiceImpl<CheckIndexCarMapper, CheckIndexCar> implements ICheckIndexCarService { @Autowired private CheckIndexCarMapper checkIndexCarMapper; + @Autowired + private ITMonitorService monitorService; + @Autowired + private SysDeptMapper deptMapper; /** * 鏌ヨ杞﹁締鎸囨爣姒傜巼鏁版嵁 - * + * * @param id 杞﹁締鎸囨爣姒傜巼鏁版嵁涓婚敭 * @return 杞﹁締鎸囨爣姒傜巼鏁版嵁 */ @Override - public CheckIndexCar selectCheckIndexCarById(Long id) - { + public CheckIndexCar selectCheckIndexCarById(Long id) { return checkIndexCarMapper.selectCheckIndexCarById(id); } /** * 鏌ヨ杞﹁締鎸囨爣姒傜巼鏁版嵁鍒楄〃 - * + * * @param checkIndexCar 杞﹁締鎸囨爣姒傜巼鏁版嵁 * @return 杞﹁締鎸囨爣姒傜巼鏁版嵁 */ @Override - public List<CheckIndexCar> selectCheckIndexCarList(CheckIndexCar checkIndexCar) - { + public List<CheckIndexCar> selectCheckIndexCarList(CheckIndexCar checkIndexCar) { return checkIndexCarMapper.selectCheckIndexCarList(checkIndexCar); } /** * 鏂板杞﹁締鎸囨爣姒傜巼鏁版嵁 - * + * * @param checkIndexCar 杞﹁締鎸囨爣姒傜巼鏁版嵁 * @return 缁撴灉 */ @Override - public int insertCheckIndexCar(CheckIndexCar checkIndexCar) - { + public int insertCheckIndexCar(CheckIndexCar checkIndexCar) { checkIndexCar.setCreateTime(DateUtils.getNowDate()); return checkIndexCarMapper.insertCheckIndexCar(checkIndexCar); } /** * 淇敼杞﹁締鎸囨爣姒傜巼鏁版嵁 - * + * * @param checkIndexCar 杞﹁締鎸囨爣姒傜巼鏁版嵁 * @return 缁撴灉 */ @Override - public int updateCheckIndexCar(CheckIndexCar checkIndexCar) - { + public int updateCheckIndexCar(CheckIndexCar checkIndexCar) { return checkIndexCarMapper.updateCheckIndexCar(checkIndexCar); } /** * 鎵归噺鍒犻櫎杞﹁締鎸囨爣姒傜巼鏁版嵁 - * + * * @param ids 闇�瑕佸垹闄ょ殑杞﹁締鎸囨爣姒傜巼鏁版嵁涓婚敭 * @return 缁撴灉 */ @Override - public int deleteCheckIndexCarByIds(Long[] ids) - { + public int deleteCheckIndexCarByIds(Long[] ids) { return checkIndexCarMapper.deleteCheckIndexCarByIds(ids); } /** * 鍒犻櫎杞﹁締鎸囨爣姒傜巼鏁版嵁淇℃伅 - * + * * @param id 杞﹁締鎸囨爣姒傜巼鏁版嵁涓婚敭 * @return 缁撴灉 */ @Override - public int deleteCheckIndexCarById(Long id) - { + public int deleteCheckIndexCarById(Long id) { return checkIndexCarMapper.deleteCheckIndexCarById(id); } + /** + * 璁$畻杞﹁締鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬� + * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId + * 寰幆map璁$畻鐐逛綅鍦ㄧ嚎鐜� + * 鏇存柊鎴栨柊澧� + * @param list + */ + //TODO:瑙嗗浘搴撳鎺ョǔ瀹氭�� + @Override + public void siteOnline(List<SnapshotDataMonitorResult> list) { + //璁惧id + List<String> deviceIds = list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(deviceIds)) { + // 鐢ㄤ簬瀛樺偍姣忎釜鍖哄煙缁熻淇℃伅鐨勮緟鍔╃被 + class AreaStats { + //鐐逛綅鎬绘暟 + int totalSites = 0; + //绂荤嚎鐐逛綅鏁� + int offlineSites = 0; + //鎬绘姄鎷嶉噺 + int totalDataSum = 0; + } + List<TMonitor> monitors = monitorService.list(new QueryWrapper<TMonitor>().in("serial_number", deviceIds)); + Map<String, AreaStats> areaStatsMap = new HashMap<>(); + //鑾峰緱鎵�鏈夊尯鍘縟eptId + List<Long> deptIds = deptMapper.selectByParentId(207L); + deptIds.forEach(deptId -> areaStatsMap.put(deptId + "", new AreaStats())); + + //杞崲涓簃ap + //TODO锛氬垎鐪佸巺甯傚眬 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹� + List<String> provinceIds = new ArrayList<>(); + Map<String, TMonitor> monitorMap = monitors.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity())); + for (SnapshotDataMonitorResult result : list) { + TMonitor monitor = monitorMap.get(result.getExternalIndexCode()); + AreaStats areaStats = areaStatsMap.get(monitor.getDeptId() + ""); + String serialNumber = monitor.getSerialNumber(); + //鏃犳暟鎹� + if (ApiConstants.HK_SnapCount_ResultType_Null == result.getResultType()) { + //鍖哄煙绂荤嚎鐐逛綅鏁� + areaStats.offlineSites++; + } else { + //鍖哄煙鎬绘姄鎷嶉噺 + areaStats.totalSites += result.getDataCount(); + } + //鍖哄煙鐐逛綅鎬绘暟 + areaStats.totalDataSum++; + //鏄惁鏄渷鍘呮暟鎹� + if (!CollectionUtils.isEmpty(provinceIds)) { + if (provinceIds.contains(serialNumber)) { + //鐪佸巺鏁版嵁 + AreaStats provinceStats = areaStatsMap.get("Province_" + monitor.getDeptId()); + //鏃犳暟鎹� + if (ApiConstants.HK_SnapCount_ResultType_Null == result.getResultType()) { + //鍖哄煙绂荤嚎鐐逛綅鏁� + provinceStats.offlineSites++; + } else { + //鍖哄煙鎬绘姄鎷嶉噺 + provinceStats.totalDataSum += result.getDataCount(); + } + //鍖哄煙鐐逛綅鎬绘暟 + provinceStats.totalSites++; + areaStatsMap.put("Province_" + monitor.getDeptId(), areaStats); + } + } + areaStatsMap.put(monitor.getDeptId() + "", areaStats); + } + List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate()); + List<CheckIndexCar> checkIndexCars = new ArrayList<>(); + areaStatsMap.forEach((k, v) -> { + if (v.totalSites == 0) { + log.info("閮ㄩ棬id涓簕}鎬荤偣浣嶆暟涓�0", k); + } else { + CheckIndexCar checkIndexCar = new CheckIndexCar(); + //鎵炬槸鍚﹀凡缁忓瓨鍦ㄦ暟鎹� + Optional<CheckIndexCar> first; + if (k.startsWith("Province_")) { + //鐪佸巺 + String[] idArray = k.split("_"); + first = checkIndexCarList.stream().filter(item -> idArray[1].equals(item.getDeptId() + "") && CheckConstants.Examine_Tag_City.equals(item.getExamineTag())) + .findFirst(); + checkIndexCar.setExamineTag(CheckConstants.Examine_Tag_City); + checkIndexCar.setDeptId(Long.parseLong(idArray[1])); + } else { + //鍖哄幙 + first = checkIndexCarList.stream().filter(item -> k.equals(item.getDeptId() + "") && CheckConstants.Examine_Tag_County.equals(item.getExamineTag())) + .findFirst(); + checkIndexCar.setExamineTag(CheckConstants.Examine_Tag_County); + checkIndexCar.setDeptId(Long.parseLong(k)); + } + checkIndexCar.setCreateTime(new Date()); + if (first.isPresent()) { + checkIndexCar = first.get(); + } + // 灏嗘暣鏁拌浆鎹负BigDecimal + BigDecimal totalSitesBd = new BigDecimal(v.totalSites); + BigDecimal offlineSitesBd = new BigDecimal(v.offlineSites); + // 鎵ц璁$畻锛屼繚鐣欏洓浣嶅皬鏁板苟鍥涜垗浜斿叆 + BigDecimal onlineSitesBd = totalSitesBd.subtract(offlineSitesBd); + BigDecimal siteOnline = onlineSitesBd.divide(totalSitesBd, 4, RoundingMode.HALF_UP); + checkIndexCar.setSiteOnline(siteOnline); + checkIndexCars.add(checkIndexCar); + } + }); + + saveOrUpdateBatch(checkIndexCars); + } + } + } -- Gitblit v1.8.0