支持厂拍门禁

java110-doc/src/main/java/com/java110/doc/annotation/Java110CmdDoc.java

@@ -50,5 +50,7 @@ public @interface Java110CmdDoc {
 
     String author() default "";
 
+    int seq() default 999;
+
 
 }

java110-doc/src/main/java/com/java110/doc/entity/CmdDocDto.java

@@ -2,7 +2,7 @@ package com.java110.doc.entity;
 
 import java.io.Serializable;
 
-public class CmdDocDto implements Serializable {
+public class CmdDocDto implements Serializable, Comparable<CmdDocDto> {
 
     /**
      * api title
@@ -33,6 +33,8 @@ public class CmdDocDto implements Serializable {
      */
     private String httpMethod;
 
+    private int seq;
+
     /**
      * request url
      *
@@ -119,4 +121,17 @@ public class CmdDocDto implements Serializable {
     public void setServiceCode(String serviceCode) {
         this.serviceCode = serviceCode;
     }
+
+    public int getSeq() {
+        return seq;
+    }
+
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
+
+    @Override
+    public int compareTo(CmdDocDto o) {
+        return this.getSeq() - o.getSeq();
+    }
 }

java110-doc/src/main/java/com/java110/doc/entity/RequestMappingsDocDto.java

@@ -2,7 +2,7 @@ package com.java110.doc.entity;
 
 import java.io.Serializable;
 
-public class RequestMappingsDocDto implements Serializable {
+public class RequestMappingsDocDto implements Serializable, Comparable<RequestMappingsDocDto> {
 
     private String name;
 
@@ -65,4 +65,9 @@ public class RequestMappingsDocDto implements Serializable {
     public void setStartWay(String startWay) {
         this.startWay = startWay;
     }
+
+    @Override
+    public int compareTo(RequestMappingsDocDto o) {
+        return this.getSeq() - o.getSeq();
+    }
 }

java110-doc/src/main/java/com/java110/doc/registrar/ApiDocCmdPublishing.java

@@ -3,6 +3,7 @@ package com.java110.doc.registrar;
 import com.java110.doc.entity.CmdDocDto;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -38,6 +39,10 @@ public class ApiDocCmdPublishing {
             }
         }
 
+        // 根据字段排序
+
+        Collections.sort(retCmdDocDto);
+
         return retCmdDocDto;
     }
 

java110-doc/src/main/java/com/java110/doc/registrar/ApiDocPublishing.java

@@ -3,6 +3,7 @@ package com.java110.doc.registrar;
 import com.java110.doc.entity.ApiDocDto;
 import com.java110.doc.entity.RequestMappingsDocDto;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -25,6 +26,7 @@ public class ApiDocPublishing {
      */
     public static void setApiDoc(ApiDocDto apiDocDto, List<RequestMappingsDocDto> mappingsDocDtos) {
         ApiDocPublishing.apiDocDto = apiDocDto;
+        Collections.sort(mappingsDocDtos);
         ApiDocPublishing.mappingsDocDtos = mappingsDocDtos;
     }
 

java110-doc/src/main/java/com/java110/doc/registrar/Java110CmdDocDiscoveryRegistrar.java

@@ -112,6 +112,7 @@ public class Java110CmdDocDiscoveryRegistrar implements ImportBeanDefinitionRegi
                     cmdDocDto.setVersion(attributes.get("version").toString());
                     cmdDocDto.setHttpMethod(attributes.get("httpMethod").toString());
                     cmdDocDto.setServiceCode(attributes.get("serviceCode").toString());
+                    cmdDocDto.setSeq(Integer.parseInt(attributes.get("seq").toString()));
 
 
                     /*BeanDefinitionHolder definitionHolder = new BeanDefinitionHolder(beanDefinition, beanName);

service-user/src/main/java/com/java110/user/cmd/login/AdminLoginPropertyCmd.java

@@ -37,7 +37,8 @@ import java.util.Map;
         url = "http://{ip}:{port}/app/login.adminLoginProperty",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "login.adminLoginProperty"
+        serviceCode = "login.adminLoginProperty",
+        seq = 2
 )
 
 @Java110ParamsDoc(params = {

service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java

@@ -46,7 +46,8 @@ import java.util.Map;
         url = "http://{ip}:{port}/app/login.pcUserLogin",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "login.pcUserLogin"
+        serviceCode = "login.pcUserLogin",
+        seq = 1
 )
 
 @Java110ParamsDoc(params = {

springboot/src/main/java/com/java110/boot/rest/RestApi.java

@@ -34,7 +34,7 @@ import java.util.Map;
         title = "HC小区管理系统api接口文档",
         description = "HC小区管理系统api接口文档",
         company = "Java110工作室",
-        version = "v1.4"
+        version = "v1.5"
 )
 
 @Java110RequestMappingsDoc(