oneao/workspace
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

u

Browse Source
This commit is contained in:
oneao committed 2025-12-26 21:35:12 +08:00
1 parent 2f8a815c62
commit c76581d8cb
34 files changed
+539 -277
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/link56/link56-backend/src/main/java/cn/link56/auth/identity/model/vo/AuthLoginVO.java
+23 -8
View File
@@ -5,17 +5,32 @@ import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
public class AuthLoginVO {
private Long companyId;
private String companyLogo;
private String companyName;
private Long userId;
private Integer userRole;
private String userName;
private String userPosition;
private Company company;
private User user;
private String token;
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class Company {
private Long id;
private String logo;
private String name;
}
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class User {
private Long id;
private Integer role;
private String name;
private String position;
private String avatar;
}
}
code/link56/link56-backend/src/main/java/cn/link56/auth/identity/service/AuthIdentityService.java
+16 -12
View File
@@ -9,8 +9,8 @@ import cn.link56.auth.identity.model.vo.AuthLoginVO;
import cn.link56.auth.token.model.AuthToken;
import cn.link56.auth.token.model.TokenPayload;
import cn.link56.auth.token.service.AuthTokenService;
import cn.link56.company.model.po.CompanyPO;
import cn.link56.company.model.po.CompanyUserPO;
import cn.link56.company.model.po.Company;
import cn.link56.company.model.po.CompanyUser;
import cn.link56.auth.identity.model.dto.AuthRegisterDTO;
import cn.link56.company.service.CompanyService;
import cn.link56.company.service.CompanyUserService;
@@ -61,7 +61,7 @@ public class AuthIdentityService {
long companyId = IdGenerator.nextId();
companyService.save(
new CompanyPO()
new Company()
.setId(companyId)
.setName(company.getName())
.setIndustry(StringUtils.join(company.getIndustries(),","))
@@ -72,7 +72,7 @@ public class AuthIdentityService {
);
companyUserService.save(
new CompanyUserPO()
new CompanyUser()
.setId(IdGenerator.nextId())
.setCompanyId(companyId)
.setName(admin.getName())
@@ -85,7 +85,7 @@ public class AuthIdentityService {
}
public AuthLoginVO loginByPassword(AuthLoginPasswordDTO dto) {
CompanyUserPO user = companyUserService.loginByEmailAndPassword(dto.getEmail(), dto.getPassword());
CompanyUser user = companyUserService.loginByEmailAndPassword(dto.getEmail(), dto.getPassword());
if (user == null) {
throw new BusinessException("邮箱或密码错误");
}
@@ -107,7 +107,7 @@ public class AuthIdentityService {
throw new BusinessException("邮箱或验证码失效");
}
CompanyUserPO user = companyUserService.loginByEmail(email);
CompanyUser user = companyUserService.loginByEmail(email);
if (user == null) {
throw new BusinessException("邮箱不存在");
}
@@ -118,8 +118,8 @@ public class AuthIdentityService {
/**
* 公共逻辑：根据用户生成 LoginVO
*/
private AuthLoginVO buildLoginVO(CompanyUserPO user) {
CompanyPO company = companyService.getById(user.getCompanyId());
private AuthLoginVO buildLoginVO(CompanyUser user) {
Company company = companyService.getById(user.getCompanyId());
TokenPayload tokenPayload = new TokenPayload();
tokenPayload.setCompanyId(user.getCompanyId());
@@ -127,18 +127,22 @@ public class AuthIdentityService {
AuthToken authToken = tokenService.generateToken(tokenPayload);
return new AuthLoginVO(
AuthLoginVO.Company companyVO = new AuthLoginVO.Company(
company.getId(),
company.getLogo(),
company.getName(),
company.getName()
);
AuthLoginVO.User userVO = new AuthLoginVO.User(
user.getId(),
user.getRole(),
user.getName(),
user.getPosition(),
authToken.getToken()
user.getAvatar()
);
return new AuthLoginVO(companyVO, userVO, authToken.getToken());
}
}
code/link56/link56-backend/src/main/java/cn/link56/company/mapper/CompanyMapper.java
+2 -2
View File
@@ -1,13 +1,13 @@
package cn.link56.company.mapper;
import cn.link56.company.model.middle.RecommendCompanyRow;
import cn.link56.company.model.po.CompanyPO;
import cn.link56.company.model.po.Company;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface CompanyMapper extends BaseMapper<CompanyPO> {
public interface CompanyMapper extends BaseMapper<Company> {
List<RecommendCompanyRow> listRecommend();
}
code/link56/link56-backend/src/main/java/cn/link56/company/mapper/CompanyUserMapper.java
+2 -2
View File
@@ -1,9 +1,9 @@
package cn.link56.company.mapper;
import cn.link56.company.model.po.CompanyUserPO;
import cn.link56.company.model.po.CompanyUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CompanyUserMapper extends BaseMapper<CompanyUserPO> {
public interface CompanyUserMapper extends BaseMapper<CompanyUser> {
}
code/link56/link56-backend/src/main/java/cn/link56/company/model/dto/UpdateCompanyUserDTO.java
+2
View File
@@ -24,4 +24,6 @@ public class UpdateCompanyUserDTO {
private String name;
private String phone;
private String canuse;
private String avatar;
}
code/link56/link56-backend/src/main/java/cn/link56/company/model/po/CompanyPO.java → code/link56/link56-backend/src/main/java/cn/link56/company/model/po/Company.java
+1 -1
View File
@@ -17,7 +17,7 @@ import java.util.Date;
@NoArgsConstructor
@TableName("b_company")
@Accessors(chain = true)
public class CompanyPO {
public class Company {
@TableId(value = "b_id")
private Long id;
code/link56/link56-backend/src/main/java/cn/link56/company/model/po/CompanyUserPO.java → code/link56/link56-backend/src/main/java/cn/link56/company/model/po/CompanyUser.java
+4 -1
View File
@@ -17,7 +17,7 @@ import java.util.Date;
@NoArgsConstructor
@TableName("b_company_user")
@Accessors(chain = true)
public class CompanyUserPO {
public class CompanyUser {
@TableId(value = "b_id")
private Long id;
@@ -42,6 +42,9 @@ public class CompanyUserPO {
@TableField("b_position")
private String position;
@TableField("b_avatar")
private String avatar;
@TableField("b_canuse")
private String canuse;
code/link56/link56-backend/src/main/java/cn/link56/company/model/vo/CompanyDetailVO.java
+2 -1
View File
@@ -26,7 +26,7 @@ public class CompanyDetailVO {
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class User{
public static class User {
private Long id;
private Long companyId;
private String email;
@@ -34,5 +34,6 @@ public class CompanyDetailVO {
private Integer role;
private String position;
private String name;
private String avatar;
}
}
code/link56/link56-backend/src/main/java/cn/link56/company/model/vo/QueryCompanyUserVO.java
+2
View File
@@ -17,5 +17,7 @@ public class QueryCompanyUserVO {
private String email;
private String phone;
private String avatar;
private String canuse;
}
code/link56/link56-backend/src/main/java/cn/link56/company/service/CompanyService.java
+36 -37
View File
@@ -7,8 +7,8 @@ import cn.link56.company.mapper.CompanyMapper;
import cn.link56.company.model.dto.QueryCompanyDTO;
import cn.link56.company.model.dto.UpdateCompanyDTO;
import cn.link56.company.model.middle.RecommendCompanyRow;
import cn.link56.company.model.po.CompanyPO;
import cn.link56.company.model.po.CompanyUserPO;
import cn.link56.company.model.po.Company;
import cn.link56.company.model.po.CompanyUser;
import cn.link56.company.model.vo.CompanyDetailVO;
import cn.link56.company.model.vo.QueryCompanyVO;
import cn.link56.company.model.vo.RecommendCompanyVO;
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.stream.Collectors;
@Service
public class CompanyService extends ServiceImpl<CompanyMapper,CompanyPO> {
public class CompanyService extends ServiceImpl<CompanyMapper, Company> {
@Resource
private CompanyMapper companyMapper;
@Resource
@@ -67,9 +67,9 @@ public class CompanyService extends ServiceImpl<CompanyMapper,CompanyPO> {
}
public List<RecommendHotCompanyVO> listHot() {
LambdaQueryWrapper<CompanyPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CompanyPO::getHotRecommend, "1")
.select(CompanyPO::getId, CompanyPO::getName);
LambdaQueryWrapper<Company> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Company::getHotRecommend, "1")
.select(Company::getId, Company::getName);
return companyMapper.selectList(queryWrapper)
.stream()
@@ -86,8 +86,8 @@ public class CompanyService extends ServiceImpl<CompanyMapper,CompanyPO> {
*/
public boolean isNameExists(String name) {
Long count = companyMapper.selectCount(
new LambdaQueryWrapper<CompanyPO>()
.eq(CompanyPO::getName, name)
new LambdaQueryWrapper<Company>()
.eq(Company::getName, name)
);
return count > 0;
}
@@ -97,8 +97,8 @@ public class CompanyService extends ServiceImpl<CompanyMapper,CompanyPO> {
*/
public boolean isPhoneExists(String phone) {
Long count = companyMapper.selectCount(
new LambdaQueryWrapper<CompanyPO>()
.eq(CompanyPO::getPhone, phone)
new LambdaQueryWrapper<Company>()
.eq(Company::getPhone, phone)
);
return count > 0;
}
@@ -108,8 +108,8 @@ public class CompanyService extends ServiceImpl<CompanyMapper,CompanyPO> {
*/
public boolean isEmailExists(String email) {
Long count = companyMapper.selectCount(
new LambdaQueryWrapper<CompanyPO>()
.eq(CompanyPO::getEmail, email)
new LambdaQueryWrapper<Company>()
.eq(Company::getEmail, email)
);
return count > 0;
}
@@ -123,19 +123,19 @@ public class CompanyService extends ServiceImpl<CompanyMapper,CompanyPO> {
List<String> industries = queryCompanyDTO.getIndustries();
// 分页
Page<CompanyPO> companyPage = new Page<>(currentPage,pageSize);
LambdaQueryWrapper<CompanyPO> queryWrapper = new LambdaQueryWrapper<>();
Page<Company> companyPage = new Page<>(currentPage,pageSize);
LambdaQueryWrapper<Company> queryWrapper = new LambdaQueryWrapper<>();
// 名称
if (StringUtils.isNotBlank(name)){
queryWrapper.like(CompanyPO::getName,name);
queryWrapper.like(Company::getName,name);
}
// 地区
if (areas != null && !areas.isEmpty()){
queryWrapper.and(wrapper -> {
for (String area : areas) {
wrapper.or(w -> w.like(CompanyPO::getArea, area));
wrapper.or(w -> w.like(Company::getArea, area));
}
});
}
@@ -144,12 +144,12 @@ public class CompanyService extends ServiceImpl<CompanyMapper,CompanyPO> {
if (industries != null && !industries.isEmpty()) {
queryWrapper.and(wrapper -> {
for (String industry : industries) {
wrapper.or(w -> w.like(CompanyPO::getIndustry, industry));
wrapper.or(w -> w.like(Company::getIndustry, industry));
}
});
}
queryWrapper.eq(CompanyPO::getCanuse,"1");
queryWrapper.eq(Company::getCanuse,"1");
List<QueryCompanyVO> result = companyMapper.selectList(companyPage, queryWrapper).stream().map(item -> {
QueryCompanyVO queryCompanyVO = new QueryCompanyVO();
@@ -173,18 +173,18 @@ public class CompanyService extends ServiceImpl<CompanyMapper,CompanyPO> {
}
public CompanyDetailVO getCompanyDetail(Long companyId) {
CompanyPO companyPO = companyMapper.selectById(companyId);
List<CompanyUserPO> companyUserPOS = companyUserService.listByCompanyId(companyId);
Company company = companyMapper.selectById(companyId);
List<CompanyUser> companyUsers = companyUserService.listByCompanyId(companyId);
CompanyDetailVO companyDetailVO = new CompanyDetailVO();
BeanUtils.copyProperties(companyPO,companyDetailVO);
companyDetailVO.setAreas(Arrays.stream(companyPO.getArea().split(","))
BeanUtils.copyProperties(company,companyDetailVO);
companyDetailVO.setAreas(Arrays.stream(company.getArea().split(","))
.collect(Collectors.toList()));
companyDetailVO.setIndustries(Arrays.stream(companyPO.getIndustry().split(","))
companyDetailVO.setIndustries(Arrays.stream(company.getIndustry().split(","))
.collect(Collectors.toList()));
companyDetailVO.setUsers(companyUserPOS.stream()
companyDetailVO.setUsers(companyUsers.stream()
.map(item -> {
CompanyDetailVO.User user = new CompanyDetailVO.User();
BeanUtils.copyProperties(item, user);
@@ -206,43 +206,42 @@ public class CompanyService extends ServiceImpl<CompanyMapper,CompanyPO> {
String name = updateCompanyDTO.getName();
String phone = updateCompanyDTO.getPhone();
String email = updateCompanyDTO.getEmail();
Date establishmentDate = updateCompanyDTO.getEstablishmentDate();
String profile = updateCompanyDTO.getProfile();
String description = updateCompanyDTO.getDescription();
String logo = updateCompanyDTO.getLogo();
String area = StringUtils.join(updateCompanyDTO.getAreas(), ",");
String industry = StringUtils.join(updateCompanyDTO.getIndustries(), ",");
// 检查
CompanyPO companyPO = companyMapper.selectById(id);
if (ObjectUtils.isEmpty(companyPO)){
Company company = companyMapper.selectById(id);
if (ObjectUtils.isEmpty(company)){
throw new BusinessException("更新失败，该公司不存在");
}
// 检查名称
if (!companyPO.getName().equals(name) && isNameExists(name)){
if (!company.getName().equals(name) && isNameExists(name)){
throw new BusinessException("公司名称已存在");
}
// 检查联系电话
if (!StringUtils.equals(phone, companyPO.getPhone())
if (!StringUtils.equals(phone, company.getPhone())
&& isPhoneExists(phone)) {
throw new BusinessException("公司联系电话已存在");
}
// 检查邮箱
if (!StringUtils.equals(email, companyPO.getEmail())
if (!StringUtils.equals(email, company.getEmail())
&& isEmailExists(email)) {
throw new BusinessException("公司联系邮箱已存在");
}
// 更新
BeanUtils.copyProperties(updateCompanyDTO,companyPO);
BeanUtils.copyProperties(updateCompanyDTO, company);
companyPO.setArea(area);
companyPO.setIndustry(industry);
company.setArea(area);
company.setIndustry(industry);
// 保存更新后的公司信息
companyMapper.updateById(companyPO);
companyMapper.updateById(company);
// 更新用户头像
companyUserService.updateCompanyAvatar(company.getId(),company.getLogo());
}
}
code/link56/link56-backend/src/main/java/cn/link56/company/service/CompanyUserService.java
+69 -52
View File
@@ -9,7 +9,7 @@ import cn.link56.company.model.dto.AddCompanyUserDTO;
import cn.link56.company.model.dto.DeleteCompanyUserDTO;
import cn.link56.company.model.dto.QueryCompanyUserDTO;
import cn.link56.company.model.dto.UpdateCompanyUserDTO;
import cn.link56.company.model.po.CompanyUserPO;
import cn.link56.company.model.po.CompanyUser;
import cn.link56.company.model.vo.QueryCompanyUserVO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.stream.Collectors;
@Service
public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUserPO> {
public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUser> {
@Resource
private CompanyUserMapper companyUserMapper;
@@ -41,8 +41,8 @@ public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUs
return false;
}
long count = companyUserMapper.selectCount(
new LambdaQueryWrapper<CompanyUserPO>()
.eq(CompanyUserPO::getEmail, email)
new LambdaQueryWrapper<CompanyUser>()
.eq(CompanyUser::getEmail, email)
);
return count > 0;
}
@@ -54,13 +54,29 @@ public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUs
*/
public boolean isPhoneExists(String phone) {
long count = companyUserMapper.selectCount(
new LambdaQueryWrapper<CompanyUserPO>()
.eq(CompanyUserPO::getPhone, phone)
new LambdaQueryWrapper<CompanyUser>()
.eq(CompanyUser::getPhone, phone)
);
return count > 0;
}
public void updateCompanyAvatar(Long companyId, String avatar) {
if (StringUtils.isBlank(avatar)) {
return;
}
LambdaUpdateWrapper<CompanyUser> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(CompanyUser::getCompanyId, companyId)
.and(w -> w.isNull(CompanyUser::getAvatar)
.or()
.eq(CompanyUser::getAvatar, ""))
.set(CompanyUser::getAvatar, avatar);
companyUserMapper.update(wrapper);
}
/**
* 校验当前用户是否有权限操作指定的公司
* @param companyId 当前公司ID
@@ -69,10 +85,10 @@ public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUs
*/
public boolean hasPermission(Long companyId, Long userId) {
// 根据 userId 查询公司用户信息
CompanyUserPO companyUserPO = companyUserMapper.selectById(userId);
CompanyUser companyUser = companyUserMapper.selectById(userId);
// 如果 companyUserPO 为空，表示该用户不存在，直接返回无权限
if (ObjectUtils.isEmpty(companyUserPO)) {
if (ObjectUtils.isEmpty(companyUser)) {
return false;
}
@@ -82,35 +98,35 @@ public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUs
}
// 判断用户是否属于该公司
if (!companyUserPO.getCompanyId().equals(companyId)) {
if (!companyUser.getCompanyId().equals(companyId)) {
return false;
}
// 检查用户角色是否为 0，只有角色为 0 才有权限
return companyUserPO.getRole() == 0;
return companyUser.getRole() == 0;
// 如果角色不是 0，表示没有权限
}
public CompanyUserPO loginByEmailAndPassword(String email, String password){
LambdaQueryWrapper<CompanyUserPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CompanyUserPO::getEmail,email)
.eq(CompanyUserPO::getPassword,password);
public CompanyUser loginByEmailAndPassword(String email, String password){
LambdaQueryWrapper<CompanyUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CompanyUser::getEmail,email)
.eq(CompanyUser::getPassword,password);
return companyUserMapper.selectOne(queryWrapper);
}
public CompanyUserPO loginByEmail(String email){
LambdaQueryWrapper<CompanyUserPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CompanyUserPO::getEmail,email);
public CompanyUser loginByEmail(String email){
LambdaQueryWrapper<CompanyUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CompanyUser::getEmail,email);
return companyUserMapper.selectOne(queryWrapper);
}
public List<CompanyUserPO> listByCompanyId(Long companyId){
LambdaQueryWrapper<CompanyUserPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CompanyUserPO::getCompanyId,companyId);
public List<CompanyUser> listByCompanyId(Long companyId){
LambdaQueryWrapper<CompanyUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CompanyUser::getCompanyId,companyId);
return companyUserMapper.selectList(queryWrapper);
}
@@ -132,34 +148,34 @@ public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUs
String position = queryCompanyUserDTO.getPosition();
String canuse = queryCompanyUserDTO.getCanuse();
Page<CompanyUserPO> queryPage = new Page<>(currentPage,pageSize);
LambdaQueryWrapper<CompanyUserPO> queryWrapper = new LambdaQueryWrapper<>();
Page<CompanyUser> queryPage = new Page<>(currentPage,pageSize);
LambdaQueryWrapper<CompanyUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CompanyUserPO::getCompanyId,companyId);
queryWrapper.eq(CompanyUser::getCompanyId,companyId);
if (StringUtils.isNotBlank(name)){
queryWrapper.like(CompanyUserPO::getName,name);
queryWrapper.like(CompanyUser::getName,name);
}
if (StringUtils.isNotBlank(email)){
queryWrapper.like(CompanyUserPO::getEmail,email);
queryWrapper.like(CompanyUser::getEmail,email);
}
if (StringUtils.isNotBlank(phone)){
queryWrapper.like(CompanyUserPO::getPhone,phone);
queryWrapper.like(CompanyUser::getPhone,phone);
}
if (StringUtils.isNotBlank(position)){
queryWrapper.like(CompanyUserPO::getPosition,position);
queryWrapper.like(CompanyUser::getPosition,position);
}
if (StringUtils.isNotBlank(canuse)){
queryWrapper.eq(CompanyUserPO::getCanuse,canuse);
queryWrapper.eq(CompanyUser::getCanuse,canuse);
}
List<CompanyUserPO> companyUserPOS = companyUserMapper.selectList(queryPage, queryWrapper);
List<CompanyUser> companyUsers = companyUserMapper.selectList(queryPage, queryWrapper);
List<QueryCompanyUserVO> result = companyUserPOS.stream().map(item -> {
List<QueryCompanyUserVO> result = companyUsers.stream().map(item -> {
QueryCompanyUserVO queryCompanyUserVO = new QueryCompanyUserVO();
BeanUtils.copyProperties(item, queryCompanyUserVO);
return queryCompanyUserVO;
@@ -192,14 +208,14 @@ public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUs
canuse = "1";
}
CompanyUserPO companyUserPO = new CompanyUserPO();
CompanyUser companyUser = new CompanyUser();
BeanUtils.copyProperties(companyUserDTO,companyUserPO);
companyUserPO.setId(IdGenerator.nextId());
companyUserPO.setRole(1);
companyUserPO.setCanuse(canuse);
BeanUtils.copyProperties(companyUserDTO, companyUser);
companyUser.setId(IdGenerator.nextId());
companyUser.setRole(1);
companyUser.setCanuse(canuse);
companyUserMapper.insert(companyUserPO);
companyUserMapper.insert(companyUser);
}
@Transactional
@@ -217,37 +233,38 @@ public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUs
throw new BusinessException("您没有权限访问该公司的信息，操作被拒绝");
}
CompanyUserPO companyUserPO = companyUserMapper.selectById(id);
String oldPassword = companyUserPO.getPassword();
CompanyUser companyUser = companyUserMapper.selectById(id);
String oldPassword = companyUser.getPassword();
if (ObjectUtils.isEmpty(companyUserPO)) {
if (ObjectUtils.isEmpty(companyUser)) {
throw new BusinessException("更新失败，该用户不存在");
}
// 检查邮箱是否发生变化
boolean isEmailChanged = !StringUtils.equals(email, companyUserPO.getEmail());
boolean isEmailChanged = !StringUtils.equals(email, companyUser.getEmail());
if (isEmailChanged && isEmailExists(email)) {
throw new BusinessException("邮箱已被注册");
}
// 检查手机号是否发生变化
if (!StringUtils.equals(phone, companyUserPO.getPhone()) && isPhoneExists(phone)) {
if (!StringUtils.equals(phone, companyUser.getPhone()) && isPhoneExists(phone)) {
throw new BusinessException("手机号已被注册");
}
if (StringUtils.isNotBlank(password)) {
companyUserPO.setPassword(password);
companyUser.setPassword(password);
}
BeanUtils.copyProperties(companyUserDTO, companyUserPO);
if(StringUtils.isNotBlank(password)){
companyUserPO.setPassword(password);
}else{
companyUserPO.setPassword(oldPassword);
BeanUtils.copyProperties(companyUserDTO, companyUser);
if(StringUtils.isNotBlank(password)) {
companyUser.setPassword(password);
} else {
companyUser.setPassword(oldPassword);
}
// 更新用户信息
companyUserMapper.updateById(companyUserPO);
companyUserMapper.updateById(companyUser);
}
@@ -261,10 +278,10 @@ public class CompanyUserService extends ServiceImpl<CompanyUserMapper, CompanyUs
throw new BusinessException("您没有权限访问该公司的信息，操作被拒绝");
}
LambdaUpdateWrapper<CompanyUserPO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(CompanyUserPO::getId, ids)
.eq(CompanyUserPO::getCompanyId, companyId)
.ne(CompanyUserPO::getRole, 0);
LambdaUpdateWrapper<CompanyUser> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(CompanyUser::getId, ids)
.eq(CompanyUser::getCompanyId, companyId)
.ne(CompanyUser::getRole, 0);
// 执行删除操作
companyUserMapper.delete(updateWrapper);
code/link56/link56-backend/src/main/java/cn/link56/post/model/vo/PostCommentVO.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class PostCommentVO {
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class User{
public static class User {
private Long id;
private Long companyId;
private String name;
code/link56/link56-backend/src/main/java/cn/link56/post/model/vo/PostCompanyVO.java
+2
View File
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
@Data
@@ -14,6 +15,7 @@ public class PostCompanyVO {
private String name;
private String logo;
private String profile;
private Date establishmentDate;
private List<String> areas;
private List<String> industries;
}
code/link56/link56-backend/src/main/java/cn/link56/post/service/PostCommentService.java
+47 -40
View File
@@ -41,61 +41,68 @@ public class PostCommentService extends ServiceImpl<PostCommentMapper, PostComme
return null;
}
public List<PostCommentVO> listPostComments(Long id) {
public List<PostCommentVO> listPostComments(Long postId) {
// 1. 查询所有评论
List<PostCommentVO> list = postCommentMapper.selectComments(id);
List<PostCommentVO> list = postCommentMapper.selectComments(postId);
// 2. 构建扁平化树形结构（所有子评论提升到根评论层级）
List<PostCommentVO> rootComments = new ArrayList<>();
Map<Long, PostCommentVO> commentMap = new HashMap<>();
// 2.1 初始化映射并收集根评论
// 2. 构建 id -> comment 映射
Map<Long, PostCommentVO> commentMap = new HashMap<>(list.size());
for (PostCommentVO comment : list) {
comment.setChildren(new ArrayList<>()); // 统一初始化
commentMap.put(comment.getId(), comment);
if (ObjectUtils.isEmpty(comment.getFatherId())) {
rootComments.add(comment);
comment.setChildren(new ArrayList<>()); // 提前初始化children
}
}
// 2.2 遍历所有评论，将子评论挂到根祖先的children中
// 3. 收集一级评论
List<PostCommentVO> rootComments = new ArrayList<>();
for (PostCommentVO comment : list) {
if (ObjectUtils.isEmpty(comment.getFatherId())) {
continue; // 跳过根评论
}
// 查找当前评论的根祖先（追溯到没有fatherId的祖先）
PostCommentVO rootAncestor = null;
Long currentFatherId = comment.getFatherId();
while (true) {
PostCommentVO parent = commentMap.get(currentFatherId);
if (parent == null) break; // 父节点不存在，终止循环
if (ObjectUtils.isEmpty(comment.getFatherId())) {
rootAncestor = parent; // 找到根祖先
break;
} else {
currentFatherId = parent.getFatherId(); // 继续向上查找
}
}
// 挂载到根祖先的children中
if (rootAncestor != null && rootAncestor.getChildren() != null) {
rootAncestor.getChildren().add(comment);
if (comment.getFatherId() == null) {
rootComments.add(comment);
}
}
// 3. 按原始顺序排序（可选）
rootComments.forEach(root -> {
if (root.getChildren() != null) {
// 根据需求排序，例如按创建时间升序
root.getChildren().sort(Comparator.comparing(PostCommentVO::getCreateTime));
// 4. 将所有子评论挂到「根评论」的 children 中
for (PostCommentVO comment : list) {
// 跳过一级评论
if (comment.getFatherId() == null) {
continue;
}
});
PostCommentVO root = findRootComment(comment, commentMap);
if (root != null) {
root.getChildren().add(comment);
}
}
// 5. 子评论排序（可选）
rootComments.forEach(root ->
root.getChildren().sort(
Comparator.comparing(PostCommentVO::getCreateTime)
)
);
return rootComments;
}
private PostCommentVO findRootComment(
PostCommentVO comment,
Map<Long, PostCommentVO> commentMap) {
PostCommentVO current = comment;
while (current.getFatherId() != null) {
PostCommentVO parent = commentMap.get(current.getFatherId());
if (parent == null) {
return null; // 数据异常，防御
}
current = parent;
}
return current; // fatherId == null 的就是根评论
}
@Transactional
public CreatePostCommentVO createPostComment(CreatePostCommentDTO dto) {
PostComment postComment = new PostComment();
code/link56/link56-backend/src/main/java/cn/link56/post/service/PostService.java
+6 -9
View File
@@ -4,7 +4,7 @@ import cn.link56.common.BasePageVO;
import cn.link56.common.context.UserContext;
import cn.link56.common.exception.BusinessException;
import cn.link56.common.utils.snowflake.idgen.IdGenerator;
import cn.link56.company.model.po.CompanyPO;
import cn.link56.company.model.po.Company;
import cn.link56.company.service.CompanyService;
import cn.link56.post.mapper.PostMapper;
import cn.link56.post.model.dto.*;
@@ -16,13 +16,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -258,7 +256,6 @@ public class PostService extends ServiceImpl<PostMapper, Post> {
Long viewTotal = postViewService.getTotalByPostId(id);
Long commentTotal = postCommentService.getTotalByPostId(id);
postVO.setViewCount(viewTotal);
postVO.setCommentCount(commentTotal);
@@ -274,16 +271,16 @@ public class PostService extends ServiceImpl<PostMapper, Post> {
}
public PostCompanyVO getPostCompanyById(Long id) {
CompanyPO companyPO = companyService.getById(id);
if (companyPO == null){
Company company = companyService.getById(id);
if (company == null){
throw new BusinessException("该公司不存在或已注销");
}
PostCompanyVO postCompanyVO = new PostCompanyVO();
BeanUtils.copyProperties(companyPO,postCompanyVO);
BeanUtils.copyProperties(company,postCompanyVO);
postCompanyVO.setAreas(Arrays.stream(StringUtils.split(companyPO.getArea(),",")).collect(Collectors.toList()));
postCompanyVO.setIndustries(Arrays.stream(StringUtils.split(companyPO.getIndustry(),",")).collect(Collectors.toList()));
postCompanyVO.setAreas(Arrays.stream(StringUtils.split(company.getArea(),",")).collect(Collectors.toList()));
postCompanyVO.setIndustries(Arrays.stream(StringUtils.split(company.getIndustry(),",")).collect(Collectors.toList()));
return postCompanyVO;
}
code/link56/link56-backend/src/main/resources/cn/link56/post/mapper/PostCommentMapper.xml
+2 -2
View File
@@ -28,8 +28,8 @@
<select id="selectComments" resultMap="CommentListMap">
SELECT c.*,
pc.b_id AS pub_user_id,pc.b_company_id AS pub_company_id,pc.b_name AS pub_user_name,
rc.b_id AS rep_user_id,rc.b_company_id AS rep_company_id,rc.b_name AS rep_company_id
pc.b_id AS pub_user_id,pc.b_company_id AS pub_company_id,pc.b_name AS pub_user_name,pc.b_avatar AS pub_user_avatar,
rc.b_id AS rep_user_id,rc.b_company_id AS rep_company_id,rc.b_name AS rep_user_name,rc.b_avatar AS rep_user_avatar
FROM b_post_comment c
LEFT JOIN b_company_user pc ON c.b_create_by = pc.b_id
LEFT JOIN b_company_user rc ON (
code/link56/link56-frontend-new/src/components/SafeImage.vue
+74
View File
@@ -0,0 +1,74 @@
<script setup lang="ts">
import { computed, ref, watch } from 'vue'
defineOptions({ inheritAttrs: false })
const props = defineProps<{
url?: string
size?: number
width?: number
height?: number
round?: boolean
}>()
const fallback = '/no-avatar.png'
const currentSrc = ref(props.url?.trim() || fallback)
// 监听 url 变化
watch(
() => props.url,
(newUrl) => {
currentSrc.value = newUrl?.trim() || fallback
},
)
// 加载失败兜底
function onError() {
currentSrc.value = fallback
}
// 尺寸样式
const sizeStyle = computed(() => {
// width / height 优先
if (props.width || props.height) {
return {
width: props.width ? `${props.width}px` : undefined,
height: props.height ? `${props.height}px` : undefined,
}
}
// size（正方形）
if (typeof props.size === 'number') {
return {
width: `${props.size}px`,
height: `${props.size}px`,
}
}
return {}
})
</script>
<template>
<img
v-bind="$attrs"
:src="currentSrc"
alt="图片"
class="base-img"
:class="{ 'is-round': round }"
:style="sizeStyle"
@error="onError"
>
</template>
<style scoped>
.base-img {
display: block;
object-fit: cover;
}
/* 圆形 */
.is-round {
border-radius: 50%;
}
</style>
code/link56/link56-frontend-new/src/layout/components/header.vue
+3 -1
View File
@@ -4,6 +4,8 @@ import {
User,
} from '@element-plus/icons-vue'
import { useRoute, useRouter } from 'vue-router'
import SafeImage from '@/components/SafeImage.vue'
import { useUserStore } from '@/store/user'
const route = useRoute()
@@ -63,7 +65,7 @@ function isActive(path: string) {
<el-dropdown>
<div class="user">
<el-avatar :size="36" :src="userStore.userInfo.company.logo ? userStore.userInfo.company.logo : '/no-avatar.png'" />
<SafeImage :size="36" :url="userStore.userInfo.user.avatar || userStore.userInfo.company.logo" />
<div class="info">
<span class="name">{{ userStore.userInfo.user.name }}</span>
<span class="company">{{ userStore.userInfo.company.name }}</span>
code/link56/link56-frontend-new/src/router/index.ts
+1 -1
View File
@@ -37,7 +37,7 @@ const router = createRouter({
},
{
path: '/company/detail',
component: () => import('@/views/company/detail/index.vue'),
component: () => import('@/views/company/detail.vue'),
},
{
path: '/settings',
code/link56/link56-frontend-new/src/store/user.ts
+3
View File
@@ -7,6 +7,7 @@ interface IUserInfo {
name: string
position: string
role: number
avatar: string
}
company: {
id: number
@@ -25,6 +26,7 @@ export const useUserStore = defineStore(
name: '',
position: '',
role: 0,
avatar: '',
},
company: {
id: 0,
@@ -45,6 +47,7 @@ export const useUserStore = defineStore(
name: '',
position: '',
role: 0,
avatar: '',
},
company: {
id: 0,
code/link56/link56-frontend-new/src/types/auth/index.ts
+12 -8
View File
@@ -9,14 +9,18 @@ export interface LoginEmailCodeApiParams {
}
export interface LoginApiResult {
companyId: number
companyLogo: string
companyName: string
userId: number
userRole: number
userName: string
userPosition: string
company: {
id: number
logo: string
name: string
}
user: {
id: number
role: number
name: string
position: string
avatar: string
}
token: string
}
code/link56/link56-frontend-new/src/types/company/user.ts
+5
View File
@@ -18,6 +18,7 @@ export interface CompanyUser {
email: string
phone: string
canuse: string
avatar: string
}
export interface CompanyUserForm extends CompanyUser {
@@ -34,6 +35,8 @@ export interface AddCompanyUserParams {
position: string
phone: string
canuse: string
avatar: string
}
export interface UpdateCompanyUserParams {
id: number
@@ -46,6 +49,8 @@ export interface UpdateCompanyUserParams {
position: string
phone: string
canuse: string
avatar: string
}
export interface DeleteCompanyUserParams {
code/link56/link56-frontend-new/src/types/post/index.ts
+1 -1
View File
@@ -58,7 +58,6 @@ export interface PublicPostDetail {
activeTime: string
viewCount: number
commentCount: number
companyId: number
}
@@ -68,6 +67,7 @@ export interface PostCompany {
name: string
logo: string
profile: string
establishmentDate: string
areas: string[]
industries: string[]
code/link56/link56-frontend-new/src/utils/time.ts
+66
View File
@@ -44,3 +44,69 @@ export function formatPostTime(input?: dayjs.ConfigType): string {
// 非本年
return time.format('YYYY年MM月DD日')
}
export function formatCommentTime(input?: dayjs.ConfigType): string {
if (!input)
return ''
const time = dayjs(input)
if (!time.isValid())
return ''
const now = dayjs()
const diffSeconds = now.diff(time, 'second')
// 未来时间兜底
if (diffSeconds < 0) {
return time.format('YYYY-MM-DD HH:mm')
}
// 1 分钟内
if (diffSeconds < 60) {
return '刚刚'
}
const diffMinutes = now.diff(time, 'minute')
if (diffMinutes < 60) {
return `${diffMinutes}分钟前`
}
const diffHours = now.diff(time, 'hour')
if (diffHours < 24) {
return `${diffHours}小时前`
}
const diffDays = now.diff(time, 'day')
if (diffDays < 7) {
return `${diffDays}天前`
}
// 本年
if (time.year() === now.year()) {
return time.format('MM-DD HH:mm')
}
// 非本年
return time.format('YYYY-MM-DD HH:mm')
}
export type DateFormat
= | 'YYYY'
| 'MM'
| 'DD'
| 'YYYY-MM-DD'
| 'YYYY-MM-DD HH:mm'
| 'YYYY-MM-DD HH:mm:ss'
| 'YYYY年MM月DD日'
export function formatDate(
input?: dayjs.ConfigType,
format: DateFormat = 'YYYY-MM-DD',
): string {
if (!input)
return ''
const date = dayjs(input)
if (!date.isValid())
return ''
return date.format(format)
}
code/link56/link56-frontend-new/src/views/auth/login.vue
+1 -14
View File
@@ -133,20 +133,7 @@ async function submitForm(formEl: FormInstance | undefined) {
if (res.isSuccess) {
ElMessage.success('登录成功')
userStore.setUserInfo({
user: {
id: res.data.userId,
name: res.data.userName,
position: res.data.userPosition,
role: res.data.userRole,
},
company: {
id: res.data.companyId,
logo: res.data.companyLogo,
name: res.data.companyName,
},
token: res.data.token,
})
userStore.setUserInfo(res.data)
router.push('/')
}
code/link56/link56-frontend-new/src/views/company/detail/index.vue → code/link56/link56-frontend-new/src/views/company/detail.vue
+9 -4
View File
@@ -8,6 +8,7 @@ import AnchorMenu from '@/components/anchor-menu/index.vue'
import WangEditor from '@/components/wang-editor/index.vue'
import { getCompanyDetailApi } from '@/request/api/company'
import { formatDate } from '@/utils/time'
const route = useRoute()
const router = useRouter()
@@ -110,14 +111,11 @@ function handleUpdateEditorDirectory(menus: AnchorMenuItem[]) {
{{ companyDetail.email || '-' }}
</el-descriptions-item>
<el-descriptions-item label="成立日期">
-
{{ formatDate(companyDetail.establishmentDate, 'YYYY-MM-DD') || '-' }}
</el-descriptions-item>
<el-descriptions-item label="区域">
{{ companyDetail.areas.join('/') || '-' }}
</el-descriptions-item>
<el-descriptions-item label="详细地址" :span="2">
-
</el-descriptions-item>
</el-descriptions>
</div>
@@ -135,6 +133,13 @@ function handleUpdateEditorDirectory(menus: AnchorMenuItem[]) {
<span class="info-title">公司成员</span>
</div>
<el-table :data="companyDetail.users" style="width: 100%" stripe border>
<el-table-column prop="avatar" label="头像" align="center" width="120">
<template #default="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<SafeImage :url="scope.row.avatar" :size="64" />
</div>
</template>
</el-table-column>
<el-table-column prop="name" label="姓名" width="180" />
<el-table-column prop="position" label="职务" width="180" />
<el-table-column prop="phone" label="手机号" width="180" />
code/link56/link56-frontend-new/src/views/company/index.vue
+16 -13
View File
@@ -4,6 +4,7 @@ import { ElMessage } from 'element-plus'
import { onMounted, reactive, ref } from 'vue'
import { useRouter } from 'vue-router'
import QueryCompany from '@/components/QueryCompany.vue'
import SafeImage from '@/components/SafeImage.vue'
import { queryCompanyApi } from '@/request/api/company'
import { useCommonStore } from '@/store/common'
@@ -77,21 +78,22 @@ function toDetail(data: Company) {
</div>
<div class="company-list">
<div v-for="item in companyList" :key="item.id" class="company-item">
<el-avatar shape="square" :src="item.logo || '/no-avatar.png'" :size="70" class="company-logo" />
<SafeImage :url="item.logo" :size="70" class="company-logo" />
<div class="company-info">
<div class="company-header">
<div class="company-name">
<div class="company-name" @click="toDetail(item)">
{{ item.name }}
</div>
<div class="company-tags">
<el-tag v-for="tag in item.industries" :key="tag" type="primary" effect="dark">
{{ tag }}
</el-tag>
</div>
</div>
<div class="company-tags">
<el-tag v-for="tag in item.industries" :key="tag" type="primary" effect="dark">
{{ tag }}
</el-tag>
</div>
<p class="company-profile">
{{ item.profile || '-' }}
<p v-if="item.profile" class="company-profile">
{{ item.profile }}
</p>
<div class="company-footer">
<div class="company-details">
@@ -109,7 +111,7 @@ function toDetail(data: Company) {
</div>
</div>
<div class="company-actions">
<el-button @click="toDetail(item)">
<!-- <el-button @click="toDetail(item)">
<i-ri:information-2-line />
<span class="button-text">
详细
@@ -121,7 +123,7 @@ function toDetail(data: Company) {
<span class="button-text">
发起聊天
</span>
</el-button>
</el-button> -->
</div>
</div>
</div>
@@ -202,7 +204,7 @@ function toDetail(data: Company) {
.company-info {
flex: 1;
min-height: 70px;
.company-header {
display: flex;
justify-content: space-between;
@@ -219,7 +221,8 @@ function toDetail(data: Company) {
.company-tags {
margin-bottom: 6px;
> * {
> *:not(:last-child) {
margin-right: 16px;
}
}
code/link56/link56-frontend-new/src/views/post/detail/components/comment-list.vue
+71 -40
View File
@@ -2,9 +2,12 @@
import type { PostComment, PublicPostDetail } from '@/types/post'
import { ElMessage } from 'element-plus'
import { nextTick, ref, watch } from 'vue'
import SafeImage from '@/components/SafeImage.vue'
import SvgIcon from '@/components/SvgIcon.vue'
import { createPostCommentApi } from '@/request/api/post'
import { useUserStore } from '@/store/user'
import { formatCommentTime } from '@/utils/time'
import CommentInput from './comment-input.vue'
const props = defineProps<{
@@ -12,6 +15,11 @@ const props = defineProps<{
postDetail: PublicPostDetail
}>()
const emits = defineEmits<{
(e: 'update:modelValue', value: PostComment[]): void
(e: 'change'): void
}>()
const commentList = ref<PostComment[]>([])
const userStore = useUserStore()
@@ -29,19 +37,36 @@ watch(
},
)
function handleReplyComment(commentId: number) {
if (replyCommentId.value === commentId) {
replyCommentId.value = null
}
else {
replyCommentId.value = commentId
}
function handleReplyComment(commentId: number, e: MouseEvent) {
const isOpen = replyCommentId.value !== commentId
replyCommentId.value = isOpen ? commentId : null
if (!isOpen)
return
nextTick(() => {
window.scrollTo({
top: document.documentElement.scrollHeight,
behavior: 'smooth',
})
const el = e.currentTarget as HTMLElement
if (!el)
return
const rect = el.getBoundingClientRect()
const viewportHeight = window.innerHeight
const scrollOffset = 70 // 👈 可调：40~70
// 点击点在视口上半部分 → 往上滚
if (rect.top < viewportHeight / 2) {
window.scrollBy({
top: -scrollOffset,
behavior: 'smooth',
})
}
// 点击点在视口下半部分 → 往下滚
else {
window.scrollBy({
top: scrollOffset,
behavior: 'smooth',
})
}
})
}
@@ -129,6 +154,9 @@ function handleReplyCommentSubmit(content: string) {
replyUser: null,
})
}
emits('update:modelValue', commentList.value)
emits('change')
})
.finally(() => {
@@ -141,7 +169,7 @@ function handleReplyCommentSubmit(content: string) {
<template>
<div v-for="item in commentList" :key="item.id" class="custom-comment">
<div class="custom-comment-left">
<el-avatar class="custom-comment-avatar" :src="item.publishUser.avatar || '/no-avatar.png'" :size="70" />
<SafeImage :url="item.publishUser.avatar" :size="32" round />
</div>
<div class="custom-comment-right">
<div class="custom-comment-meta">
@@ -149,33 +177,36 @@ function handleReplyCommentSubmit(content: string) {
<div class="custom-comment-author">
{{ item.publishUser.name }}
</div>
<div v-if="item.publishUser.companyId === postDetail.companyId" class="custom-comment-author-tag">
<!-- <div v-if="item.publishUser.companyId === postDetail.companyId" class="custom-comment-author-tag">
作者
</div>
</div> -->
</div>
<div class="custom-comment-time">
{{ item.createTime }}
{{ formatCommentTime(item.createTime) }}
</div>
</div>
<div class="custom-comment-content" v-html="item.content" />
<div class="custom-comment-actions">
<div class="custom-comment-action" :style="{ color: replyCommentId === item.id ? '#165dff' : '#1d2129' }" @click="handleReplyComment(item.id)">
<SvgIcon icon="mingcute:message-3-line" />
<div
class="custom-comment-action" :style="{ color: replyCommentId === item.id ? '#165dff' : '#8A919F' }"
@click="handleReplyComment(item.id, $event)"
>
<SvgIcon icon="mingcute:message-3-line" :size="16" />
<div>{{ replyCommentId === item.id ? "取消回复" : "回复" }}</div>
</div>
<div class="custom-comment-action flex ml-auto">
<SvgIcon icon="akar-icons:more-horizontal-fill" />
<div class="custom-comment-action" style="margin-left: auto;">
<SvgIcon icon="mingcute:more-1-fill" :size="16" />
</div>
</div>
<!-- 父级评论输入框 -->
<CommentInput v-if="replyCommentId === item.id" :loading="replyCommentLoading" @submit="handleReplyCommentSubmit" />
<CommentInput v-if="replyCommentId === item.id" :loading="replyCommentLoading" style="margin-top: 8px;" @submit="handleReplyCommentSubmit" />
<!-- 子评论 -->
<div v-if="item.children && item.children.length > 0" class="custom-comment-children">
<div v-for="child in item.children" :key="child.id" class="custom-comment">
<div class="custom-comment-left">
<el-avatar class="custom-comment-avatar" :src="item.publishUser.avatar || '/no-avatar.png'" :size="70" />
<SafeImage :url="item.publishUser.avatar" :size="32" round />
</div>
<div class="custom-comment-right">
<div class="custom-comment-meta">
@@ -183,33 +214,36 @@ function handleReplyCommentSubmit(content: string) {
<div class="custom-comment-author">
{{ child.publishUser.name }}
</div>
<div v-if="child.publishUser.companyId === postDetail.companyId" class="custom-comment-author-tag">
<!-- <div v-if="child.publishUser.companyId === postDetail.companyId" class="custom-comment-author-tag">
作者
</div>
</div> -->
<template v-if="child.replyUser && child.fatherId !== item.id">
<div>回复</div>
<div style="margin: 0px 4px;">
回复
</div>
<div class="custom-comment-author">
{{ child.replyUser.name }}
</div>
</template>
</div>
<div class="custom-comment-time">
{{ child.createTime }}
{{ formatCommentTime(child.createTime) }}
</div>
</div>
<div class="custom-comment-content">
{{ child.content }}
</div>
<div class="custom-comment-actions">
<div class="custom-comment-action" :style="{ color: replyCommentId === child.id ? '#165dff' : '#1d2129' }" @click="handleReplyComment(child.id)">
<SvgIcon icon="mingcute:message-3-line" />
<div class="custom-comment-action" :style="{ color: replyCommentId === child.id ? '#165dff' : '#8A919F' }" @click="handleReplyComment(child.id, $event)">
<SvgIcon icon="mingcute:message-3-line" :size="16" />
<div>{{ replyCommentId === child.id ? "取消回复" : "回复" }}</div>
</div>
<div class="custom-comment-action flex ml-auto">
<SvgIcon icon="akar-icons:more-horizontal-fill" />
<div class="custom-comment-action" style="margin-left: auto;">
<SvgIcon icon="akar-icons:more-horizontal-fill" :size="16" />
</div>
</div>
<CommentInput v-if="replyCommentId === child.id" :loading="replyCommentLoading" @submit="handleReplyCommentSubmit" />
<CommentInput v-if="replyCommentId === child.id" :loading="replyCommentLoading" style="margin-top: 8px;" @submit="handleReplyCommentSubmit" />
</div>
</div>
</div>
@@ -238,21 +272,17 @@ function handleReplyCommentSubmit(content: string) {
display: flex;
flex-direction: column;
flex: 1;
gap: 8px;
}
.custom-comment-avatar {
width: 32px;
height: 32px;
border-radius: 50%;
object-fit: cover;
}
.custom-comment-meta {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 4px;
.custom-comment-title {
font-size: 14px;
color: #4e5969;
color: #515767;
display: flex;
align-items: center;
gap: 4px;
@@ -274,14 +304,15 @@ function handleReplyCommentSubmit(content: string) {
}
}
.custom-comment-content {
font-size: 14px;
color: #1d2129;
font-size: 16px;
color: #252933;
word-break: break-all;
white-space: pre-wrap;
margin-bottom: 6px;
}
.custom-comment-actions {
display: flex;
gap: 8px;
gap: 12px;
.custom-comment-action {
display: flex;
gap: 4px;
@@ -289,7 +320,7 @@ function handleReplyCommentSubmit(content: string) {
cursor: pointer;
font-size: 14px;
line-height: 14px;
color: #1d2129;
color: #8a919f;
}
.custom-comment-action:hover {
color: #165dff;
code/link56/link56-frontend-new/src/views/post/detail/index.vue
+28 -8
View File
@@ -2,14 +2,14 @@
import type { AnchorMenuItem } from '@/components/anchor-menu/type'
import type { PostComment, PostCompany, PublicPostDetail } from '@/types/post'
import { ElMessage } from 'element-plus'
import { onMounted, ref } from 'vue'
import { computed, onMounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import AnchorMenu from '@/components/anchor-menu/index.vue'
import CustomEmpty from '@/components/CustomEmpty.vue'
import WandEditor from '@/components/wang-editor/index.vue'
import { createPostCommentApi, getPostCompanyById, getPublicPostDetailApi, listPostCommentApi } from '@/request/api/post'
import { useUserStore } from '@/store/user'
import { formatPostTime } from '@/utils/time'
import { formatDate, formatPostTime } from '@/utils/time'
import CommentInput from './components/comment-input.vue'
import CommentList from './components/comment-list.vue'
@@ -25,6 +25,7 @@ const postCompany = ref<PostCompany>({
name: '',
logo: '',
profile: '',
establishmentDate: '',
areas: [],
industries: [],
})
@@ -37,7 +38,6 @@ const postDetail = ref<PublicPostDetail>({
activeTime: '',
viewCount: 0,
commentCount: 0,
companyId: 0,
})
@@ -92,6 +92,22 @@ onMounted(async () => {
loading.value = false
}
})
function getTotalCommentCount(list: PostComment[]): number {
let count = 0
for (const comment of list) {
count += 1 // 一级评论
if (comment.children && comment.children.length > 0) {
count += comment.children.length // 所有子评论（已扁平）
}
}
return count
}
const totalCommentCount = computed(() => {
return getTotalCommentCount(postComments.value)
})
function handleUpdateEditorDirectory(menus: AnchorMenuItem[]) {
anchorMenu.value = anchorMenu.value.concat(menus)
@@ -161,7 +177,7 @@ function handleSubmitRootComment(content: string) {
</div>
<div class="post-meta-item">
<SvgIcon icon="mdi:comment-outline" :size="16" />
<span>{{ postDetail.commentCount }} </span>
<span>{{ totalCommentCount }} </span>
</div>
</div>
</div>
@@ -185,7 +201,10 @@ function handleSubmitRootComment(content: string) {
<div class="reply-comment">
<div v-if="postComments.length > 0" class="reply-comment-list">
<CommentList v-model="postComments" :post-detail="postDetail" />
<CommentList
v-model="postComments"
:post-detail="postDetail"
/>
</div>
<CustomEmpty v-else title="暂时没有评论 🤔" :in-container="true" />
</div>
@@ -200,10 +219,11 @@ function handleSubmitRootComment(content: string) {
<h3 class="company-name">
{{ postCompany.name }}
</h3>
<div v-if="postCompany.areas.length > 0" class="company-meta">
<!-- 成立于 2012 年 · 上海 -->
{{ postCompany.areas.join("/") }}
<template v-if="postCompany.establishmentDate">
成立于 {{ formatDate(postCompany.establishmentDate, 'YYYY') }} 年 ·
</template>
{{ postCompany.areas.join('/') }}
</div>
<div class="company-desc">
code/link56/link56-frontend-new/src/views/settings/creator/home/index.vue
+15 -16
View File
@@ -3,7 +3,6 @@ import type { DashboardData } from '@/types/post'
import { ElMessage } from 'element-plus'
import { onMounted, ref } from 'vue'
import CustomLoading from '@/components/CustomLoading.vue'
import { getDashboardDataApi } from '@/request/api/post'
import PostNumberChart from './components/post-number-chart.vue'
import PostTypeChart from './components/post-type-chart.vue'
import PostViewChart from './components/post-view-chart.vue'
@@ -25,22 +24,22 @@ const activeCollapseNames = ref(['1', '2'])
onMounted(() => {
loading.value = true
getDashboardDataApi().then((res) => {
if (res.isSuccess) {
// dashboradData.value = res.data
dashboradData.value.typeChart = [...res.data.typeChart]
// getDashboardDataApi().then((res) => {
// if (res.isSuccess) {
// // dashboradData.value = res.data
// dashboradData.value.typeChart = [...res.data.typeChart]
console.log(dashboradData.value)
}
else {
ElMessage.error(res.message || '加载失败，请稍后再试')
}
}).catch((err) => {
console.log(err)
ElMessage.error('加载失败，请稍后再试')
}).finally(() => {
loading.value = false
})
// console.log(dashboradData.value)
// }
// else {
// ElMessage.error(res.message || '加载失败，请稍后再试')
// }
// }).catch((err) => {
// console.log(err)
// ElMessage.error('加载失败，请稍后再试')
// }).finally(() => {
// loading.value = false
// })
})
</script>
code/link56/link56-frontend-new/src/views/settings/index.vue
+1
View File
@@ -190,6 +190,7 @@ watch(searchKey, async (val) => {
}
.right-view {
padding:0px 120px;
flex: 1;
flex-shrink: 0;
border-radius: 0px;
code/link56/link56-frontend-new/src/views/settings/info/company.vue
+2 -3
View File
@@ -155,6 +155,7 @@ const activeCollapseNames = ref(['1', '2', '3'])
:rules="formRules"
label-width="auto"
label-position="top"
style="width: 700px;"
>
<el-row :gutter="16">
<el-col :span="24">
@@ -214,6 +215,7 @@ const activeCollapseNames = ref(['1', '2', '3'])
:model="companyDetail"
:rules="formRules"
label-width="auto"
style="width: 700px;"
>
<el-form-item prop="profile">
<el-input v-model="companyDetail.profile" type="textarea" />
@@ -284,9 +286,6 @@ const activeCollapseNames = ref(['1', '2', '3'])
}
.form-footer {
width: 100%;
box-shadow: 0 -2px 6px rgba(0, 0, 0, 0.08);
position: sticky;
bottom: 0;
align-self: flex-end;
height: 56px;
display: flex;
code/link56/link56-frontend-new/src/views/settings/info/user/components/EditDrawer.vue
+6
View File
@@ -5,6 +5,7 @@ import type { CompanyUser, CompanyUserForm } from '@/types/company/user'
import { ElMessage } from 'element-plus'
import { computed, ref, watch } from 'vue'
import EmailCodeInput from '@/components/EmailCodeInput.vue'
import ImageUploadCard from '@/components/ImageUploadCard.vue'
import { authCodeVerifyApi } from '@/request/api/auth/code'
import { addCompanyUserApi, updateCompanyUserApi } from '@/request/api/company/user'
import { useUserStore } from '@/store/user'
@@ -44,6 +45,7 @@ const form = ref<CompanyUserForm>({
canuse: '1',
password: '',
emailCode: '',
avatar: '',
})
watch(
() => props.user,
@@ -172,6 +174,7 @@ async function handleSubmit(formEl: FormInstance | undefined) {
position: form.value.position,
phone: form.value.phone,
canuse: form.value.canuse,
avatar: form.value.avatar,
})
if (response.isSuccess) {
@@ -220,6 +223,9 @@ async function handleSubmit(formEl: FormInstance | undefined) {
label-width="auto"
label-position="right"
>
<el-form-item label="头像" prop="name">
<ImageUploadCard v-model="form.avatar" :auto-upload-aliyun="true" />
</el-form-item>
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" />
</el-form-item>
code/link56/link56-frontend-new/src/views/settings/info/user/index.vue
+8
View File
@@ -3,6 +3,7 @@ import type { CompanyUser, QueryCompanyUserParams } from '@/types/company/user'
import { Delete, Plus, Refresh, Search } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { onMounted, reactive, ref } from 'vue'
import SafeImage from '@/components/SafeImage.vue'
import { deleteCompanyUserApi, queryCompanyUserApi } from '@/request/api/company/user'
import { useUserStore } from '@/store/user'
import EditDrawer from './components/EditDrawer.vue'
@@ -251,6 +252,13 @@ function handleDelteRows(val?: CompanyUser) {
align="center"
:selectable="selectable"
/>
<el-table-column prop="avatar" label="头像" align="center" width="120">
<template #default="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<SafeImage :url="scope.row.avatar" :size="64" />
</div>
</template>
</el-table-column>
<el-table-column prop="name" label="名称" align="center">
<template #default="scope">
<template v-if="scope.row.role === 1">