From 002372c5cfd2c9b9881fda5e527c2b6c4ee4d599 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期三, 19 二月 2025 09:26:40 +0800 Subject: [PATCH] 代码注释,运维监控报表接口统计sql重新编写 --- ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java index 8aaa8bf..55976c3 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java @@ -33,6 +33,7 @@ import com.ycl.platform.mapper.DynamicColumnMapper; import com.ycl.platform.mapper.TMonitorMapper; import com.ycl.platform.mapper.WorkOrderMapper; +import com.ycl.platform.mapper.YwPointMapper; import com.ycl.platform.service.ITMonitorService; import com.ycl.system.Result; import com.ycl.system.entity.SysDictData; @@ -57,6 +58,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import pojo.ExcelExp; import utils.poi.ExcelUtilManySheet; @@ -89,6 +91,8 @@ public class TMonitorServiceImpl extends ServiceImpl<TMonitorMapper, TMonitor> implements ITMonitorService { @Autowired private TMonitorMapper tMonitorMapper; + @Autowired + private YwPointMapper pointMapper; @Autowired private ISysConfigService configService; @Autowired @@ -368,16 +372,21 @@ */ @Override public Map<String, Object> home(HomeQuery monitorQuery) { - + System.out.println(monitorQuery + "~~~~~~~~~~~~~鎵撳嵃"); Map<String, Object> dataMap = new HashMap<>(); Map<String, Object> monthMap1 = new HashMap<>(); Map<String, Object> monthMap2 = new HashMap<>(); List<Map<String, Object>> home = baseMapper.home(monitorQuery); if (ObjectUtils.isNotEmpty(home)) { + //鎷垮埌鏁版嵁搴� 寰幆鏌ヨ + System.out.println(home + "~~~~~~~~~~~~~鎵撳嵃"); for (Map<String, Object> map : home) { + //寰楀埌map鐨� months閿殑鍊� num1閿殑鍊� 缁勮涓烘柊瀵硅薄 monthMap1.put(map.get("months").toString(), map.get("num1")); + //寰楀埌map鐨� months閿殑鍊� num2閿殑鍊� 缁勮涓烘柊瀵硅薄 monthMap2.put(map.get("months").toString(), map.get("num2")); } + //home 鐨勪笅鏍�0鐨� map鐨� name閿殑鍊� dataMap.put("name", home.get(0).get("name")); dataMap.put("state", monthMap1); dataMap.put("state2", monthMap2); @@ -961,7 +970,7 @@ )) .append("loseCount", new Document("$sum", new Document("$cond", Arrays.asList( - new Document("$eq", Arrays.asList("$recordStatus", -1)), + new Document("$in", Arrays.asList("$recordStatus", Arrays.asList(-1, 0))), 1, 0 )) @@ -1084,6 +1093,24 @@ util.exportExcel(response, monitors, sheetName); } + /** + * 娓呯悊涓�鏈轰竴妗� + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Result clearMonitor() { + tMonitorMapper.clearMonitor(); + pointMapper.clearMonitor(); + return Result.ok(); + } + + @Override + public Result assetManagementCount(DataCenterQuery query) { + Map<String, String> map =tMonitorMapper.assetManagementCount(); + return Result.ok().data(map); + } + //棣栭〉杞﹁締鎶ヨ〃 @Override -- Gitblit v1.8.0