新增城市管理

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaCityController.java

@@ -0,0 +1,62 @@
+package com.ruoyi.oa.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.bo.OaCityBo;
+import com.ruoyi.oa.domain.vo.OaCityVo;
+import com.ruoyi.oa.service.IOaCityService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oa/city")
+@Validated
+public class OaCityController extends BaseController {
+
+    private final IOaCityService cityService;
+
+    @GetMapping("/list")
+    public TableDataInfo<OaCityVo> list(OaCityBo bo, PageQuery pageQuery) {
+        return cityService.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{cityId}")
+    public R<OaCityVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long cityId) {
+        return R.ok(cityService.queryById(cityId));
+    }
+
+    @Log(title = "城市管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody OaCityBo bo) {
+        return toAjax(cityService.insertByBo(bo));
+    }
+
+    @Log(title = "城市管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaCityBo bo) {
+        return toAjax(cityService.updateByBo(bo));
+    }
+
+    @Log(title = "城市管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{cityIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] cityIds) {
+        return toAjax(cityService.deleteWithValidByIds(Arrays.asList(cityIds), true));
+    }
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaCity.java

@@ -0,0 +1,37 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 城市管理对象 oa_city
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_city")
+public class OaCity extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "city_id")
+    private Long cityId;
+
+    /** 国家 */
+    private String countryName;
+
+    /** 城市 */
+    private String cityName;
+
+    /** 状态 1正常 0禁用 */
+    private Long status;
+
+    /** 备注 */
+    private String remark;
+
+    @TableLogic
+    private Integer delFlag;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaCityBo.java

@@ -0,0 +1,28 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 城市管理业务对象 oa_city
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaCityBo extends BaseEntity {
+
+    private Long cityId;
+
+    @NotBlank(message = "国家不能为空")
+    private String countryName;
+
+    @NotBlank(message = "城市不能为空")
+    private String cityName;
+
+    private Long status;
+
+    private String remark;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaCityVo.java

@@ -0,0 +1,23 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 城市管理视图对象 oa_city
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaCityVo extends BaseEntity {
+
+    private Long cityId;
+
+    private String countryName;
+
+    private String cityName;
+
+    private Long status;
+
+    private String remark;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaCityMapper.java

@@ -0,0 +1,11 @@
+package com.ruoyi.oa.mapper;
+
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.oa.domain.OaCity;
+import com.ruoyi.oa.domain.vo.OaCityVo;
+
+/**
+ * 城市管理 Mapper
+ */
+public interface OaCityMapper extends BaseMapperPlus<OaCityMapper, OaCity, OaCityVo> {
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaCityService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.oa.service;
+
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.oa.domain.bo.OaCityBo;
+import com.ruoyi.oa.domain.vo.OaCityVo;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface IOaCityService {
+
+    OaCityVo queryById(Long cityId);
+
+    TableDataInfo<OaCityVo> queryPageList(OaCityBo bo, PageQuery pageQuery);
+
+    List<OaCityVo> queryList(OaCityBo bo);
+
+    Boolean insertByBo(OaCityBo bo);
+
+    Boolean updateByBo(OaCityBo bo);
+
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaCityServiceImpl.java

@@ -0,0 +1,73 @@
+package com.ruoyi.oa.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.oa.domain.OaCity;
+import com.ruoyi.oa.domain.bo.OaCityBo;
+import com.ruoyi.oa.domain.vo.OaCityVo;
+import com.ruoyi.oa.mapper.OaCityMapper;
+import com.ruoyi.oa.service.IOaCityService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Service
+public class OaCityServiceImpl implements IOaCityService {
+
+    private final OaCityMapper baseMapper;
+
+    @Override
+    public OaCityVo queryById(Long cityId) {
+        return baseMapper.selectVoById(cityId);
+    }
+
+    @Override
+    public TableDataInfo<OaCityVo> queryPageList(OaCityBo bo, PageQuery pageQuery) {
+        IPage<OaCityVo> page = baseMapper.selectVoPage(pageQuery.build(), buildQueryWrapper(bo));
+        TableDataInfo<OaCityVo> tableDataInfo = new TableDataInfo<>(page.getRecords(), page.getTotal());
+        return tableDataInfo;
+    }
+
+    @Override
+    public List<OaCityVo> queryList(OaCityBo bo) {
+        return baseMapper.selectVoList(buildQueryWrapper(bo));
+    }
+
+    @Override
+    public Boolean insertByBo(OaCityBo bo) {
+        OaCity add = BeanUtil.toBean(bo, OaCity.class);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setCityId(add.getCityId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(OaCityBo bo) {
+        OaCity update = BeanUtil.toBean(bo, OaCity.class);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    private LambdaQueryWrapper<OaCity> buildQueryWrapper(OaCityBo bo) {
+        LambdaQueryWrapper<OaCity> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getCountryName()), OaCity::getCountryName, bo.getCountryName());
+        lqw.like(StringUtils.isNotBlank(bo.getCityName()), OaCity::getCityName, bo.getCityName());
+        lqw.eq(bo.getStatus() != null, OaCity::getStatus, bo.getStatus());
+        lqw.orderByDesc(OaCity::getCreateTime);
+        return lqw;
+    }
+}