Преглед изворни кода

Merge remote-tracking branch 'origin/develop' into develop

liyang пре 3 година
родитељ
комит
f58d3c5f07

+ 6 - 0
adm-business/adm-diagram/pom.xml

@@ -67,5 +67,11 @@
             <artifactId>gson</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.spring4all</groupId>
+            <artifactId>swagger-spring-boot-starter</artifactId>
+            <version>1.7.1.RELEASE</version>
+        </dependency>
+
     </dependencies>
 </project>

+ 67 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/config/SwaggerConfig.java

@@ -0,0 +1,67 @@
+package com.persagy.adm.diagram.config;
+
+import com.google.common.base.Predicate;
+import com.spring4all.swagger.EnableSwagger2Doc;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.RequestHandler;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+import javax.annotation.Nullable;
+
+@Configuration
+@EnableSwagger2Doc
+public class SwaggerConfig {
+
+//	private static final List<String> excludedPathPrefix = Arrays.asList(
+//			"/",
+//			"/legend",
+//			"/diagram"
+//	);
+
+	@Bean
+	public Docket createRestApi() {
+		return new Docket(DocumentationType.SWAGGER_2)
+				.apiInfo(apiInfo())
+				.select()
+				.apis(new Swaggerfilter())
+//				.paths((s) -> {
+//					for(String pathPrefix : excludedPathPrefix) {
+//						if(StringUtils.startsWith(s, pathPrefix)) {
+//							return false;
+//						}
+//					}
+//					return true;
+//				})
+				.build();
+	}
+
+	private ApiInfo apiInfo() {
+		return new ApiInfoBuilder()
+				.title("系统图接口")
+				.version("0.1")
+				.build();
+	}
+
+
+	/**
+	 * 过滤页面路由
+	 */
+	class Swaggerfilter implements Predicate<RequestHandler> {
+		@Override
+		public boolean apply(@Nullable RequestHandler requestHandler) {
+			if(requestHandler.findAnnotation(ApiOperation.class).isPresent()){
+				return true;
+			}
+//       		if(requestHandler.findAnnotation(ResponseBody.class).isPresent()|| requestHandler.findControllerAnnotation(ResponseBody.class).isPresent()){
+//                return true;
+//            }
+			return false;
+		}
+	}
+
+}

+ 7 - 5
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/CommonController.java

@@ -7,10 +7,11 @@ import com.persagy.adm.diagram.entity.DiagramType;
 import com.persagy.adm.diagram.frame.BdtpRequest;
 import com.persagy.adm.diagram.service.BdtpDataService;
 import com.persagy.dmp.common.model.response.CommonResult;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Iterator;
