Commit 72523e22 authored by 刘基明's avatar 刘基明

机构成员

parent 01cabc67
...@@ -31,5 +31,11 @@ public class UserInfoOrg { ...@@ -31,5 +31,11 @@ public class UserInfoOrg {
private String certPosition; private String certPosition;
@ApiModelProperty("是否已关注 0未关注 1已关注") @ApiModelProperty("是否已关注 0未关注 1已关注")
private Integer isFollower = 0; private Integer isFollower = 0;
@ApiModelProperty("全新用户等级体系 详见 UserLevelEnum")
private Integer levelGrade;
@ApiModelProperty("当levelGrade=10有值 1投资萌新 2投资达人")
private Integer userInvestorType;
@ApiModelProperty("用户类型 1个人 2机构账号 3机构人员")
private Integer userType;
} }
...@@ -5,6 +5,7 @@ import com.tanpu.common.constant.BizStatus; ...@@ -5,6 +5,7 @@ import com.tanpu.common.constant.BizStatus;
import com.tanpu.common.exception.BizException; import com.tanpu.common.exception.BizException;
import com.tanpu.community.dao.entity.community.ThemeCheckDuplicateEntity; import com.tanpu.community.dao.entity.community.ThemeCheckDuplicateEntity;
import com.tanpu.community.dao.mapper.community.ThemeCheckDuplicateMapper; import com.tanpu.community.dao.mapper.community.ThemeCheckDuplicateMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -28,8 +29,8 @@ public class ThemeTextCheckService { ...@@ -28,8 +29,8 @@ public class ThemeTextCheckService {
content = content.replaceAll(regex, "。"); content = content.replaceAll(regex, "。");
String[] split = content.split("。"); String[] split = content.split("。");
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
getMD5(split[i]); String trim = StringUtils.trim(split[i]);
insert(themeId, split[i], getMD5(split[i]), i + 1, split.length,userId); insert(themeId, trim, getMD5(trim), i + 1, split.length,userId);
} }
} }
...@@ -58,7 +59,8 @@ public class ThemeTextCheckService { ...@@ -58,7 +59,8 @@ public class ThemeTextCheckService {
String[] split = content.split("。"); String[] split = content.split("。");
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
list.add(getMD5(split[i])); String trim = StringUtils.trim(split[i]);
list.add(getMD5(trim));
} }
LambdaQueryWrapper<ThemeCheckDuplicateEntity> w = new LambdaQueryWrapper<ThemeCheckDuplicateEntity>().in(ThemeCheckDuplicateEntity::getPartitionHash, list) LambdaQueryWrapper<ThemeCheckDuplicateEntity> w = new LambdaQueryWrapper<ThemeCheckDuplicateEntity>().in(ThemeCheckDuplicateEntity::getPartitionHash, list)
.eq(ThemeCheckDuplicateEntity::getDeleteTag, BizStatus.DeleteTag.tag_init) .eq(ThemeCheckDuplicateEntity::getDeleteTag, BizStatus.DeleteTag.tag_init)
...@@ -92,11 +94,11 @@ public class ThemeTextCheckService { ...@@ -92,11 +94,11 @@ public class ThemeTextCheckService {
content = content.replaceAll(regex, "。"); content = content.replaceAll(regex, "。");
String[] split = content.split("。"); String[] split = content.split("。");
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
getMD5(split[i]); String trim = StringUtils.trim(split[i]);
ThemeCheckDuplicateEntity build = ThemeCheckDuplicateEntity.builder() ThemeCheckDuplicateEntity build = ThemeCheckDuplicateEntity.builder()
.themeId(themeId) .themeId(themeId)
.partitionText(split[i]) .partitionText(trim)
.partitionHash(getMD5(split[i])) .partitionHash(getMD5(split[i]))
.partitionNum(i+1) .partitionNum(i+1)
.totalParts(split.length) .totalParts(split.length)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment