From d384786ab5868cd4d856691372eee5359e7d9b2c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 28 三月 2025 17:48:47 +0800
Subject: [PATCH] 导出新增 连个列，以及同步数据库时点位名修改未成功问题

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 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..3865624 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;
@@ -65,6 +67,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -89,6 +92,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 +373,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,6 +971,13 @@
                         ))
                         .append("loseCount", new Document("$sum",
                                 new Document("$cond", Arrays.asList(
+                                        new Document("$eq", Arrays.asList("$recordStatus", 0)),
+                                        1,
+                                        0
+                                ))
+                        ))
+                        .append("errCount", new Document("$sum",
+                                new Document("$cond", Arrays.asList(
                                         new Document("$eq", Arrays.asList("$recordStatus", -1)),
                                         1,
                                         0
@@ -975,6 +992,7 @@
             homeVideoVO.setCreateDate(doc.getDate("_id"));
             homeVideoVO.setIntegrityNum(doc.getInteger("normalCount"));
             homeVideoVO.setLoseNum(doc.getInteger("loseCount"));
+            homeVideoVO.setErrNum(doc.getInteger("errCount"));
             results.add(homeVideoVO);
         }
 
@@ -1082,6 +1100,24 @@
             sheetName = "浜鸿劯";
         }
         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);
     }
 
 
@@ -1392,13 +1428,13 @@
     private void setLoseDaily(VideoDailyExp videoDailyExp, List<RecordMetaDSumResult> recordResults) throws NoSuchFieldException, IllegalAccessException {
         //涓�涓澶囧綋鏈堝湪绾挎儏鍐�
         for (RecordMetaDSumResult recordResult : recordResults) {
-            int dayOfMonth = DateUtils.getDayOfMonth(recordResult.getStatTime());
+            int dayOfMonth = DateUtils.getDayOfMonth(recordResult.getStatTime());  //鑾峰彇鍚姩鏃ユ湡鏄綋鏈堢鍑犲ぉ
             //鍙嶅皠璧嬪�硷紝瀛楁缁熶竴瀹氫箟涓篸ay+1锛�2锛�3...
             Field field = videoDailyExp.getClass().getDeclaredField("day" + dayOfMonth);
             field.setAccessible(true);
             //闃叉杞崲涓虹瀛﹁鏁版硶
-            BigDecimal bigDecimal = BigDecimal.valueOf(recordResult.getMissDuration() == null ? 0 : recordResult.getMissDuration());
-            field.set(videoDailyExp, bigDecimal.toString());
+            BigDecimal bigDecimal = BigDecimal.valueOf(recordResult.getMissDuration() == null ? 0 : (recordResult.getMissDuration()) * 60);
+            field.set(videoDailyExp, bigDecimal.setScale(2, RoundingMode.HALF_UP).toString());
         }
     }
 }

--
Gitblit v1.8.0