From 9d0b2e0d276911935d064aa8db1772cc34427948 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 26 Jan 2021 18:09:54 +0800 Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new --- src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderLabelEntity.java | 8 +++++--- src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java | 6 ++++-- src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 7 +++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderLabelEntity.java b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderLabelEntity.java index d492bc5..baacee7 100644 --- a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderLabelEntity.java +++ b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderLabelEntity.java @@ -1,21 +1,23 @@ package com.xcong.excoin.modules.documentary.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.xcong.excoin.common.system.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -@EqualsAndHashCode(callSuper = true) @Data @TableName("follow_trader_label") -public class FollowTraderLabelEntity extends BaseEntity{ +public class FollowTraderLabelEntity{ /** * */ private static final long serialVersionUID = 1L; - + @TableId(value = "id",type = IdType.AUTO) + private Long id; /** * 标签 */ diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java index 23d1783..44af655 100644 --- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java @@ -784,16 +784,15 @@ String labels = followTraderInfoEntity.getLabels(); if(StrUtil.isNotEmpty(labels)) { - String labelsName = ""; + ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>(); String[] split = labels.split(","); int length = split.length; for(int i = 0;i < length;i++) { String string = split[i]; FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string)); - labelsName = selectById.getLabels(); - labelsName += (labelsName + ","); + arrayList.add(selectById); } - tradeSetInfoVo.setLabels(labelsName); + tradeSetInfoVo.setFollowTraderLabelEntitys(arrayList); } return Result.ok(tradeSetInfoVo); } diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java index 1f0d0a7..59ef975 100644 --- a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java +++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeSetInfoVo.java @@ -1,12 +1,14 @@ package com.xcong.excoin.modules.documentary.vo; +import java.util.List; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "TradeSetInfoVo", description = "返回类") -public class TradeSetInfoVo { +public class TradeSetInfoVo<FollowTraderLabelEntity> { @ApiModelProperty(value = "交易员ID") private Long tradeId; @@ -24,7 +26,7 @@ private String declaration; @ApiModelProperty("标签") - private String labels; + private List<FollowTraderLabelEntity> FollowTraderLabelEntitys; -- Gitblit v1.9.1