uml 接口0.0.1版本

pom.xml

@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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"
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>2.2.2.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yame</groupId>
 	<artifactId>uml</artifactId>
@@ -19,6 +18,10 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>net.sourceforge.plantuml</groupId>
@@ -55,7 +58,6 @@
 		</dependency>
 
 
-		
 	</dependencies>
 
 	<build>

src/main/java/com/yame/uml/control/api.java

@@ -13,13 +13,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import lombok.extern.slf4j.Slf4j;
 import net.sourceforge.plantuml.BlockUml;
 import net.sourceforge.plantuml.FileFormat;
 import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.SourceStringReader;
+import net.sourceforge.plantuml.core.Diagram;
+import net.sourceforge.plantuml.error.PSystemError;
 
 @RestController
 @RequestMapping("/api")
+@Slf4j
 public class api {
 
     static public String getUmlSource(String source) {
@@ -53,10 +57,7 @@ public class api {
         if(srcblocks.size() != 0 && dstblocks.size() != 0) {
 
                
-            
         }
-
-
         result.setType(ResultType.ErrorMegreUML2SVG);
         return result;
     }
@@ -71,15 +72,26 @@ public class api {
         Result result = new Result();
         if(blocks.size() != 0) {
             for(BlockUml block: blocks) {
-                OutputStream os = new ByteArrayOutputStream();
+                Diagram diagram = block.getDiagram();
-                block.getDiagram().exportDiagram(os, 0, new FileFormatOption(FileFormat.SVG));
+                if (diagram instanceof PSystemError) {
+                    result.setType(ResultType.ErrorSource2SVG);
+                    int errorLine = ((PSystemError) diagram).getLineLocation().getPosition();
+                    result.setMsg("error line: " + errorLine);
+                } else {
                     result.setType(ResultType.Source2SVG);
+                }
+
+                OutputStream os = new ByteArrayOutputStream();
+                diagram.exportDiagram(os, 0, new FileFormatOption(FileFormat.SVG));
                 result.getContent().add(os.toString());
                 return result;
             }
         }
 
+        
+
         result.setType(ResultType.ErrorSource2SVG);
+        log.debug( ResultType.ErrorSource2SVG + data);
         return result;
     }
 }

src/main/java/com/yame/uml/model/Result.java

@@ -6,10 +6,13 @@ import java.util.List;
 /**
  * result
  */
+
 public class Result {
 
-    public ResultType type;
+    
-    public List<String> content;
+    private ResultType type;
+    private String msg; 
+    private List<String> content;
 
     public Result() {
         content = new ArrayList<String>();
@@ -19,6 +22,14 @@ public class Result {
         return content;
     }
 
+    public void addContent(String content) {
+        this.content.add(content);
+    }
+
+    public void delContent(int idx) {
+        this.content.remove(idx);
+    }
+
     public ResultType getType() {
         return type;
     }
@@ -26,4 +37,12 @@ public class Result {
     public void setType(ResultType type) {
         this.type = type;
     }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
 }

src/main/java/com/yame/uml/model/ResultType.java

@@ -1,32 +1,36 @@
 package com.yame.uml.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@JsonFormat(shape = Shape.OBJECT)
 public enum ResultType {
-    Success("Success", 1), 
+    Success("Success", 1, true), 
-    Source2PNG("Source2PNG", 101),
+    Source2PNG("Source2PNG", 101, true),
-    Source2SVG("Source2SVG", 102),
+    Source2SVG("Source2SVG", 102, true),
 
-    MegreUML2SVG("megreUML2SVG", 202),
+    MegreUML2SVG("megreUML2SVG", 202, true),
     
-    Error("Error", 0),
+    Error("Error", 0, false),
-    ErrorSource2PNG("Error Source2PNG: source format is erorr", -101),
+    ErrorSource2PNG("Error Source2PNG", -101, false),
-    ErrorSource2SVG("Error Source2SVG: source format is erorr", -102),
+    ErrorSource2SVG("Error Source2SVG", -102, false),
-    ErrorMegreUML2SVG("Error MegreUML2SVG: source format is erorr or not support format", -202),
+
+    ErrorMegreUML2SVG("Error MegreUML2SVG", -202, false),
     ;
 
-    private String status;
+    @JsonProperty("desc")
+    private String desc;
+    @JsonProperty("code")
     private int code;
+    @JsonProperty("success")
+    private boolean success;
 
-    private ResultType(String status, int code) {
+    private ResultType(String desc, int code, Boolean isSuccessed) {
-        this.status = status;
+        this.desc = desc;
         this.code = code;
-    }
+        this.success = isSuccessed;
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
     }
 
     public int getCode() {
@@ -36,4 +40,20 @@ public enum ResultType {
     public void setCode(int code) {
         this.code = code;
     }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
 }