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 @@ + + + 4.0.0 + + com.fastbee + fastbee-service + 3.8.5 + + + fastbee-deviceData-service + + + 8 + 8 + UTF-8 + + + \ 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 @@ fastbee-waterele-service fastbee-project-service fastbee-ggroup-service + fastbee-deviceData-service