diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java index 13c5b22..f8ff377 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java @@ -35,7 +35,7 @@ public class PartyMemberEventController { @ApiOperation("右侧专业线数据") @GetMapping("/data/list") public BaseResponse> getProfessionalDataList() { - return BaseResponse.success(eventMockDataService.list()); + return BaseResponse.success(eventMockDataService.getProfessionalDataList()); } @ApiOperation("活动风采轮播列表") @@ -52,7 +52,7 @@ public class PartyMemberEventController { @ApiOperation("活动宣言") @GetMapping("/eventDeclaration/list") - public BaseResponse> getEventDeclarationList() { + public BaseResponse> getEventDeclarationList() { return BaseResponse.success(eventPartyBranchService.getEventDeclarationList()); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventMockDataMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventMockDataMapper.xml index f7b0c04..9945a43 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventMockDataMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventMockDataMapper.xml @@ -6,6 +6,7 @@ type="com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData"> + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMockData.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMockData.java index 2862776..a00022b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMockData.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMockData.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -7,6 +8,7 @@ import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; +import java.util.List; /** * 实体类 EventMockData @@ -33,6 +35,12 @@ public class EventMockData implements Serializable { @ApiModelProperty(value = "数据归类") private String dataClass; + /** + * 数据父类 + */ + @ApiModelProperty(value = "数据父类") + private String parentClass; + /** * 数据拼音 */ @@ -63,5 +71,10 @@ public class EventMockData implements Serializable { @ApiModelProperty(value = "同比") private String dataCompare; - + /** + * 同比 + */ + @TableField(exist = false) + @ApiModelProperty(value = "同比") + private List data; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/MockDataValue.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/MockDataValue.java new file mode 100644 index 0000000..29a5bc4 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/MockDataValue.java @@ -0,0 +1,41 @@ +package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 MockDataValue + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@Builder +public class MockDataValue implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 数量 + */ + @ApiModelProperty(value = "数量") + private String value; + + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String name; + + + /** + * 文字 + */ + @ApiModelProperty(value = "文字") + private String text; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java index 4df85ff..d2cbd7e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java @@ -3,6 +3,8 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; +import java.util.List; + /** * 对数据表 event_mock_data 操作的 service * @author Auto create @@ -11,5 +13,5 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; public interface EventMockDataService extends IService{ - + List getProfessionalDataList(); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java index f363c5f..861ec77 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyBranch; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; import java.util.List; import java.util.Map; @@ -14,7 +15,7 @@ import java.util.Map; public interface EventPartyBranchService extends IService{ - List getEventDeclarationList(); + List getEventDeclarationList(); Map getPartyBranchMemberCount(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java index 2b1d989..101c3eb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java @@ -1,11 +1,20 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventMockDataMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventMockDataService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * 对数据表 event_mock_data 操作的 serviceImpl * @author Auto create @@ -15,4 +24,21 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; public class EventMockDataServiceImpl extends ServiceImpl implements EventMockDataService { + @Override + public List getProfessionalDataList() { + List list = this.list(); + List returnList = list.stream().filter(f -> StrUtil.isBlank(f.getParentClass()) ).collect(Collectors.toList()); + + Map> map = list.stream().filter(f -> StrUtil.isNotBlank(f.getParentClass())).collect(Collectors.groupingBy(EventMockData::getParentClass)); + + returnList.forEach(f -> { + List dataList = map.get(f.getDataPy()); + if (ObjectUtil.isNotNull(dataList) && !dataList.isEmpty()) { + List newList = new ArrayList<>(); + dataList.forEach(l -> newList.add(MockDataValue.builder().name(l.getDataName()).value(l.getDataValue()).build())); + f.setData(newList); + } + }); + return returnList; + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index b280798..2cc316e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventPartyBranchMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyBranch; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventPartyBranchService; import org.springframework.stereotype.Service; @@ -22,15 +23,15 @@ public class EventPartyBranchServiceImpl extends ServiceImpl getEventDeclarationList() { + public List getEventDeclarationList() { LambdaQueryWrapper query = Wrappers.lambdaQuery(); query.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1").isNotNull(EventPartyBranch::getEventDeclaration); List list = this.list(query); if (list.isEmpty()) { return new ArrayList<>(); } - List returnList = new ArrayList<>(); - list.forEach(f -> returnList.add(f.getContactName() + ":" + f.getEventDeclaration())); + List returnList = new ArrayList<>(); + list.forEach(f -> returnList.add(MockDataValue.builder().name(f.getContactName()).text(f.getEventDeclaration()).build())); return returnList; }