Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5

iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/file/FileUtils.java

@@ -1,10 +1,11 @@
 package cc.iotkit.common.utils.file;
 
 import cn.hutool.core.io.FileUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
-import javax.servlet.http.HttpServletResponse;
+
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 

iot-common/pom.xml

@@ -21,7 +21,6 @@
         <module>iot-common-core</module>
         <module>iot-script-engine</module>
         <module>iot-message-bus</module>
-        <module>iot-message-notify</module>
         <module>iot-common-doc</module>
         <module>iot-common-excel</module>
         <module>iot-common-log</module>

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOssConfigData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysOssConfigData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOssData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysOssData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysPostData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysPostData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysRoleData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleDeptData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysRoleDeptData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleMenuData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysRoleMenuData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysTenantData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysTenantData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysTenantPackageData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysTenantPackageData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysUserData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserPostData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysUserPostData {
+}

iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserRoleData.java

@@ -0,0 +1,9 @@
+package cc.iotkit.data.system;
+
+/**
+ * 操作日志数据接口
+ *
+ * @author sjg
+ */
+public interface ISysUserRoleData {
+}

iot-data/iot-rdb-data-service/pom.xml

@@ -23,6 +23,16 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
+        <!-- QueryDSL框架依赖 -->
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-apt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-jpa</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -63,6 +73,11 @@
             <groupId>cc.iotkit</groupId>
             <artifactId>iot-data-service</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+            <version>2.7.11</version>
+        </dependency>
 
     </dependencies>
 
@@ -90,6 +105,26 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <!--因为QueryDsl是类型安全的，所以还需要加上Maven APT plugin，使用 APT 自动生成Q类:-->
+                <groupId>com.mysema.maven</groupId>
+                <artifactId>apt-maven-plugin</artifactId>
+                <version>1.1.3</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/generated-sources/java</outputDirectory>
+                            <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 

iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/convert/system/SysConfigMapper.java

@@ -0,0 +1,23 @@
+package cc.iotkit.data.convert.system;
+
+import cc.iotkit.data.model.TbAlertConfig;
+import cc.iotkit.model.alert.AlertConfig;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper
+public interface SysConfigMapper {
+
+    SysConfigMapper M = Mappers.getMapper(SysConfigMapper.class);
+
+    AlertConfig toDto(TbAlertConfig vo);
+
+    TbAlertConfig toVo(AlertConfig dto);
+
+    static List<AlertConfig> toDto(List<TbAlertConfig> alertConfigs) {
+        return alertConfigs.stream().map(M::toDto).collect(Collectors.toList());
+    }
+}

iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/dao/system/SysConfigRepository.java

@@ -0,0 +1,17 @@
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+package cc.iotkit.data.dao.system;
+
+import cc.iotkit.data.model.system.TbSysConfig;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface SysConfigRepository extends JpaRepository<TbSysConfig, Long>, QueryDslPredicateExecutor<TbSysConfig> {
+
+}

iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/dao/system/SysDeptRepository.java

@@ -0,0 +1,17 @@
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+package cc.iotkit.data.dao.system;
+
+import cc.iotkit.data.model.system.TbSysConfig;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface SysDeptRepository extends JpaRepository<TbSysConfig, Long> {
+
+}

iot-module/iot-system/src/main/java/cc/iotkit/system/mapper/SysDeptMapper.java

@@ -1,5 +1,6 @@
 package cc.iotkit.system.mapper;
 
+import cc.iotkit.model.system.SysDept;
 import cc.iotkit.system.domain.vo.SysDeptVo;
 
 import java.util.List;

iot-module/pom.xml

@@ -15,6 +15,7 @@
         <module>iot-system</module>
         <module>iot-manager</module>
         <module>iot-rule-engine</module>
+        <module>iot-message-notify</module>
     </modules>