From b99551d0a248400f2d5dcafff2d85261f441e3d9 Mon Sep 17 00:00:00 2001 From: sdy Date: Fri, 15 May 2026 18:32:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=88=AA=E7=BA=BF=E8=AF=A6=E6=83=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=88=AA=E7=82=B9=E5=8A=A8=E4=BD=9C=202.=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/dto/RouteWaypointDTO.java | 3 +++ .../service/impl/RouteServiceImpl.java | 10 ++++----- .../multictrl/modules/sys/dto/SysUserDTO.java | 4 ++++ .../modules/sys/service/SysRoleService.java | 17 ++++++++------- .../sys/service/impl/SysRoleServiceImpl.java | 4 ++++ .../sys/service/impl/SysUserServiceImpl.java | 21 ++++++++++++++++++- 6 files changed, 46 insertions(+), 13 deletions(-) diff --git a/admin/src/main/java/com/multictrl/modules/business/dto/RouteWaypointDTO.java b/admin/src/main/java/com/multictrl/modules/business/dto/RouteWaypointDTO.java index 386223f..bc9ed4d 100644 --- a/admin/src/main/java/com/multictrl/modules/business/dto/RouteWaypointDTO.java +++ b/admin/src/main/java/com/multictrl/modules/business/dto/RouteWaypointDTO.java @@ -24,6 +24,9 @@ public class RouteWaypointDTO implements Serializable { @Serial private static final long serialVersionUID = 1L; + @Schema(hidden = true) + private Long id; + @JsonProperty(required = true) @NotNull(message = "{route.waypoint.longitude.require}", groups = {AddGroup.class, UpdateGroup.class}) @Schema(description = "航点经度") diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java index aabce1b..a621246 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java @@ -134,16 +134,16 @@ public class RouteServiceImpl extends CrudServiceImpl routeWaypointList = routeWaypointDao.selectList(new QueryWrapper() .eq("route_id", id).orderByAsc("waypoint_sort")); - for (RouteWaypointEntity waypointEntity : routeWaypointList) { + List routeWaypointDTOList = ConvertUtils.sourceToTarget(routeWaypointList, RouteWaypointDTO.class); + for (RouteWaypointDTO waypoint : routeWaypointDTOList) { //航点动作 List actionEntities = waypointActionDao.selectList(new QueryWrapper() - .eq("route_id", id).eq("waypoint_id", waypointEntity.getId()).orderByAsc("action_sort")); + .eq("route_id", id).eq("waypoint_id", waypoint.getId()).orderByAsc("action_sort")); List actionDTOList = ConvertUtils.sourceToTarget(actionEntities, WaypointActionDTO.class); - RouteWaypointDTO waypointDTO = ConvertUtils.sourceToTarget(waypointEntity, RouteWaypointDTO.class); - waypointDTO.setWaypointActionList(actionDTOList); + waypoint.setWaypointActionList(actionDTOList); } - routeDTO.setRouteWaypointList(ConvertUtils.sourceToTarget(routeWaypointList, RouteWaypointDTO.class)); + routeDTO.setRouteWaypointList(routeWaypointDTOList); return routeDTO; } diff --git a/admin/src/main/java/com/multictrl/modules/sys/dto/SysUserDTO.java b/admin/src/main/java/com/multictrl/modules/sys/dto/SysUserDTO.java index 18e43c5..3cd5f1c 100644 --- a/admin/src/main/java/com/multictrl/modules/sys/dto/SysUserDTO.java +++ b/admin/src/main/java/com/multictrl/modules/sys/dto/SysUserDTO.java @@ -83,6 +83,10 @@ public class SysUserDTO implements Serializable { @Schema(title = "角色ID列表") private List roleIdList; + @Schema(title = "角色ID列表中文") + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private String roleIdListText; + @Schema(title = "部门名称") private String deptName; diff --git a/admin/src/main/java/com/multictrl/modules/sys/service/SysRoleService.java b/admin/src/main/java/com/multictrl/modules/sys/service/SysRoleService.java index 845889c..0f4a192 100644 --- a/admin/src/main/java/com/multictrl/modules/sys/service/SysRoleService.java +++ b/admin/src/main/java/com/multictrl/modules/sys/service/SysRoleService.java @@ -2,6 +2,7 @@ package com.multictrl.modules.sys.service; import com.multictrl.common.page.PageData; import com.multictrl.common.service.BaseService; +import com.multictrl.modules.sys.dao.SysRoleDao; import com.multictrl.modules.sys.dto.SysRoleDTO; import com.multictrl.modules.sys.entity.SysRoleEntity; @@ -10,21 +11,23 @@ import java.util.Map; /** * 角色 - * + * * @author Sdy */ public interface SysRoleService extends BaseService { - PageData page(Map params); + PageData page(Map params); - List list(Map params); + List list(Map params); - SysRoleDTO get(Long id); + SysRoleDTO get(Long id); - void save(SysRoleDTO dto); + void save(SysRoleDTO dto); - void update(SysRoleDTO dto); + void update(SysRoleDTO dto); - void delete(Long[] ids); + void delete(Long[] ids); + + SysRoleDao getDao(); } diff --git a/admin/src/main/java/com/multictrl/modules/sys/service/impl/SysRoleServiceImpl.java b/admin/src/main/java/com/multictrl/modules/sys/service/impl/SysRoleServiceImpl.java index 9657fc3..72dc372 100644 --- a/admin/src/main/java/com/multictrl/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/sys/service/impl/SysRoleServiceImpl.java @@ -121,4 +121,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl implements SysUserService { private final SysRoleUserService sysRoleUserService; private final SysDeptService sysDeptService; + private final SysRoleService sysRoleService; @Override public PageData page(Map params) { @@ -52,8 +58,21 @@ public class SysUserServiceImpl extends BaseServiceImpl list = baseDao.getList(params); + List dtos = ConvertUtils.sourceToTarget(list, SysUserDTO.class); + //增加角色中文 + for (SysUserDTO dto : dtos) { + List roleIdList = sysRoleUserService.getRoleIdList(dto.getId()); + if (CollectionUtil.isNotEmpty(roleIdList)) { + dto.setRoleIdList(roleIdList); + List roleEntityList = sysRoleService.getDao().selectList(new QueryWrapper() + .in("id", roleIdList)); + String roleListText = roleEntityList.stream().map(SysRoleEntity::getName).collect(Collectors.joining(",")); + dto.setRoleIdListText(roleListText); + } + } - return getPageData(list, page.getTotal(), SysUserDTO.class); +// return getPageData(list, page.getTotal(), SysUserDTO.class); + return new PageData(dtos, page.getTotal()); } @Override