toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据训练实时日志展示

Browse Source
This commit is contained in:
gulongcheng
2025-11-03 14:45:00 +08:00
parent 62a381fd00
commit 37682d2e01
45 changed files with 847 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
system/src/main/java/com/sdm/system/controller/SysUserController.java
View File

@@ -9,6 +9,8 @@ import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.feign.inter.system.ISysUserFeignClient;
import com.sdm.system.model.entity.SysRole;
import com.sdm.system.model.req.user.*;
import com.sdm.system.model.resp.SysUserGroupDetailResp;
import com.sdm.system.model.resp.SysUserGroupResp;
import com.sdm.system.service.ISysUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -164,7 +166,7 @@ public class SysUserController implements ISysUserFeignClient {
*/
@Operation(summary = "查询用户组", description = "查询用户组接口，支持分页和条件查询")
@PostMapping("/queryGroup")
public SdmResponse queryGroup(@Parameter(description = "用户组查询请求参数") @RequestBody @Validated GroupQueryReq req) {
public SdmResponse<PageDataResp<List<SysUserGroupResp>>> queryGroup(@Parameter(description = "用户组查询请求参数") @RequestBody @Validated GroupQueryReq req) {
return ISysUserService.queryGroup(req);
}
@@ -172,9 +174,9 @@ public class SysUserController implements ISysUserFeignClient {
* 根据用户组id查询用户组详情
*/
@Operation(summary = "根据用户组id查询用户组详情", description = "根据用户组id查询用户组详细信息")
@GetMapping("/queryGroupDetail")
public SdmResponse queryGroupDetail(@Parameter(description = "用户组id") @NotNull @RequestParam Integer id) {
return ISysUserService.queryGroupDetail(id);
@PostMapping("/queryGroupDetail")
public SdmResponse<SysUserGroupDetailResp> queryGroupDetail(@RequestBody @Validated QueryGroupDetailReq req) {
return ISysUserService.queryGroupDetail(req);
}
/**
@@ -209,7 +211,7 @@ public class SysUserController implements ISysUserFeignClient {
*/
@Operation(summary = "查询用户组成员", description = "查询用户组成员接口，用于查询指定用户组的成员列表")
@PostMapping("/queryGroupMember")
public SdmResponse queryGroupMember(@Parameter(description = "用户组成员查询请求参数") @RequestBody @Validated GroupMemberQueryReq req) {
public SdmResponse<CIDUserResp> queryGroupMember(@Parameter(description = "用户组成员查询请求参数") @RequestBody @Validated GroupMemberQueryReq req) {
return ISysUserService.queryGroupMember(req);
}

2
system/src/main/java/com/sdm/system/dao/SysUserGroupRelationMapper.java
View File

@@ -16,5 +16,5 @@ import java.util.List;
* @since 2025-09-28
*/
public interface SysUserGroupRelationMapper extends BaseMapper<SysUserGroupRelation> {
List<SysUser> queryUserByGroupId(@Param("groupId") Integer groupId, @Param("userName") String userName);
List<SysUser> queryUserByGroupId(@Param("groupId") Long groupId, @Param("userName") String userName);
}

19
system/src/main/java/com/sdm/system/filter/AuthFilter.java
View File

@@ -1,13 +1,11 @@
package com.sdm.system.filter;
import com.sdm.common.common.ThreadLocalContext;
//import com.sdm.system.service.UserService;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import javax.annotation.Resource;
import java.io.IOException;
@Slf4j
@@ -23,17 +21,24 @@ public class AuthFilter implements Filter {
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
/*if (servletRequest instanceof HttpServletRequest) {
if (servletRequest instanceof HttpServletRequest) {
HttpServletRequest req = (HttpServletRequest) servletRequest;
String jobNumber = StringUtils.isEmpty(req.getHeader("jobNumber")) ? "" : req.getHeader("jobNumber");
ThreadLocalContext.getCommonHeader().setJobNumber(jobNumber);
ThreadLocalContext.getCommonHeader().setCompany(req.getHeader("company"));
ThreadLocalContext.getCommonHeader().setSessionId(req.getHeader("sessionId"));
Long usrId = StringUtils.isEmpty(req.getHeader("userId")) ? null : Long.valueOf(req.getHeader("userId"));
Long tenantId = StringUtils.isEmpty(req.getHeader("tenantId")) ? null : Long.valueOf(req.getHeader("tenantId"));
String userName = StringUtils.isEmpty(req.getHeader("userName")) ? null : req.getHeader("userName");
ThreadLocalContext.setJobNumber(jobNumber);
ThreadLocalContext.setCompany(req.getHeader("company"));
ThreadLocalContext.setSessionId(req.getHeader("sessionId"));
ThreadLocalContext.setUserId(usrId);
ThreadLocalContext.setTenantId(tenantId);
ThreadLocalContext.setUserName(userName);
// User user = userService.getUserByIdCode(idCode);
// if (user != null) {
// ThreadLocalContext.setUserContext(new UserContext(user));
// }
}*/
}
filterChain.doFilter(servletRequest, servletResponse);
}

2
system/src/main/java/com/sdm/system/model/req/user/GroupMemberQueryReq.java
View File

@@ -10,7 +10,7 @@ public class GroupMemberQueryReq {
@NotBlank(message = "groupID不能为空")
@Schema(description = "groupID", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer groupID;
private Long groupId;
@Schema(description = "用户名")
private String userName;

15
system/src/main/java/com/sdm/system/model/req/user/QueryGroupDetailReq.java Normal file
View File

@@ -0,0 +1,15 @@
package com.sdm.system.model.req.user;
import com.sdm.system.model.req.BaseReq;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;
@Data
public class QueryGroupDetailReq extends BaseReq {
@Schema(description = "用户组id")
@NotNull(message = "用户组id不能为空")
Long id;
}

35
system/src/main/java/com/sdm/system/model/resp/SysUserGroupDetailResp.java Normal file
View File

@@ -0,0 +1,35 @@
package com.sdm.system.model.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.entity.resp.system.CIDUserResp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
/**
* <p>
* 用户组
* </p>
*
* @author author
* @since 2025-09-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@Schema( description="用户组和组成员信息查询")
public class SysUserGroupDetailResp implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "用户组信息")
SysUserGroupResp sysUserGroup;
@Schema(description = "用户信息")
PageDataResp<List<CIDUserResp>> users;
}

2
system/src/main/java/com/sdm/system/service/ISysUserGroupRelationService.java
View File

@@ -15,7 +15,7 @@ import java.util.List;
* @since 2025-09-28
*/
public interface ISysUserGroupRelationService extends IService<SysUserGroupRelation> {
List<SysUser> queryUserByGroupId(Integer groupId, String userName);
List<SysUser> queryUserByGroupId(Long groupId, String userName);

9
system/src/main/java/com/sdm/system/service/ISysUserService.java
View File

@@ -7,9 +7,10 @@ import com.sdm.common.entity.req.system.UserQueryReq;
import com.sdm.common.entity.resp.system.CIDRoleResp;
import com.sdm.common.entity.resp.system.CIDUserResp;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.system.model.entity.SysRole;
import com.sdm.system.model.entity.SysUser;
import com.sdm.system.model.req.user.*;
import com.sdm.system.model.resp.SysUserGroupDetailResp;
import com.sdm.system.model.resp.SysUserGroupResp;
import java.util.List;
@@ -38,13 +39,13 @@ public interface ISysUserService extends IService<SysUser> {
SdmResponse delGroup(Integer id);
SdmResponse queryGroup(GroupQueryReq req);
SdmResponse<PageDataResp<List<SysUserGroupResp>>> queryGroup(GroupQueryReq req);
SdmResponse queryGroupDetail(Integer id);
SdmResponse<SysUserGroupDetailResp> queryGroupDetail(QueryGroupDetailReq req);
SdmResponse updateGroup(GroupUpdateReq req);
SdmResponse updateGroupMember(UpdateGroupMemberBatchReq req);
SdmResponse queryGroupMember(GroupMemberQueryReq req);
SdmResponse<CIDUserResp> queryGroupMember(GroupMemberQueryReq req);
}

56
system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java
View File

@@ -14,6 +14,8 @@ import com.sdm.system.model.entity.SysRole;
import com.sdm.system.model.entity.SysUser;
import com.sdm.system.model.req.user.*;
import com.sdm.common.entity.resp.system.CIDUserResp;
import com.sdm.system.model.resp.SysUserGroupDetailResp;
import com.sdm.system.model.resp.SysUserGroupResp;
import com.sdm.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -41,6 +43,15 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
@Value("${cid.user.queryUserRole}")
private String queryUserRole;
@Value("${cid.user.queryGroup}")
private String queryGroup;
@Value("${cid.user.queryGroupDetail}")
private String queryGroupDetail;
@Value("${cid.user.queryGroupMember}")
private String queryGroupMember;
@Override
public String getType() {
return type;
@@ -91,9 +102,6 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
try {
String userJson = HttpUtil.post(cidUrl + listUser, JSONUtil.toJsonStr(req));
SdmResponse<PageDataResp<List<CIDUserResp>>> cidUserAddReq = JSON.parseObject(userJson, SdmResponse.class);
if (cidUserAddReq.getCode() != 0 ) {
return SdmResponse.failed("用户不存在");
}
return cidUserAddReq;
} catch (Exception e) {
log.error("查询用户失败", e);
@@ -157,13 +165,33 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
}
@Override
public SdmResponse queryGroup(GroupQueryReq req) {
return null;
public SdmResponse<PageDataResp<List<SysUserGroupResp>>> queryGroup(GroupQueryReq req) {
try {
String userJson = HttpUtil.post(cidUrl + queryGroup, JSONUtil.toJsonStr(req));
SdmResponse<PageDataResp<List<SysUserGroupResp>>> CIDGroupRespose = JSON.parseObject(userJson, SdmResponse.class);
if (CIDGroupRespose != null) {
return CIDGroupRespose;
}
return SdmResponse.failed("用户组不存在");
} catch (Exception e) {
log.error("查询用户组失败", e);
return SdmResponse.failed("查询用户组失败: ");
}
}
@Override
public SdmResponse queryGroupDetail(Integer id) {
return null;
public SdmResponse<SysUserGroupDetailResp> queryGroupDetail(QueryGroupDetailReq req) {
try {
String userJson = HttpUtil.post(cidUrl + queryGroupDetail, JSONUtil.toJsonStr(req));
SdmResponse<SysUserGroupDetailResp> CIDGroupDetailRespose = JSON.parseObject(userJson, SdmResponse.class);
if (CIDGroupDetailRespose != null) {
return CIDGroupDetailRespose;
}
return SdmResponse.failed("用户组不存在");
} catch (Exception e) {
log.error("查询用户组失败", e);
return SdmResponse.failed("查询用户组失败: ");
}
}
@Override
@@ -177,7 +205,17 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
}
@Override
public SdmResponse queryGroupMember(GroupMemberQueryReq req) {
return null;
public SdmResponse<CIDUserResp> queryGroupMember(GroupMemberQueryReq req) {
try {
String userJson = HttpUtil.post(cidUrl + queryGroupDetail, JSONUtil.toJsonStr(req));
SdmResponse<CIDUserResp> cIDUserResp = JSON.parseObject(userJson, SdmResponse.class);
if (cIDUserResp != null) {
return cIDUserResp;
}
return SdmResponse.failed("用户组成员不存在");
} catch (Exception e) {
log.error("查询用户组成员失败", e);
return SdmResponse.failed("查询用户组成员失败: ");
}
}
}

7
system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java
View File

@@ -201,7 +201,7 @@ public class LocalUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> im
}
@Override
public SdmResponse queryGroup(GroupQueryReq req) {
public SdmResponse<PageDataResp<List<SysUserGroupResp>>> queryGroup(GroupQueryReq req) {
PageHelper.startPage(req.getCurrent(), req.getSize());
List<SysUserGroup> sysUserGroups = sysUserGroupService.lambdaQuery()
.like(ObjectUtils.isNotEmpty(req.getGroupName()), SysUserGroup::getGroupName, req.getGroupName()).list();
@@ -217,7 +217,8 @@ public class LocalUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> im
}
@Override
public SdmResponse queryGroupDetail(Integer id) {
public SdmResponse queryGroupDetail(QueryGroupDetailReq req) {
Long id = req.getId();
SysUserGroup sysUserGroup = sysUserGroupService.lambdaQuery().eq(SysUserGroup::getId, id).one();
List<SysUser> list = sysUserGroupRelationService.queryUserByGroupId(id,null);
JSONObject jsonObject = new JSONObject();
@@ -289,7 +290,7 @@ public class LocalUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> im
@Override
public SdmResponse queryGroupMember(GroupMemberQueryReq req) {
List<SysUser> sysUsers = sysUserGroupRelationService.queryUserByGroupId(req.getGroupID(), req.getUserName());
List<SysUser> sysUsers = sysUserGroupRelationService.queryUserByGroupId(req.getGroupId(), req.getUserName());
return SdmResponse.success(sysUsers);
}

2
system/src/main/java/com/sdm/system/service/impl/SysUserGroupRelationServiceImpl.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
public class SysUserGroupRelationServiceImpl extends ServiceImpl<SysUserGroupRelationMapper, SysUserGroupRelation> implements ISysUserGroupRelationService {
@Override
public List<SysUser> queryUserByGroupId(Integer groupId, String userName) {
public List<SysUser> queryUserByGroupId(Long groupId, String userName) {
return baseMapper.queryUserByGroupId(groupId, userName);
}
}

3
system/src/main/resources/application-dev.yml
View File

@@ -130,6 +130,9 @@ cid:
listUser: /spdm-user/listUser
queryUserDetail: /spdm-user/queryUserDetail
queryUserRole: /spdm-user/queryUserRole
queryGroup: /spdm-user/queryGroup
queryGroupDetail: /spdm-user/queryGroupDetail
queryGroupMember: /spdm-user/queryGroupMember
role:
getRoleByRoleName: /spdm-role/getRoleByRoleName
getRoleByRoleCode: /spdm-role/getRoleByRoleCode

3
system/src/main/resources/application-local.yml
View File

@@ -121,6 +121,9 @@ cid:
listUser: /spdm-user/listUser
queryUserDetail: /spdm-user/queryUserDetail
queryUserRole: /spdm-user/queryUserRole
queryGroup: /spdm-user/queryGroup
queryGroupDetail: /spdm-user/queryGroupDetail
queryGroupMember: /spdm-user/queryGroupMember
role:
getRoleByRoleName: /spdm-role/getRoleByRoleName
getRoleByRoleCode: /spdm-role/getRoleByRoleCode

3
system/src/main/resources/application-prod.yml
View File

@@ -149,6 +149,9 @@ cid:
listUser: /spdm-user/listUser
queryUserDetail: /spdm-user/queryUserDetail
queryUserRole: /spdm-user/queryUserRole
queryGroup: /spdm-user/queryGroup
queryGroupDetail: /spdm-user/queryGroupDetail
queryGroupMember: /spdm-user/queryGroupMember
role:
getRoleByRoleName: /spdm-role/getRoleByRoleName
getRoleByRoleCode: /spdm-role/getRoleByRoleCode

3
system/src/main/resources/application-test.yml
View File

@@ -148,6 +148,9 @@ cid:
listUser: /spdm-user/listUser
queryUserDetail: /spdm-user/queryUserDetail
queryUserRole: /spdm-user/queryUserRole
queryGroup: /spdm-user/queryGroup
queryGroupDetail: /spdm-user/queryGroupDetail
queryGroupMember: /spdm-user/queryGroupMember
role:
getRoleByRoleName: /spdm-role/getRoleByRoleName
getRoleByRoleCode: /spdm-role/getRoleByRoleCode