sdy
/
Dock-MultiCtrl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.航线详情增加航点动作 

2.用户列表增加用户角色
This commit is contained in:
sdy 2026-05-15 18:32:51 +08:00
parent 484fa679f3
commit b99551d0a2
6 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/src/main/java/com/multictrl/modules/business/dto/RouteWaypointDTO.java
View File

@ -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 = "航点经度")

10
admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java
View File

@ -134,16 +134,16 @@ public class RouteServiceImpl extends CrudServiceImpl<RouteDao, RouteEntity, Rou
//航点信息
List<RouteWaypointEntity> routeWaypointList = routeWaypointDao.selectList(new QueryWrapper<RouteWaypointEntity>()
.eq("route_id", id).orderByAsc("waypoint_sort"));
for (RouteWaypointEntity waypointEntity : routeWaypointList) {
List<RouteWaypointDTO> routeWaypointDTOList = ConvertUtils.sourceToTarget(routeWaypointList, RouteWaypointDTO.class);
for (RouteWaypointDTO waypoint : routeWaypointDTOList) {
//航点动作
List<WaypointActionEntity> actionEntities = waypointActionDao.selectList(new QueryWrapper<WaypointActionEntity>()
.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<WaypointActionDTO> 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;
}

4
admin/src/main/java/com/multictrl/modules/sys/dto/SysUserDTO.java
View File

@ -83,6 +83,10 @@ public class SysUserDTO implements Serializable {
@Schema(title = "角色ID列表")
private List<Long> roleIdList;
@Schema(title = "角色ID列表中文")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private String roleIdListText;
@Schema(title = "部门名称")
private String deptName;

3
admin/src/main/java/com/multictrl/modules/sys/service/SysRoleService.java
View File

@ -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;
@ -27,4 +28,6 @@ public interface SysRoleService extends BaseService<SysRoleEntity> {
void delete(Long[] ids);
SysRoleDao getDao();
}

4
admin/src/main/java/com/multictrl/modules/sys/service/impl/SysRoleServiceImpl.java
View File

@ -121,4 +121,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
sysRoleDataScopeService.deleteByRoleIds(ids);
}
@Override
public SysRoleDao getDao() {
return baseDao;
}
}

21
admin/src/main/java/com/multictrl/modules/sys/service/impl/SysUserServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.multictrl.modules.sys.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.multictrl.common.constant.Constant;
import com.multictrl.common.page.PageData;
@ -11,9 +13,11 @@ import com.multictrl.modules.security.user.SecurityUser;
import com.multictrl.modules.security.user.UserDetail;
import com.multictrl.modules.sys.dao.SysUserDao;
import com.multictrl.modules.sys.dto.SysUserDTO;
import com.multictrl.modules.sys.entity.SysRoleEntity;
import com.multictrl.modules.sys.entity.SysUserEntity;
import com.multictrl.modules.sys.enums.SuperAdminEnum;
import com.multictrl.modules.sys.service.SysDeptService;
import com.multictrl.modules.sys.service.SysRoleService;
import com.multictrl.modules.sys.service.SysRoleUserService;
import com.multictrl.modules.sys.service.SysUserService;
import lombok.AllArgsConstructor;
@ -23,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@ -35,6 +40,7 @@ import java.util.Map;
public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntity> implements SysUserService {
private final SysRoleUserService sysRoleUserService;
private final SysDeptService sysDeptService;
private final SysRoleService sysRoleService;
@Override
public PageData<SysUserDTO> page(Map<String, Object> params) {
@ -52,8 +58,21 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
//查询
List<SysUserEntity> list = baseDao.getList(params);
List<SysUserDTO> dtos = ConvertUtils.sourceToTarget(list, SysUserDTO.class);
//增加角色中文
for (SysUserDTO dto : dtos) {
List<Long> roleIdList = sysRoleUserService.getRoleIdList(dto.getId());
if (CollectionUtil.isNotEmpty(roleIdList)) {
dto.setRoleIdList(roleIdList);
List<SysRoleEntity> roleEntityList = sysRoleService.getDao().selectList(new QueryWrapper<SysRoleEntity>()
.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<SysUserDTO>(dtos, page.getTotal());
}
@Override