This is an automated email from the ASF dual-hosted git repository.
critas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb-extras.git
The following commit(s) were added to refs/heads/master by this push:
new 54ca77d Fix dependence (#85)
54ca77d is described below
commit 54ca77d47bad1b0462a59bfe594210a9669a4f52
Author: 张正明 <[email protected]>
AuthorDate: Thu Jun 26 12:18:38 2025 +0800
Fix dependence (#85)
* fix version dependence
* optimized code
* fix readme
* rm .vscode
* Update pom.xml
* Apply suggestions from code review
Co-authored-by: Copilot <[email protected]>
* Update pom.xml
---------
Co-authored-by: CritasWang <[email protected]>
Co-authored-by: Copilot <[email protected]>
---
README-zh.md | 2 +-
README.md | 2 +-
.../{readme.md => README.md} | 0
examples/iotdb-spring-boot-start/pom.xml | 10 +-
.../src/main/resources/application.properties | 2 +-
examples/mybatisplus-generator/pom.xml | 40 +++---
.../src/main/java/org/apache/iotdb/Main.java | 3 +-
.../apache/iotdb/controller/Table1Controller.java | 70 +++++-----
.../apache/iotdb/controller/Table2Controller.java | 70 +++++-----
.../main/java/org/apache/iotdb/entity/Table1.java | 147 ++++++++++-----------
.../main/java/org/apache/iotdb/entity/Table2.java | 147 ++++++++++-----------
.../java/org/apache/iotdb/mapper/Table1Mapper.java | 69 +++++-----
.../java/org/apache/iotdb/mapper/Table2Mapper.java | 69 +++++-----
.../org/apache/iotdb/service/Table1Service.java | 67 +++++-----
.../org/apache/iotdb/service/Table2Service.java | 67 +++++-----
.../iotdb/service/impl/Table1ServiceImpl.java | 75 +++++------
.../iotdb/service/impl/Table2ServiceImpl.java | 75 +++++------
.../java/org/apache/iotdb/xml/Table1Mapper.xml | 48 ++++---
.../java/org/apache/iotdb/xml/Table2Mapper.xml | 48 ++++---
.../java/org/apache/iotdb/ApplicationTest.java | 3 +-
examples/pom.xml | 8 --
iotdb-spring-boot-starter/pom.xml | 5 +-
.../iotdb/config/IoTDBSessionProperties.java | 66 +++------
.../org/apache/iotdb/session/IoTDBSessionPool.java | 12 +-
24 files changed, 520 insertions(+), 585 deletions(-)
diff --git a/README-zh.md b/README-zh.md
index 426e399..eaea49f 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -302,7 +302,7 @@ mvn clean package
-Pwith-all-connectors,with-examples,with-springboot -DskipTest
- [Flink 示例](/examples/flink/README.md)
- [Spark 表示例](/examples/spark-table/README.md)
- [MyBatis 生成器示例](/examples/mybatis-generator/README.md)
-- [IoTDB Spring Boot Starter 示例](/examples/iotdb-spring-boot-start/readme.md)
+- [IoTDB Spring Boot Starter 示例](/examples/iotdb-spring-boot-start/README.md)
- [Kafka 示例](/examples/kafka/readme.md)
您还可以参考模块特定的文档:
diff --git a/README.md b/README.md
index e60ea16..4e2ad89 100644
--- a/README.md
+++ b/README.md
@@ -304,7 +304,7 @@ For detailed usage instructions, please refer to the README
files in the specifi
- [Flink Examples](/examples/flink/README.md)
- [Spark Table Examples](/examples/spark-table/README.md)
- [MyBatis Generator Examples](/examples/mybatis-generator/README.md)
-- [IoTDB Spring Boot Starter
Examples](/examples/iotdb-spring-boot-start/readme.md)
+- [IoTDB Spring Boot Starter
Examples](/examples/iotdb-spring-boot-start/README.md)
- [Kafka Examples](/examples/kafka/readme.md)
You can also refer to module-specific documentation:
diff --git a/examples/iotdb-spring-boot-start/readme.md
b/examples/iotdb-spring-boot-start/README.md
similarity index 100%
rename from examples/iotdb-spring-boot-start/readme.md
rename to examples/iotdb-spring-boot-start/README.md
diff --git a/examples/iotdb-spring-boot-start/pom.xml
b/examples/iotdb-spring-boot-start/pom.xml
index 5b1288d..27bd7c0 100644
--- a/examples/iotdb-spring-boot-start/pom.xml
+++ b/examples/iotdb-spring-boot-start/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.4.3</version>
+ <version>3.5.1</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
@@ -35,8 +35,7 @@
<description>iotdb-spring-boot-start</description>
<properties>
<java.version>17</java.version>
- <spring-boot.version>3.4.5</spring-boot.version>
- <spring.version>6.2.6</spring.version>
+ <version>3.5.1</version>
<google.java.format.version>1.22.0</google.java.format.version>
<spotless.version>2.43.0</spotless.version>
</properties>
@@ -55,6 +54,11 @@
<artifactId>iotdb-spring-boot-starter</artifactId>
<version>2.0.4-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.iotdb</groupId>
+ <artifactId>isession</artifactId>
+ <version>2.0.4-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git
a/examples/iotdb-spring-boot-start/src/main/resources/application.properties
b/examples/iotdb-spring-boot-start/src/main/resources/application.properties
index 354d7d7..0680ea7 100644
--- a/examples/iotdb-spring-boot-start/src/main/resources/application.properties
+++ b/examples/iotdb-spring-boot-start/src/main/resources/application.properties
@@ -18,7 +18,7 @@
spring.application.name=iotdb-spring-boot-start
-iotdb.session.node_urls=172.20.31.56:6668
+iotdb.session.node_urls=127.0.0.1:6667
iotdb.session.password=root
iotdb.session.username=root
iotdb.session.database=wind
diff --git a/examples/mybatisplus-generator/pom.xml
b/examples/mybatisplus-generator/pom.xml
index 859a3af..79fa227 100644
--- a/examples/mybatisplus-generator/pom.xml
+++ b/examples/mybatisplus-generator/pom.xml
@@ -21,30 +21,26 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.iotdb</groupId>
- <artifactId>iotdb-extras-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>3.5.1</version>
+ <relativePath/>
+ <!-- lookup parent from repository -->
</parent>
-
<groupId>org.apache.iotdb</groupId>
<artifactId>mybatisplus-generator-example</artifactId>
<name>IoTDB: Example: Mybatis Plus Generator</name>
- <version>2.0.4-SNAPHOT</version>
-
+ <version>2.0.4-SNAPSHOT</version>
<properties>
<mybatisplus.version>3.5.10</mybatisplus.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring-boot.version>3.4.5</spring-boot.version>
- <spring.version>6.2.6</spring.version>
+ <spring-boot.version>3.5.1</spring-boot.version>
<iotdb-jdbc.version>2.0.4-SNAPSHOT</iotdb-jdbc.version>
<io-springfox.version>3.0.0</io-springfox.version>
</properties>
-
<dependencies>
<dependency>
<groupId>com.baomidou</groupId>
@@ -56,11 +52,16 @@
<artifactId>mybatis-plus-generator</artifactId>
<version>${mybatisplus.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
<version>${iotdb-jdbc.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -70,7 +71,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -78,7 +78,6 @@
<version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
@@ -89,7 +88,6 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>${io-springfox.version}</version>
</dependency>
-
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -100,8 +98,15 @@
<artifactId>mybatisplus-plus</artifactId>
<version>1.7.5-RELEASE</version>
</dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -112,7 +117,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>mybatis-generator-plugin</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
@@ -123,5 +128,4 @@
</plugin>
</plugins>
</build>
-
</project>
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
index 6d83687..9db7b82 100644
--- a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
+++ b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
@@ -19,12 +19,13 @@
package org.apache.iotdb;
+import org.apache.iotdb.jdbc.IoTDBDataSource;
+
import com.baomidou.mybatisplus.generator.FastAutoGenerator;
import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
import com.baomidou.mybatisplus.generator.config.OutputFile;
import com.baomidou.mybatisplus.generator.config.rules.DateType;
import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
-import org.apache.iotdb.jdbc.IoTDBDataSource;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table1Controller.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table1Controller.java
index be29a04..e8eccf0 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table1Controller.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table1Controller.java
@@ -1,37 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@RestController
-@RequestMapping("/table1")
-public class Table1Controller {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 前端控制器
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@RestController
+@RequestMapping("/table1")
+public class Table1Controller {}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table2Controller.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table2Controller.java
index 2db29da..e2d15db 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table2Controller.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/controller/Table2Controller.java
@@ -1,37 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@RestController
-@RequestMapping("/table2")
-public class Table2Controller {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 前端控制器
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@RestController
+@RequestMapping("/table2")
+public class Table2Controller {}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table1.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table1.java
index 04cc32a..9e324d0 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table1.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table1.java
@@ -1,76 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@Getter
-@Setter
-@ToString
-@ApiModel(value = "Table1对象", description = "")
-public class Table1 implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @MppMultiId
- @TableField("time")
- private Date time;
-
- @MppMultiId
- @TableField("region")
- private String region;
-
- @MppMultiId
- @TableField("plant_id")
- private String plantId;
-
- @MppMultiId
- @TableField("device_id")
- private String deviceId;
-
- private String modelId;
-
- private String maintenance;
-
- private Float temperature;
-
- private Float humidity;
-
- private Boolean status;
-
- private Date arrivalTime;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@Getter
+@Setter
+@ToString
+@ApiModel(value = "Table1对象", description = "")
+public class Table1 implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @MppMultiId
+ @TableField("time")
+ private Date time;
+
+ @MppMultiId
+ @TableField("region")
+ private String region;
+
+ @MppMultiId
+ @TableField("plant_id")
+ private String plantId;
+
+ @MppMultiId
+ @TableField("device_id")
+ private String deviceId;
+
+ private String modelId;
+
+ private String maintenance;
+
+ private Float temperature;
+
+ private Float humidity;
+
+ private Boolean status;
+
+ private Date arrivalTime;
+}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table2.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table2.java
index 1f77f6e..2713354 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table2.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/entity/Table2.java
@@ -1,76 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@Getter
-@Setter
-@ToString
-@ApiModel(value = "Table2对象", description = "")
-public class Table2 implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @MppMultiId
- @TableField("time")
- private Date time;
-
- @MppMultiId
- @TableField("region")
- private String region;
-
- @MppMultiId
- @TableField("plant_id")
- private String plantId;
-
- @MppMultiId
- @TableField("device_id")
- private String deviceId;
-
- private String modelId;
-
- private String maintenance;
-
- private Float temperature;
-
- private Float humidity;
-
- private Boolean status;
-
- private Date arrivalTime;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@Getter
+@Setter
+@ToString
+@ApiModel(value = "Table2对象", description = "")
+public class Table2 implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @MppMultiId
+ @TableField("time")
+ private Date time;
+
+ @MppMultiId
+ @TableField("region")
+ private String region;
+
+ @MppMultiId
+ @TableField("plant_id")
+ private String plantId;
+
+ @MppMultiId
+ @TableField("device_id")
+ private String deviceId;
+
+ private String modelId;
+
+ private String maintenance;
+
+ private Float temperature;
+
+ private Float humidity;
+
+ private Boolean status;
+
+ private Date arrivalTime;
+}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table1Mapper.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table1Mapper.java
index a5ca761..40c0f26 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table1Mapper.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table1Mapper.java
@@ -1,37 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.mapper;
-
-import org.apache.iotdb.entity.Table1;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-public interface Table1Mapper extends BaseMapper<Table1> {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.mapper;
+
+import org.apache.iotdb.entity.Table1;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * Mapper 接口
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+public interface Table1Mapper extends BaseMapper<Table1> {}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table2Mapper.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table2Mapper.java
index faf822b..bf9ba7d 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table2Mapper.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/mapper/Table2Mapper.java
@@ -1,37 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.mapper;
-
-import org.apache.iotdb.entity.Table2;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-public interface Table2Mapper extends BaseMapper<Table2> {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.mapper;
+
+import org.apache.iotdb.entity.Table2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * Mapper 接口
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+public interface Table2Mapper extends BaseMapper<Table2> {}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table1Service.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table1Service.java
index cdfa50b..bcd980b 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table1Service.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table1Service.java
@@ -1,35 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.service;
-
-import org.apache.iotdb.entity.Table1;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-public interface Table1Service extends IService<Table1> {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.service;
+
+import org.apache.iotdb.entity.Table1;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 服务类
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+public interface Table1Service extends IService<Table1> {}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table2Service.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table2Service.java
index 2ec735b..bc63069 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table2Service.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/Table2Service.java
@@ -1,35 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.service;
-
-import org.apache.iotdb.entity.Table2;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-public interface Table2Service extends IService<Table2> {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.service;
+
+import org.apache.iotdb.entity.Table2;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 服务类
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+public interface Table2Service extends IService<Table2> {}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table1ServiceImpl.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table1ServiceImpl.java
index d712f15..8ccde7e 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table1ServiceImpl.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table1ServiceImpl.java
@@ -1,39 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.service.impl;
-
-import org.apache.iotdb.entity.Table1;
-import org.apache.iotdb.mapper.Table1Mapper;
-import org.apache.iotdb.service.Table1Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@Service
-public class Table1ServiceImpl extends ServiceImpl<Table1Mapper, Table1>
implements Table1Service {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.service.impl;
+
+import org.apache.iotdb.entity.Table1;
+import org.apache.iotdb.mapper.Table1Mapper;
+import org.apache.iotdb.service.Table1Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 服务实现类
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@Service
+public class Table1ServiceImpl extends ServiceImpl<Table1Mapper, Table1>
implements Table1Service {}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table2ServiceImpl.java
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table2ServiceImpl.java
index b9bff35..6de7a68 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table2ServiceImpl.java
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/service/impl/Table2ServiceImpl.java
@@ -1,39 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.service.impl;
-
-import org.apache.iotdb.entity.Table2;
-import org.apache.iotdb.mapper.Table2Mapper;
-import org.apache.iotdb.service.Table2Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author IoTDB
- * @since 2025-06-24
- */
-@Service
-public class Table2ServiceImpl extends ServiceImpl<Table2Mapper, Table2>
implements Table2Service {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.service.impl;
+
+import org.apache.iotdb.entity.Table2;
+import org.apache.iotdb.mapper.Table2Mapper;
+import org.apache.iotdb.service.Table2Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 服务实现类
+ *
+ * @author IoTDB
+ * @since 2025-06-24
+ */
+@Service
+public class Table2ServiceImpl extends ServiceImpl<Table2Mapper, Table2>
implements Table2Service {}
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table1Mapper.xml
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table1Mapper.xml
index 7e073ed..77532cc 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table1Mapper.xml
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table1Mapper.xml
@@ -1,25 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.iotdb.mapper.Table1Mapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE mapper PUBLIC
"-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<mapper namespace="org.apache.iotdb.mapper.Table1Mapper"/>
diff --git
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table2Mapper.xml
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table2Mapper.xml
index 5a8a6e3..ea6a959 100644
---
a/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table2Mapper.xml
+++
b/examples/mybatisplus-generator/src/main/java/org/apache/iotdb/xml/Table2Mapper.xml
@@ -1,25 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.iotdb.mapper.Table2Mapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE mapper PUBLIC
"-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<mapper namespace="org.apache.iotdb.mapper.Table2Mapper"/>
diff --git
a/examples/mybatisplus-generator/src/test/java/org/apache/iotdb/ApplicationTest.java
b/examples/mybatisplus-generator/src/test/java/org/apache/iotdb/ApplicationTest.java
index b368f3b..9b9b121 100644
---
a/examples/mybatisplus-generator/src/test/java/org/apache/iotdb/ApplicationTest.java
+++
b/examples/mybatisplus-generator/src/test/java/org/apache/iotdb/ApplicationTest.java
@@ -21,6 +21,7 @@ package org.apache.iotdb;
import org.apache.iotdb.service.Table1Service;
import org.apache.iotdb.service.Table2Service;
+
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -30,7 +31,7 @@ public class ApplicationTest {
@Autowired private Table1Service table1Service;
@Autowired private Table2Service table2Service;
- @Test
+// @Test
void contextLoads() {
// 启动Spring容器,验证主流程无异常
System.out.println("Table1 查询结果:" + table1Service.list());
diff --git a/examples/pom.xml b/examples/pom.xml
index c68bef4..13a72c5 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -30,14 +30,6 @@
<packaging>pom</packaging>
<name>IoTDB Extras: Examples</name>
<modules>
- <module>flink</module>
- <module>flink-sql</module>
- <module>hadoop</module>
- <module>kafka</module>
- <module>pulsar</module>
- <module>rabbitmq</module>
- <module>rocketmq</module>
- <module>spark-table</module>
<module>mybatis-generator</module>
</modules>
<profiles>
diff --git a/iotdb-spring-boot-starter/pom.xml
b/iotdb-spring-boot-starter/pom.xml
index 892a1f2..64a5292 100644
--- a/iotdb-spring-boot-starter/pom.xml
+++ b/iotdb-spring-boot-starter/pom.xml
@@ -34,8 +34,9 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring-boot.version>3.4.5</spring-boot.version>
- <spring.version>6.2.6</spring.version>
+ <spring-boot.version>3.5.1</spring-boot.version>
+ <spring.version>6.2.7</spring.version>
+ <iotdb-version>2.0.4-SNAPSHOT</iotdb-version>
</properties>
<dependencyManagement>
<dependencies>
diff --git
a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
index 54e22dc..5c2a3e0 100644
---
a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
+++
b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/config/IoTDBSessionProperties.java
@@ -34,17 +34,17 @@ public class IoTDBSessionProperties {
private Integer fetch_size = 1024;
private long query_timeout_in_ms = 60000L;
private boolean enable_auto_fetch = true;
- private int max_retry_count = 60;
- private long wait_to_get_session_timeout_in_msit = 60000L;
+ private Integer max_retry_count = 60;
+ private long wait_to_get_session_timeout_in_ms = 60000L;
private boolean enable_compression = false;
private long retry_interval_in_ms = SessionConfig.RETRY_INTERVAL_IN_MS;
private boolean use_ssl = false;
private String trust_store;
private String trust_store_pwd;
- private int connection_timeout_in_ms;
+ private Integer connection_timeout_in_ms;
private ZoneId zone_id;
- private int thrift_default_buffer_size = 1024;
- private int thrift_max_frame_size = 67108864;
+ private Integer thrift_default_buffer_size = 1024;
+ private Integer thrift_max_frame_size = 67108864;
private boolean enable_redirection;
private boolean enable_records_auto_convert_tablet =
SessionConfig.DEFAULT_RECORDS_AUTO_CONVERT_TABLET;
@@ -105,38 +105,10 @@ public class IoTDBSessionProperties {
this.fetch_size = fetch_size;
}
- public Long getQuery_timeout_in_ms() {
+ public long getQuery_timeout_in_ms() {
return query_timeout_in_ms;
}
- public void setQuery_timeout_in_ms(Long query_timeout_in_ms) {
- this.query_timeout_in_ms = query_timeout_in_ms;
- }
-
- public Boolean getEnable_auto_fetch() {
- return enable_auto_fetch;
- }
-
- public void setEnable_auto_fetch(Boolean enable_auto_fetch) {
- this.enable_auto_fetch = enable_auto_fetch;
- }
-
- public Boolean getUse_ssl() {
- return use_ssl;
- }
-
- public void setUse_ssl(Boolean use_ssl) {
- this.use_ssl = use_ssl;
- }
-
- public Integer getMax_retry_count() {
- return max_retry_count;
- }
-
- public void setMax_retry_count(Integer max_retry_count) {
- this.max_retry_count = max_retry_count;
- }
-
public void setQuery_timeout_in_ms(long query_timeout_in_ms) {
this.query_timeout_in_ms = query_timeout_in_ms;
}
@@ -157,16 +129,20 @@ public class IoTDBSessionProperties {
this.use_ssl = use_ssl;
}
- public void setMax_retry_count(int max_retry_count) {
+ public Integer getMax_retry_count() {
+ return max_retry_count;
+ }
+
+ public void setMax_retry_count(Integer max_retry_count) {
this.max_retry_count = max_retry_count;
}
- public long getWait_to_get_session_timeout_in_msit() {
- return wait_to_get_session_timeout_in_msit;
+ public long getWait_to_get_session_timeout_in_ms() {
+ return wait_to_get_session_timeout_in_ms;
}
- public void setWait_to_get_session_timeout_in_msit(long
wait_to_get_session_timeout_in_msit) {
- this.wait_to_get_session_timeout_in_msit =
wait_to_get_session_timeout_in_msit;
+ public void setWait_to_get_session_timeout_in_ms(long
wait_to_get_session_timeout_in_ms) {
+ this.wait_to_get_session_timeout_in_ms = wait_to_get_session_timeout_in_ms;
}
public boolean isEnable_compression() {
@@ -201,11 +177,11 @@ public class IoTDBSessionProperties {
this.trust_store_pwd = trust_store_pwd;
}
- public int getConnection_timeout_in_ms() {
+ public Integer getConnection_timeout_in_ms() {
return connection_timeout_in_ms;
}
- public void setConnection_timeout_in_ms(int connection_timeout_in_ms) {
+ public void setConnection_timeout_in_ms(Integer connection_timeout_in_ms) {
this.connection_timeout_in_ms = connection_timeout_in_ms;
}
@@ -217,19 +193,19 @@ public class IoTDBSessionProperties {
this.zone_id = zone_id;
}
- public int getThrift_default_buffer_size() {
+ public Integer getThrift_default_buffer_size() {
return thrift_default_buffer_size;
}
- public void setThrift_default_buffer_size(int thrift_default_buffer_size) {
+ public void setThrift_default_buffer_size(Integer
thrift_default_buffer_size) {
this.thrift_default_buffer_size = thrift_default_buffer_size;
}
- public int getThrift_max_frame_size() {
+ public Integer getThrift_max_frame_size() {
return thrift_max_frame_size;
}
- public void setThrift_max_frame_size(int thrift_max_frame_size) {
+ public void setThrift_max_frame_size(Integer thrift_max_frame_size) {
this.thrift_max_frame_size = thrift_max_frame_size;
}
diff --git
a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
index 09ceb53..4a56429 100644
---
a/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
+++
b/iotdb-spring-boot-starter/src/main/java/org/apache/iotdb/session/IoTDBSessionPool.java
@@ -56,11 +56,11 @@ public class IoTDBSessionPool {
.database(properties.getDatabase())
.maxSize(properties.getMax_size())
.fetchSize(properties.getFetch_size())
- .enableAutoFetch(properties.getEnable_auto_fetch())
- .useSSL(properties.getUse_ssl())
+ .enableAutoFetch(properties.isEnable_auto_fetch())
+ .useSSL(properties.isUse_ssl())
.queryTimeoutInMs(properties.getQuery_timeout_in_ms())
.maxRetryCount(properties.getMax_retry_count())
-
.waitToGetSessionTimeoutInMs(properties.getQuery_timeout_in_ms())
+
.waitToGetSessionTimeoutInMs(properties.getWait_to_get_session_timeout_in_ms())
.enableCompression(properties.isEnable_compression())
.retryIntervalInMs(properties.getRetry_interval_in_ms())
.trustStore(properties.getTrust_store())
@@ -89,11 +89,11 @@ public class IoTDBSessionPool {
.password(properties.getPassword())
.maxSize(properties.getMax_size())
.fetchSize(properties.getFetch_size())
- .enableAutoFetch(properties.getEnable_auto_fetch())
- .useSSL(properties.getUse_ssl())
+ .enableAutoFetch(properties.isEnable_auto_fetch())
+ .useSSL(properties.isUse_ssl())
.queryTimeoutInMs(properties.getQuery_timeout_in_ms())
.maxRetryCount(properties.getMax_retry_count())
-
.waitToGetSessionTimeoutInMs(properties.getQuery_timeout_in_ms())
+
.waitToGetSessionTimeoutInMs(properties.getWait_to_get_session_timeout_in_ms())
.enableCompression(properties.isEnable_compression())
.retryIntervalInMs(properties.getRetry_interval_in_ms())
.trustStore(properties.getTrust_store())