Browse Source

需求:实现根据revit.project表查询集团编码的逻辑
jar版本升级:
1.poi-ooxml,poi:3.17->4.1.2
2.fastjson:1.2.47->1.2.75
3.mybatis-plus:3.3.1->3.4.2

lijie 3 years ago
parent
commit
14295936bf

+ 2 - 2
dmp-common/pom.xml

@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>4.1.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
+            <version>4.1.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

+ 12 - 1
dmp-comp/dmp-auth-starter/src/main/java/com/persagy/dmp/auth/domain/Group.java

@@ -1,5 +1,8 @@
 package com.persagy.dmp.auth.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -10,9 +13,17 @@ import java.util.List;
 @ToString
 @EqualsAndHashCode
 public class Group {
-
+    @JSONField(name = "groupCode",alternateNames = {"GroupCode","groupCode"})
+    @JsonAlias({"GroupCode","groupCode"})
+    @JsonProperty("groupCode")
     private String groupCode;
+    @JSONField(name = "groupName",alternateNames = {"GroupName","groupName"})
+    @JsonAlias({"GroupName","groupName"})
+    @JsonProperty("groupName")
     private String groupName;
+    @JSONField(name = "projects",alternateNames = {"Projects","projects"})
+    @JsonAlias({"Projects","projects"})
+    @JsonProperty("projects")
     private List<Project> projects;
 
 }

+ 9 - 0
dmp-comp/dmp-auth-starter/src/main/java/com/persagy/dmp/auth/domain/Project.java

@@ -1,5 +1,8 @@
 package com.persagy.dmp.auth.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -8,6 +11,12 @@ import lombok.ToString;
 @ToString
 @EqualsAndHashCode
 public class Project {
+    @JSONField(name = "projectId",alternateNames = {"ProjectId","projectId"})
+    @JsonAlias({"ProjectId","projectId"})
+    @JsonProperty("projectId")
     private String projectId;
+    @JSONField(name = "projectName",alternateNames = {"ProjectName","projectName"})
+    @JsonAlias({"ProjectName","projectName"})
+    @JsonProperty("projectName")
     private String projectName;
 }

+ 13 - 6
dmp-comp/dmp-auth-starter/src/main/java/com/persagy/dmp/auth/domain/ResultReturn.java

@@ -1,6 +1,7 @@
 package com.persagy.dmp.auth.domain;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,32 +15,38 @@ import java.util.List;
 public class ResultReturn<T> {
 
 	/**返回状态:success,failure*/
-	@JSONField(name = "Result")
+	@JSONField(name = "Result",alternateNames = {"Result","result"})
+	@JsonAlias({"Result","result"})
 	@JsonProperty("Result")
 	private String result;
 
 	/**返回一个对象时使用*/
-	@JSONField(name = "Item")
+	@JSONField(name = "Item",alternateNames = {"Item","item"})
+	@JsonAlias({"Item","item"})
 	@JsonProperty("Item")
 	private T item;
 
 	/**返回集合时使用*/
-	@JSONField(name = "Content")
+	@JSONField(name = "Content",alternateNames = {"Content","content"})
+	@JsonAlias({"Content","content"})
 	@JsonProperty("Content")
 	private List<T> content;
 
 	/**返回状态的具体信息*/
-	@JSONField(name = "ResultMsg")
+	@JSONField(name = "ResultMsg",alternateNames = {"ResultMsg","resultMsg"})
+	@JsonAlias({"ResultMsg","resultMsg"})
 	@JsonProperty("ResultMsg")
 	private String resultMsg;
 
 	/**返回状态码*/
-	@JSONField(name = "ResultCode")
+	@JSONField(name = "ResultCode",alternateNames = {"ResultCode","resultCode"})
+	@JsonAlias({"ResultCode","resultCode"})
 	@JsonProperty("ResultCode")
 	private Integer resultCode;
 
 	/**返回集合的长度*/
-	@JSONField(name = "Count")
+	@JSONField(name = "Count",alternateNames = {"Count","count"})
+	@JsonAlias({"Count","count"})
 	@JsonProperty("Count")
 	private Integer count;
 

+ 0 - 3
dmp-comp/dmp-file-starter/pom.xml

@@ -21,18 +21,15 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>2.1.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-annotation</artifactId>
-            <version>3.3.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.3.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

+ 2 - 2
dmp-parent/pom.xml

@@ -34,7 +34,7 @@
     <properties>
         <dmp.version>1.0.0</dmp.version>
         <platform.version>1.0.0</platform.version>
-        <mybatis-plus.version>3.3.1</mybatis-plus.version>
+        <mybatis-plus.version>3.4.2</mybatis-plus.version>
         <dynamic-datasource.version>3.3.2</dynamic-datasource.version>
         <tomcat-jdbc.version>9.0.31</tomcat-jdbc.version>
         <HikariCP.version>3.2.0</HikariCP.version>
@@ -47,7 +47,7 @@
         <mapstruct.version>1.2.0.Final</mapstruct.version>
         <lang.version>2.5</lang.version>
         <gson.version>2.8.6</gson.version>
-        <fastjson.version>1.2.47</fastjson.version>
+        <fastjson.version>1.2.75</fastjson.version>
         <druid.version>1.1.22</druid.version>
         <hutool.version>5.5.8</hutool.version>
         <!-- Minio -->