From 8af76e086fab5fc346e0431d18797c1ff82af8dc Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期四, 07 三月 2024 17:44:57 +0800 Subject: [PATCH] 地区管理 --- dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/SysRegionController.java | 105 +++++++++++++ dujy-modules/dujy-demo/src/main/resources/mapper/demo/SysRegionMapper.xml | 7 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/SysRegionServiceImpl.java | 112 ++++++++++++++ dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/SysRegionMapper.java | 15 + dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/SysRegionBo.java | 54 ++++++ dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/SysRegion.java | 49 ++++++ dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/ISysRegionService.java | 49 ++++++ dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/SysRegionVo.java | 62 +++++++ 8 files changed, 453 insertions(+), 0 deletions(-) diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/SysRegionController.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/SysRegionController.java new file mode 100644 index 0000000..eb567e6 --- /dev/null +++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/SysRegionController.java @@ -0,0 +1,105 @@ +package org.dromara.demo.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.demo.domain.vo.SysRegionVo; +import org.dromara.demo.domain.bo.SysRegionBo; +import org.dromara.demo.service.ISysRegionService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 鍦板尯 + * + * @author gonghl + * @date 2024-03-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/demo/region") +public class SysRegionController extends BaseController { + + private final ISysRegionService sysRegionService; + + /** + * 鏌ヨ鍦板尯鍒楄〃 + */ + @SaCheckPermission("demo:region:list") + @GetMapping("/list") + public TableDataInfo<SysRegionVo> list(SysRegionBo bo, PageQuery pageQuery) { + return sysRegionService.queryPageList(bo, pageQuery); + } + + /** + * 瀵煎嚭鍦板尯鍒楄〃 + */ + @SaCheckPermission("demo:region:export") + @Log(title = "鍦板尯", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysRegionBo bo, HttpServletResponse response) { + List<SysRegionVo> list = sysRegionService.queryList(bo); + ExcelUtil.exportExcel(list, "鍦板尯", SysRegionVo.class, response); + } + + /** + * 鑾峰彇鍦板尯璇︾粏淇℃伅 + * + * @param id 涓婚敭 + */ + @SaCheckPermission("demo:region:query") + @GetMapping("/{id}") + public R<SysRegionVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖") + @PathVariable String id) { + return R.ok(sysRegionService.queryById(id)); + } + + /** + * 鏂板鍦板尯 + */ + @SaCheckPermission("demo:region:add") + @Log(title = "鍦板尯", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R<Void> add(@Validated(AddGroup.class) @RequestBody SysRegionBo bo) { + return toAjax(sysRegionService.insertByBo(bo)); + } + + /** + * 淇敼鍦板尯 + */ + @SaCheckPermission("demo:region:edit") + @Log(title = "鍦板尯", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysRegionBo bo) { + return toAjax(sysRegionService.updateByBo(bo)); + } + + /** + * 鍒犻櫎鍦板尯 + * + * @param ids 涓婚敭涓� + */ + @SaCheckPermission("demo:region:remove") + @Log(title = "鍦板尯", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") + @PathVariable String[] ids) { + return toAjax(sysRegionService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/SysRegion.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/SysRegion.java new file mode 100644 index 0000000..2816435 --- /dev/null +++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/SysRegion.java @@ -0,0 +1,49 @@ +package org.dromara.demo.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; + +/** + * 鍦板尯瀵硅薄 sys_region + * + * @author gonghl + * @date 2024-03-07 + */ +@Data +@TableName("sys_region") +public class SysRegion { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private String id; + + /** + * 鍦板尯缂栫爜 + */ + private Long code; + + /** + * 鐖剁骇鍦板尯 + */ + private Long parentCode; + + /** + * 鍦板尯鍚嶇О + */ + private String name; + + /** + * 鍦板尯绾у埆 + */ + private String level; + + +} diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/SysRegionBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/SysRegionBo.java new file mode 100644 index 0000000..112ec4c --- /dev/null +++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/SysRegionBo.java @@ -0,0 +1,54 @@ +package org.dromara.demo.domain.bo; + +import org.dromara.demo.domain.SysRegion; +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.*; + +/** + * 鍦板尯涓氬姟瀵硅薄 sys_region + * + * @author gonghl + * @date 2024-03-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysRegion.class, reverseConvertGenerate = false) +public class SysRegionBo extends BaseEntity { + + /** + * + */ + @NotBlank(message = "涓嶈兘涓虹┖", groups = { EditGroup.class }) + private String id; + + /** + * 鍦板尯缂栫爜 + */ + @NotNull(message = "鍦板尯缂栫爜涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) + private Long code; + + /** + * 鐖剁骇鍦板尯 + */ + @NotNull(message = "鐖剁骇鍦板尯涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) + private Long parentCode; + + /** + * 鍦板尯鍚嶇О + */ + @NotBlank(message = "鍦板尯鍚嶇О涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) + private String name; + + /** + * 鍦板尯绾у埆 + */ + @NotBlank(message = "鍦板尯绾у埆涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) + private String level; + + +} diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/SysRegionVo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/SysRegionVo.java new file mode 100644 index 0000000..ece7eba --- /dev/null +++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/SysRegionVo.java @@ -0,0 +1,62 @@ +package org.dromara.demo.domain.vo; + +import org.dromara.demo.domain.SysRegion; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.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; + + + +/** + * 鍦板尯瑙嗗浘瀵硅薄 sys_region + * + * @author gonghl + * @date 2024-03-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysRegion.class) +public class SysRegionVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private String id; + + /** + * 鍦板尯缂栫爜 + */ + @ExcelProperty(value = "鍦板尯缂栫爜") + private Long code; + + /** + * 鐖剁骇鍦板尯 + */ + @ExcelProperty(value = "鐖剁骇鍦板尯") + private Long parentCode; + + /** + * 鍦板尯鍚嶇О + */ + @ExcelProperty(value = "鍦板尯鍚嶇О") + private String name; + + /** + * 鍦板尯绾у埆 + */ + @ExcelProperty(value = "鍦板尯绾у埆") + private String level; + + +} diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/SysRegionMapper.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/SysRegionMapper.java new file mode 100644 index 0000000..a5d9d21 --- /dev/null +++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/SysRegionMapper.java @@ -0,0 +1,15 @@ +package org.dromara.demo.mapper; + +import org.dromara.demo.domain.SysRegion; +import org.dromara.demo.domain.vo.SysRegionVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 鍦板尯Mapper鎺ュ彛 + * + * @author gonghl + * @date 2024-03-07 + */ +public interface SysRegionMapper extends BaseMapperPlus<SysRegion, SysRegionVo> { + +} diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/ISysRegionService.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/ISysRegionService.java new file mode 100644 index 0000000..0366840 --- /dev/null +++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/ISysRegionService.java @@ -0,0 +1,49 @@ +package org.dromara.demo.service; + +import org.dromara.demo.domain.SysRegion; +import org.dromara.demo.domain.vo.SysRegionVo; +import org.dromara.demo.domain.bo.SysRegionBo; +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 gonghl + * @date 2024-03-07 + */ +public interface ISysRegionService { + + /** + * 鏌ヨ鍦板尯 + */ + SysRegionVo queryById(String id); + + /** + * 鏌ヨ鍦板尯鍒楄〃 + */ + TableDataInfo<SysRegionVo> queryPageList(SysRegionBo bo, PageQuery pageQuery); + + /** + * 鏌ヨ鍦板尯鍒楄〃 + */ + List<SysRegionVo> queryList(SysRegionBo bo); + + /** + * 鏂板鍦板尯 + */ + Boolean insertByBo(SysRegionBo bo); + + /** + * 淇敼鍦板尯 + */ + Boolean updateByBo(SysRegionBo bo); + + /** + * 鏍¢獙骞舵壒閲忓垹闄ゅ湴鍖轰俊鎭� + */ + Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid); +} diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/SysRegionServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/SysRegionServiceImpl.java new file mode 100644 index 0000000..42745b1 --- /dev/null +++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/SysRegionServiceImpl.java @@ -0,0 +1,112 @@ +package org.dromara.demo.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 org.springframework.stereotype.Service; +import org.dromara.demo.domain.bo.SysRegionBo; +import org.dromara.demo.domain.vo.SysRegionVo; +import org.dromara.demo.domain.SysRegion; +import org.dromara.demo.mapper.SysRegionMapper; +import org.dromara.demo.service.ISysRegionService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 鍦板尯Service涓氬姟灞傚鐞� + * + * @author gonghl + * @date 2024-03-07 + */ +@RequiredArgsConstructor +@Service +public class SysRegionServiceImpl implements ISysRegionService { + + private final SysRegionMapper baseMapper; + + /** + * 鏌ヨ鍦板尯 + */ + @Override + public SysRegionVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 鏌ヨ鍦板尯鍒楄〃 + */ + @Override + public TableDataInfo<SysRegionVo> queryPageList(SysRegionBo bo, PageQuery pageQuery) { + LambdaQueryWrapper<SysRegion> lqw = buildQueryWrapper(bo); + Page<SysRegionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 鏌ヨ鍦板尯鍒楄〃 + */ + @Override + public List<SysRegionVo> queryList(SysRegionBo bo) { + LambdaQueryWrapper<SysRegion> lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper<SysRegion> buildQueryWrapper(SysRegionBo bo) { + Map<String, Object> params = bo.getParams(); + LambdaQueryWrapper<SysRegion> lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getCode() != null, SysRegion::getCode, bo.getCode()); + lqw.eq(bo.getParentCode() != null, SysRegion::getParentCode, bo.getParentCode()); + lqw.like(StringUtils.isNotBlank(bo.getName()), SysRegion::getName, bo.getName()); + lqw.eq(StringUtils.isNotBlank(bo.getLevel()), SysRegion::getLevel, bo.getLevel()); + return lqw; + } + + /** + * 鏂板鍦板尯 + */ + @Override + public Boolean insertByBo(SysRegionBo bo) { + SysRegion add = MapstructUtils.convert(bo, SysRegion.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 淇敼鍦板尯 + */ + @Override + public Boolean updateByBo(SysRegionBo bo) { + SysRegion update = MapstructUtils.convert(bo, SysRegion.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 淇濆瓨鍓嶇殑鏁版嵁鏍¢獙 + */ + private void validEntityBeforeSave(SysRegion entity){ + //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫 + } + + /** + * 鎵归噺鍒犻櫎鍦板尯 + */ + @Override + public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) { + if(isValid){ + //TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠� + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/dujy-modules/dujy-demo/src/main/resources/mapper/demo/SysRegionMapper.xml b/dujy-modules/dujy-demo/src/main/resources/mapper/demo/SysRegionMapper.xml new file mode 100644 index 0000000..d101850 --- /dev/null +++ b/dujy-modules/dujy-demo/src/main/resources/mapper/demo/SysRegionMapper.xml @@ -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.demo.mapper.SysRegionMapper"> + +</mapper> -- Gitblit v1.8.0