Gitlink
/
microservices
43
0
Fork 9
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

修复了一些bug

This commit is contained in:
13036795865 2025-06-20 09:28:03 +08:00
parent 987150e01d
commit aa593e1583
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/InBlockchainDataMapper.java
View File

@ -8,6 +8,7 @@ import com.microservices.dms.achievementLibrary.domain.BlockchainListQueryVo;
import com.microservices.dms.achievementLibrary.domain.KeyValueVo; import com.microservices.dms.achievementLibrary.domain.KeyValueVo;
import com.microservices.dms.achievementLibrary.domain.blockchain.InBlockchainData; import com.microservices.dms.achievementLibrary.domain.blockchain.InBlockchainData;
import com.microservices.dms.common.vo.CommitCreateVo; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -77,5 +78,5 @@ public interface InBlockchainDataMapper
List<String> getNeedToBlockCommitList(); List<String> getNeedToBlockCommitList();
List<CommitCreateVo> getCommitListById(@Param("projectId") String projectId); List<CommitResultVo> getCommitListById(@Param("projectId") String projectId);
} }

15
microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java
View File

@ -383,27 +383,30 @@ public class BlockChainService {
} }
public AjaxResult commitCreate(CommitCreateVo commitCreateVo) { public AjaxResult commitCreate(CommitCreateVo commitCreateVo) {
List<CommitCreateVo> CommitCreateVoList = new ArrayList<>(); List<CommitResultVo> CommitCreateVoList = new ArrayList<>();
if(StringUtils.isEmpty(commitCreateVo.getCommit_id())) { if(StringUtils.isEmpty(commitCreateVo.getCommit_id())) {
String projectId = commitCreateVo.getProject_id(); String projectId = commitCreateVo.getProject_id();
if (StringUtils.isNotEmpty(projectId)) { if (StringUtils.isNotEmpty(projectId)) {
CommitCreateVoList = inBlockchainDataMapper.getCommitListById(projectId); CommitCreateVoList = inBlockchainDataMapper.getCommitListById(projectId);
} }
}else{ }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) { if(CommitCreateVoList!=null && CommitCreateVoList.size()>0) {
for(CommitCreateVo commit : CommitCreateVoList) { for(CommitResultVo commit : CommitCreateVoList) {
commitDataTnBlock(commit); commitDataTnBlock(commit);
} }
} }
return AjaxResult.success(); return AjaxResult.success();
} }
private AjaxResult commitDataTnBlock(CommitCreateVo commitCreateVo) { private AjaxResult commitDataTnBlock(CommitResultVo commitCreateVo) {
String commitId = commitCreateVo.getCommit_id(); String commitId = commitCreateVo.getCommitId();
//根据项目id,查询对应的需要入链的commit //根据项目id,查询对应的需要入链的commit
Map<String, Object> res = projectResourceLibraryMapper.selectCommitInfo(commitId,commitCreateVo.getCommit_diff()); Map<String, Object> res = projectResourceLibraryMapper.selectCommitInfo(commitId,commitCreateVo.getCommitDiff());
JSONObject params = JSONObject.from(res); JSONObject params = JSONObject.from(res);
params.put(REQUEST_TYPE, CREATE_COMMIT); params.put(REQUEST_TYPE, CREATE_COMMIT);
Map<String, String> p = convertParams(params); Map<String, String> p = convertParams(params);

10
microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/common/vo/CommitResultVo.java Normal file
View File

@ -0,0 +1,10 @@
package com.microservices.dms.common.vo;
import lombok.Data;
@Data
public class CommitResultVo {
private String commitId;
private String commitDiff;
}

2
microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/InBlockchainDataMapper.xml
View File

@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where p.use_blockchain = '1' and ibd.tx_hash is null where p.use_blockchain = '1' and ibd.tx_hash is null
</select> </select>
<select id="getCommitListById" resultType="com.microservices.dms.common.vo.CommitCreateVo"> <select id="getCommitListById" resultType="com.microservices.dms.common.vo.CommitResultVo">
select select
cl.commit_id as "commit_id",cl.ref as "commit_diff" cl.commit_id as "commit_id",cl.ref as "commit_diff"
from commit_logs cl from commit_logs cl