From 935fda56e95270493d9e3e46d28b29125d330ca3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期一, 29 七月 2024 16:31:02 +0800
Subject: [PATCH] 修改：流媒体转码使用ffmpeg绝对路径，配置文件中增加ffmpegPath 增加：部门列表查询和部门详情查询无数据权限
---
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
index 92642cd..24aa518 100644
--- a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
+++ b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -321,7 +321,13 @@
if(listResult.size()>0){
for(int i = 0 ; i<listResult.size(); i++){
Map<String , Object> mapTemp = listResult.get(i);
- BigDecimal value = (BigDecimal)mapTemp.get("Value"); //鏁板��
+ //BigDecimal value = (BigDecimal)mapTemp.get("Value"); //鏁板��
+ BigDecimal value = null; //鏁板��
+ try{
+ value = (BigDecimal)mapTemp.get("Value");
+ }catch(Exception e){
+ value = BigDecimal.valueOf(((Number)mapTemp.get("Value")).floatValue());
+ }
String measureStr = (String)mapTemp.get("MeasureDate"); //娴嬮噺鏃堕棿
measureStr = measureStr.substring(measureStr.indexOf("(")+1, measureStr.indexOf(")",2));
SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
--
Gitblit v1.9.3