Преглед изворни кода

feat:新增自取地址管理增删改查功能

kgy пре 5 месеци
родитељ
комит
6dca00a147

+ 43 - 6
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/controller/SelfGetAddressController.java

@@ -2,16 +2,53 @@ package org.dromara.dataManagement.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import org.dromara.dataManagement.service.SelfGetAddressSerivce;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.dataManagement.domain.bo.SelfGetAddressBo;
+import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
+import org.dromara.dataManagement.service.SelfGetAddressService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
+/**
+ * 自取地址管理接口
+ */
 @SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/getAddress")
-public class SelfGetAddressController {
-
-    private final SelfGetAddressSerivce selfGetAddressSerivce;
+public class SelfGetAddressController extends BaseController {
+    private final SelfGetAddressService selfGetAddressService;
+    @GetMapping("/PageList")
+    public TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery){
+        return selfGetAddressService.selectPageSelfGetAddressList(selfGetAddressBo,pageQuery);
+    }
+    @PostMapping()
+    public R<Void> insertSelfGetAddress(@Validated @RequestBody SelfGetAddressBo selfGetAddressBo){
+        return toAjax(selfGetAddressService.insertSelfGetAddress(selfGetAddressBo));
+    }
+    @PutMapping()
+    public R<Void> updateSelfGetAddress(@Validated @RequestBody SelfGetAddressBo selfGetAddressBo){
+        return toAjax(selfGetAddressService.updateSelfGetAddress(selfGetAddressBo));
+    }
+    @DeleteMapping("/{selfGetAddressIds}")
+    public R<Void> deleteSelfGetAddressByIds(@PathVariable Long[] selfGetAddressIds){
+        return toAjax(selfGetAddressService.deleteSelfGetAddressByIds(selfGetAddressIds));
+    }
+    @GetMapping("/exportExcel")
+    public void exportSelfGetAddressExcel(HttpServletResponse response){
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),selfGetAddressService.selectList()),"自取地址列表.xlsx","excel/自取地址导出模板.xlsx",response);
+    }
+    @GetMapping("/exportExcelByIds")
+    public void exportSelfGetAddressExcelByIds(@RequestParam("ids") Long[] selfGetAddressIds, HttpServletResponse response){
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),selfGetAddressService.selectSelfGetAddressByIds(selfGetAddressIds)),"自取地址列表.xlsx","excel/自取地址导出模板.xlsx",response);
+    }
 }

+ 64 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/SelfGetAddress.java

@@ -1,4 +1,68 @@
 package org.dromara.dataManagement.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 自取地址管理基类
+ */
+@Data
+@TableName("fa_kuyou_address")
 public class SelfGetAddress {
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 管理员id
+     */
+    private int adminId;
+    /**
+     * 地址简称
+     */
+    private String nickname;
+    /**
+     * 联系人
+     */
+    private String connectName;
+    /**
+     * 联系电话
+     */
+    private String connectPhone;
+    /**
+     * 手机号码
+     */
+    private String connectMobile;
+    /**
+     * 省
+     */
+    private int province;
+    /**
+     * 市
+     */
+    private int city;
+    /**
+     * 区
+     */
+    private int area;
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+    /**
+     * 邮政编码
+     */
+    private String postCode;
+    /**
+     * 默认地址:0=否,1=是
+     */
+    private String isDefault;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
 }

+ 62 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/bo/SelfGetAddressBo.java

@@ -1,4 +1,66 @@
 package org.dromara.dataManagement.domain.bo;
 
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.dataManagement.domain.SelfGetAddress;
+
+@Data
+@AutoMapper(target = SelfGetAddress.class, reverseConvertGenerate = false)
 public class SelfGetAddressBo {
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 管理员id
+     */
+    private int adminId;
+    /**
+     * 地址简称
+     */
+    private String nickname;
+    /**
+     * 联系人
+     */
+    private String connectName;
+    /**
+     * 联系电话
+     */
+    private String connectPhone;
+    /**
+     * 手机号码
+     */
+    private String connectMobile;
+    /**
+     * 省
+     */
+    private int province;
+    /**
+     * 市
+     */
+    private int city;
+    /**
+     * 区
+     */
+    private int area;
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+    /**
+     * 邮政编码
+     */
+    private String postCode;
+    /**
+     * 默认地址:0=否,1=是
+     */
+    private String isDefault;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
 }

+ 68 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/vo/SelfGetAddressVo.java

