Update node info offchain node type

ontio-community · May 22, 2024 · 9338515 · 9338515
1 parent 6866327
commit 9338515
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 21 deletions.
diff --git a/sql/update20230407.sql b/sql/update20230407.sql
diff --git a/src/main/java/com/github/ontio/explorer/statistics/service/ConfigService.java b/src/main/java/com/github/ontio/explorer/statistics/service/ConfigService.java
@@ -71,18 +71,20 @@ public Response insertOffChainInfo(InsertOffChainNodeInfoDto insertOffChainNodeI
         String address = insertOffChainNodeInfoDto.getAddress();
         String name = insertOffChainNodeInfoDto.getName();
         String publicKey = insertOffChainNodeInfoDto.getPublicKey();
-        if (StringUtils.isEmpty(publicKey)) {
+        if (!StringUtils.hasLength(publicKey)) {
             return new Response(61001, "Public key is blank", "");
         }
         String peerInfo = ontSdkService.getPeerInfo(publicKey);
-        if (!StringUtils.isEmpty(peerInfo)) {
+        if (StringUtils.hasLength(peerInfo)) {
+            JSONObject jsonObject = JSONObject.parseObject(peerInfo);
+            int status = jsonObject.getIntValue("status");
             NodeInfoOffChain nodeInfoOffChain = new NodeInfoOffChain();
             nodeInfoOffChain.setPublicKey(publicKey);
             nodeInfoOffChain.setAddress(address);
             nodeInfoOffChain.setName(name);
             nodeInfoOffChain.setVerification(0);
             nodeInfoOffChain.setOntId("");
-            nodeInfoOffChain.setNodeType(1);
+            nodeInfoOffChain.setNodeType(status);
             nodeInfoOffChain.setOpenFlag(true);
             nodeInfoOffChainMapper.insertSelective(nodeInfoOffChain);
             return new Response(0, "SUCCESS", "SUCCESS");
@@ -109,14 +111,22 @@ public Response updateOffChainInfoByPublicKey(UpdateOffChainNodeInfoDto updateOf
         if (ontId == null) {
             nodeInfoOffChain.setOntId("");
         }
-        nodeInfoOffChain.setNodeType(1);
         String nodePublicKey = nodeInfoOffChain.getPublicKey();
         String name = nodeInfoOffChainMapper.selectNameByPublicKey(nodePublicKey);
-        if (StringUtils.isEmpty(name)) {
+        if (!StringUtils.hasLength(name)) {
             // insert
+            String peerInfo = ontSdkService.getPeerInfo(nodePublicKey);
+            if (StringUtils.hasLength(peerInfo)) {
+                JSONObject jsonObject = JSONObject.parseObject(peerInfo);
+                int status = jsonObject.getIntValue("status");
+                nodeInfoOffChain.setNodeType(status);
+            } else {
+                nodeInfoOffChain.setNodeType(1);
+            }
             nodeInfoOffChainMapper.insertSelective(nodeInfoOffChain);
         } else {
             // update
+            nodeInfoOffChain.setNodeType(null);
             nodeInfoOffChainMapper.updateByPrimaryKeySelective(nodeInfoOffChain);
         }
         return new Response(0, "SUCCESS", "SUCCESS");
@@ -147,14 +157,22 @@ public Response updateOffChainInfoByLedger(UpdateOffChainNodeInfoDto updateOffCh
         if (ontId == null) {
             nodeInfoOffChain.setOntId("");
         }
-        nodeInfoOffChain.setNodeType(1);
         String nodePublicKey = nodeInfoOffChain.getPublicKey();
         String name = nodeInfoOffChainMapper.selectNameByPublicKey(nodePublicKey);
-        if (StringUtils.isEmpty(name)) {
+        if (!StringUtils.hasLength(name)) {
             // insert
+            String peerInfo = ontSdkService.getPeerInfo(nodePublicKey);
+            if (StringUtils.hasLength(peerInfo)) {
+                JSONObject jsonObject = JSONObject.parseObject(peerInfo);
+                int status = jsonObject.getIntValue("status");
+                nodeInfoOffChain.setNodeType(status);
+            } else {
+                nodeInfoOffChain.setNodeType(1);
+            }
             nodeInfoOffChainMapper.insertSelective(nodeInfoOffChain);
         } else {
             // update
+            nodeInfoOffChain.setNodeType(null);
             nodeInfoOffChainMapper.updateByPrimaryKeySelective(nodeInfoOffChain);
         }
         return new Response(0, "SUCCESS", "SUCCESS");

diff --git a/src/main/resources/mapper/NodeInfoOffChainMapper.xml b/src/main/resources/mapper/NodeInfoOffChainMapper.xml
@@ -31,20 +31,19 @@
   <insert id="syncWithOnChainNodes">
 INSERT INTO tbl_node_info_off_chain ( name, public_key, address, node_type, ont_id, open_flag ) SELECT
 CASE
-		onchain.name
+		name
 		WHEN '' THEN
-		CONCAT('Node','_',SUBSTRING(onchain.public_key,1,6)) ELSE onchain.name
+		CONCAT('Node','_',SUBSTRING(public_key,1,6)) ELSE name
 	END,
-	onchain.public_key,
-	onchain.address,
-	onchain.STATUS,
+	public_key,
+	address,
+	status,
 	'',
 	1
 FROM
 	tbl_node_info_on_chain onchain
-	LEFT JOIN tbl_node_info_off_chain offchain ON onchain.public_key = offchain.public_key
-WHERE
-	offchain.public_key IS NULL;
+    ON DUPLICATE KEY UPDATE
+    node_type = VALUES(node_type)
   </insert>