+ 设备登录支持多租户

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/PileMachineInfoServiceImpl.java

@@ -13,7 +13,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 
 import com.huashe.common.utils.StringUtils;
 import com.huashe.park.common.EnhancedIDGenerator;

bd-park/park-backend/pom.xml

@@ -60,6 +60,7 @@
         <common.collect>4.4</common.collect>
         <geotools.version>20.0</geotools.version>
         <jsqlparser.version>4.6</jsqlparser.version>
+        <warm-flow>1.6.7</warm-flow>
     </properties>
 
     <!-- 依赖声明 -->
@@ -222,7 +223,11 @@
                 <artifactId>ruoyi-common</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.huashe.application</groupId>
+                <artifactId>ruoyi-flow</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.dtflys.forest</groupId>
                 <artifactId>forest-spring-boot-starter</artifactId>
@@ -407,6 +412,16 @@
                 <artifactId>gt-epsg-hsql</artifactId>
                 <version>${geotools.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.dromara.warm</groupId>
+                <artifactId>warm-flow-mybatis-sb-starter</artifactId>
+                <version>${warm-flow}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.dromara.warm</groupId>
+                <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
+                <version>${warm-flow}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <repositories>

common-application/pom.xml

@@ -220,7 +220,11 @@
                 <artifactId>ruoyi-common</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.huashe.application</groupId>
+                <artifactId>ruoyi-flow</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.huashe.common</groupId>
                 <artifactId>prod-commons</artifactId>
@@ -251,6 +255,7 @@
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+        <module>ruoyi-flow</module>
     </modules>
     <packaging>pom</packaging>
 

common-application/ruoyi-flow/pom.xml

@@ -21,10 +21,15 @@
             <groupId>com.huashe.application</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.dromara.warm</groupId>
             <artifactId>warm-flow-mybatis-sb-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>mybatis-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.dromara.warm</groupId>