admin/AdvisorServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正接口字段遗漏

Browse Source
This commit is contained in:
easonzhu 2025-03-04 10:03:28 +08:00
parent 049fba65a8
commit d3fadf8bbe
5 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
deploy_prod_without_package.bat Normal file
View File

@ -0,0 +1,30 @@
@echo off
:: 1. 设置动态参数
set REMOTE_IP=119.29.151.152
set REMOTE_PORT=22101
set REMOTE_PATH=/tmp
set REMOTE_USER=ubuntu
set DEPLOY_SCRIPT=/home/ubuntu/deploy_advisor.sh
:: 2. 将 JAR 包传输到 Linux 服务器
echo Copying JAR file to Linux server...
call scp -P %REMOTE_PORT% target\AdvisorServer-2.6.7.jar %REMOTE_USER%@%REMOTE_IP%:%REMOTE_PATH%
:: 检查 SCP 命令是否成功
IF %ERRORLEVEL% NEQ 0 (
echo File transfer failed, exiting...
exit /b %ERRORLEVEL%
)
:: 3. 通过 SSH 运行 deploy.sh 脚本
echo Running deploy_advisor.sh script on Linux server...
call ssh -p %REMOTE_PORT% %REMOTE_USER%@%REMOTE_IP% "bash %DEPLOY_SCRIPT%"
:: 检查 SSH 命令是否成功
IF %ERRORLEVEL% NEQ 0 (
echo Failed to start the application, exiting...
exit /b %ERRORLEVEL%
)
echo Deployment successful!

10
src/main/java/com/syzb/group/query/ListGroupCustomerQuery.java
View File

@ -24,7 +24,7 @@ public class ListGroupCustomerQuery extends PageQuery {
private Integer customerStatus;
@ApiModelProperty("禁言状态 1:已禁言 2:未禁言")
private Integer commentBlackStatus;
private Integer isForbidden;
public Integer getGroupId() {
return groupId;
@ -66,11 +66,11 @@ public class ListGroupCustomerQuery extends PageQuery {
this.customerStatus = customerStatus;
}
public Integer getCommentBlackStatus() {
return commentBlackStatus;
public Integer getIsForbidden() {
return isForbidden;
}
public void setCommentBlackStatus(Integer commentBlackStatus) {
this.commentBlackStatus = commentBlackStatus;
public void setIsForbidden(Integer isForbidden) {
this.isForbidden = isForbidden;
}
}

8
src/main/java/com/syzb/group/service/admin/AdminGroupCollectService.java
View File

@ -226,7 +226,7 @@ public class AdminGroupCollectService {
String nickName = query.getNickName();
Integer isOnline = query.getIsOnline();
Integer customerStatus = query.getCustomerStatus();
Integer commentBlackStatus = query.getCommentBlackStatus();
Integer commentBlackStatus = query.getIsForbidden();
Set<Integer> moduleIdSet = groupCommonService.getModuleIds(groupId);
if (CollUtil.isEmpty(moduleIdSet)) {
return Pager.emptyPager();
@ -254,10 +254,10 @@ public class AdminGroupCollectService {
WxUser wxUser = wxUserMap.get(moduleUser.getUserId());
if (wxUser != null) {
vo.setNickName(wxUser.getNickName());
vo.setHeadPicUrl(wxUser.getImgUrl());
vo.setUserHeadPicUrl(wxUser.getImgUrl());
}
vo.setIsOnline(onlineUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value);
vo.setCommentBlackStatus(blackUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value);
vo.setIsForbidden(blackUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value);
vo.setCustomerStatus(calCustomerStatus(moduleUser).value);
vo.setLastVisitTime(lastVisitTimeMap.get(moduleUser.getUserId()));
vo.setLastChatTime(lastChatTimeMap.get(moduleUser.getUserId()));
@ -274,7 +274,7 @@ public class AdminGroupCollectService {
voStream = voStream.filter(vo -> customerStatus.equals(vo.getCustomerStatus()));
}
if (commentBlackStatus != null) {
voStream = voStream.filter(vo -> commentBlackStatus.equals(vo.getCommentBlackStatus()));
voStream = voStream.filter(vo -> commentBlackStatus.equals(vo.getIsForbidden()));
}
List<GroupCustomerVO> voList = voStream.collect(Collectors.toList());
List<GroupCustomerVO> pageList = CollUtil.page(query.getCurrent() - 1, query.getSize(), voList);

4
src/main/java/com/syzb/group/service/admin/AdminGroupMessageService.java
View File

@ -302,9 +302,9 @@ public class AdminGroupMessageService {
WxUser wxUser = wxUserMap.get(moduleUser.getUserId());
if (wxUser != null) {
vo.setNickName(wxUser.getNickName());
vo.setHeadPicUrl(wxUser.getImgUrl());
vo.setUserHeadPicUrl(wxUser.getImgUrl());
}
vo.setCommentBlackStatus(blackUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value);
vo.setIsForbidden(blackUserIds.contains(moduleUser.getUserId()) ? IsOrNot.IS.value : IsOrNot.NOT.value);
return vo;
}).collect(Collectors.toList());
return new AppPager<>(list, hasNext);

20
src/main/java/com/syzb/group/vo/GroupCustomerVO.java
View File

@ -17,7 +17,7 @@ public class GroupCustomerVO {
private String nickName;
@ApiModelProperty("头像")
private String headPicUrl;
private String userHeadPicUrl;
@ApiModelProperty("加入时间")
private LocalDateTime joinTime;
@ -32,7 +32,7 @@ public class GroupCustomerVO {
private Integer customerStatus;
@ApiModelProperty("禁言状态 1:已禁言 2:未禁言")
private Integer commentBlackStatus;
private Integer isForbidden;
@ApiModelProperty("最近一次访问时间")
private LocalDateTime lastVisitTime;
@ -71,12 +71,12 @@ public class GroupCustomerVO {
this.nickName = nickName;
}
public String getHeadPicUrl() {
return headPicUrl;
public String getUserHeadPicUrl() {
return userHeadPicUrl;
}
public void setHeadPicUrl(String headPicUrl) {
this.headPicUrl = headPicUrl;
public void setUserHeadPicUrl(String userHeadPicUrl) {
this.userHeadPicUrl = userHeadPicUrl;
}
public LocalDateTime getJoinTime() {
@ -111,12 +111,12 @@ public class GroupCustomerVO {
this.customerStatus = customerStatus;
}
public Integer getCommentBlackStatus() {
return commentBlackStatus;
public Integer getIsForbidden() {
return isForbidden;
}
public void setCommentBlackStatus(Integer commentBlackStatus) {
this.commentBlackStatus = commentBlackStatus;
public void setIsForbidden(Integer isForbidden) {
this.isForbidden = isForbidden;
}
public LocalDateTime getLastVisitTime() {