tangqk
/
vdi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(后端): 联调修改11

master
rdpnr_puzhi 2025-08-14 11:12:47 +08:00
parent 5840992c97
commit 69131ae7c3
9 changed files with 73 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nex-be/src/main/java/com/unisinsight/project/entity/dao/UserDeviceGroup.java
View File

@ -7,7 +7,6 @@ import java.io.Serializable;
import java.util.Date;
/**
*
* @TableName user_device_group
*/
@TableName(value = "user_device_group")
@ -86,6 +85,12 @@ public class UserDeviceGroup implements Serializable {
@TableField(value = "deleted")
private Integer deleted;
/**
* 分组是否删除: 0-否，1-是
*/
@TableField(value = "is_deleted")
private Integer isDeleted;
/**
* 描述
*/

8
nex-be/src/main/java/com/unisinsight/project/entity/res/UserDeviceGroupRes.java
View File

@ -54,6 +54,14 @@ public class UserDeviceGroupRes implements Serializable {
@ApiModelProperty("全路径")
private String path;
/**
* 分组是否删除: 0-否，1-是
*/
@ApiModelProperty("分组是否删除: 0-否，1-是")
@JsonProperty("is_deleted")
private Integer isDeleted;
@JsonProperty("children")
@ApiModelProperty("下级数据")
private List<UserDeviceGroupRes> children;

20
nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceImageMappingServiceImpl.java
View File

@ -65,13 +65,11 @@ public class DeviceImageMappingServiceImpl extends ServiceImpl<DeviceImageMappin
LambdaQueryWrapper<Image> imageLambdaQueryWrapper = new QueryWrapper<Image>().lambda().in(Image::getId, imageIds);
List<Image> images = imageMapper.selectList(imageLambdaQueryWrapper);
if (CollectionUtil.isNotEmpty(images)) {
deviceImageMappingRes.forEach(deviceImage -> {
images.forEach(image -> {
deviceImageMappingRes.forEach(deviceImage -> images.forEach(image -> {
if (ObjectUtil.isNotEmpty(deviceImage.getImageId()) && image.getId().equals(deviceImage.getImageId())) {
deviceImage.setImageName(image.getImageName());
}
});
});
}));
}
}
List<Long> groupIdList = deviceImageMappingRes.stream().map(DeviceImageMappingRes::getDeviceGroupId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
@ -79,16 +77,20 @@ public class DeviceImageMappingServiceImpl extends ServiceImpl<DeviceImageMappin
LambdaQueryWrapper<UserDeviceGroup> groupLambdaQueryWrapper = new QueryWrapper<UserDeviceGroup>().lambda().in(UserDeviceGroup::getId, groupIdList);
List<UserDeviceGroup> userDeviceGroups = groupMapper.selectList(groupLambdaQueryWrapper);
if (CollectionUtil.isNotEmpty(userDeviceGroups)) {
deviceImageMappingRes.forEach(deviceImage -> {
userDeviceGroups.forEach(userDeviceGroup -> {
deviceImageMappingRes.forEach(deviceImage -> userDeviceGroups.forEach(userDeviceGroup -> {
if (ObjectUtil.isNotEmpty(deviceImage.getImageId()) && userDeviceGroup.getId().equals(deviceImage.getImageId())) {
deviceImage.setDeviceGroupName(userDeviceGroup.getName());
}
});
});
}));
}
}
deviceImageMappingRes = deviceImageMappingRes.stream().sorted((u1, u2) -> {
// 对结果按主键排序
if (u1.getId() != null && u2.getId() != null) {
return u1.getId().compareTo(u2.getId());
}
return 0;
}).collect(Collectors.toList());
return Result.successResult(deviceImageMappingRes);
}
}

6
nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceServiceImpl.java
View File

@ -127,6 +127,12 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device>
device.setDeviceGroupName(userDeviceGroup.getName());
}
}
}).sorted((u1, u2) -> {
// 对结果按主键排序
if (u1.getId() != null && u2.getId() != null) {
return u1.getId().compareTo(u2.getId());
}
return 0;
}).collect(Collectors.toList());
convert.setData(resList);
return Result.successResult(convert);

8
nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceUserMappingServiceImpl.java
View File

