From fe171d73f48e724a8f1de7c3fbae88c92da54702 Mon Sep 17 00:00:00 2001 From: long <18782126717@163.com> Date: Sat, 25 Jun 2022 17:56:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B8=E9=80=A0id=E8=87=AA=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nft/mapper/NftCollectionMapper.java | 2 + .../nft/service/INftCollectionService.java | 2 + .../nft/service/impl/ConfluxServiceImpl.java | 21 +++++- .../impl/NftCollectionServiceImpl.java | 5 ++ .../webjars/springfox-swagger-ui/index.html | 75 ------------------- conflux-admin/src/main/resources/logback.xml | 2 +- .../mapper/system/NftCollectionMapper.xml | 3 + 7 files changed, 32 insertions(+), 78 deletions(-) delete mode 100644 conflux-admin/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/index.html diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java b/conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java index f9375f4..42d58ff 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/mapper/NftCollectionMapper.java @@ -68,4 +68,6 @@ public interface NftCollectionMapper public int deleteNftCollectionByIds(Long[] ids); int updateByTokenId(@Param("hexTokenId")String hexTokenId,@Param("time")Date time); + + int selectMax(String unitName); } diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/INftCollectionService.java b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/INftCollectionService.java index 328c4e3..8c76671 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/INftCollectionService.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/INftCollectionService.java @@ -79,4 +79,6 @@ public interface INftCollectionService public int deleteNftCollectionById(Long id); void updateCollect(NftDTO nftDTO); + + int queryTotalNum(String unitName); } diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java index 4671154..ffe6d3b 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/ConfluxServiceImpl.java @@ -211,7 +211,7 @@ public class ConfluxServiceImpl implements ConfluxService { } /** - * 带有图片元数据nft铸造 限量版 + * 带有图片元数据nft铸造 * * @param checkArgs * @return @@ -302,11 +302,13 @@ public class ConfluxServiceImpl implements ConfluxService { String contract = contractConfig.getContract(); String owner = contractConfig.getOwner(); ConfluxExecutor confluxExecutor = new ConfluxExecutor(account, contract); + int totalNum = nftCollectionService.queryTotalNum(checkArgs.getUnitName()); List list = Arrays.asList(checkArgs.getIds()); + List tokenIds = autoincrement(totalNum, list.size()); List tokenURIs = Arrays.asList(checkArgs.getUri()); long start = DateUtil.currentSeconds(); log.info("[--------------------->mintNft][time]{}", new SimpleDateFormat("HH:mm:ss").format(new Date(start * 1000))); - List tokenIds = list.stream().map(n -> new BigInteger(n, 16)).collect(Collectors.toList()); + //List tokenIds = list.stream().map(n -> new BigInteger(n, 16)).collect(Collectors.toList()); log.info("[--------------------->mintNft][tokenIds]:{}", tokenIds); //估算gas UsedGasAndCollateral est = confluxExecutor.getEstimateData(cfx, new Address(owner), @@ -801,4 +803,19 @@ public class ConfluxServiceImpl implements ConfluxService { vo.setMap(map); return vo; } + + /** + * 实现自增 + * @param count + * @param size + * @return + */ + private List autoincrement(int count,int size){ + List big=new ArrayList<>(); + for (int i = 0; i < size; i++) { + count=count+1; + big.add(BigInteger.valueOf(count)); + } + return big; + } } diff --git a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/NftCollectionServiceImpl.java b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/NftCollectionServiceImpl.java index 48e8702..91e260b 100644 --- a/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/NftCollectionServiceImpl.java +++ b/conflux-admin/src/main/java/com/conflux/web/controller/nft/service/impl/NftCollectionServiceImpl.java @@ -133,4 +133,9 @@ public class NftCollectionServiceImpl implements INftCollectionService { throw new RuntimeException("updateCollect error"); } } + + @Override + public int queryTotalNum(String unitName) { + return nftCollectionMapper.selectMax(unitName); + } } diff --git a/conflux-admin/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/index.html b/conflux-admin/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/index.html deleted file mode 100644 index 61060ed..0000000 --- a/conflux-admin/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/index.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - Swagger UI - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - diff --git a/conflux-admin/src/main/resources/logback.xml b/conflux-admin/src/main/resources/logback.xml index 34a5c20..8405e2f 100644 --- a/conflux-admin/src/main/resources/logback.xml +++ b/conflux-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/conflux-system/src/main/resources/mapper/system/NftCollectionMapper.xml b/conflux-system/src/main/resources/mapper/system/NftCollectionMapper.xml index 9878398..d39c168 100644 --- a/conflux-system/src/main/resources/mapper/system/NftCollectionMapper.xml +++ b/conflux-system/src/main/resources/mapper/system/NftCollectionMapper.xml @@ -110,4 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + \ No newline at end of file