ycl-common/src/main/java/enumeration/general/RegionLevelEnum.java
New file @@ -0,0 +1,33 @@ package enumeration.general; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; /** * 地区级别 * * @author：xp * @date：2024/3/12 14:32 */ @Getter public enum RegionLevelEnum { CITY("city", "市"), COUNTY("county", "区县"), STREET("street", "街道"), ; @EnumValue private String code; @JsonValue private String value; RegionLevelEnum(String code, String value) { this.code = code; this.value = value; } } ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Region.java
New file @@ -0,0 +1,51 @@ package com.ycl.platform.domain.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.ycl.platform.base.AbsEntity; import enumeration.general.RegionLevelEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; /** * 地域 * * @author xp * @since 2024-03-12 */ @Data @Accessors(chain = true) @TableName("t_region") @ApiModel(value = "Region对象", description = "地域") public class Region extends AbsEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("区域全称") @TableField("full_name") private String fullName; @ApiModelProperty("区域简称") @TableField("simple_name") private String simpleName; @ApiModelProperty("地域级别") @TableField("region_level") private RegionLevelEnum regionLevel; @ApiModelProperty("市") @TableField("city") private String city; @ApiModelProperty("区县") @TableField("county") private String county; @ApiModelProperty("父级id") @TableField("parent_id") private Integer parentId; } ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -53,4 +53,9 @@ @ApiModelProperty("上报部门") @TableField("dept_id") private Long deptId; @TableField("point_detail") private String pointDetail; } ycl-pojo/src/main/java/com/ycl/platform/domain/form/RegionForm.java
New file @@ -0,0 +1,60 @@ package com.ycl.platform.domain.form; import com.ycl.system.domain.group.Update; import com.ycl.system.domain.group.Add; import com.ycl.platform.base.AbsForm; import com.ycl.platform.domain.entity.Region; import java.time.LocalDateTime; import enumeration.general.RegionLevelEnum; import org.springframework.beans.BeanUtils; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import org.springframework.lang.NonNull; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; /** * 地域表单 * * @author xp * @since 2024-03-12 */ @Data @Accessors(chain = true) @ApiModel(value = "Region表单", description = "地域表单") public class RegionForm extends AbsForm { @NotBlank(message = "区域全称不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("区域全称") private String fullName; @NotBlank(message = "区域简称不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("区域简称") private String simpleName; @ApiModelProperty("地域级别") private RegionLevelEnum regionLevel; @NotBlank(message = "市不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("市") private String city; @NotBlank(message = "区县不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("区县") private String county; @ApiModelProperty("父级id") private Integer parentId; public static Region getEntityByForm(@NonNull RegionForm form, Region entity) { if(entity == null) { entity = new Region(); } BeanUtils.copyProperties(form, entity); return entity; } } ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -46,6 +46,9 @@ @ApiModelProperty("运维状态") private String status; private String pointDetail; // @NotBlank(message = "备注不能为空", groups = {Add.class, Update.class}) // @ApiModelProperty("备注") // private String remark; ycl-pojo/src/main/java/com/ycl/platform/domain/query/RegionQuery.java
New file @@ -0,0 +1,43 @@ package com.ycl.platform.domain.query; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.platform.base.AbsQuery; import java.util.Date; import java.util.List; import enumeration.general.RegionLevelEnum; import org.springframework.lang.NonNull; import jakarta.validation.constraints.NotBlank; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; /** * 地域查询 * * @author xp * @since 2024-03-12 */ @Data @Accessors(chain = true) @ApiModel(value = "Region查询", description = "地域查询") public class RegionQuery extends AbsQuery { private String fullName; private String simpleName; private Integer parentId; private String regionLevel; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date start; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date end; }
@@ -20,5 +20,8 @@ @Accessors(chain = true) @ApiModel(value = "YwPoint查询", description = "运维点位查询") public class YwPointQuery extends AbsQuery { private String pointName; }
New file @@ -0,0 +1,27 @@ package com.ycl.platform.domain.vo; import enumeration.general.RegionLevelEnum; import lombok.Data; import java.util.List; /** * 地域级联 * * @author：xp * @date：2024/3/12 16:21 */ @Data public class RegionCascaderVO { private Integer value; private String label; private Integer parentId; private RegionLevelEnum regionLevel; private List<RegionCascaderVO> children; } ycl-pojo/src/main/java/com/ycl/platform/domain/vo/RegionVO.java
New file @@ -0,0 +1,52 @@ package com.ycl.platform.domain.vo; import com.ycl.platform.base.AbsVo; import com.ycl.platform.domain.entity.Region; import java.util.List; import java.time.LocalDateTime; import enumeration.general.RegionLevelEnum; import org.springframework.lang.NonNull; import org.springframework.beans.BeanUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; /** * 地域展示 * * @author xp * @since 2024-03-12 */ @Data @Accessors(chain = true) public class RegionVO extends AbsVo { /** 区域全称 */ private String fullName; /** 区域简称 */ private String simpleName; /** 地域级别 */ private RegionLevelEnum regionLevel; /** 市 */ private String city; /** 区县 */ private String county; /** 父级id */ private Integer parentId; public static RegionVO getVoByEntity(@NonNull Region entity, RegionVO vo) { if(vo == null) { vo = new RegionVO(); } BeanUtils.copyProperties(entity, vo); return vo; } } ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
@@ -34,6 +34,7 @@ /** 运维单位 */ private Integer unitId; private String unitName; private String unitName; /** 运维状态 */ @@ -45,6 +46,8 @@ private Short category; private String deptName; private String pointDetail; public static YwPointVO getVoByEntity(@NonNull YwPoint entity, YwPointVO vo) { if(vo == null) { vo = new YwPointVO(); ycl-server/src/main/java/com/ycl/platform/controller/RegionController.java
New file @@ -0,0 +1,87 @@ package com.ycl.platform.controller; import com.ycl.system.domain.group.Update; import com.ycl.system.domain.group.Add; import org.springframework.validation.annotation.Validated; import lombok.RequiredArgsConstructor; import java.util.List; import org.springframework.validation.annotation.Validated; import jakarta.validation.constraints.NotEmpty; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.ycl.platform.service.RegionService; import com.ycl.system.Result; import com.ycl.platform.domain.form.RegionForm; import com.ycl.platform.domain.query.RegionQuery; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; /** * 地域 前端控制器 * * @author xp * @since 2024-03-12 */ @Validated @RequiredArgsConstructor @Api(value = "地域", tags = "地域管理") @RestController @RequestMapping("/region") public class RegionController { private final RegionService regionService; @PostMapping @ApiOperation(value = "添加", notes = "添加") public Result add(@RequestBody @Validated(Add.class) RegionForm form) { return regionService.add(form); } @PutMapping @ApiOperation(value = "修改", notes = "修改") public Result update(@RequestBody @Validated(Update.class) RegionForm form) { return regionService.update(form); } @DeleteMapping("/{id}") @ApiOperation(value = "ID删除", notes = "ID删除") public Result removeById(@PathVariable("id") String id) { return regionService.removeById(id); } @DeleteMapping("/batch") @ApiOperation(value = "批量删除", notes = "批量删除") public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) { return regionService.remove(ids); } @PostMapping("/page") @ApiOperation(value = "分页", notes = "分页") public Result page(@RequestBody RegionQuery query) { return regionService.page(query); } @GetMapping("/{id}") @ApiOperation(value = "详情", notes = "详情") public Result detail(@PathVariable("id") String id) { return regionService.detail(id); } @GetMapping("/list") @ApiOperation(value = "列表", notes = "列表") public Result list() { return regionService.all(); } @GetMapping("/counties") @ApiOperation(value = "区县列表", notes = "区县列表") public Result counties() { return regionService.counties(); } @GetMapping("/cascader") @ApiOperation(value = "级联选择", notes = "级联选择") public Result cascader() { return regionService.cascader(); } } ycl-server/src/main/java/com/ycl/platform/mapper/RegionMapper.java
New file @@ -0,0 +1,19 @@ package com.ycl.platform.mapper; import com.ycl.platform.domain.entity.Region; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.platform.domain.vo.RegionVO; import com.ycl.platform.domain.form.RegionForm; import java.util.List; import org.apache.ibatis.annotations.Mapper; /** * 地域 Mapper 接口 * * @author xp * @since 2024-03-12 */ @Mapper public interface RegionMapper extends BaseMapper<Region> { } ycl-server/src/main/java/com/ycl/platform/service/RegionService.java
New file @@ -0,0 +1,77 @@ package com.ycl.platform.service; import com.ycl.platform.domain.entity.Region; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.system.Result; import com.ycl.platform.domain.form.RegionForm; import com.ycl.platform.domain.query.RegionQuery; import java.util.List; /** * 地域 服务类 * * @author xp * @since 2024-03-12 */ public interface RegionService extends IService<Region> { /** * 添加 * @param form * @return */ Result add(RegionForm form); /** * 修改 * @param form * @return */ Result update(RegionForm form); /** * 批量删除 * @param ids * @return */ Result remove(List<String> ids); /** * id删除 * @param id * @return */ Result removeById(String id); /** * 分页查询 * @param query * @return */ Result page(RegionQuery query); /** * 根据id查找 * @param id * @return */ Result detail(String id); /** * 列表 * @return */ Result all(); /** * 区县列表 * @return */ Result counties(); /** * 级联选择 * @return */ Result cascader(); } ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java
New file @@ -0,0 +1,205 @@ package com.ycl.platform.service.impl; import com.ycl.platform.base.BaseSelect; import com.ycl.platform.domain.entity.Region; import com.ycl.platform.domain.entity.YwUnit; import com.ycl.platform.domain.vo.RegionCascaderVO; import com.ycl.platform.mapper.RegionMapper; import com.ycl.platform.service.RegionService; import com.ycl.system.Result; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.platform.domain.form.RegionForm; import com.ycl.platform.domain.vo.RegionVO; import com.ycl.platform.domain.query.RegionQuery; import java.util.List; import com.ycl.utils.DateUtils; import enumeration.general.RegionLevelEnum; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.system.page.PageUtil; import org.springframework.stereotype.Service; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import java.util.ArrayList; import java.util.Objects; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.RequiredArgsConstructor; import org.springframework.util.StringUtils; /** * 地域 服务实现类 * * @author xp * @since 2024-03-12 */ @Service @RequiredArgsConstructor public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService { private final RegionMapper regionMapper; /** * 添加 * @param form * @return */ @Override public Result add(RegionForm form) { Region entity = RegionForm.getEntityByForm(form, null); entity.setRegionLevel(RegionLevelEnum.STREET); if(baseMapper.insert(entity) > 0) { return Result.ok("添加成功"); } return Result.error("添加失败"); } /** * 修改 * @param form * @return */ @Override public Result update(RegionForm form) { Region entity = baseMapper.selectById(form.getId()); // 为空抛IllegalArgumentException，做全局异常处理 Assert.notNull(entity, "记录不存在"); BeanUtils.copyProperties(form, entity); if (baseMapper.updateById(entity) > 0) { return Result.ok("修改成功"); } return Result.error("修改失败"); } /** * 批量删除 * @param ids * @return */ @Override public Result remove(List<String> ids) { if(baseMapper.deleteBatchIds(ids) > 0) { return Result.ok("删除成功"); } return Result.error("删除失败"); } /** * id删除 * @param id * @return */ @Override public Result removeById(String id) { if(baseMapper.deleteById(id) > 0) { return Result.ok("删除成功"); } return Result.error("删除失败"); } /** * 分页查询 * @param query * @return */ @Override public Result page(RegionQuery query) { IPage<Region> page = new LambdaQueryChainWrapper<>(baseMapper) .like(StringUtils.hasText(query.getFullName()), Region::getFullName, query.getFullName()) .like(StringUtils.hasText(query.getSimpleName()), Region::getSimpleName, query.getSimpleName()) .eq(Objects.nonNull(query.getParentId()), Region::getParentId, query.getParentId()) .eq(StringUtils.hasText(query.getRegionLevel()), Region::getRegionLevel, query.getRegionLevel()) .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()), Region::getCreateTime, DateUtils.getDayStart(query.getStart()), DateUtils.getDayEnd(query.getEnd())) .orderByDesc(Region::getCreateTime) .page(PageUtil.getPage(query, Region.class)); List<RegionVO> vos = page.getRecords().stream() .map( entity -> RegionVO.getVoByEntity(entity, null) ) .collect(Collectors.toList()); return Result.ok().data(vos).total(page.getTotal()); } /** * 根据id查找 * @param id * @return */ @Override public Result detail(String id) { Region entity = baseMapper.selectById(id); Assert.notNull(entity, "记录不存在"); RegionVO vo = RegionVO.getVoByEntity(entity, null); return Result.ok().data(vo); } /** * 列表 * @return */ @Override public Result all() { List<Region> entities = baseMapper.selectList(null); List<RegionVO> vos = entities.stream() .map( entity -> RegionVO.getVoByEntity(entity, null) ) .collect(Collectors.toList()); return Result.ok().data(vos); } @Override public Result counties() { List<Region> entityList = new LambdaQueryChainWrapper<>(baseMapper) .eq(Region::getRegionLevel, RegionLevelEnum.COUNTY) .orderByDesc(Region::getCreateTime) .list(); List<BaseSelect> vos = entityList.stream().map(entity -> { BaseSelect vo = new BaseSelect(); vo.setId(entity.getId()); vo.setValue(entity.getFullName()); return vo; }).collect(Collectors.toList()); return Result.ok().data(vos); } @Override public Result cascader() { List<Region> regionList = new LambdaQueryChainWrapper<>(baseMapper) .ne(Region::getRegionLevel, RegionLevelEnum.CITY) .list(); List<RegionCascaderVO> vos = regionList.stream().map(entity -> { RegionCascaderVO vo = new RegionCascaderVO(); vo.setValue(entity.getId()); vo.setLabel(entity.getSimpleName()); vo.setRegionLevel(entity.getRegionLevel()); vo.setParentId(entity.getParentId()); return vo; }).collect(Collectors.toList()); List<RegionCascaderVO> removeList = new ArrayList<>(12); for (RegionCascaderVO region : vos) { if (region.getRegionLevel() == RegionLevelEnum.COUNTY) { List<RegionCascaderVO> childList = new ArrayList<>(12); for (RegionCascaderVO region1 : vos) { if (region1.getParentId() == region.getValue()) { childList.add(region1); removeList.add(region1); } } region.setChildren(childList); } } vos.removeAll(removeList); return Result.ok().data(vos); } } ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -1,7 +1,9 @@ package com.ycl.platform.service.impl; import com.ycl.platform.domain.entity.YwPoint; import com.ycl.platform.domain.entity.YwUnit; import com.ycl.platform.mapper.YwPointMapper; import com.ycl.platform.mapper.YwUnitMapper; import com.ycl.platform.service.YwPointService; import com.ycl.platform.service.YwUnitService; import com.ycl.system.Result; @@ -14,6 +16,7 @@ import com.ycl.system.entity.SysDept; import com.ycl.system.service.ISysDeptService; import org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.system.page.PageUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +30,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.RequiredArgsConstructor; import org.springframework.util.StringUtils; /** * 运维点位 服务实现类 @@ -43,6 +47,7 @@ private ISysDeptService deptService; @Autowired private YwUnitService unitService; private final YwUnitMapper ywUnitMapper; /** * 添加 @@ -124,6 +129,7 @@ public Result page(YwPointQuery query) { IPage<YwPoint> page = new LambdaQueryChainWrapper<>(baseMapper) .like(StringUtils.hasText(query.getPointName()), YwPoint::getPointName, query.getPointName()) .orderByDesc(YwPoint::getCreateTime) .page(PageUtil.getPage(query, YwPoint.class));
New file @@ -0,0 +1,18 @@ <?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.ycl.platform.mapper.RegionMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.RegionVO"> <result column="id" property="id" /> <result column="create_time" property="createTime" /> <result column="update_time" property="updateTime" /> <result column="full_name" property="fullName" /> <result column="simple_name" property="simpleName" /> <result column="region_level" property="regionLevel" /> <result column="city" property="city" /> <result column="county" property="county" /> <result column="parent_id" property="parentId" /> </resultMap> </mapper>
