添加设备数据模块

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秒）
 
 #集群配置

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>

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())){
+//                        if(JsonStrUtil.nonEmptyArray(sysDept.getVillageCode())){
-                                queryInAdcodeList.add(JSONUtil.parseArray(sysDept.getVillageCode()).get(0));
+//                                queryInAdcodeList.add(JSONUtil.parseArray(sysDept.getVillageCode()).get(0));
-                        }
+//                        }
                         //村级查户级别行政区划
                         queryInLevelList.add(DepartmentAdministrationLevelConstant.VILLAGE);
 

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>