From 7e7fbe6c20432ba65e8501e109d305666ce68afa Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 08:42:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/IndCollectTaskNetDay.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/IndCollectTaskNetDay.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/IndCollectTaskNetDay.java
index 69a1a07..904cc5d 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/IndCollectTaskNetDay.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/IndCollectTaskNetDay.java
@@ -3,6 +3,7 @@
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.iailab.module.data.api.ind.IndItemApi;
 import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
+import com.iailab.module.data.common.utils.DateUtils;
 import com.iailab.module.data.ind.item.service.IndItemService;
 import com.iailab.module.data.ind.item.vo.IndItemPageReqVO;
 import com.iailab.module.data.ind.item.vo.IndItemRespVO;
@@ -57,8 +58,8 @@
                         logger.info("开始保存指标数据,指标编号:" + indItem.getItemNo() + ", 指标数据:" + indItemValue.getDataValue());
                         IndItemValueSaveReqVO saveReqVO = new IndItemValueSaveReqVO();
                         saveReqVO.setItemNo(indItem.getItemNo());
-                        saveReqVO.setDataTime(indItemValue.getDataTime());
-                        saveReqVO.setDataValue((BigDecimal) indItemValue.getDataValue());
+                        saveReqVO.setDataTime(DateUtils.format(calendar.getTime(), DateUtils.DATE_TIME_PATTERN));
+                        saveReqVO.setDataValue(convertToBigDecimal(indItemValue.getDataValue()));
                         indItemValueService.create(saveReqVO);
                     }
                 }
@@ -66,8 +67,28 @@
             logger.info("indCollectTaskNetDay定时任务完成时间:" + LocalDateTime.now());
         } catch (Exception ex) {
             ex.printStackTrace();
+            logger.error("indCollectTaskNetDay定时任务错误信息:" + ex.getMessage());
             logger.error("indCollectTaskNetDay定时任务失败时间:" + LocalDateTime.now());
         }
 
     }
+
+    public static BigDecimal convertToBigDecimal(Object value){
+        if (value == null){
+            return null;
+        }
+        if (value instanceof BigDecimal){
+            return (BigDecimal) value;
+        }else if (value instanceof Double){
+            return BigDecimal.valueOf((Double) value);
+        }else if (value instanceof Integer){
+            return BigDecimal.valueOf((Integer) value);
+        }else if (value instanceof Long){
+            return BigDecimal.valueOf((Long) value);
+        }else if (value instanceof String){
+            return new BigDecimal((String) value);
+        }else {
+            throw new RuntimeException("不支持的类型:" + value.getClass().getName());
+        }
+    }
 }

--
Gitblit v1.9.3