@@ -1,4 +1,72 @@
 package org.dromara.dataManagement.domain.vo;
 
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.dromara.dataManagement.domain.SelfGetAddress;
+
+@Data
+@AutoMapper(target = SelfGetAddress.class)
 public class SelfGetAddressVo {
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 管理员id
+     */
+    private int adminId;
+    /**
+     * 地址简称
+     */
+    private String nickname;
+    /**
+     * 联系人
+     */
+    @NotBlank(message = "联系人不能为空")
+    private String connectName;
+    /**
+     * 联系电话
+     */
+    @NotBlank(message = "联系电话不能为空")
+    private String connectPhone;
+    /**
+     * 手机号码
+     */
+    @NotBlank(message = "手机号码不能为空")
+    private String connectMobile;
+    /**
+     * 省
+     */
+    private int province;
+    /**
+     * 市
+     */
+    private int city;
+    /**
+     * 区
+     */
+    private int area;
+    /**
+     * 详细地址
+     */
+    @NotBlank(message = "详细地址不能为空")
+    private String detailAddress;
+    /**
+     * 邮政编码
+     */
+    @NotBlank(message = "邮政编码不能为空")
+    private String postCode;
+    /**
+     * 默认地址:0=否,1=是
+     */
+    private String isDefault;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
 }

+ 23 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/SelfGetAddressService.java

@@ -0,0 +1,23 @@
+package org.dromara.dataManagement.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.SelfGetAddress;
+import org.dromara.dataManagement.domain.bo.SelfGetAddressBo;
+import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
+
+import java.util.List;
+
+public interface SelfGetAddressService {
+    TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery);
+
+    int insertSelfGetAddress(SelfGetAddressBo selfGetAddressBo);
+
+    int updateSelfGetAddress(SelfGetAddressBo selfGetAddressBo);
+
+    int deleteSelfGetAddressByIds(Long[] selfGetAddressIds);
+
+    List<SelfGetAddress> selectList();
+
+    List<SelfGetAddress> selectSelfGetAddressByIds(Long[] selfGetAddressIds);
+}

+ 57 - 0
ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/impl/SelfGetAddressServiceImpl.java

@@ -0,0 +1,57 @@
+package org.dromara.dataManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.SelfGetAddress;
+import org.dromara.dataManagement.domain.bo.SelfGetAddressBo;
+import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
+import org.dromara.dataManagement.mapper.SelfGetAddressMapper;
+import org.dromara.dataManagement.service.SelfGetAddressService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class SelfGetAddressServiceImpl implements SelfGetAddressService {
+    private final SelfGetAddressMapper selfGetAddressMapper;
+    @Override
+    public TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery) {
+        QueryWrapper<SelfGetAddress> qw=new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(selfGetAddressBo.getConnectName()),"ConnectName",selfGetAddressBo.getConnectName());
+        qw.like(StringUtils.isNotBlank(selfGetAddressBo.getConnectPhone()),"ConnectPhone",selfGetAddressBo.getConnectPhone());
+        qw.like(StringUtils.isNotBlank(selfGetAddressBo.getConnectMobile()),"ConnectMobile",selfGetAddressBo.getConnectMobile());
+        Page<SelfGetAddressVo>page= selfGetAddressMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+    @Override
+    public int insertSelfGetAddress(SelfGetAddressBo selfGetAddressBo) {
+        SelfGetAddress selfGetAddress= MapstructUtils.convert(selfGetAddressBo, SelfGetAddress.class);
+        return selfGetAddressMapper.insert(selfGetAddress);
+    }
+    @Override
+    public int updateSelfGetAddress(SelfGetAddressBo selfGetAddressBo) {
+        SelfGetAddress selfGetAddress= MapstructUtils.convert(selfGetAddressBo, SelfGetAddress.class);
+        QueryWrapper<SelfGetAddress> qw=new QueryWrapper<>();
+        qw.eq("id",selfGetAddressBo.getId());
+        return selfGetAddressMapper.updateById(selfGetAddress);
+    }
+    @Override
+    public int deleteSelfGetAddressByIds(Long[] selfGetAddressIds) {
+        return selfGetAddressMapper.deleteByIds(Arrays.asList(selfGetAddressIds));
+    }
+    @Override
+    public List<SelfGetAddress> selectList() {
+        return selfGetAddressMapper.selectList();
+    }
+    @Override
+    public List<SelfGetAddress> selectSelfGetAddressByIds(Long[] selfGetAddressIds) {
+        return MapstructUtils.convert(selfGetAddressMapper.selectVoByIds(Arrays.asList(selfGetAddressIds)), SelfGetAddress.class);
+    }
+}

BIN
ruoyi-modules/ruoyi-dataManagement/src/main/resources/excel/自取地址导出模板.xlsx