Merge pull request #260 from yg3630536/feature/get-weid-list

Feature/get weid list
WeBankBlockchain · Sep 18, 2020 · 40f1ea7 · 40f1ea7
2 parents 9ab66a1 + 35f9ed1
commit 40f1ea7
Show file tree

Hide file tree

Showing 11 changed files with 366 additions and 14 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.6.4
+1.6.6
diff --git a/build.gradle b/build.gradle
@@ -153,7 +153,7 @@ dependencies {
     if (gradleVer.startsWith("4")) {
         if (!gradle.startParameter.isOffline()) {
             compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval
-            compile("com.webank:weid-contract-java:1.2.22-rc.4-SNAPSHOT") {
+            compile("com.webank:weid-contract-java:1.2.24") {
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
                 // exclude group: "org.fisco-bcos", module: "web3sdk"
                 // exclude group: "org.fisco-bcos", module: "web3sdk-weevent"
@@ -174,7 +174,7 @@ dependencies {
             testAnnotationProcessor 'org.projectlombok:lombok:1.18.10'
             testCompileOnly 'org.projectlombok:lombok:1.18.10'
             compile logger, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval
-            compile("com.webank:weid-contract-java:1.2.22-rc.4-SNAPSHOT") {
+            compile("com.webank:weid-contract-java:1.2.24") {
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
                 // exclude group: "org.fisco-bcos", module: "web3sdk"
                 // exclude group: "org.fisco-bcos", module: "web3sdk-weevent"

diff --git a/src/main/java/com/webank/weid/protocol/base/WeIdBaseInfo.java b/src/main/java/com/webank/weid/protocol/base/WeIdBaseInfo.java
@@ -0,0 +1,35 @@
+/*
+ *       Copyright© (2018-2020) WeBank Co., Ltd.
+ *
+ *       This file is part of weid-java-sdk.
+ *
+ *       weid-java-sdk is free software: you can redistribute it and/or modify
+ *       it under the terms of the GNU Lesser General Public License as published by
+ *       the Free Software Foundation, either version 3 of the License, or
+ *       (at your option) any later version.
+ *
+ *       weid-java-sdk is distributed in the hope that it will be useful,
+ *       but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *       GNU Lesser General Public License for more details.
+ *
+ *       You should have received a copy of the GNU Lesser General Public License
+ *       along with weid-java-sdk.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.webank.weid.protocol.base;
+
+import lombok.Data;
+
+@Data
+public class WeIdBaseInfo {
+    /**
+     * Required: The id.
+     */
+    private String id;
+
+    /**
+     * Required: The created.
+     */
+    private Long created;
+}
diff --git a/src/main/java/com/webank/weid/protocol/base/WeIdDocument.java b/src/main/java/com/webank/weid/protocol/base/WeIdDocument.java
@@ -23,6 +23,8 @@
 import java.util.List;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,7 +39,8 @@
  * @author tonychen 2018.9.29
  */
 @Data
-public class WeIdDocument implements JsonSerializer {
+@EqualsAndHashCode(callSuper = true)
+public class WeIdDocument extends WeIdBaseInfo implements JsonSerializer {
 
     private static final Logger logger = LoggerFactory.getLogger(WeIdDocument.class);
 
@@ -46,16 +49,6 @@ public class WeIdDocument implements JsonSerializer {
      */
     private static final long serialVersionUID = 411522771907189878L;
 
-    /**
-     * Required: The id.
-     */
-    private String id;
-
-    /**
-     * Required: The created.
-     */
-    private Long created;
-
     /**
      * Required: The updated.
      */

diff --git a/src/main/java/com/webank/weid/protocol/base/WeIdPojo.java b/src/main/java/com/webank/weid/protocol/base/WeIdPojo.java
@@ -0,0 +1,50 @@
+/*
+ *       Copyright© (2018-2020) WeBank Co., Ltd.
+ *
+ *       This file is part of weid-java-sdk.
+ *
+ *       weid-java-sdk is free software: you can redistribute it and/or modify
+ *       it under the terms of the GNU Lesser General Public License as published by
+ *       the Free Software Foundation, either version 3 of the License, or
+ *       (at your option) any later version.
+ *
+ *       weid-java-sdk is distributed in the hope that it will be useful,
+ *       but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *       GNU Lesser General Public License for more details.
+ *
+ *       You should have received a copy of the GNU Lesser General Public License
+ *       along with weid-java-sdk.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.webank.weid.protocol.base;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * WeIdentity DID information for created. 
+ * @author v_wbgyang
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class WeIdPojo extends WeIdBaseInfo {
+
+    /**
+     * the blockNum for the WeIdentity DID.
+     */
+    private Integer currentBlockNum;
+
+    /**
+     * the index for the blockNum.
+     */
+    private Integer index;
+
+    /**
+     * the previous blockNum.
+     */
+    private Integer previousBlockNum;
+}
diff --git a/src/main/java/com/webank/weid/rpc/WeIdService.java b/src/main/java/com/webank/weid/rpc/WeIdService.java
@@ -19,8 +19,11 @@
 
 package com.webank.weid.rpc;
 
+import java.util.List;
+
 import com.webank.weid.protocol.base.WeIdAuthentication;
 import com.webank.weid.protocol.base.WeIdDocument;
+import com.webank.weid.protocol.base.WeIdPojo;
 import com.webank.weid.protocol.base.WeIdPrivateKey;
 import com.webank.weid.protocol.base.WeIdPublicKey;
 import com.webank.weid.protocol.request.AuthenticationArgs;
@@ -193,4 +196,20 @@ ResponseData<Boolean> revokeAuthentication(
         String weId,
         AuthenticationArgs authenticationArgs,
         WeIdPrivateKey privateKey);
+
+    /**
+     * query data according to block height, index location and search direction.
+     * 
+     * @param blockNumber the query blockNumber
+     * @param pageSize the page size
+     * @param indexInBlock the beginning (including) of the current block
+     * @param direction search direction: true means forward search, false means backward search
+     * @return return the WeIdPojo List
+     */
+    ResponseData<List<WeIdPojo>> getWeIdList(
+        Integer blockNumber,
+        Integer pageSize,
+        Integer indexInBlock,
+        boolean direction
+    );
 }
diff --git a/src/main/java/com/webank/weid/service/impl/WeIdServiceImpl.java b/src/main/java/com/webank/weid/service/impl/WeIdServiceImpl.java
@@ -37,6 +37,7 @@
 import com.webank.weid.protocol.base.PublicKeyProperty;
 import com.webank.weid.protocol.base.WeIdAuthentication;
 import com.webank.weid.protocol.base.WeIdDocument;
+import com.webank.weid.protocol.base.WeIdPojo;
 import com.webank.weid.protocol.base.WeIdPrivateKey;
 import com.webank.weid.protocol.base.WeIdPublicKey;
 import com.webank.weid.protocol.request.AuthenticationArgs;
@@ -923,4 +924,26 @@ public ResponseData<Boolean> delegateSetAuthentication(
             weId,
             true);
     }
+
+    @Override
+    public ResponseData<List<WeIdPojo>> getWeIdList(
+        Integer blockNumber,
+        Integer pageSize,
+        Integer indexInBlock,
+        boolean direction
+    ) {
+        try {
+            logger.info("[getWeIdList] begin get weIdList, blockNumber = {}, pageSize = {}, "
+                + "indexInBlock = {}, direction = {}", 
+                blockNumber, 
+                pageSize, 
+                indexInBlock, 
+                direction
+            );
+            return weIdServiceEngine.getWeIdList(blockNumber, pageSize, indexInBlock, direction);
+        } catch (Exception e) {
+            logger.error("[getWeIdList] get weIdList failed with exception. ", e);
+            return new ResponseData<>(null, ErrorCode.UNKNOW_ERROR);
+        }
+    }
 }
diff --git a/src/main/java/com/webank/weid/service/impl/engine/WeIdServiceEngine.java b/src/main/java/com/webank/weid/service/impl/engine/WeIdServiceEngine.java
@@ -19,7 +19,10 @@
 
 package com.webank.weid.service.impl.engine;
 
+import java.util.List;
+
 import com.webank.weid.protocol.base.WeIdDocument;
+import com.webank.weid.protocol.base.WeIdPojo;
 import com.webank.weid.protocol.response.ResponseData;
 
 /**
@@ -79,4 +82,21 @@ ResponseData<Boolean> setAttribute(
      * @return weid document
      */
     ResponseData<WeIdDocument> getWeIdDocument(String weId);
+
+    /**
+     * query data according to block height, index location and search direction.
+     * 
+     * @param blockNumber the query blockNumber
+     * @param pageSize the page size
+     * @param indexInBlock the beginning (including) of the current block
+     * @param direction search direction: true means forward search, false means backward search
+     * @return return the WeIdPojo List
+     * @throws Exception unknown exception
+     */
+    ResponseData<List<WeIdPojo>> getWeIdList(
+        Integer blockNumber,
+        Integer pageSize,
+        Integer indexInBlock,
+        boolean direction
+    ) throws Exception;
 }
diff --git a/src/main/java/com/webank/weid/service/impl/engine/fiscov1/WeIdServiceEngineV1.java b/src/main/java/com/webank/weid/service/impl/engine/fiscov1/WeIdServiceEngineV1.java
@@ -61,6 +61,7 @@
 import com.webank.weid.protocol.base.PublicKeyProperty;
 import com.webank.weid.protocol.base.ServiceProperty;
 import com.webank.weid.protocol.base.WeIdDocument;
+import com.webank.weid.protocol.base.WeIdPojo;
 import com.webank.weid.protocol.response.ResolveEventLogResult;
 import com.webank.weid.protocol.response.ResponseData;
 import com.webank.weid.protocol.response.TransactionInfo;
@@ -575,4 +576,14 @@ public ResponseData<Boolean> setAttribute(
             return new ResponseData<Boolean>(false, ErrorCode.TRANSACTION_TIMEOUT);
         }
     }
+
+    @Override
+    public ResponseData<List<WeIdPojo>> getWeIdList(
+        Integer blockNumber, 
+        Integer pageSize, 
+        Integer indexInBlock,
+        boolean direction
+    ) throws Exception {
+        return new ResponseData<>(null, ErrorCode.THIS_IS_UNSUPPORTED);
+    }
 }