浏览代码

+ 北斗园区业务代码

chen.cheng 7 月之前
父节点
当前提交
044ed534e0

+ 7 - 6
bd-park/park-backend/park-application/pom.xml

@@ -3,13 +3,12 @@
          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">
     <parent>
-        <groupId>com.huashe</groupId>
+        <groupId>com.huashe.park</groupId>
         <artifactId>bd-park</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.huashe.bd-park</groupId>
     <artifactId>park-appliication</artifactId>
     <version>1.0-SNAPSHOT</version>
 
@@ -54,6 +53,10 @@
             <groupId>com.huashe.application</groupId>
             <artifactId>ruoyi-framework</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.huashe.application</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.dtflys.forest</groupId>
@@ -68,16 +71,14 @@
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.huashe</groupId>
+            <groupId>com.huashe.park</groupId>
             <artifactId>park-common</artifactId>
             <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.huashe.park.application.bd-park</groupId>
+            <groupId>com.huashe.park</groupId>
             <artifactId>park-core</artifactId>
             <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
     <build>

+ 6 - 5
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/BDApplication.java

@@ -1,21 +1,22 @@
 package com.huashe.park.application;
 
 import com.dtflys.forest.springboot.annotation.ForestScan;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * 启动程序
  *
  * @author ruoyi
  */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@ComponentScan(basePackages = {"com.ruoyi"})
 @ForestScan(basePackages = "com.ruoyi.system.rest")
-public class BDApplication
-{
-    public static void main(String[] args)
-    {
+public class BDApplication {
+    public static void main(String[] args) {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(BDApplication.class, args);
     }

+ 1 - 1
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/engine/impl/FenceBreakInEngine.java

@@ -43,7 +43,7 @@ public class FenceBreakInEngine extends EvtFusionEngine {
     @Autowired
     private IBdFenceVioEvtService vioEvtService;
 
-    @Resource
+    @Autowired
     private RedisCache redisCache;
 
     @Autowired

+ 1 - 1
bd-park/park-backend/park-application/src/main/resources/application.yml

@@ -90,7 +90,7 @@ token:
 # MyBatis配置
 mybatis:
   # 搜索指定包别名
-  typeAliasesPackage: com.ruoyi.**.domain
+  typeAliasesPackage: com.huashe.**.domain,com.ruoyi.**.domain
   # 配置mapper的扫描,找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件

+ 1 - 1
bd-park/park-backend/park-common/pom.xml

@@ -4,7 +4,7 @@
          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>com.huashe</groupId>
+        <groupId>com.huashe.park</groupId>
         <artifactId>bd-park</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>

+ 2 - 3
bd-park/park-backend/park-core/pom.xml

@@ -3,13 +3,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-        <groupId>com.huashe</groupId>
+        <groupId>com.huashe.park</groupId>
         <artifactId>bd-park</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.huashe.park.application.bd-park</groupId>
     <artifactId>park-core</artifactId>
     <version>1.0-SNAPSHOT</version>
 
@@ -61,7 +60,7 @@
             <version>${ruoyi.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.huashe</groupId>
+            <groupId>com.huashe.park</groupId>
             <artifactId>park-common</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>

+ 1 - 1
bd-park/park-backend/pom.xml

@@ -4,7 +4,7 @@
          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>
 
-    <groupId>com.huashe</groupId>
+    <groupId>com.huashe.park</groupId>
     <artifactId>bd-park</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>