Merge remote-tracking branch 'origin/develop' into develop

ruoyi-modules/ruoyi-InventoryManagement/pom.xml

@@ -12,7 +12,7 @@
     <artifactId>ruoyi-InventoryManagement</artifactId>
 
     <description>
-        demo模块
+        进销存管理模块
     </description>
 
     <dependencies>
@@ -103,6 +103,11 @@
             <artifactId>ruoyi-common-websocket</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-commodityManagement</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/InventoryMonitoringController.java

@@ -0,0 +1,36 @@
+package org.dromara.InventoryManagement.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.InventoryMonitoringBo;
+import org.dromara.InventoryManagement.domain.vo.InventoryMonitoringVo;
+import org.dromara.InventoryManagement.service.InventoryMonitoringService;
+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.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 库存监控接口
+ */
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/inventoryMonitoring")
+public class InventoryMonitoringController extends BaseController {
+    private final InventoryMonitoringService inventoryMonitoringService;
+
+    /**
+     * 查询品牌列表
+     * @param inventoryMonitoring 库存监控Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<InventoryMonitoringVo> selectPageDiBuList(InventoryMonitoringBo inventoryMonitoring, PageQuery pageQuery) {
+        return inventoryMonitoringService.selectPageInventoryMonitoringList(inventoryMonitoring, pageQuery);
+    }
+
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/PutInStorageController.java

@@ -0,0 +1,38 @@
+package org.dromara.InventoryManagement.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+import org.dromara.InventoryManagement.service.PutInStorageService;
+import org.dromara.common.core.domain.R;
+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.springframework.web.bind.annotation.*;
+
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/putInStorage")
+public class PutInStorageController extends BaseController {
+
+    private final PutInStorageService putInStorageService;
+
+    /**
+     * 查询入库订单分页列表
+     * @param putInStorageBo
+     * @param pageQuery
+     * @return
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<PutInStorageVo> selectPutInStoragePageList(PutInStorageBo putInStorageBo, PageQuery pageQuery) {
+        return putInStorageService.selectPutInStoragePageList(putInStorageBo, pageQuery);
+    }
+
+    @PostMapping
+    public R<Void> insert(@RequestBody PutInStorageBo putInStorageBo){
+        return toAjax(putInStorageService.insertInventory(putInStorageBo));
+    }
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/InventoryMonitoring.java

@@ -0,0 +1,99 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+/**
+ * 库存监控基类
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_kuyou_dibu")
+public class InventoryMonitoring extends TenantEntity {
+    /**
+     * 底布ID
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 单价
+     */
+    private String price;
+
+    /**
+     * 进货价
+     */
+    private double purchasePrice;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 针织
+     */
+    private String zhenzhi;
+
+    /**
+     * 成分
+     */
+    private String chengfen;
+
+    /**
+     * 供应商
+     */
+    private String gongyingshang;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 单价2
+     */
+    private String price2;
+
+    /**
+     * 单位2
+     */
+    private String unit2;
+
+    /**
+     * 库存预警
+     */
+    private String stockWarn;
+
+    /**
+     * 库存
+     */
+    private double stock;
+
+    /**
+     * 库存1
+     */
+    private double stock1;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/PutInStorage.java

@@ -0,0 +1,45 @@
+package org.dromara.InventoryManagement.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_ykjp_storage")
+public class PutInStorage extends TenantEntity {
+
+    /**
+     * 主键Id
+     */
+    private int id;
+
+    /**
+     * 单据编号
+     */
+    private String code;
+
+    /**
+     * 入库类型 0=采购入库，1=销售退货入库
+     */
+    private int inboundType;
+
+    /**
+     * 库区
+     */
+    private int partitionId;
+
+    /**
+     * 入库单状态
+     */
+    private String status;
+
+    /**
+     * 入库单更新时间
+     */
+    private Date updatetime;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/InventoryMonitoringBo.java

@@ -0,0 +1,101 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.PutInStorage;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 库存监控业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PutInStorage.class, reverseConvertGenerate = false)
+public class InventoryMonitoringBo extends BaseEntity {
+    /**
+     * 底布Id
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+
+    private String name;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 单价
+     */
+    private String price;
+
+    /**
+     * 进货价
+     */
+    private double purchasePrice;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 针织
+     */
+    private String zhenzhi;
+
+    /**
+     * 成分
+     */
+    private String chengfen;
+
+    /**
+     * 供应商
+     */
+    private String gongyingshang;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 价格2
+     */
+    private String price2;
+
+    /**
+     * 单位2
+     */
+    private String unit2;
+
+    /**
+     * 库存预警
+     */
+    private String stockWarn;
+
+    /**
+     * 库存
+     */
+    private double stock;
+
+    /**
+     * 库存1
+     */
+    private double stock1;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/PutInStorageBo.java

@@ -0,0 +1,36 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.InventoryManagement.domain.PutInStorage;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PutInStorage.class, reverseConvertGenerate = false)
+public class PutInStorageBo extends BaseEntity {
+
+    /**
+     * 主键Id
+     */
+    private int id;
+
+    /**
+     * 单据编号
+     */
+    private String code;
+
+    /**
+     * 入库单状态
+     */
+    private String status;
+
+    /**
+     * 入库单更新时间
+     */
+    private Date updatetime;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/InventoryMonitoringVo.java

@@ -0,0 +1,100 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.InventoryManagement.domain.InventoryMonitoring;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 库存监控值对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InventoryMonitoring.class)
+public class InventoryMonitoringVo extends BaseEntity {
+    /**
+     * 底布ID
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 单价
+     */
+    private String price;
+
+    /**
+     * 进货价
+     */
+    private double purchasePrice;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 针织
+     */
+    private String zhenzhi;
+
+    /**
+     * 成分
+     */
+    private String chengfen;
+
+    /**
+     * 供应商
+     */
+    private String gongyingshang;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 价格2
+     */
+    private String price2;
+
+    /**
+     * 单位2
+     */
+    private String unit2;
+
+    /**
+     * 库存预警
+     */
+    private String stockWarn;
+
+    /**
+     * 库存
+     */
+    private double stock;
+
+    /**
+     * 库存1
+     */
+    private double stock1;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/PutInStorageVo.java

@@ -0,0 +1,36 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.InventoryManagement.domain.PutInStorage;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PutInStorage.class)
+public class PutInStorageVo extends BaseEntity {
+
+    /**
+     * 主键Id
+     */
+    private int id;
+
+    /**
+     * 单据编号
+     */
+    private String code;
+
+    /**
+     * 入库单状态
+     */
+    private String status;
+
+    /**
+     * 入库单更新时间
+     */
+    private Date updatetime;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapper/InventoryMonitoringMapper.java

@@ -0,0 +1,13 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.InventoryMonitoring;
+import org.dromara.InventoryManagement.domain.vo.InventoryMonitoringVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 库存监控Mapper接口
+ */
+@Mapper
+public interface InventoryMonitoringMapper extends BaseMapperPlus<InventoryMonitoring, InventoryMonitoringVo> {
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapper/PutInStorageMapper.java

@@ -0,0 +1,10 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.InventoryManagement.domain.PutInStorage;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+
+@Mapper
+public interface PutInStorageMapper extends BaseMapperPlus<PutInStorage, PutInStorageVo> {
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/InventoryMonitoringService.java

@@ -0,0 +1,19 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.InventoryMonitoringBo;
+import org.dromara.InventoryManagement.domain.vo.InventoryMonitoringVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 库存监控Service接口
+ */
+public interface InventoryMonitoringService {
+    /**
+     * 分页查询品牌管理
+     * @param inventoryMonitoringBO 品牌BO对象
+     * @param pageQuery 分页参数
+     * @return 分页结果
+     */
+    TableDataInfo<InventoryMonitoringVo> selectPageInventoryMonitoringList(InventoryMonitoringBo inventoryMonitoringBO, PageQuery pageQuery);
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/InventoryMonitoringServiceImpl.java

@@ -0,0 +1,38 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.InventoryMonitoring;
+import org.dromara.InventoryManagement.domain.bo.InventoryMonitoringBo;
+import org.dromara.InventoryManagement.domain.vo.InventoryMonitoringVo;
+import org.dromara.InventoryManagement.mapper.InventoryMonitoringMapper;
+import org.dromara.InventoryManagement.service.InventoryMonitoringService;
+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.springframework.stereotype.Service;
+
+/**
+ *  库存监控服务实现
+ */
+@Service
+@RequiredArgsConstructor
+public class InventoryMonitoringServiceImpl implements InventoryMonitoringService {
+    private final InventoryMonitoringMapper inventoryMonitoringMapper;
+
+    /**
+     * 根据InventoryMonitoring对象分页查询品牌数据
+     *
+     * @param inventoryMonitoringBo   BrandBo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<InventoryMonitoringVo> selectPageInventoryMonitoringList(InventoryMonitoringBo inventoryMonitoringBo, PageQuery pageQuery) {
+        QueryWrapper<InventoryMonitoring> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(inventoryMonitoringBo.getName()),"name", inventoryMonitoringBo.getName());
+        Page<InventoryMonitoringVo> page=inventoryMonitoringMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/PutInStorageServiceImpl.java

@@ -0,0 +1,53 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.PutInStorage;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+import org.dromara.InventoryManagement.mapper.PutInStorageMapper;
+import org.dromara.InventoryManagement.service.PutInStorageService;
+import org.dromara.commodityManagement.domain.bo.DiBuBo;
+import org.dromara.commodityManagement.service.impl.DiBuServiceImpl;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+@RequiredArgsConstructor
+public class PutInStorageServiceImpl implements PutInStorageService {
+
+    private final PutInStorageMapper putInStorageMapper;
+
+    private final DiBuServiceImpl diBuService;
+
+    /**
+     * 查询入库订单分页列表
+     * @param putInStorageBo
+     * @param pageQuery
+     * @return
+     */
+    @Override
+    public TableDataInfo<PutInStorageVo> selectPutInStoragePageList(PutInStorageBo putInStorageBo, PageQuery pageQuery) {
+        QueryWrapper<PutInStorage> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(putInStorageBo.getCode()), "code", putInStorageBo.getCode());
+        qw.eq(StringUtils.isNotBlank(putInStorageBo.getStatus()), "status", putInStorageBo.getStatus());
+//        qw.eq(StringUtils.isNotBlank();
+
+        List<PutInStorage> page = putInStorageMapper.selectList(pageQuery.build(), qw);
+        List<PutInStorageVo> supplierVoList = MapstructUtils.convert(page, PutInStorageVo.class);
+        return TableDataInfo.build(supplierVoList);
+    }
+
+    @Override
+    public int insertInventory(PutInStorageBo putInStorageBo) {
+        PutInStorage putInStorage = MapstructUtils.convert(putInStorageBo, PutInStorage.class);
+        // 入库数
+        return putInStorageMapper.insert(putInStorage);
+    }
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/InventoryMonitoringMapper.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.InventoryManagement.mapper.InventoryMonitoringMapper">
+
+</mapper>

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/PutInStorageMapper.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.InventoryManagement.mapper.PutInStorageMapper">
+
+</mapper>

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

@@ -21,32 +21,67 @@ import java.util.HashMap;
 /**
  * 自取地址管理接口
  */
-@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/getAddress")
 public class SelfGetAddressController extends BaseController {
     private final SelfGetAddressService selfGetAddressService;
+
+    /**
+     * 查询自取地址管理列表
+     * @param selfGetAddressBo 地址Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery){
         return selfGetAddressService.selectPageSelfGetAddressList(selfGetAddressBo,pageQuery);
     }
+
+    /**
+     * 新增地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 新增结果
+     */
     @PostMapping()
     public R<Void> insertSelfGetAddress(@Validated @RequestBody SelfGetAddressBo selfGetAddressBo){
         return toAjax(selfGetAddressService.insertSelfGetAddress(selfGetAddressBo));
     }
+
+    /**
+     * 修改地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 修改结果
+     */
     @PutMapping()
     public R<Void> updateSelfGetAddress(@Validated @RequestBody SelfGetAddressBo selfGetAddressBo){
         return toAjax(selfGetAddressService.updateSelfGetAddress(selfGetAddressBo));
     }
+
+    /**
+     * 批量删除地址
+     * @param selfGetAddressIds 地址Ids
+     * @return 删除结果
+     */
     @DeleteMapping("/{selfGetAddressIds}")
     public R<Void> deleteSelfGetAddressByIds(@PathVariable Long[] selfGetAddressIds){
         return toAjax(selfGetAddressService.deleteSelfGetAddressByIds(selfGetAddressIds));
     }
+
+    /**
+     * 通过Excel导出所有自取地址数据
+     * @param response 响应对象
+     */
     @GetMapping("/exportExcel")
     public void exportSelfGetAddressExcel(HttpServletResponse response){
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),selfGetAddressService.selectList()),"自取地址列表.xlsx","excel/自取地址导出模板.xlsx",response);
     }
+
+    /**
+     * 根据职员Ids导出Excel
+     * @param selfGetAddressIds 职员Ids
+     * @param 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);

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/mapper/SelfGetAddressMapper.java

@@ -5,6 +5,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.dataManagement.domain.SelfGetAddress;
 import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
 
+/**
+ * 自取地址管理Mapper
+ */
 @Mapper
 public interface SelfGetAddressMapper extends BaseMapperPlus<SelfGetAddress, SelfGetAddressVo> {
 }

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

@@ -8,16 +8,49 @@ import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
 
 import java.util.List;
 
+/**
+ * 自取地址Service接口
+ */
 public interface SelfGetAddressService {
+    /**
+     * 查询自取地址列表
+     * @param selfGetAddressBo 地址Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery);
 
+    /**
+     * 新增地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 影响行数
+     */
     int insertSelfGetAddress(SelfGetAddressBo selfGetAddressBo);
 
+    /**
+     * 修改地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 影响行数
+     */
     int updateSelfGetAddress(SelfGetAddressBo selfGetAddressBo);
 
+    /**
+     * 批量删除地址
+     * @param selfGetAddressIds 地址Ids
+     * @return 影响行数
+     */
     int deleteSelfGetAddressByIds(Long[] selfGetAddressIds);
 
+    /**
+     * 查询地址列表
+     * @return 地址列表
+     */
     List<SelfGetAddress> selectList();
 
+    /**
+     * 根据地址Ids查询地址列表
+     * @param selfGetAddressIds 地址Ids
+     * @return 地址列表
+     */
     List<SelfGetAddress> selectSelfGetAddressByIds(Long[] selfGetAddressIds);
 }

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

@@ -17,10 +17,20 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * 自取地址管理业务实现
+ */
 @Service
 @RequiredArgsConstructor
 public class SelfGetAddressServiceImpl implements SelfGetAddressService {
     private final SelfGetAddressMapper selfGetAddressMapper;
+
+    /**
+     * 查询地址对象分页查询地址列表
+     * @param selfGetAddressBo 地址Bo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
     @Override
     public TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery) {
         QueryWrapper<SelfGetAddress> qw=new QueryWrapper<>();
@@ -30,11 +40,23 @@ public class SelfGetAddressServiceImpl implements SelfGetAddressService {
         Page<SelfGetAddressVo>page= selfGetAddressMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 新增结果
+     */
     @Override
     public int insertSelfGetAddress(SelfGetAddressBo selfGetAddressBo) {
         SelfGetAddress selfGetAddress= MapstructUtils.convert(selfGetAddressBo, SelfGetAddress.class);
         return selfGetAddressMapper.insert(selfGetAddress);
     }
+
+    /**
+     * 修改地址
+     * @param selfGetAddressBo 地址Bo对象
+     * @return 修改结果
+     */
     @Override
     public int updateSelfGetAddress(SelfGetAddressBo selfGetAddressBo) {
         SelfGetAddress selfGetAddress= MapstructUtils.convert(selfGetAddressBo, SelfGetAddress.class);
@@ -42,6 +64,12 @@ public class SelfGetAddressServiceImpl implements SelfGetAddressService {
         qw.eq("id",selfGetAddressBo.getId());
         return selfGetAddressMapper.updateById(selfGetAddress);
     }
+
+    /**
+     * 删除地址
+     * @param selfGetAddressIds 地址Ids
+     * @return 删除结果
+     */
     @Override
     public int deleteSelfGetAddressByIds(Long[] selfGetAddressIds) {
         return selfGetAddressMapper.deleteByIds(Arrays.asList(selfGetAddressIds));