From 39676fc53ae0fce69aadcd5125accc1c67d463a5 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 09 八月 2024 14:30:34 +0800 Subject: [PATCH] 方法格式 --- ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java index 6bdf620..4a832e8 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java +++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java @@ -1,24 +1,20 @@ package com.ycl.calculate; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ycl.platform.base.CheckIndex; -import com.ycl.platform.domain.entity.CheckIndexCar; -import com.ycl.platform.domain.entity.TMonitor; import com.ycl.platform.domain.entity.YwPoint; -import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult; import com.ycl.platform.mapper.YwPointMapper; -import com.ycl.platform.service.ITMonitorService; import constant.CheckConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.*; -import java.util.function.Function; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -123,13 +119,13 @@ //杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚� public List<String> getProvince() { - List<YwPoint> province = pointMapper.selectByTag(null, "province"); + List<YwPoint> province = pointMapper.selectByTag(null, Boolean.TRUE); return province.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } //杩斿洖閲嶇偣鐐逛綅闆嗗悎 public List<String> getImportant() { - List<YwPoint> important = pointMapper.selectByTag("important", null); + List<YwPoint> important = pointMapper.selectByTag(Boolean.TRUE, null); return important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } @@ -140,7 +136,7 @@ // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁 Optional<T> existingIndex = checkIndexList.stream() .filter(index -> key.equals(index.getDeptId().toString()) && - (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(index.getExamineTag()) + (key.startsWith("Province_") ? CheckConstants.Examine_Tag_Province.equals(index.getExamineTag()) : CheckConstants.Examine_Tag_County.equals(index.getExamineTag()))) .findFirst(); @@ -150,7 +146,7 @@ try { checkIndex = clazz.getDeclaredConstructor().newInstance(); checkIndex.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key)); - checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County); + checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_Province : CheckConstants.Examine_Tag_County); checkIndex.setCreateTime(new Date()); } catch (Exception e) { checkIndex = null; -- Gitblit v1.8.0