From 561b30e12cc7d17621ae0727cfee4b6bfadc5522 Mon Sep 17 00:00:00 2001
From: mi9688 <dqwzam0@163.com>
Date: Thu, 7 Nov 2024 14:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  2 +-
 .../fastbee-deviceData-service/pom.xml        | 20 +++++++++++++++++++
 .../service/impl/ProjectServiceImpl.java      |  6 +++---
 fastbee-service/pom.xml                       |  1 +
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 fastbee-service/fastbee-deviceData-service/pom.xml

diff --git a/fastbee-admin/src/main/resources/application.yml b/fastbee-admin/src/main/resources/application.yml
index 9b96806..c9fb039 100644
--- a/fastbee-admin/src/main/resources/application.yml
+++ b/fastbee-admin/src/main/resources/application.yml
@@ -85,7 +85,7 @@ spring:
   # 缓存配置
   cache:
     enable: false
-    type: none              # none=不使用缓存 redis=使用redis缓存
+    type: redis              # none=不使用缓存 redis=使用redis缓存
     ttl: 60                 # 缓存过期时间（默认60秒）
 
 #集群配置
diff --git a/fastbee-service/fastbee-deviceData-service/pom.xml b/fastbee-service/fastbee-deviceData-service/pom.xml
new file mode 100644
index 0000000..c2aeed7
--- /dev/null
+++ b/fastbee-service/fastbee-deviceData-service/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>com.fastbee</groupId>
+        <artifactId>fastbee-service</artifactId>
+        <version>3.8.5</version>
+    </parent>
+
+    <artifactId>fastbee-deviceData-service</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java b/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java
index 861996b..94e5d1e 100644
--- a/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java
+++ b/fastbee-service/fastbee-project-service/src/main/java/com/fastbee/project/service/impl/ProjectServiceImpl.java
@@ -564,9 +564,9 @@ public class ProjectServiceImpl implements IProjectService
                                 queryInAdcodeList.add(JSONUtil.parseArray(sysDept.getTownCode()).get(0));
                         }
                         //添加村代码
-                        if(JsonStrUtil.nonEmptyArray(sysDept.getVillageCode())){
-                                queryInAdcodeList.add(JSONUtil.parseArray(sysDept.getVillageCode()).get(0));
-                        }
+//                        if(JsonStrUtil.nonEmptyArray(sysDept.getVillageCode())){
+//                                queryInAdcodeList.add(JSONUtil.parseArray(sysDept.getVillageCode()).get(0));
+//                        }
                         //村级查户级别行政区划
                         queryInLevelList.add(DepartmentAdministrationLevelConstant.VILLAGE);
 
diff --git a/fastbee-service/pom.xml b/fastbee-service/pom.xml
index c080188..969125e 100644
--- a/fastbee-service/pom.xml
+++ b/fastbee-service/pom.xml
@@ -19,6 +19,7 @@
         <module>fastbee-waterele-service</module>
         <module>fastbee-project-service</module>
         <module>fastbee-ggroup-service</module>
+        <module>fastbee-deviceData-service</module>
     </modules>