修改铸造修改条件

conflux-admin/src/main/java/com/conflux/web/controller/nft/domain/dto/NftDTO.java

@@ -10,5 +10,5 @@ public class NftDTO {
     private BigInteger tokenId;
     private Long updateTime;
     private Long epochNumber;
-
+    private String nftName;
 }

conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java

@@ -68,7 +68,7 @@ public interface NftCollectionMapper
      */
     public int deleteNftCollectionByIds(Long[] ids);
 
-    int updateByTokenId(@Param("hexTokenId")String hexTokenId,@Param("time")Date time);
+    int updateByTokenId(@Param("hexTokenId")String hexTokenId,@Param("nftName")String nftName,@Param("time")Date time);
 
     int selectMaxNftId(@Param("unitName")String unitName,@Param("nftName")String nftName);
 }

conflux-admin/src/main/java/com/conflux/web/controller/nft/service/IHandlerStrategy.java

@@ -4,5 +4,5 @@ package com.conflux.web.controller.nft.service;
 import conflux.web3j.Cfx;
 
 public interface IHandlerStrategy {
-    boolean relayHandler(Cfx cfx, String json, int type);
+    boolean relayHandler(Cfx cfx, String json, int type,String nftName);
 }

conflux-admin/src/main/java/com/conflux/web/controller/nft/service/INftInfoV2Handler.java

@@ -5,5 +5,5 @@ import conflux.web3j.Cfx;
 
 public interface INftInfoV2Handler {
 
-    void send721NftTransfer(Cfx cfx, String json);
+    void send721NftTransfer(Cfx cfx, String json,String nftName);
 }

conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java

@@ -201,7 +201,7 @@ public class ConfluxServiceImpl implements ConfluxService {
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                    if (executeMakeUp(contract, contractConfig.getUnitName())) {
+                    if (executeMakeUp(contract, contractConfig.getUnitName(),checkArgs.getNftName())) {
                         isFalg = false;
                     }
                     System.out.println("--------正在铸造----------->");
@@ -346,7 +346,7 @@ public class ConfluxServiceImpl implements ConfluxService {
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                    if (executeMakeUp(contract, contractConfig.getUnitName())) {
+                    if (executeMakeUp(contract, contractConfig.getUnitName(),checkArgs.getNftName())) {
                         isFalg = false;
                     }
                     System.out.println("--------正在铸造----------->");
@@ -489,7 +489,7 @@ public class ConfluxServiceImpl implements ConfluxService {
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                    if (executeMakeUp(contract, contractConfig.getUnitName())) {
+                    if (executeMakeUp(contract, contractConfig.getUnitName(),checkArgs.getNftName())) {
                         isFalg = false;
                     }
                     System.out.println("--------正在铸造----------->");
@@ -662,7 +662,7 @@ public class ConfluxServiceImpl implements ConfluxService {
         return AjaxResult.error("token或sign签名失效！");
     }
 
-    public boolean executeMakeUp(String contract, String markName) {
+    public boolean executeMakeUp(String contract, String markName,String nftName) {
         log.info("[dispatchHandler]{}", "开始监听数据");
         CollectConfig collect = (CollectConfig) redisUtils.get(contract);
         if (null == collect) {
@@ -754,7 +754,7 @@ public class ConfluxServiceImpl implements ConfluxService {
             }
             boolean res;
             try {
-                res = iHandlerStrategy.relayHandler(cfx, gson.toJson(l), type);
+                res = iHandlerStrategy.relayHandler(cfx, gson.toJson(l), type,nftName);
             } catch (Exception e) {
                 e.printStackTrace();
                 isSuccess = false;

conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/HandlerStrategy.java

@@ -16,11 +16,11 @@ public class HandlerStrategy implements IHandlerStrategy {
     private INftInfoV2Handler iNftInfoV2ImplHandler;
 
     @Override
-    public boolean relayHandler(Cfx cfx, String json, int type) {
+    public boolean relayHandler(Cfx cfx, String json, int type,String nftName) {
         if (type == 20000) {
             //nft 1155 采集
             log.info("transfer: {}", json);
-            iNftInfoV2ImplHandler.send721NftTransfer(cfx, json);
+            iNftInfoV2ImplHandler.send721NftTransfer(cfx, json,nftName);
             return true;
         }
         return false;

conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/NftCollectionServiceImpl.java

@@ -133,7 +133,7 @@ public class NftCollectionServiceImpl implements INftCollectionService {
             log.info("[WjMyCollection][has mint]{}", nftDTO);
             return;
         }
-        int row = nftCollectionMapper.updateByTokenId(hexTokenId,new Date());
+        int row = nftCollectionMapper.updateByTokenId(hexTokenId,nftDTO.getNftName(),new Date());
         if (row < 1) {
             log.info("[WjMyCollection][updateCollect]{}", nftDTO);
             throw new RuntimeException("updateCollect error");

conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/NftInfoV2ImplHandler.java

@@ -32,7 +32,7 @@ public class NftInfoV2ImplHandler extends BaseHandler implements INftInfoV2Handl
      * @param json json
      */
     @Override
-    public void send721NftTransfer(Cfx cfx, String json) {
+    public void send721NftTransfer(Cfx cfx, String json,String nftName) {
         Log logInfo = getLogInfo(json);
         NftDTO nftDTO = new NftDTO();
         nftDTO.setOwner(decode(logInfo.getTopics().get(2)).getValue());

conflux-admin/src/main/java/com/conflux/web/controller/util/ScheduledTask.java

@@ -123,7 +123,7 @@ public class ScheduledTask {
             }
             boolean res;
             try {
-                res = iHandlerStrategy.relayHandler(cfx, gson.toJson(l), type);
+                res = iHandlerStrategy.relayHandler(cfx, gson.toJson(l), type,null);
             } catch (Exception e) {
                 e.printStackTrace();
                 isSuccess = false;

conflux-system/src/main/resources/mapper/system/NftCollectionMapper.xml

@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         set
             on_chain_status = 2,
             updated_time = #{time}
-        where  information_table_id = #{hexTokenId} AND on_chain_status = 1
+        where  information_table_id = #{hexTokenId} AND nft_name=#{nftName} and on_chain_status = 1
     </update>
 
     <delete id="deleteNftCollectionById" parameterType="Long">