修改重复问题

master
whb 11 months ago
parent 81f85b050b
commit bae9875af8

@ -7,7 +7,7 @@ import com.sztzjy.block_finance.entity.StuPracticalTrainingReport;
import com.sztzjy.block_finance.entity.StuSupplyOnchain; import com.sztzjy.block_finance.entity.StuSupplyOnchain;
import com.sztzjy.block_finance.entity.StuSupplyScore; import com.sztzjy.block_finance.entity.StuSupplyScore;
import com.sztzjy.block_finance.entity.dto.StuBlockProductWithBLOBs; 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.mappers.StuUploadResourceInfoMapper;
import com.sztzjy.block_finance.service.StuPublicService; import com.sztzjy.block_finance.service.StuPublicService;
import com.sztzjy.block_finance.util.ResultDataEntity; import com.sztzjy.block_finance.util.ResultDataEntity;
@ -142,10 +142,10 @@ public class StuPublicModuleController {
@GetMapping("/getOnChain") @GetMapping("/getOnChain")
@ApiOperation("2.区块上链") @ApiOperation("2.区块上链")
@AnonymousAccess @AnonymousAccess
public ResultEntity<StuOnChainInfoDTO> getOnChain(String userId) { public ResultEntity<StuOnSupplyChainInfoDTO> getOnChain(String userId) {
StuOnChainInfoDTO info = publicService.getOnChain(userId); StuOnSupplyChainInfoDTO info = publicService.getOnChain(userId);
return new ResultEntity<StuOnChainInfoDTO>(HttpStatus.OK, info); return new ResultEntity<StuOnSupplyChainInfoDTO>(HttpStatus.OK, info);
} }

@ -11,7 +11,7 @@ import java.util.List;
*/ */
@Data @Data
public class StuOnChainInfoDTO { public class StuOnSupplyChainInfoDTO {
//节点数 //节点数
private Integer nodeNumber; private Integer nodeNumber;

@ -4,7 +4,7 @@ import com.sztzjy.block_finance.entity.StuPracticalTrainingReport;
import com.sztzjy.block_finance.entity.StuSupplyOnchain; import com.sztzjy.block_finance.entity.StuSupplyOnchain;
import com.sztzjy.block_finance.entity.StuSupplyScore; import com.sztzjy.block_finance.entity.StuSupplyScore;
import com.sztzjy.block_finance.entity.dto.StuBlockProductWithBLOBs; 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 org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -46,7 +46,7 @@ public interface StuPublicService {
* @return * @return
*/ */
StuOnChainInfoDTO getOnChain(String userId); StuOnSupplyChainInfoDTO getOnChain(String userId);
List<StuSupplyOnchain> getTrace(String numbers, String userId); List<StuSupplyOnchain> getTrace(String numbers, String userId);

@ -8,7 +8,7 @@ import cn.hutool.core.util.IdUtil;
import com.sztzjy.block_finance.config.exception.handler.InvoceTException; import com.sztzjy.block_finance.config.exception.handler.InvoceTException;
import com.sztzjy.block_finance.entity.*; import com.sztzjy.block_finance.entity.*;
import com.sztzjy.block_finance.entity.dto.StuBlockProductWithBLOBs; 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.mappers.*;
import com.sztzjy.block_finance.service.StuPublicService; import com.sztzjy.block_finance.service.StuPublicService;
import com.sztzjy.block_finance.util.CalculationScoreUtil; import com.sztzjy.block_finance.util.CalculationScoreUtil;
@ -386,13 +386,13 @@ public class StuPublicServiceImpl implements StuPublicService {
*/ */
@Override @Override
public StuOnChainInfoDTO getOnChain(String userId) { public StuOnSupplyChainInfoDTO getOnChain(String userId) {
StuSupplyOnchainExample onChainExample = new StuSupplyOnchainExample(); StuSupplyOnchainExample onChainExample = new StuSupplyOnchainExample();
onChainExample.createCriteria().andUserIdEqualTo(userId); onChainExample.createCriteria().andUserIdEqualTo(userId);
onChainExample.setOrderByClause("block_index asc"); onChainExample.setOrderByClause("block_index asc");
List<StuSupplyOnchain> blockOnChainList = stuBlockOnChainMapper.selectByExample(onChainExample); List<StuSupplyOnchain> blockOnChainList = stuBlockOnChainMapper.selectByExample(onChainExample);
StuOnChainInfoDTO stuOnChainInfoDTO = new StuOnChainInfoDTO(); StuOnSupplyChainInfoDTO stuOnChainInfoDTO = new StuOnSupplyChainInfoDTO();
stuOnChainInfoDTO.setNodeNumber(blockOnChainList.size()); stuOnChainInfoDTO.setNodeNumber(blockOnChainList.size());
stuOnChainInfoDTO.setStuBlockOnChains(blockOnChainList); stuOnChainInfoDTO.setStuBlockOnChains(blockOnChainList);
return stuOnChainInfoDTO; return stuOnChainInfoDTO;

Loading…
Cancel
Save