feat:硬件设备分组

This commit is contained in:
dzc committed 2025-01-14 17:07:34 +08:00
1 parent 79be68e8dc
commit 7b05ba6711
19 files changed
+554 -157

No files matched your search

@@ -0,0 +1,9 @@
package com.bsd.pjcloud.hard.api.dto;
import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
import lombok.Data;
@Data
public class HardGroupDto extends HardGroupEntity {
}
@@ -0,0 +1,85 @@
package com.bsd.pjcloud.hard.api.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.bsd.pjcloud.common.core.util.TenantTable;
import java.time.LocalDateTime;
/**
* 设备分组
*
* @author dzc
* @date 2025-01-14 16:31:20
*/
@Data
@TenantTable
@TableName("hard_group")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "设备分组")
public class HardGroupEntity extends Model<HardGroupEntity> {
/**
* 编号
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description="编号")
private Long id;
/**
* 部门id
*/
@Schema(description="部门id")
private Long deptId;
/**
* 分组名
*/
@Schema(description="分组名")
private String name;
/**
* 创建人
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description="创建人")
private String createBy;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description="创建时间")
private LocalDateTime createTime;
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description="修改人")
private String updateBy;
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description="修改时间")
private LocalDateTime updateTime;
/**
* 删除标记
*/
@TableLogic
@TableField(fill = FieldFill.INSERT)
@Schema(description="删除标记")
private String delFlag;
/**
* 租户ID
*/
@Schema(description="租户ID")
private Long tenantId;
}
@@ -0,0 +1,16 @@
package com.bsd.pjcloud.hard.api.vo;
import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
import lombok.Data;
@Data
public class HardGroupVo extends HardGroupEntity implements BaseDeptInterface {
/**
* 部门相关
*/
private String deptName;
}
@@ -0,0 +1,92 @@
package com.bsd.pjcloud.hard.controller;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.common.log.annotation.SysLog;
import com.bsd.pjcloud.hard.api.dto.HardGroupDto;
import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
import com.bsd.pjcloud.hard.service.HardGroupService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import org.springdoc.core.annotations.ParameterObject;
import org.springframework.http.HttpHeaders;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 设备分组
*
* @author dzc
* @date 2025-01-14 16:31:20
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/hard-group")
@Tag(description = "hard-group", name = "设备分组管理")
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class HardGroupController {
private final HardGroupService hardGroupService;
@Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page-join")
@PreAuthorize("@pms.hasPermission('hard_hardGroup_view')")
public R pageJoin(@ParameterObject Page page, @ParameterObject HardGroupDto dto) {
return R.ok(hardGroupService.pageJoin(page, dto));
}
@Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('hard_hardGroup_view')")
public R getHardGroupPage(@ParameterObject Page page, @ParameterObject HardGroupEntity hardGroup) {
LambdaQueryWrapper<HardGroupEntity> wrapper = Wrappers.lambdaQuery();
return R.ok(hardGroupService.page(page, wrapper));
}
@Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}")
@PreAuthorize("@pms.hasPermission('hard_hardGroup_view')")
public R getById(@PathVariable("id") Long id) {
return R.ok(hardGroupService.getById(id));
}
@Operation(summary = "新增设备分组", description = "新增设备分组")
@SysLog("新增设备分组")
@PostMapping
@PreAuthorize("@pms.hasPermission('hard_hardGroup_add')")
public R save(@RequestBody HardGroupEntity hardGroup) {
return R.ok(hardGroupService.save(hardGroup));
}
@Operation(summary = "修改设备分组", description = "修改设备分组")
@SysLog("修改设备分组")
@PutMapping
@PreAuthorize("@pms.hasPermission('hard_hardGroup_edit')")
public R updateById(@RequestBody HardGroupEntity hardGroup) {
return R.ok(hardGroupService.updateById(hardGroup));
}
@Operation(summary = "通过id删除设备分组", description = "通过id删除设备分组")
@SysLog("通过id删除设备分组")
@DeleteMapping
@PreAuthorize("@pms.hasPermission('hard_hardGroup_del')")
public R removeById(@RequestBody Long[] ids) {
return R.ok(hardGroupService.removeBatchByIds(CollUtil.toList(ids)));
}
@ResponseExcel
@GetMapping("/export")
@PreAuthorize("@pms.hasPermission('hard_hardGroup_export')")
public List<HardGroupEntity> export(HardGroupEntity hardGroup, Long[] ids) {
return hardGroupService.list(Wrappers.lambdaQuery(hardGroup).in(ArrayUtil.isNotEmpty(ids), HardGroupEntity::getId, ids));
}
}
@@ -0,0 +1,32 @@
package com.bsd.pjcloud.hard.mapper;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bsd.pjcloud.common.core.util.BeanUtils;
import com.bsd.pjcloud.common.data.datascope.DataScope;
import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
import com.bsd.pjcloud.hard.api.dto.HardGroupDto;
import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
import com.bsd.pjcloud.hard.api.vo.HardGroupVo;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface HardGroupMapper extends PjcloudBaseMapper<HardGroupEntity> {
default Page<HardGroupVo> pageJoin(Page page, HardGroupDto dto) {
MPJLambdaWrapper<HardGroupEntity> wrapper = new MPJLambdaWrapper<HardGroupEntity>()
.like(HardGroupEntity::getName, dto.getName());
return selectJoinPage(page, HardGroupVo.class, wrapper);
}
default Page<HardGroupVo> scopePageList(Page page, HardGroupDto dto) {
LambdaQueryWrapper<HardGroupEntity> wrapper = new LambdaQueryWrapper<HardGroupEntity>()
.like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName());
Page list = selectPageByScope(page, wrapper, DataScope.of());
list.setRecords(BeanUtils.toBean(list.getRecords(), HardGroupVo.class));
return list;
}
}
@@ -0,0 +1,15 @@
package com.bsd.pjcloud.hard.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.bsd.pjcloud.hard.api.dto.HardGroupDto;
import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
import com.bsd.pjcloud.hard.api.vo.HardGroupVo;
public interface HardGroupService extends IService<HardGroupEntity> {
Page<HardGroupVo> pageJoin(Page page, HardGroupDto dto);
Page<HardGroupVo> scopePageList(Page page, HardGroupDto dto);
}
@@ -0,0 +1,69 @@
package com.bsd.pjcloud.hard.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bsd.pjcloud.admin.api.entity.SysDept;
import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
import com.bsd.pjcloud.admin.api.utils.DataUtil;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.hard.api.dto.HardGroupDto;
import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
import com.bsd.pjcloud.hard.api.vo.HardGroupVo;
import com.bsd.pjcloud.hard.api.vo.HardManagerVo;
import com.bsd.pjcloud.hard.mapper.HardGroupMapper;
import com.bsd.pjcloud.hard.service.HardGroupService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import java.util.List;
import java.util.Map;
/**
* 设备分组
*
* @author dzc
* @date 2025-01-14 16:31:20
*/
@Validated
@Slf4j
@RequiredArgsConstructor
@Service
public class HardGroupServiceImpl extends ServiceImpl<HardGroupMapper, HardGroupEntity> implements HardGroupService {
private final RemoteDeptService deptService;
@Override
public Page<HardGroupVo> pageJoin(Page page, HardGroupDto dto) {
Page<HardGroupVo> list = baseMapper.pageJoin(page, dto);
if (ObjectUtil.isNotEmpty(list)) {
// 部门
List<Long> deptIds = list.getRecords().stream().map(HardGroupVo::getDeptId).distinct().toList();
if (ObjectUtil.isNotEmpty(deptIds)) {
R<Map<Long, SysDept>> deptList = deptService.getDeptByDeptIds(deptIds);
if (ObjectUtil.isNotEmpty(deptList.getData())) {
DataUtil.convertDeptList(list.getRecords(), deptList.getData());
}
}
}
return list;
}
@Override
public Page<HardGroupVo> scopePageList(Page page, HardGroupDto dto) {
Page<HardGroupVo> list = baseMapper.scopePageList(page, dto);
if (ObjectUtil.isNotEmpty(list)) {
// 部门
List<Long> deptIds = list.getRecords().stream().map(HardGroupVo::getDeptId).distinct().toList();
if (ObjectUtil.isNotEmpty(deptIds)) {
R<Map<Long, SysDept>> deptList = deptService.getDeptByDeptIds(deptIds);
if (ObjectUtil.isNotEmpty(deptList.getData())) {
DataUtil.convertDeptList(list.getRecords(), deptList.getData());
}
}
}
return list;
}
}
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bsd.pjcloud.hard.mapper.HardGroupMapper">
<resultMap id="hardGroupMap" type="com.bsd.pjcloud.hard.api.entity.HardGroupEntity">
<id property="id" column="id"/>
<result property="deptId" column="dept_id"/>
<result property="name" column="name"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="tenantId" column="tenant_id"/>
</resultMap>
</mapper>