修改基础库

forecast-common/pom.xml

@@ -100,10 +100,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.iotdb</groupId>
-            <artifactId>iotdb-session</artifactId>
-        </dependency>
 
         <!-- pool 对象池 -->
         <dependency>

forecast-common/src/main/java/cn/oleauto/common/config/AgvcConfig.java → forecast-common/src/main/java/cn/oleauto/common/config/AppConfig.java

@@ -1,6 +1,5 @@
 package cn.oleauto.common.config;
 
-import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -10,8 +9,8 @@ import org.springframework.stereotype.Component;
  * @author oleauto
  */
 @Component
-@ConfigurationProperties(prefix = "agvc")
-public class AgvcConfig
+@ConfigurationProperties(prefix = "app")
+public class AppConfig
 {
     /** 版本 */
     private String version;
@@ -57,7 +56,7 @@ public class AgvcConfig
 
     public void setProfile(String profile)
     {
-        AgvcConfig.profile = profile;
+        AppConfig.profile = profile;
     }
 
     public static boolean isAddressEnabled()
@@ -67,7 +66,7 @@ public class AgvcConfig
 
     public void setAddressEnabled(boolean addressEnabled)
     {
-        AgvcConfig.addressEnabled = addressEnabled;
+        AppConfig.addressEnabled = addressEnabled;
     }
 
     public static String getCaptchaType() {
@@ -75,7 +74,7 @@ public class AgvcConfig
     }
 
     public void setCaptchaType(String captchaType) {
-        AgvcConfig.captchaType = captchaType;
+        AppConfig.captchaType = captchaType;
     }
 
     public String getGatewayUrl() {

forecast-common/src/main/java/cn/oleauto/common/config/IotDbConfig.java

@@ -1,19 +0,0 @@
-package cn.oleauto.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "agvc.iotdb")
-public class IotDbConfig {
-    private String host; // 设备或服务的主机地址
-    private int port; // 主机地址上的端口号
-    private String username; // 连接时使用的用户名
-    private String password; // 连接时使用的密码
-    private String name = "agvc";
-    private String database="agvc";
-    private long valueTtl = 86400_1000L * 30 * 12 * 5;
-    private long messageTtl = 86400_1000L * 30 * 3;
-}

forecast-common/src/main/java/cn/oleauto/common/core/dto/PointIdDto.java

@@ -7,7 +7,7 @@ import lombok.Data;
 public class PointIdDto {
     // 只有pointType为ch,tr时才需要填写。其它类型可保持为-1或者必须是正确的值
     private long channelId = -1;
-    private long deviceId;
+    private long deviceId = -1;
     private String pointCode;
     private PointType pointType;
 }

forecast-common/src/main/java/cn/oleauto/common/core/iotdb/IotDb.java

@@ -1,38 +0,0 @@
-package cn.oleauto.common.core.iotdb;
-
-import cn.oleauto.common.config.IotDbConfig;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.iotdb.session.pool.SessionPool;
-
-import java.util.List;
-
-@Slf4j
-public class IotDb {
-    private static final IotDb instance = new IotDb();
-    private IotDb(){}
-    public static IotDb getInstance() {
-        return instance;
-    }
-
-    private SessionPool sessionPool = null;
-    public SessionPool sessionPool(){
-        return sessionPool;
-    }
-    public int init(IotDbConfig iotConfig) {
-        try {
-            // 使用IoT配置信息构建一个新的会话实例
-            this.sessionPool =  new SessionPool.Builder()
-                    .nodeUrls(List.of(iotConfig.getHost() + ":" + iotConfig.getPort()))
-                    .user(iotConfig.getUsername())
-                    .password(iotConfig.getPassword())
-                    .maxSize(3)
-                    .build();
-            return 0;
-        }
-        catch (Exception e) {
-            // 记录初始化IoT数据库时遇到的任何错误
-            log.error("init iotdb error", e);
-            return -1;
-        }
-    }
-}

forecast-common/src/main/java/cn/oleauto/common/utils/file/FileUploadUtils.java

@@ -4,9 +4,10 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Objects;
+
+import cn.oleauto.common.config.AppConfig;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
-import cn.oleauto.common.config.AgvcConfig;
 import cn.oleauto.common.constant.Constants;
 import cn.oleauto.common.exception.file.FileNameLengthLimitExceededException;
 import cn.oleauto.common.exception.file.FileSizeLimitExceededException;
@@ -36,7 +37,7 @@ public class FileUploadUtils
     /**
      * 默认上传的地址
      */
-    private static String defaultBaseDir = AgvcConfig.getProfile();
+    private static String defaultBaseDir = AppConfig.getProfile();
 
     public static void setDefaultBaseDir(String defaultBaseDir)
     {
@@ -170,7 +171,7 @@ public class FileUploadUtils
 
     public static final String getPathFileName(String uploadDir, String fileName) throws IOException
     {
-        int dirLastIndex = AgvcConfig.getProfile().length() + 1;
+        int dirLastIndex = AppConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
         return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
     }

forecast-common/src/main/java/cn/oleauto/common/utils/file/FileUtils.java

@@ -9,12 +9,13 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+
+import cn.oleauto.common.config.AppConfig;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
-import cn.oleauto.common.config.AgvcConfig;
 import cn.oleauto.common.constant.Constants;
 import cn.oleauto.common.utils.DateUtils;
 import cn.oleauto.common.utils.StringUtils;
@@ -74,7 +75,7 @@ public class FileUtils
      */
     public static String writeImportBytes(byte[] data) throws IOException
     {
-        return writeBytes(data, AgvcConfig.getImportPath());
+        return writeBytes(data, AppConfig.getImportPath());
     }
 
     /**

forecast-common/src/main/java/cn/oleauto/common/utils/file/ImageUtils.java

@@ -7,10 +7,11 @@ import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Arrays;
+
+import cn.oleauto.common.config.AppConfig;
 import org.apache.poi.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import cn.oleauto.common.config.AgvcConfig;
 import cn.oleauto.common.constant.Constants;
 import cn.oleauto.common.utils.StringUtils;
 
@@ -80,7 +81,7 @@ public class ImageUtils
             else
             {
                 // 本机地址
-                String localPath = AgvcConfig.getProfile();
+                String localPath = AppConfig.getProfile();
                 String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX);
                 in = new FileInputStream(downloadPath);
             }

forecast-common/src/main/java/cn/oleauto/common/utils/ip/AddressUtils.java

@@ -1,10 +1,10 @@
 package cn.oleauto.common.utils.ip;
 
+import cn.oleauto.common.config.AppConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import cn.oleauto.common.config.AgvcConfig;
 import cn.oleauto.common.constant.Constants;
 import cn.oleauto.common.utils.StringUtils;
 import cn.oleauto.common.utils.http.HttpUtils;
@@ -31,7 +31,7 @@ public class AddressUtils
         {
             return "内网IP";
         }
-        if (AgvcConfig.isAddressEnabled())
+        if (AppConfig.isAddressEnabled())
         {
             try
             {

forecast-common/src/main/java/cn/oleauto/common/utils/poi/ExcelUtil.java

@@ -23,6 +23,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
+
+import cn.oleauto.common.config.AppConfig;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RegExUtils;
@@ -74,7 +76,6 @@ import cn.oleauto.common.annotation.Excel;
 import cn.oleauto.common.annotation.Excel.ColumnType;
 import cn.oleauto.common.annotation.Excel.Type;
 import cn.oleauto.common.annotation.Excels;
-import cn.oleauto.common.config.AgvcConfig;
 import cn.oleauto.common.core.domain.AjaxResult;
 import cn.oleauto.common.core.text.Convert;
 import cn.oleauto.common.exception.UtilException;
@@ -1459,7 +1460,7 @@ public class ExcelUtil<T>
      */
     public String getAbsoluteFile(String filename)
     {
-        String downloadPath = AgvcConfig.getDownloadPath() + filename;
+        String downloadPath = AppConfig.getDownloadPath() + filename;
         File desc = new File(downloadPath);
         if (!desc.getParentFile().exists())
         {