@ -110,7 +110,13 @@ public class DeviceUserMappingServiceImpl extends ServiceImpl<DeviceUserMappingM
}
}).collect(Collectors.toList());
}
deviceUserMappingRes = deviceUserMappingRes.stream().sorted((u1, u2) -> {
// 对结果按主键排序
if (u1.getId() != null && u2.getId() != null) {
return u1.getId().compareTo(u2.getId());
}
return 0;
}).collect(Collectors.toList());
return Result.successResult(deviceUserMappingRes);
}

6
nex-be/src/main/java/com/unisinsight/project/service/impl/ImageServiceImpl.java
View File

@ -81,6 +81,12 @@ public class ImageServiceImpl extends ServiceImpl<ImageMapper, Image>
e.setBtPath(btUrl + "/api/vdi/file/down/" + fileName);
}
}
}).sorted((u1, u2) -> {
// 对结果按主键排序
if (u1.getId() != null && u2.getId() != null) {
return u1.getId().compareTo(u2.getId());
}
return 0;
}).collect(Collectors.toList());
convert.setData(collect);
return Result.successResult(convert);

3
nex-be/src/main/java/com/unisinsight/project/service/impl/UserDeviceGroupServiceImpl.java
View File

@ -54,7 +54,7 @@ public class UserDeviceGroupServiceImpl extends ServiceImpl<UserDeviceGroupMappe
group.setParentId(userDeviceGroup.getId());
group.setParentName(userDeviceGroup.getName());
group.setPath(userDeviceGroup.getId().toString());
group.setIndex(userDeviceGroup.getId().toString());
// group.setIndex(userDeviceGroup.getId().toString());
}
} else {
UserDeviceGroup groupParent = groupMapper.selectById(group.getParentId());
@ -69,6 +69,7 @@ public class UserDeviceGroupServiceImpl extends ServiceImpl<UserDeviceGroupMappe
}
group.setCreateUser("admin");
group.setUpdateUser("admin");
int insert = groupMapper.insert(group);
log.info("分组新增insert:{}", insert);
if (insert == 1) {

6
nex-be/src/main/java/com/unisinsight/project/service/impl/UserServiceImpl.java
View File

@ -119,6 +119,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User>
user.setUserGroupName(userDeviceGroup.getName());
}
}
}).sorted((u1, u2) -> {
// 对结果按主键排序
if (u1.getId() != null && u2.getId() != null) {
return u1.getId().compareTo(u2.getId());
}
return 0;
}).collect(Collectors.toList());
convert.setData(resList);
return Result.successResult(convert);

18
nex-be/src/main/resources/db/user_device_group.sql
View File

@ -1,11 +1,19 @@
-- 数据初始化
INSERT INTO "public"."user_device_group" ("id", "name", "type", "path", "deleted")
VALUES (1, '用户顶级组织a', '1', '1', 0),
(2, '终端顶级组织b', '2', '2', 0)
INSERT INTO "public"."user_device_group" ("id", "name", "type", "deleted", "is_deleted")
VALUES (1, '用户顶级组织a', '1', 0, 0),
(2, '终端顶级组织b', '2', 0, 0)
ON CONFLICT (id) DO NOTHING;
INSERT INTO "public"."user_device_group" ("id", "name", "parent_id", "parent_name", "index", "type", "path", "deleted")
VALUES (3, '默认终端分组', 2, '终端顶级组织', '3', 2, '2', 0)
INSERT INTO "public"."user_device_group" ("id", "name", "parent_id", "parent_name", "type", "path", "deleted", "is_deleted")
VALUES (3, '默认终端分组', 2, '终端顶级组织', 2, '2', 0, 0)
ON CONFLICT (id) DO NOTHING;
INSERT INTO "public"."user_device_group" ("id", "name", "parent_id", "parent_name", "type", "path", "deleted", "is_deleted")
VALUES (4, '黑名单', 1, '用户顶级组织a', 1, '1', 0, 0)
ON CONFLICT (id) DO NOTHING;
INSERT INTO "public"."user_device_group" ("id", "name", "parent_id", "parent_name", "type", "path", "deleted", "is_deleted")
VALUES (5, '黑名单', 2, '终端顶级组织b', 2, '2', 0, 0)
ON CONFLICT (id) DO NOTHING;
-- 更新序列