diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/InBlockchainDataMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/InBlockchainDataMapper.java index aa4ad6ccd..ef4f11d54 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/InBlockchainDataMapper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/InBlockchainDataMapper.java @@ -8,6 +8,7 @@ import com.microservices.dms.achievementLibrary.domain.BlockchainListQueryVo; import com.microservices.dms.achievementLibrary.domain.KeyValueVo; import com.microservices.dms.achievementLibrary.domain.blockchain.InBlockchainData; import com.microservices.dms.common.vo.CommitCreateVo; +import com.microservices.dms.common.vo.CommitResultVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -77,5 +78,5 @@ public interface InBlockchainDataMapper List getNeedToBlockCommitList(); - List getCommitListById(@Param("projectId") String projectId); + List getCommitListById(@Param("projectId") String projectId); } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java index ee1b465c2..cd2d00c25 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java @@ -383,27 +383,30 @@ public class BlockChainService { } public AjaxResult commitCreate(CommitCreateVo commitCreateVo) { - List CommitCreateVoList = new ArrayList<>(); + List CommitCreateVoList = new ArrayList<>(); if(StringUtils.isEmpty(commitCreateVo.getCommit_id())) { String projectId = commitCreateVo.getProject_id(); if (StringUtils.isNotEmpty(projectId)) { CommitCreateVoList = inBlockchainDataMapper.getCommitListById(projectId); } }else{ - CommitCreateVoList.add(commitCreateVo); + CommitResultVo resultVo = new CommitResultVo(); + resultVo.setCommitId(commitCreateVo.getCommit_id()); + resultVo.setCommitDiff(commitCreateVo.getCommit_diff()); + CommitCreateVoList.add(resultVo); } if(CommitCreateVoList!=null && CommitCreateVoList.size()>0) { - for(CommitCreateVo commit : CommitCreateVoList) { + for(CommitResultVo commit : CommitCreateVoList) { commitDataTnBlock(commit); } } return AjaxResult.success(); } - private AjaxResult commitDataTnBlock(CommitCreateVo commitCreateVo) { - String commitId = commitCreateVo.getCommit_id(); + private AjaxResult commitDataTnBlock(CommitResultVo commitCreateVo) { + String commitId = commitCreateVo.getCommitId(); //根据项目id,查询对应的需要入链的commit - Map res = projectResourceLibraryMapper.selectCommitInfo(commitId,commitCreateVo.getCommit_diff()); + Map res = projectResourceLibraryMapper.selectCommitInfo(commitId,commitCreateVo.getCommitDiff()); JSONObject params = JSONObject.from(res); params.put(REQUEST_TYPE, CREATE_COMMIT); Map p = convertParams(params); diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/common/vo/CommitResultVo.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/common/vo/CommitResultVo.java new file mode 100644 index 000000000..d3d847f72 --- /dev/null +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/common/vo/CommitResultVo.java @@ -0,0 +1,10 @@ +package com.microservices.dms.common.vo; + +import lombok.Data; + +@Data +public class CommitResultVo { + private String commitId; + + private String commitDiff; +} \ No newline at end of file diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/InBlockchainDataMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/InBlockchainDataMapper.xml index 4a4ee9982..3ddbd17ef 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/InBlockchainDataMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/InBlockchainDataMapper.xml @@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where p.use_blockchain = '1' and ibd.tx_hash is null - select cl.commit_id as "commit_id",cl.ref as "commit_diff" from commit_logs cl