提交 80646792 作者: 沈振路

人群包回显处理

上级 3423a5b1
...@@ -5,6 +5,8 @@ import java.io.Serializable; ...@@ -5,6 +5,8 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
...@@ -22,6 +24,7 @@ public class CrowdPackageCondition implements Serializable { ...@@ -22,6 +24,7 @@ public class CrowdPackageCondition implements Serializable {
*/ */
@TableId("id") @TableId("id")
@Id @Id
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** /**
......
...@@ -134,11 +134,11 @@ public class CrowdPackageServiceImpl extends ServiceImpl<MaterialCrowdPackageMap ...@@ -134,11 +134,11 @@ public class CrowdPackageServiceImpl extends ServiceImpl<MaterialCrowdPackageMap
List<CrowdPackageConditionMatchVO> parseConditionList = jsonArray.toList(CrowdPackageConditionMatchVO.class); List<CrowdPackageConditionMatchVO> parseConditionList = jsonArray.toList(CrowdPackageConditionMatchVO.class);
// 获取条件的主体 // 获取条件的主体
if (CollectionUtil.isNotEmpty(parseConditionList)) { if (CollectionUtil.isNotEmpty(parseConditionList)) {
Set<String> conditionIdSet = parseConditionList.stream().map(CrowdPackageConditionMatchVO::getConditionId).collect(Collectors.toSet()); Set<Long> conditionIdSet = parseConditionList.stream().map(CrowdPackageConditionMatchVO::getConditionId).collect(Collectors.toSet());
List<CrowdPackageCondition> conditionList = conditionService.list(new QueryWrapper<CrowdPackageCondition>().in("id", conditionIdSet)); List<CrowdPackageCondition> conditionList = conditionService.list(new QueryWrapper<CrowdPackageCondition>().in("id", conditionIdSet));
Map<Long, CrowdPackageCondition> conditionMap = conditionList.stream().collect(Collectors.toMap(CrowdPackageCondition::getId, Function.identity())); Map<Long, CrowdPackageCondition> conditionMap = conditionList.stream().collect(Collectors.toMap(CrowdPackageCondition::getId, Function.identity()));
parseConditionList.forEach(item -> item.setConditionEntity(conditionMap.get(item.longConditionId()))); parseConditionList.forEach(item -> item.setConditionEntity(conditionMap.get(item.getConditionId())));
} }
vo.setConditionList(parseConditionList); vo.setConditionList(parseConditionList);
return new GenericsResult<>(vo); return new GenericsResult<>(vo);
......
package com.yaoyaozw.customer.vo.crowd; package com.yaoyaozw.customer.vo.crowd;
import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yaoyaozw.customer.entity.CrowdPackageCondition; import com.yaoyaozw.customer.entity.CrowdPackageCondition;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -32,6 +33,7 @@ public class CrowdPackageConditionMatchVO implements Serializable { ...@@ -32,6 +33,7 @@ public class CrowdPackageConditionMatchVO implements Serializable {
* 条件表主键ID * 条件表主键ID
*/ */
@ApiModelProperty("条件表主键ID") @ApiModelProperty("条件表主键ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long conditionId; private Long conditionId;
private CrowdPackageCondition conditionEntity; private CrowdPackageCondition conditionEntity;
...@@ -42,14 +44,4 @@ public class CrowdPackageConditionMatchVO implements Serializable { ...@@ -42,14 +44,4 @@ public class CrowdPackageConditionMatchVO implements Serializable {
@ApiModelProperty("条件描述") @ApiModelProperty("条件描述")
private String operatorDescription; private String operatorDescription;
public String getConditionId() {
if (ObjectUtil.isNull(this.conditionId)) {
return null;
}
return conditionId.toString();
}
public Long longConditionId() {
return this.conditionId;
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论