区域组管理实现
This commit is contained in:
parent
187690125c
commit
f615486c55
@ -0,0 +1,106 @@
|
||||
package org.dromara.property.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.property.domain.vo.TbAreaGroupVo;
|
||||
import org.dromara.property.domain.bo.TbAreaGroupBo;
|
||||
import org.dromara.property.service.ITbAreaGroupService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 区域组信息
|
||||
* 前端访问路由地址为:/property/areaGroup
|
||||
*
|
||||
* @author dy
|
||||
* @date 2025-06-25
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/areaGroup")
|
||||
public class TbAreaGroupController extends BaseController {
|
||||
|
||||
private final ITbAreaGroupService tbAreaGroupService;
|
||||
|
||||
/**
|
||||
* 查询区域组信息列表
|
||||
*/
|
||||
@SaCheckPermission("property:areaGroup:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<TbAreaGroupVo> list(TbAreaGroupBo bo, PageQuery pageQuery) {
|
||||
return tbAreaGroupService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出区域组信息列表
|
||||
*/
|
||||
@SaCheckPermission("property:areaGroup:export")
|
||||
@Log(title = "区域组信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(TbAreaGroupBo bo, HttpServletResponse response) {
|
||||
List<TbAreaGroupVo> list = tbAreaGroupService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "区域组信息", TbAreaGroupVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取区域组信息详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("property:areaGroup:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<TbAreaGroupVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("id") Long id) {
|
||||
return R.ok(tbAreaGroupService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增区域组信息
|
||||
*/
|
||||
@SaCheckPermission("property:areaGroup:add")
|
||||
@Log(title = "区域组信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody TbAreaGroupBo bo) {
|
||||
return toAjax(tbAreaGroupService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改区域组信息
|
||||
*/
|
||||
@SaCheckPermission("property:areaGroup:edit")
|
||||
@Log(title = "区域组信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbAreaGroupBo bo) {
|
||||
return toAjax(tbAreaGroupService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除区域组信息
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("property:areaGroup:remove")
|
||||
@Log(title = "区域组信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("ids") Long[] ids) {
|
||||
return toAjax(tbAreaGroupService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package org.dromara.property.domain;
|
||||
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 区域组信息对象 tb_area_group
|
||||
*
|
||||
* @author dy
|
||||
* @date 2025-06-25
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("tb_area_group")
|
||||
public class TbAreaGroup extends BaseEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 区域组ID
|
||||
*/
|
||||
private Long areaGroupId;
|
||||
|
||||
/**
|
||||
* 区域组名称
|
||||
*/
|
||||
private String areaGroupName;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
package org.dromara.property.domain.bo;
|
||||
|
||||
import org.dromara.property.domain.TbAreaGroup;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 区域组信息业务对象 tb_area_group
|
||||
*
|
||||
* @author dy
|
||||
* @date 2025-06-25
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = TbAreaGroup.class, reverseConvertGenerate = false)
|
||||
public class TbAreaGroupBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@NotNull(message = "id不能为空", groups = { EditGroup.class })
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 区域组ID
|
||||
*/
|
||||
private Long areaGroupId;
|
||||
|
||||
/**
|
||||
* 区域组名称
|
||||
*/
|
||||
private String areaGroupName;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package org.dromara.property.domain.vo;
|
||||
|
||||
import org.dromara.property.domain.TbAreaGroup;
|
||||
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import cn.idev.excel.annotation.ExcelProperty;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 区域组信息视图对象 tb_area_group
|
||||
*
|
||||
* @author dy
|
||||
* @date 2025-06-25
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = TbAreaGroup.class)
|
||||
public class TbAreaGroupVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@ExcelProperty(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 区域组ID
|
||||
*/
|
||||
@ExcelProperty(value = "区域组ID")
|
||||
private Long areaGroupId;
|
||||
|
||||
/**
|
||||
* 区域组名称
|
||||
*/
|
||||
@ExcelProperty(value = "区域组名称")
|
||||
private String areaGroupName;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.property.mapper;
|
||||
|
||||
import org.dromara.property.domain.TbAreaGroup;
|
||||
import org.dromara.property.domain.vo.TbAreaGroupVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 区域组信息Mapper接口
|
||||
*
|
||||
* @author dy
|
||||
* @date 2025-06-25
|
||||
*/
|
||||
public interface TbAreaGroupMapper extends BaseMapperPlus<TbAreaGroup, TbAreaGroupVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.property.service;
|
||||
|
||||
import org.dromara.property.domain.TbAreaGroup;
|
||||
import org.dromara.property.domain.vo.TbAreaGroupVo;
|
||||
import org.dromara.property.domain.bo.TbAreaGroupBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 区域组信息Service接口
|
||||
*
|
||||
* @author dy
|
||||
* @date 2025-06-25
|
||||
*/
|
||||
public interface ITbAreaGroupService {
|
||||
|
||||
/**
|
||||
* 查询区域组信息
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 区域组信息
|
||||
*/
|
||||
TbAreaGroupVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询区域组信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 区域组信息分页列表
|
||||
*/
|
||||
TableDataInfo<TbAreaGroupVo> queryPageList(TbAreaGroupBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的区域组信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 区域组信息列表
|
||||
*/
|
||||
List<TbAreaGroupVo> queryList(TbAreaGroupBo bo);
|
||||
|
||||
/**
|
||||
* 新增区域组信息
|
||||
*
|
||||
* @param bo 区域组信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(TbAreaGroupBo bo);
|
||||
|
||||
/**
|
||||
* 修改区域组信息
|
||||
*
|
||||
* @param bo 区域组信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(TbAreaGroupBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除区域组信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,134 @@
|
||||
package org.dromara.property.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.property.domain.bo.TbAreaGroupBo;
|
||||
import org.dromara.property.domain.vo.TbAreaGroupVo;
|
||||
import org.dromara.property.domain.TbAreaGroup;
|
||||
import org.dromara.property.mapper.TbAreaGroupMapper;
|
||||
import org.dromara.property.service.ITbAreaGroupService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 区域组信息Service业务层处理
|
||||
*
|
||||
* @author dy
|
||||
* @date 2025-06-25
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class TbAreaGroupServiceImpl implements ITbAreaGroupService {
|
||||
|
||||
private final TbAreaGroupMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询区域组信息
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 区域组信息
|
||||
*/
|
||||
@Override
|
||||
public TbAreaGroupVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询区域组信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 区域组信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<TbAreaGroupVo> queryPageList(TbAreaGroupBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<TbAreaGroup> lqw = buildQueryWrapper(bo);
|
||||
Page<TbAreaGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的区域组信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 区域组信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<TbAreaGroupVo> queryList(TbAreaGroupBo bo) {
|
||||
LambdaQueryWrapper<TbAreaGroup> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<TbAreaGroup> buildQueryWrapper(TbAreaGroupBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<TbAreaGroup> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(TbAreaGroup::getId);
|
||||
lqw.eq(bo.getAreaGroupId() != null, TbAreaGroup::getAreaGroupId, bo.getAreaGroupId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getAreaGroupName()), TbAreaGroup::getAreaGroupName, bo.getAreaGroupName());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增区域组信息
|
||||
*
|
||||
* @param bo 区域组信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(TbAreaGroupBo bo) {
|
||||
TbAreaGroup add = MapstructUtils.convert(bo, TbAreaGroup.class);
|
||||
validEntityBeforeSave(add);
|
||||
//todo: 新增区域组时需要新增区域信息
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改区域组信息
|
||||
*
|
||||
* @param bo 区域组信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(TbAreaGroupBo bo) {
|
||||
TbAreaGroup update = MapstructUtils.convert(bo, TbAreaGroup.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(TbAreaGroup entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除区域组信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
<?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="org.dromara.property.mapper.TbAreaGroupMapper">
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue
Block a user