1、Dockerfile 、 docker-compose.yaml 配置

2、新建工单服务
3、抽取公共依赖（blade-boot、blade-cloud、swagger、hutools）

blade-biz-common/src/main/java/org/springblade/common/constant/RequestUrlConstant.java

@@ -7,7 +7,8 @@ package org.springblade.common.constant;
  **/
 public interface RequestUrlConstant {
 
-	String baseUrl = "36.103.227.152:9527";
+//	String baseUrl = "36.103.227.152:9527";
+	String baseUrl = "192.168.1.244:9527";  //德希电脑
 
 	String AGENCY_BYAREACODE = "http://"+baseUrl+"/grid-community/agency/list";
 

blade-biz-common/src/main/java/org/springblade/common/constant/ServicesName.java

@@ -14,6 +14,9 @@ public interface ServicesName  {
 	//网格服务
 	String GRID_SERVICE = "grid";
 
+	//工单服务
+	String WORK_ORDER = "work-order";
+
 	//系统扩展服务
 	String SYSTEM_EXPAND_SERVICE = "blade-system-expand";
 

blade-service-api/pom.xml

@@ -22,6 +22,7 @@
         <module>system-expand-api</module>
         <module>enterprise-api</module>
         <module>smart-party-api</module>
+        <module>estate-api</module>
     </modules>
 
     <dependencies>

blade-service/community/Dockerfile

@@ -0,0 +1,14 @@
+FROM openjdk:8
+
+
+RUN mkdir -p /blade/community
+
+WORKDIR /blade/community
+
+EXPOSE 9522
+
+ADD ./grid.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+
+CMD ["--spring.profiles.active=prod"]

blade-service/community/pom.xml

@@ -13,14 +13,6 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-swagger</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-oss-all</artifactId>
@@ -49,24 +41,12 @@
             <artifactId>community-api</artifactId>
             <version>2.7.2.RELEASE</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springblade</groupId>-->
-<!--            <artifactId>system-expand</artifactId>-->
-<!--            <version>2.7.2.RELEASE</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system</artifactId>
             <version>2.8.0.RELEASE</version>
         </dependency>
 
-        <!--糊涂工具包-->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.6.0</version>
-        </dependency>
-
     </dependencies>
 
 </project>

blade-service/community/src/main/resources/application-prod.yml

@@ -1,11 +1,11 @@
 #服务器端口
 server:
-  port: 8102
+  port: 9522
 
 #数据源配置
 spring:
   datasource:
-    url: ${blade.datasource.prod.url}
-    username: ${blade.datasource.prod.username}
-    password: ${blade.datasource.prod.password}
+    url: ${blade.datasource.community.url}
+    username: ${blade.datasource.community.username}
+    password: ${blade.datasource.community.password}
 

blade-service/enterprise/Dockerfile

@@ -0,0 +1,14 @@
+FROM openjdk:8
+
+
+RUN mkdir -p /blade/enterprise
+
+WORKDIR /blade/enterprise
+
+EXPOSE 9529
+
+ADD ./enterprise.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+
+CMD ["--spring.profiles.active=prod"]

blade-service/enterprise/pom.xml

@@ -12,14 +12,6 @@
     <artifactId>enterprise</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-swagger</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-oss-all</artifactId>

blade-service/enterprise/src/main/resources/application-prod.yml

@@ -1,11 +1,11 @@
 #服务器端口
 server:
-  port: 8102
+  port: 9529
 
 #数据源配置
 spring:
   datasource:
-    url: ${blade.datasource.prod.url}
-    username: ${blade.datasource.prod.username}
-    password: ${blade.datasource.prod.password}
+    url: ${blade.datasource.enterprise.url}
+    username: ${blade.datasource.enterprise.username}
+    password: ${blade.datasource.enterprise.password}
 

blade-service/estate/Dockerfile

@@ -0,0 +1,14 @@
+FROM openjdk:8
+
+
+RUN mkdir -p /blade/estate
+
+WORKDIR /blade/estate
+
+EXPOSE 9530
+
+ADD ./estate.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+
+CMD ["--spring.profiles.active=prod"]

blade-service/estate/pom.xml

@@ -12,15 +12,6 @@
     <artifactId>estate</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-swagger</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
@@ -46,28 +37,4 @@
             <version>${bladex.project.version}</version>
         </dependency>
     </dependencies>
-
-<!--    <build>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <username>${docker.username}</username>-->
-<!--                    <password>${docker.password}</password>-->
-<!--                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>-->
-<!--                    <tag>${project.version}</tag>-->
-<!--                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>-->
-<!--                    <buildArgs>-->
-<!--                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>-->
-<!--                    </buildArgs>-->
-<!--                    <skip>false</skip>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-antrun-plugin</artifactId>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--    </build>-->
 </project>

blade-service/estate/src/main/java/org/springblade/estate/controller/AccessRecordController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.estate.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,11 +28,10 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.estate.entity.AccessRecord;
 import org.springblade.estate.vo.AccessRecordVO;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.wrapper.AccessRecordWrapper;
 import org.springblade.estate.service.IAccessRecordService;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -62,7 +62,7 @@ public class AccessRecordController extends BladeController {
 	}
 
 	/**
-	 * 分页 
+	 * 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -74,7 +74,7 @@ public class AccessRecordController extends BladeController {
 
 
 	/**
-	 * 自定义分页 
+	 * 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -85,7 +85,7 @@ public class AccessRecordController extends BladeController {
 	}
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -95,7 +95,7 @@ public class AccessRecordController extends BladeController {
 	}
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -105,7 +105,7 @@ public class AccessRecordController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -114,9 +114,9 @@ public class AccessRecordController extends BladeController {
 		return R.status(accessRecordService.saveOrUpdate(accessRecord));
 	}
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -125,5 +125,5 @@ public class AccessRecordController extends BladeController {
 		return R.status(accessRecordService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/estate/src/main/resources/application-prod.yml

@@ -1,11 +1,11 @@
 #服务器端口
 server:
-  port: 8102
+  port: 9530
 
 #数据源配置
 spring:
   datasource:
-    url: ${blade.datasource.prod.url}
-    username: ${blade.datasource.prod.username}
-    password: ${blade.datasource.prod.password}
+    url: ${blade.datasource.estate.url}
+    username: ${blade.datasource.estate.username}
+    password: ${blade.datasource.estate.password}
 

blade-service/grid/pom.xml

@@ -11,18 +11,6 @@
 
     <artifactId>grid</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-excel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-cloud</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>grid-api</artifactId>
@@ -34,12 +22,7 @@
             <artifactId>knife4j-annotations</artifactId>
             <version>2.0.8</version>
         </dependency>
-        <!--糊涂工具包-->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.6.0</version>
-        </dependency>
+
     </dependencies>
 
 

blade-service/grid/src/main/java/org/springblade/community/grid/controller/CommunityController.java

@@ -1,12 +1,21 @@
 package org.springblade.community.grid.controller;
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.RequestUrlConstant;
+import org.springblade.common.constant.ServicesName;
 import org.springblade.community.entity.Agency;
+import org.springblade.community.grid.entity.GridResource;
+import org.springblade.community.grid.service.IGridResourceService;
 import org.springblade.core.tool.api.R;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -32,6 +41,7 @@ import java.util.Map;
 @RequestMapping("/grid-community")
 @Api( tags = "网格社区接口")
 public class CommunityController {
+	private IGridResourceService gridResourceService;
 
 	/**
 	 * 根据区code获取社区列表
@@ -48,13 +58,31 @@ public class CommunityController {
 		HttpEntity<String> requestEntity = new HttpEntity<String>(JSONUtil.toJsonStr(map), headers);
 		ParameterizedTypeReference<R<List<Agency>>> reference = new ParameterizedTypeReference<R<List<Agency>>>() {
 		};
-
 		String url = RequestUrlConstant.AGENCY_BYAREACODE+"?areaCode="+areaCode;
 		URI uri = URI.create(url);
-
 		responseEntity = restTemplate.exchange(uri, HttpMethod.GET, requestEntity, reference);
+		return (R<List<Agency>>)responseEntity.getBody();
+	}
 
+	/**
+	 * 自定义网格获取社区列表
+	 **/
+	@GetMapping("/getAgencyListForCustom")
+	@ApiOperation("自定义网格获取社区列表")
+	public R<List<Agency>> getAgencyListForCustom(@RequestParam String gridId){
+		GridResource detail = gridResourceService.getOne(new QueryWrapper<GridResource>().lambda().eq(GridResource::getGridId, gridId));
+		Assert.notNull(detail);
+		String res = HttpUtil.get(RequestUrlConstant.AGENCYLIST_BYIDS, new HashMap<String, Object>() {{
+			put(CommunityController.getGridResourceLevelName(detail.getLevel()), detail.getResourseIds());
+		}});
+		return (R<List<Agency>>) JSON.parseObject(res,R.class);
+	}
 
-		return (R<List<Agency>>)responseEntity.getBody();
+	public static String getGridResourceLevelName(Integer level){
+		switch (level){
+			case 1: return "agencyIds";
+			case 2: return "residentialIds";
+			default: return "";
+		}
 	}
 }

blade-service/pom.xml

@@ -23,6 +23,7 @@
         <module>system-expand</module>
         <module>enterprise</module>
         <module>smart-party</module>
+        <module>work-order</module>
     </modules>
 
     <dependencies>
@@ -38,6 +39,34 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-api-crypto</artifactId>
         </dependency>
+
+
+        <!--Bladex 微服务依赖-->
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-cloud</artifactId>
+        </dependency>
+
+        <!--糊涂工具包-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.6.0</version>
+        </dependency>
+
+        <!--Swagger 接口文档-->
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-swagger</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

blade-service/smart-party/Dockerfile

@@ -0,0 +1,14 @@
+FROM openjdk:8
+
+
+RUN mkdir -p /blade/smartparty
+
+WORKDIR /blade/smartparty
+
+EXPOSE 9528
+
+ADD ./smart-party.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+
+CMD ["--spring.profiles.active=prod"]

blade-service/smart-party/pom.xml

@@ -11,14 +11,6 @@
 
     <artifactId>smart-party</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-swagger</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-oss-all</artifactId>

blade-service/smart-party/src/main/resources/application-prod.yml

@@ -1,11 +1,10 @@
 #服务器端口
 server:
-  port: 8102
+  port: 9528
 
 #数据源配置
 spring:
   datasource:
-    url: ${blade.datasource.prod.url}
-    username: ${blade.datasource.prod.username}
-    password: ${blade.datasource.prod.password}
-
+    url: ${blade.datasource.smartparty.url}
+    username: ${blade.datasource.smartparty.username}
+    password: ${blade.datasource.smartparty.password}

blade-service/system-expand/Dockerfile

@@ -0,0 +1,14 @@
+FROM openjdk:8
+
+
+RUN mkdir -p /blade/systemExpand
+
+WORKDIR /blade/systemExpand
+
+EXPOSE 9526
+
+ADD ./system-expand.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+
+CMD ["--spring.profiles.active=prod"]

blade-service/system-expand/pom.xml

@@ -18,16 +18,6 @@
             <version>2.7.2.RELEASE</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-boot</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-core-cloud</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-annotations</artifactId>

blade-service/system-expand/src/main/resources/application-prod.yml

@@ -1,11 +1,10 @@
 #服务器端口
 server:
-  port: 8102
+  port: 9526
 
 #数据源配置
 spring:
   datasource:
-    url: ${blade.datasource.prod.url}
-    username: ${blade.datasource.prod.username}
-    password: ${blade.datasource.prod.password}
-
+    url: ${blade.datasource.systemExpand.url}
+    username: ${blade.datasource.systemExpand.username}
+    password: ${blade.datasource.systemExpand.password}

blade-service/work-order/pom.xml

@@ -0,0 +1,22 @@
+<?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">
+    <parent>
+        <artifactId>blade-service</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>2.7.2.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>work-order</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+
+    <dependencies>
+    </dependencies>
+</project>

blade-service/work-order/src/main/java/org/springblade/workorder/WorkOrderApplication.java

@@ -0,0 +1,13 @@
+package org.springblade.workorder;
+import org.springblade.common.constant.ServicesName;
+import org.springblade.core.cloud.feign.EnableBladeFeign;
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+
+@SpringCloudApplication
+@EnableBladeFeign
+public class WorkOrderApplication {
+	public static void main(String[] args) {
+		BladeApplication.run(ServicesName.WORK_ORDER, WorkOrderApplication.class,args);
+	}
+}

blade-service/work-order/src/main/resources/application-dev.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 9522
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.workOrder.url}
+    username: ${blade.datasource.workOrder.username}
+    password: ${blade.datasource.workOrder.password}

blade-service/work-order/src/main/resources/application-prod.yml

@@ -0,0 +1,11 @@
+#服务器端口
+server:
+  port: 9525
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.grid.url}
+    username: ${blade.datasource.grid.username}
+    password: ${blade.datasource.grid.password}
+

blade-service/work-order/src/main/resources/application-test.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 8102
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.test.url}
+    username: ${blade.datasource.test.username}
+    password: ${blade.datasource.test.password}

docker-compose.yaml

@@ -0,0 +1,10 @@
+version: '3'
+services:
+    system-expand:
+        restart: always
+        ports:
+            - "9526:9526"
+        build:
+            context: ./
+            dockerfile: Dockerfile
+