@@ -28,17 +29,17 @@ public class CommonController {
 	@Qualifier(DataStrategy.implQualifier)
 	private DataStrategy dataStrategy;
 
-	@RequestMapping("equipTypes")
+	@GetMapping("equipTypes")
 	public CommonResult<List<ObjectNode>> equipTypes(){
 		return CommonResult.success(bdtpDataService.getEquipTypeList(BdtpRequest.getCurrent(), null));
 	}
 
-	@RequestMapping("relTypes")
+	@GetMapping("relTypes")
 	public CommonResult<List<Map<String, Object>>> relTypes(){
 		return CommonResult.success(bdtpDataService.getRelTypeTree(BdtpRequest.getCurrent()));
 	}
 
-	@RequestMapping("majSys")
+	@GetMapping("majSys")
 	public CommonResult<List<ObjectNode>> majSys(){
 		BdtpRequest req = BdtpRequest.getCurrent();
 		List<ObjectNode> majList = bdtpDataService.getMajorList(req);
@@ -59,7 +60,8 @@ public class CommonController {
 		return CommonResult.success(majList);
 	}
 
-	@RequestMapping("diagramTypes")
+	@ApiOperation("查询系统图类型列表")
+	@GetMapping("diagramTypes")
 	public CommonResult<List<DiagramType>> diagramTypes(){
 		return CommonResult.success(dataStrategy.getDiagramTypes());
 	}

+ 8 - 6
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/DemoDiagramController.java

@@ -5,6 +5,7 @@ import com.persagy.adm.diagram.manage.DemoDiagramManager;
 import com.persagy.adm.diagram.manage.Folder;
 import com.persagy.adm.diagram.core.model.Diagram;
 import com.persagy.dmp.common.model.response.CommonResult;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,7 +27,8 @@ public class DemoDiagramController {
 	 * @param groupCode 集团编码
 	 * @return 树形结构数据(专业-系统-类型-图)
 	 */
-	@RequestMapping("getDiagrams")
+	@ApiOperation("查询系统图,返回树形结构")
+	@GetMapping("getDiagrams")
 	public CommonResult<List<Folder>> getDiagrams(@RequestParam String projectId,
 												  @RequestParam(required = false) String systemId,
 												  @RequestParam(required = false) String groupCode){
@@ -41,7 +43,7 @@ public class DemoDiagramController {
 	 * @param groupCode 集团编码
 	 * @return 新建的系统图对象
 	 */
-	@RequestMapping("newDiagram")
+	@PostMapping("newDiagram")
 	public CommonResult<Diagram> newDiagram(@RequestBody Map<String, String> params,
 											@RequestParam String projectId,
 											@RequestParam(required = false) String systemId,
@@ -54,7 +56,7 @@ public class DemoDiagramController {
 	 * @param params 删除参数,对象类型,包含字段 id:系统图id
 	 * @return
 	 */
-	@RequestMapping("delDiagram")
+	@PostMapping("delDiagram")
 	public CommonResult<Boolean> delDiagram(@RequestBody Map<String, String> params){
 		return CommonResult.success(diagramManager.deleteDiagram(params.get("id")));
 	}
@@ -64,7 +66,7 @@ public class DemoDiagramController {
 	 * @param req 编辑参数,对象类型,包含字段 diagramId:系统图id, templateId:使用的模板id
 	 * @return 系统图对象
 	 */
-	@RequestMapping("setTemplate")
+	@PostMapping("setTemplate")
 	public CommonResult<Diagram> setTemplate(@RequestBody EditRequest req){
 		return CommonResult.success(diagramManager.setTemplate(req.getDiagramId(), req.getTemplateId()));
 	}
@@ -74,7 +76,7 @@ public class DemoDiagramController {
 	 * @param req 编辑参数,对象类型,包含字段 diagramId:系统图id
 	 * @return 系统图对象
 	 */
-	@RequestMapping("loadData")
+	@PostMapping("loadData")
 	public CommonResult<Diagram> loadData(@RequestBody EditRequest req) {
 		return CommonResult.success(diagramManager.loadData(req.getDiagramId(), true));
 	}
@@ -84,7 +86,7 @@ public class DemoDiagramController {
 	 * @param req 编辑参数,对象类型,包含字段 diagram:系统图对象
 	 * @return 保存后的系统图对象
 	 */
-	@RequestMapping("saveDiagram")
+	@PostMapping("saveDiagram")
 	public CommonResult<Diagram> saveDiagram(@RequestBody EditRequest req) {
 		return CommonResult.success(diagramManager.saveDiagram(req.getDiagram()));
 	}

+ 5 - 3
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/LegendController.java

@@ -4,6 +4,7 @@ import com.persagy.adm.diagram.frame.EditRequest;
 import com.persagy.adm.diagram.core.model.legend.Legend;
 import com.persagy.adm.diagram.manage.LegendManager;
 import com.persagy.dmp.common.model.response.CommonResult;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,17 +18,18 @@ public class LegendController {
 	@Autowired
 	private LegendManager legendManager;
 
-	@RequestMapping("getLegends")
+	@ApiOperation("按照系统代码,查询图例列表")
+	@GetMapping("getLegends")
 	public CommonResult<List<Legend>> getLegends(@RequestParam String sys){
 		return CommonResult.success(legendManager.getLegends(sys));
 	}
 
-	@RequestMapping("saveLegend")
+	@PostMapping("saveLegend")
 	public CommonResult<Legend> saveLegend(@RequestBody EditRequest req){
 		return CommonResult.success(legendManager.saveLegend(req.getLegend(), req.getSys()));
 	}
 
-	@RequestMapping("delLegend")
+	@PostMapping("delLegend")
 	public CommonResult<Boolean> delLegend(@RequestBody EditRequest req){
 		return CommonResult.success(legendManager.deleteLegend(req.getCurrentCompId(), req.getSys()));
 	}

+ 19 - 16
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/TemplateController.java

@@ -1,10 +1,11 @@
 package com.persagy.adm.diagram.controller;
 
+import com.persagy.adm.diagram.core.model.template.DiagramTemplate;
 import com.persagy.adm.diagram.frame.EditRequest;
 import com.persagy.adm.diagram.manage.Folder;
 import com.persagy.adm.diagram.manage.TemplateManager;
-import com.persagy.adm.diagram.core.model.template.DiagramTemplate;
 import com.persagy.dmp.common.model.response.CommonResult;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,62 +20,64 @@ public class TemplateController {
     @Autowired
     private TemplateManager templateManager;
 
-    @RequestMapping("getTemplates")
+    @ApiOperation("查询模板列表")
+    @GetMapping("getTemplates")
     public CommonResult<List<Folder>> getTemplates(){
         return CommonResult.success(templateManager.getTemplates());
     }
 
-    @RequestMapping("getTemplatesByType")
+    @ApiOperation("按系统图类型查询模板列表")
+    @GetMapping("getTemplatesByType")
     public CommonResult<List<DiagramTemplate>> getTemplatesByType(@RequestParam String diagramType){
         return CommonResult.success(templateManager.getTemplates(diagramType));
     }
 
-    @RequestMapping("newTemplate")
+    @PostMapping("newTemplate")
     public CommonResult<DiagramTemplate> newTemplate(@RequestBody Map<String, String> params){
         return CommonResult.success(templateManager.createTemplate(params.get("name"), params.get("type")));
     }
 
-    @RequestMapping("delTemplate")
+    @PostMapping("delTemplate")
     public CommonResult<Boolean> delTemplate(@RequestBody Map<String, String> params){
         return CommonResult.success(templateManager.deleteTemplate(params.get("id")));
     }
 
-    @RequestMapping("editTemplateInfo")
+    @PostMapping("editTemplateInfo")
     public CommonResult<Boolean> editTemplateInfo(@RequestBody Map<String, String> params){
         return CommonResult.success(templateManager.editTemplateInfo(params.remove("id"), params));
     }
 
-    @RequestMapping("addCon")
+    @PostMapping("addCon")
     public CommonResult<DiagramTemplate> addCon(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.addCon(params.getNewCompId(), params.getCurrentCompId(), params.getTemplateId()));
     }
 
-    @RequestMapping("delCon")
+    @PostMapping("delCon")
     public CommonResult<DiagramTemplate> delCon(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.delCon(params.getCurrentCompId(), params.getTemplateId()));
     }
 
-    @RequestMapping("moveCon")
+    @PostMapping("moveCon")
     public CommonResult<DiagramTemplate> moveCon(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.moveCon(params.getCurrentCompId(), params.getTemplateId(), params.getMoveOffset()));
     }
 
-    @RequestMapping("addMainPipe")
+    @PostMapping("addMainPipe")
     public CommonResult<DiagramTemplate> addMainPipe(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.addMainPipe(params.getLines(), params.getTemplateId()));
     }
 
-    @RequestMapping("delLine")
+    @PostMapping("delLine")
     public CommonResult<DiagramTemplate> delLine(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.delMainPipe(params.getCurrentCompId(), params.getTemplateId()));
     }
 
-    @RequestMapping("modifyCon")
+    @PostMapping("modifyCon")
     public CommonResult<DiagramTemplate> modifyCon(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.modifyCon(params.getTemplatePropsData(), params.getCurrentCompId(), params.getTemplateId()));
     }
 
-    @RequestMapping("modifyMainPipe")
+    @PostMapping("modifyMainPipe")
     public CommonResult<DiagramTemplate> modifyMainPipe(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.modifyMainPipe(params.getTemplatePropsData(), params.getCurrentCompId(), params.getTemplateId()));
     }
@@ -82,7 +85,7 @@ public class TemplateController {
     /**
      * 编辑设备过滤条件
      */
-    @RequestMapping("modifyFilter")
+    @PostMapping("modifyFilter")
     public CommonResult<DiagramTemplate> modifyFilter(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.modifyFilter(params.getDataFilter(), params.getCurrentCompId(), params.getTemplateId()));
     }
@@ -90,7 +93,7 @@ public class TemplateController {
     /**
      * 编辑设备打包配置
      */
-    @RequestMapping("modifyPack")
+    @PostMapping("modifyPack")
     public CommonResult<DiagramTemplate> modifyPack(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.modifyPack(params.getEquipPack(), params.getCurrentCompId(), params.getTemplateId()));
     }
@@ -98,7 +101,7 @@ public class TemplateController {
     /**
      * 编辑容器的动态组配置
      */
-    @RequestMapping("modifyDynGroup")
+    @PostMapping("modifyDynGroup")
     public CommonResult<DiagramTemplate> modifyDynGroup(@RequestBody EditRequest params){
         return CommonResult.success(templateManager.modifyDynGroup(params.getDynGroup(), params.getCurrentCompId(), params.getTemplateId()));
     }