优化import

das/src/main/java/com/das/modules/cache/domain/IotModelInfoCache.java

@@ -2,8 +2,6 @@ package com.das.modules.cache.domain;
 
 import lombok.Data;
 
-import java.util.concurrent.ConcurrentHashMap;
-
 @Data
 public class IotModelInfoCache {
     private Long iotModelId;

das/src/main/java/com/das/modules/cache/service/impl/IotModelCacheImpl.java

@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 @Service
 public class IotModelCacheImpl implements IotModelCache {

das/src/main/java/com/das/modules/calc/controller/CalcController.java

@@ -1,11 +1,9 @@
 package com.das.modules.calc.controller;
 
-import cn.hutool.core.io.FileUtil;
 import com.das.common.result.R;
 import com.das.modules.calc.domain.vo.CalcModuleVo;
 import com.das.modules.calc.service.CalcService;
 import lombok.extern.slf4j.Slf4j;
-import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,9 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;

das/src/main/java/com/das/modules/calc/domain/entity/CalcModule.java

@@ -10,7 +10,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Date;
-import java.util.concurrent.atomic.AtomicInteger;
 
 @Slf4j
 @TableName("sys_calc_module")

das/src/main/java/com/das/modules/calc/functions/FunctionAvgValue.java

@@ -1,7 +1,5 @@
 package com.das.modules.calc.functions;
 
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateUtil;
 import com.das.modules.cache.domain.DeviceInfoCache;
 import com.das.modules.cache.service.CacheService;
 import com.das.modules.data.service.DataService;

das/src/main/java/com/das/modules/calc/functions/FunctionCacheValue.java

@@ -9,7 +9,6 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Aviator扩展函数  - 获取设备实时数据

das/src/main/java/com/das/modules/calc/functions/FunctionRealData.java

@@ -5,7 +5,8 @@ import com.das.modules.cache.service.CacheService;
 import com.das.modules.data.domain.SnapshotValueQueryParam;
 import com.das.modules.data.service.DataService;
 import com.googlecode.aviator.runtime.function.AbstractFunction;
-import com.googlecode.aviator.runtime.type.*;
+import com.googlecode.aviator.runtime.type.AviatorObject;
+import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;

das/src/main/java/com/das/modules/calc/functions/FunctionSaveCalcData.java

@@ -12,7 +12,10 @@ import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Aviator扩展函数  - 获取设备实时数据

das/src/main/java/com/das/modules/calc/functions/FunctionSumValue.java

@@ -1,6 +1,5 @@
 package com.das.modules.calc.functions;
 
-import cn.hutool.core.date.DateUtil;
 import com.das.modules.cache.domain.DeviceInfoCache;
 import com.das.modules.cache.service.CacheService;
 import com.das.modules.data.service.DataService;
@@ -8,12 +7,10 @@ import com.googlecode.aviator.runtime.function.AbstractFunction;
 import com.googlecode.aviator.runtime.type.AviatorNil;
 import com.googlecode.aviator.runtime.type.AviatorObject;
 import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Date;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Aviator扩展函数  - 获取时间维度内最早的一条数据

das/src/main/java/com/das/modules/calc/functions/FunctionTopValue.java

@@ -1,10 +1,8 @@
 package com.das.modules.calc.functions;
 
-import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.das.modules.cache.domain.DeviceInfoCache;
 import com.das.modules.cache.service.CacheService;
-import com.das.modules.data.domain.SnapshotValueQueryParam;
 import com.das.modules.data.service.DataService;
 import com.googlecode.aviator.runtime.function.AbstractFunction;
 import com.googlecode.aviator.runtime.type.AviatorNil;
@@ -14,8 +12,6 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

das/src/main/java/com/das/modules/calc/functions/FunctionWindSpeedFactor.java

@@ -11,7 +11,6 @@ import com.googlecode.aviator.runtime.type.AviatorObject;
 import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

das/src/main/java/com/das/modules/calc/service/CalcJob.java

@@ -6,7 +6,6 @@ import com.das.modules.cache.service.CacheService;
 import com.das.modules.calc.domain.entity.CalcModule;
 import com.googlecode.aviator.AviatorEvaluatorInstance;
 import com.googlecode.aviator.Expression;
-import com.googlecode.aviator.runtime.type.AviatorRuntimeJavaType;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
 import org.quartz.JobDataMap;

das/src/main/java/com/das/modules/node/command/HeartbeatCommand.java

@@ -56,7 +56,7 @@ public class HeartbeatCommand implements BaseCommand{
                     }
                     //判断是不是风机
                     String keyPLCDeviceStatus = String.format("RT:%d:iturbineoperationmode", deviceId);
-                    String keyCommFaultState = String.format("RT:%d:commfaultstate");
+                    String keyCommFaultState = String.format("RT:%d:commfaultstate",deviceId);
                     Integer plcDeviceStatus = adminRedisTemplate.get(keyPLCDeviceStatus);
                     if (plcDeviceStatus == null){
                         adminRedisTemplate.set(keyCommFaultState, online ? 0 : 1);