diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuPublicModuleController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuPublicModuleController.java index b9ed8b3..20f525f 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuPublicModuleController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuPublicModuleController.java @@ -7,7 +7,7 @@ import com.sztzjy.block_finance.entity.StuPracticalTrainingReport; import com.sztzjy.block_finance.entity.StuSupplyOnchain; import com.sztzjy.block_finance.entity.StuSupplyScore; import com.sztzjy.block_finance.entity.dto.StuBlockProductWithBLOBs; -import com.sztzjy.block_finance.entity.dto.StuOnChainInfoDTO; +import com.sztzjy.block_finance.entity.dto.StuOnSupplyChainInfoDTO; import com.sztzjy.block_finance.mappers.StuUploadResourceInfoMapper; import com.sztzjy.block_finance.service.StuPublicService; import com.sztzjy.block_finance.util.ResultDataEntity; @@ -142,10 +142,10 @@ public class StuPublicModuleController { @GetMapping("/getOnChain") @ApiOperation("2.区块上链") @AnonymousAccess - public ResultEntity getOnChain(String userId) { + public ResultEntity getOnChain(String userId) { - StuOnChainInfoDTO info = publicService.getOnChain(userId); - return new ResultEntity(HttpStatus.OK, info); + StuOnSupplyChainInfoDTO info = publicService.getOnChain(userId); + return new ResultEntity(HttpStatus.OK, info); } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/dto/StuOnChainInfoDTO.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/dto/StuOnSupplyChainInfoDTO.java similarity index 89% rename from BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/dto/StuOnChainInfoDTO.java rename to BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/dto/StuOnSupplyChainInfoDTO.java index 774a94c..7bc3c68 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/dto/StuOnChainInfoDTO.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/entity/dto/StuOnSupplyChainInfoDTO.java @@ -11,7 +11,7 @@ import java.util.List; */ @Data -public class StuOnChainInfoDTO { +public class StuOnSupplyChainInfoDTO { //节点数 private Integer nodeNumber; diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuPublicService.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuPublicService.java index c556eac..aaa533d 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuPublicService.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuPublicService.java @@ -4,7 +4,7 @@ import com.sztzjy.block_finance.entity.StuPracticalTrainingReport; import com.sztzjy.block_finance.entity.StuSupplyOnchain; import com.sztzjy.block_finance.entity.StuSupplyScore; import com.sztzjy.block_finance.entity.dto.StuBlockProductWithBLOBs; -import com.sztzjy.block_finance.entity.dto.StuOnChainInfoDTO; +import com.sztzjy.block_finance.entity.dto.StuOnSupplyChainInfoDTO; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -46,7 +46,7 @@ public interface StuPublicService { * @return */ - StuOnChainInfoDTO getOnChain(String userId); + StuOnSupplyChainInfoDTO getOnChain(String userId); List getTrace(String numbers, String userId); diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuPublicServiceImpl.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuPublicServiceImpl.java index e817bb8..a07d269 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuPublicServiceImpl.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuPublicServiceImpl.java @@ -8,7 +8,7 @@ import cn.hutool.core.util.IdUtil; import com.sztzjy.block_finance.config.exception.handler.InvoceTException; import com.sztzjy.block_finance.entity.*; import com.sztzjy.block_finance.entity.dto.StuBlockProductWithBLOBs; -import com.sztzjy.block_finance.entity.dto.StuOnChainInfoDTO; +import com.sztzjy.block_finance.entity.dto.StuOnSupplyChainInfoDTO; import com.sztzjy.block_finance.mappers.*; import com.sztzjy.block_finance.service.StuPublicService; import com.sztzjy.block_finance.util.CalculationScoreUtil; @@ -386,13 +386,13 @@ public class StuPublicServiceImpl implements StuPublicService { */ @Override - public StuOnChainInfoDTO getOnChain(String userId) { + public StuOnSupplyChainInfoDTO getOnChain(String userId) { StuSupplyOnchainExample onChainExample = new StuSupplyOnchainExample(); onChainExample.createCriteria().andUserIdEqualTo(userId); onChainExample.setOrderByClause("block_index asc"); List blockOnChainList = stuBlockOnChainMapper.selectByExample(onChainExample); - StuOnChainInfoDTO stuOnChainInfoDTO = new StuOnChainInfoDTO(); + StuOnSupplyChainInfoDTO stuOnChainInfoDTO = new StuOnSupplyChainInfoDTO(); stuOnChainInfoDTO.setNodeNumber(blockOnChainList.size()); stuOnChainInfoDTO.setStuBlockOnChains(blockOnChainList); return stuOnChainInfoDTO;