空间扩容管理相关

doc-biz/src/main/java/com/doc/biz/controller/DocSpaceController.java

@@ -31,79 +31,80 @@ public class DocSpaceController extends BaseController {
     private IDocSpaceService docSpaceService;
 
     /**
-     * 查询文档空间管理列表
+     * 获取空间详情
      */
-    @ApiOperation("查询文档空间管理列表")
-    //@PreAuthorize("@ss.hasPermi('biz:space:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocSpace docSpace) {
-        startPage();
-        List<DocSpace> list = docSpaceService.selectDocSpaceList(docSpace);
-        return getDataTable(list);
+    @ApiOperation("获取空间信息")
+    @GetMapping(value = "/info/{type}")
+    public AjaxResult spaceType(@ApiParam(value = "空间类型（1.公共 2.部门 3.个人）", required = true) @PathVariable("type") String type) {
+        return success(docSpaceService.selectDocSpaceListByType(type));
     }
 
     /**
-     * 导出文档空间管理列表
+     * 查询文档空间管理列表
      */
-    @ApiOperation("导出文档空间管理列表")
-    //@PreAuthorize("@ss.hasPermi('biz:space:export')")
-    @Log(title = "文档空间管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, DocSpace docSpace) {
-        List<DocSpace> list = docSpaceService.selectDocSpaceList(docSpace);
-        ExcelUtil<DocSpace> util = new ExcelUtil<DocSpace>(DocSpace.class);
-        util.exportExcel(response, list, "文档空间管理数据");
-    }
+//    @ApiOperation("查询文档空间管理列表")
+//    //@PreAuthorize("@ss.hasPermi('biz:space:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(DocSpace docSpace) {
+//        startPage();
+//        List<DocSpace> list = docSpaceService.selectDocSpaceList(docSpace);
+//        return getDataTable(list);
+//    }
 
     /**
-     * 获取文档空间管理详细信息
+     * 导出文档空间管理列表
      */
-    @ApiOperation("获取文档空间管理详细信息")
-    //@PreAuthorize("@ss.hasPermi('biz:space:query')")
-    @GetMapping(value = "/{spaceId}")
-    public AjaxResult getInfo(@PathVariable("spaceId") Long spaceId) {
-        return success(docSpaceService.selectDocSpaceBySpaceId(spaceId));
-    }
+//    @ApiOperation("导出文档空间管理列表")
+//    //@PreAuthorize("@ss.hasPermi('biz:space:export')")
+//    @Log(title = "文档空间管理", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, DocSpace docSpace) {
+//        List<DocSpace> list = docSpaceService.selectDocSpaceList(docSpace);
+//        ExcelUtil<DocSpace> util = new ExcelUtil<DocSpace>(DocSpace.class);
+//        util.exportExcel(response, list, "文档空间管理数据");
+//    }
 
     /**
-     * 获取空间详情
+     * 获取文档空间管理详细信息
      */
-    @ApiOperation("获取空间信息")
-    @GetMapping(value = "/info/{type}")
-    public AjaxResult spaceType(@ApiParam(value = "空间类型（1.公共 2.部门 3.个人）", required = true) @PathVariable("type") String type) {
-        return success(docSpaceService.selectDocSpaceListByType(type));
-    }
+//    @ApiOperation("获取文档空间管理详细信息")
+//    //@PreAuthorize("@ss.hasPermi('biz:space:query')")
+//    @GetMapping(value = "/{spaceId}")
+//    public AjaxResult getInfo(@PathVariable("spaceId") Long spaceId) {
+//        return success(docSpaceService.selectDocSpaceBySpaceId(spaceId));
+//    }
+
 
     /**
      * 新增文档空间管理
      */
-    @ApiOperation("新增文档空间管理")
-    //@PreAuthorize("@ss.hasPermi('biz:space:add')")
-    @Log(title = "文档空间管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocSpace docSpace) {
-        return toAjax(docSpaceService.insertDocSpace(docSpace));
-    }
+//    @ApiOperation("新增文档空间管理")
+//    //@PreAuthorize("@ss.hasPermi('biz:space:add')")
+//    @Log(title = "文档空间管理", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody DocSpace docSpace) {
+//        return toAjax(docSpaceService.insertDocSpace(docSpace));
+//    }
 
     /**
      * 修改文档空间管理
      */
-    @ApiOperation("修改文档空间管理")
+//    @ApiOperation("修改文档空间管理")
     //@PreAuthorize("@ss.hasPermi('biz:space:edit')")
-    @Log(title = "文档空间管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocSpace docSpace) {
-        return toAjax(docSpaceService.updateDocSpace(docSpace));
-    }
+//    @Log(title = "文档空间管理", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody DocSpace docSpace) {
+//        return toAjax(docSpaceService.updateDocSpace(docSpace));
+//    }
 
     /**
      * 删除文档空间管理
      */
-    @ApiOperation("删除文档空间管理")
-    //@PreAuthorize("@ss.hasPermi('biz:space:remove')")
-    @Log(title = "文档空间管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{spaceIds}")
-    public AjaxResult remove(@PathVariable Long[] spaceIds) {
-        return toAjax(docSpaceService.deleteDocSpaceBySpaceIds(spaceIds));
-    }
+//    @ApiOperation("删除文档空间管理")
+//    //@PreAuthorize("@ss.hasPermi('biz:space:remove')")
+//    @Log(title = "文档空间管理", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{spaceIds}")
+//    public AjaxResult remove(@PathVariable Long[] spaceIds) {
+//        return toAjax(docSpaceService.deleteDocSpaceBySpaceIds(spaceIds));
+//    }
 }

doc-biz/src/main/java/com/doc/biz/controller/DocSpaceExpansionController.java

@@ -1,26 +1,26 @@
 package com.doc.biz.controller;
 
+import com.doc.biz.domain.DocSpace;
 import com.doc.biz.domain.DocSpaceExpansion;
 import com.doc.biz.service.IDocSpaceExpansionService;
+import com.doc.biz.service.IDocSpaceService;
 import com.doc.common.annotation.Log;
 import com.doc.common.core.controller.BaseController;
 import com.doc.common.core.domain.AjaxResult;
 import com.doc.common.core.page.TableDataInfo;
 import com.doc.common.enums.BusinessType;
-import com.doc.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
  * 空间扩容管理Controller
  *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-09-20
  */
 @Api(tags = "空间扩容管理")
 @RestController
@@ -29,6 +29,9 @@ public class DocSpaceExpansionController extends BaseController {
     @Resource
     private IDocSpaceExpansionService docSpaceExpansionService;
 
+    @Resource
+    private IDocSpaceService spaceService;
+
     /**
      * 查询空间扩容管理列表
      */
@@ -42,58 +45,38 @@ public class DocSpaceExpansionController extends BaseController {
     }
 
     /**
-     * 导出空间扩容管理列表
-     */
-    @ApiOperation("导出空间扩容管理列表")
-    //@PreAuthorize("@ss.hasPermi('biz:expansion:export')")
-    @Log(title = "空间扩容管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, DocSpaceExpansion docSpaceExpansion) {
-        List<DocSpaceExpansion> list = docSpaceExpansionService.selectDocSpaceExpansionList(docSpaceExpansion);
-        ExcelUtil<DocSpaceExpansion> util = new ExcelUtil<DocSpaceExpansion>(DocSpaceExpansion.class);
-        util.exportExcel(response, list, "空间扩容管理数据");
-    }
-
-    /**
-     * 获取空间扩容管理详细信息
-     */
-    @ApiOperation("获取空间扩容管理详细信息")
-    //@PreAuthorize("@ss.hasPermi('biz:expansion:query')")
-    @GetMapping(value = "/{autoId}")
-    public AjaxResult getInfo(@PathVariable("autoId") Long autoId) {
-        return success(docSpaceExpansionService.selectDocSpaceExpansionByAutoId(autoId));
-    }
-
-    /**
      * 新增空间扩容管理
      */
-    @ApiOperation("新增空间扩容管理")
-    //@PreAuthorize("@ss.hasPermi('biz:expansion:add')")
+    @ApiOperation("申请扩容")
     @Log(title = "空间扩容管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DocSpaceExpansion docSpaceExpansion) {
+    public AjaxResult apply(@RequestBody DocSpaceExpansion docSpaceExpansion) {
+        DocSpace space = spaceService.selectDocSpaceBySpaceId(docSpaceExpansion.getSpaceId());
+        docSpaceExpansion.setExpandStatus("1");
+        docSpaceExpansion.setSpaceName(space.getSpaceName());
+        docSpaceExpansion.setCurrentCap(space.getSpaceCap());
         return toAjax(docSpaceExpansionService.insertDocSpaceExpansion(docSpaceExpansion));
     }
 
-    /**
-     * 修改空间扩容管理
-     */
-    @ApiOperation("修改空间扩容管理")
-    //@PreAuthorize("@ss.hasPermi('biz:expansion:edit')")
+    @ApiOperation("同意扩容")
     @Log(title = "空间扩容管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocSpaceExpansion docSpaceExpansion) {
-        return toAjax(docSpaceExpansionService.updateDocSpaceExpansion(docSpaceExpansion));
+    @PostMapping("/agree/{autoId}")
+    public AjaxResult agree(@PathVariable("autoId") Long autoId) {
+        DocSpaceExpansion expansion = docSpaceExpansionService.selectDocSpaceExpansionByAutoId(autoId);
+        expansion.setExpandStatus("2");
+
+        spaceService.addCap(expansion.getSpaceId(), expansion.getExpandCap());
+
+        return success(docSpaceExpansionService.updateDocSpaceExpansion(expansion));
     }
 
-    /**
-     * 删除空间扩容管理
-     */
-    @ApiOperation("删除空间扩容管理")
-    //@PreAuthorize("@ss.hasPermi('biz:expansion:remove')")
-    @Log(title = "空间扩容管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{autoIds}")
-    public AjaxResult remove(@PathVariable Long[] autoIds) {
-        return toAjax(docSpaceExpansionService.deleteDocSpaceExpansionByAutoIds(autoIds));
+    @ApiOperation("拒绝扩容")
+    @Log(title = "空间扩容管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/refuse/{autoId}")
+    public AjaxResult refuse(@PathVariable("autoId") Long autoId, @RequestParam String remark) {
+        DocSpaceExpansion expansion = docSpaceExpansionService.selectDocSpaceExpansionByAutoId(autoId);
+        expansion.setExpandStatus("3");
+        expansion.setDescription(remark);
+        return success(docSpaceExpansionService.updateDocSpaceExpansion(expansion));
     }
 }

doc-biz/src/main/java/com/doc/biz/domain/DocSpaceExpansion.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 空间扩容管理对象 doc_space_expansion
  *
  * @author wukai
- * @date 2023-08-21
+ * @date 2023-09-20
  */
 @ApiModel(value = "DocSpaceExpansion", description = "空间扩容管理")
 public class DocSpaceExpansion extends BaseEntity {
@@ -30,7 +30,8 @@ public class DocSpaceExpansion extends BaseEntity {
     /**
      * 空间ID
      */
-    @ApiModelProperty("空间ID")
+    @ApiModelProperty(value = "空间ID", required = true)
+    @Excel(name = "空间ID")
     private Long spaceId;
 
     /**
@@ -50,16 +51,37 @@ public class DocSpaceExpansion extends BaseEntity {
     /**
      * 申请扩充容量
      */
-    @ApiModelProperty("申请扩充容量")
+    @ApiModelProperty(value = "申请扩充容量", required = true)
     @Excel(name = "申请扩充容量")
     private Long expandCap;
 
     /**
      * 扩容原因
      */
-    @ApiModelProperty("扩容原因")
+    @ApiModelProperty(value = "扩容原因", required = true)
     @Excel(name = "扩容原因")
-    private String expandReson;
+    private String expandReason;
+
+    /**
+     * 扩容状态 1.申请 2.同意扩容 3.拒绝扩容
+     */
+    @ApiModelProperty("扩容状态 1.申请 2.同意扩容 3.拒绝扩容")
+    @Excel(name = "扩容状态 1.申请 2.同意扩容 3.拒绝扩容")
+    private String expandStatus;
+
+    /**
+     * 审核说明
+     */
+    @ApiModelProperty("审核说明")
+    @Excel(name = "审核说明")
+    private String description;
+
+    /**
+     * 申请人ID
+     */
+    @ApiModelProperty("申请人ID")
+    @Excel(name = "申请人ID")
+    private Long created;
 
     public void setAutoId(Long autoId) {
         this.autoId = autoId;
@@ -101,12 +123,36 @@ public class DocSpaceExpansion extends BaseEntity {
         return expandCap;
     }
 
-    public void setExpandReson(String expandReson) {
-        this.expandReson = expandReson;
+    public void setExpandReason(String expandReason) {
+        this.expandReason = expandReason;
+    }
+
+    public String getExpandReason() {
+        return expandReason;
+    }
+
+    public void setExpandStatus(String expandStatus) {
+        this.expandStatus = expandStatus;
+    }
+
+    public String getExpandStatus() {
+        return expandStatus;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setCreated(Long created) {
+        this.created = created;
     }
 
-    public String getExpandReson() {
-        return expandReson;
+    public Long getCreated() {
+        return created;
     }
 
     @Override
@@ -117,7 +163,10 @@ public class DocSpaceExpansion extends BaseEntity {
                 .append("spaceName", getSpaceName())
                 .append("currentCap", getCurrentCap())
                 .append("expandCap", getExpandCap())
-                .append("expandReson", getExpandReson())
+                .append("expandReason", getExpandReason())
+                .append("expandStatus", getExpandStatus())
+                .append("description", getDescription())
+                .append("created", getCreated())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

doc-biz/src/main/java/com/doc/biz/mapper/DocSpaceExpansionMapper.java

@@ -1,20 +1,20 @@
 package com.doc.biz.mapper;
 
+import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.doc.biz.domain.DocSpaceExpansion;
 
-import java.util.List;
-
 /**
  * 空间扩容管理Mapper接口
- *
+ * 
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-09-20
  */
-public interface DocSpaceExpansionMapper extends BaseMapper<DocSpaceExpansion> {
+public interface DocSpaceExpansionMapper extends BaseMapper<DocSpaceExpansion>
+{
     /**
      * 查询空间扩容管理
-     *
+     * 
      * @param autoId 空间扩容管理主键
      * @return 空间扩容管理
      */
@@ -22,7 +22,7 @@ public interface DocSpaceExpansionMapper extends BaseMapper<DocSpaceExpansion> {
 
     /**
      * 查询空间扩容管理列表
-     *
+     * 
      * @param docSpaceExpansion 空间扩容管理
      * @return 空间扩容管理集合
      */
@@ -30,7 +30,7 @@ public interface DocSpaceExpansionMapper extends BaseMapper<DocSpaceExpansion> {
 
     /**
      * 新增空间扩容管理
-     *
+     * 
      * @param docSpaceExpansion 空间扩容管理
      * @return 结果
      */
@@ -38,7 +38,7 @@ public interface DocSpaceExpansionMapper extends BaseMapper<DocSpaceExpansion> {
 
     /**
      * 修改空间扩容管理
-     *
+     * 
      * @param docSpaceExpansion 空间扩容管理
      * @return 结果
      */
@@ -46,7 +46,7 @@ public interface DocSpaceExpansionMapper extends BaseMapper<DocSpaceExpansion> {
 
     /**
      * 删除空间扩容管理
-     *
+     * 
      * @param autoId 空间扩容管理主键
      * @return 结果
      */
@@ -54,7 +54,7 @@ public interface DocSpaceExpansionMapper extends BaseMapper<DocSpaceExpansion> {
 
     /**
      * 批量删除空间扩容管理
-     *
+     * 
      * @param autoIds 需要删除的数据主键集合
      * @return 结果
      */

doc-biz/src/main/java/com/doc/biz/mapper/DocSpaceMapper.java

@@ -68,4 +68,20 @@ public interface DocSpaceMapper extends BaseMapper<DocSpace> {
      * @return 结果
      */
     List<DocSpace> selectDocSpaceByUser(@Param("userId") Long userId);
+
+    /**
+     * 根据spaceId更新空间使用情况
+     *
+     * @param spaceId 空间ID
+     * @return i
+     */
+    int updateUsedCap(Long spaceId);
+
+    /**
+     * 增加容量
+     *
+     * @param spaceId   空间ID
+     * @param expandCap 容量大小
+     */
+    void addCap(@Param("spaceId") Long spaceId, @Param("cap") Long expandCap);
 }

doc-biz/src/main/java/com/doc/biz/service/IDocSpaceExpansionService.java

@@ -1,19 +1,19 @@
 package com.doc.biz.service;
 
-import com.doc.biz.domain.DocSpaceExpansion;
-
 import java.util.List;
+import com.doc.biz.domain.DocSpaceExpansion;
 
 /**
  * 空间扩容管理Service接口
- *
+ * 
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-09-20
  */
-public interface IDocSpaceExpansionService {
+public interface IDocSpaceExpansionService 
+{
     /**
      * 查询空间扩容管理
-     *
+     * 
      * @param autoId 空间扩容管理主键
      * @return 空间扩容管理
      */
@@ -21,7 +21,7 @@ public interface IDocSpaceExpansionService {
 
     /**
      * 查询空间扩容管理列表
-     *
+     * 
      * @param docSpaceExpansion 空间扩容管理
      * @return 空间扩容管理集合
      */
@@ -29,7 +29,7 @@ public interface IDocSpaceExpansionService {
 
     /**
      * 新增空间扩容管理
-     *
+     * 
      * @param docSpaceExpansion 空间扩容管理
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IDocSpaceExpansionService {
 
     /**
      * 修改空间扩容管理
-     *
+     * 
      * @param docSpaceExpansion 空间扩容管理
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IDocSpaceExpansionService {
 
     /**
      * 批量删除空间扩容管理
-     *
+     * 
      * @param autoIds 需要删除的空间扩容管理主键集合
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface IDocSpaceExpansionService {
 
     /**
      * 删除空间扩容管理信息
-     *
+     * 
      * @param autoId 空间扩容管理主键
      * @return 结果
      */

doc-biz/src/main/java/com/doc/biz/service/IDocSpaceService.java

@@ -22,6 +22,13 @@ public interface IDocSpaceService {
     public DocSpace selectDocSpaceBySpaceId(Long spaceId);
 
     /**
+     * 根据spaceId更新空间使用情况
+     *
+     * @param spaceId 空间ID
+     */
+    void updateUsedCap(Long spaceId);
+
+    /**
      * 查询文档空间管理列表
      *
      * @param docSpace 文档空间管理
@@ -37,6 +44,12 @@ public interface IDocSpaceService {
      */
     DocSpace selectDocSpaceListByType(String type);
 
+    /**
+     * 根据用户ID获取空间信息
+     *
+     * @param userId 用户ID
+     * @return
+     */
     List<DocSpace> getSpaceByUser(Long userId);
 
     /**
@@ -84,4 +97,12 @@ public interface IDocSpaceService {
      * @param dept 部门实体
      */
     void initDeptSpace(SysDept dept);
+
+    /**
+     * 增加容量
+     *
+     * @param spaceId   空间ID
+     * @param expandCap 容量大小
+     */
+    void addCap(Long spaceId, Long expandCap);
 }

doc-biz/src/main/java/com/doc/biz/service/impl/DocSpaceExpansionServiceImpl.java

@@ -1,19 +1,18 @@
 package com.doc.biz.service.impl;
 
-import com.doc.biz.domain.DocSpaceExpansion;
+import java.util.List;
+        import com.doc.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
 import com.doc.biz.mapper.DocSpaceExpansionMapper;
+import com.doc.biz.domain.DocSpaceExpansion;
 import com.doc.biz.service.IDocSpaceExpansionService;
-import com.doc.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * 空间扩容管理Service业务层处理
  *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-09-20
  */
 @Service
 public class DocSpaceExpansionServiceImpl implements IDocSpaceExpansionService {
@@ -50,8 +49,8 @@ public class DocSpaceExpansionServiceImpl implements IDocSpaceExpansionService {
      */
     @Override
     public int insertDocSpaceExpansion(DocSpaceExpansion docSpaceExpansion) {
-        docSpaceExpansion.setCreateTime(DateUtils.getNowDate());
-        return docSpaceExpansionMapper.insertDocSpaceExpansion(docSpaceExpansion);
+                docSpaceExpansion.setCreateTime(DateUtils.getNowDate());
+            return docSpaceExpansionMapper.insertDocSpaceExpansion(docSpaceExpansion);
     }
 
     /**
@@ -62,7 +61,7 @@ public class DocSpaceExpansionServiceImpl implements IDocSpaceExpansionService {
      */
     @Override
     public int updateDocSpaceExpansion(DocSpaceExpansion docSpaceExpansion) {
-        docSpaceExpansion.setUpdateTime(DateUtils.getNowDate());
+                docSpaceExpansion.setUpdateTime(DateUtils.getNowDate());
         return docSpaceExpansionMapper.updateDocSpaceExpansion(docSpaceExpansion);
     }
 

doc-biz/src/main/java/com/doc/biz/service/impl/DocSpaceServiceImpl.java

@@ -44,6 +44,16 @@ public class DocSpaceServiceImpl implements IDocSpaceService {
     }
 
     /**
+     * 根据spaceId更新空间使用情况
+     *
+     * @param spaceId 空间ID
+     */
+    @Override
+    public void updateUsedCap(Long spaceId) {
+        docSpaceMapper.updateUsedCap(spaceId);
+    }
+
+    /**
      * 查询文档空间管理列表
      *
      * @param docSpace 文档空间管理
@@ -156,6 +166,17 @@ public class DocSpaceServiceImpl implements IDocSpaceService {
     }
 
     /**
+     * 增加容量
+     *
+     * @param spaceId   空间ID
+     * @param expandCap 容量大小
+     */
+    @Override
+    public void addCap(Long spaceId, Long expandCap) {
+        docSpaceMapper.addCap(spaceId, expandCap);
+    }
+
+    /**
      * 初始化空间
      *
      * @param spaceType  空间类型

doc-biz/src/main/resources/mapper/biz/DocSpaceExpansionMapper.xml

@@ -10,7 +10,10 @@
         <result property="spaceName" column="SPACE_NAME"/>
         <result property="currentCap" column="CURRENT_CAP"/>
         <result property="expandCap" column="EXPAND_CAP"/>
-        <result property="expandReson" column="EXPAND_RESON"/>
+        <result property="expandReason" column="EXPAND_REASON"/>
+        <result property="expandStatus" column="EXPAND_STATUS"/>
+        <result property="description" column="DESCRIPTION"/>
+        <result property="created" column="CREATED"/>
         <result property="createBy" column="CREATE_BY"/>
         <result property="createTime" column="CREATE_TIME"/>
         <result property="updateBy" column="UPDATE_BY"/>
@@ -24,7 +27,10 @@
                SPACE_NAME,
                CURRENT_CAP,
                EXPAND_CAP,
-               EXPAND_RESON,
+               EXPAND_REASON,
+               EXPAND_STATUS,
+               DESCRIPTION,
+               CREATED,
                CREATE_BY,
                CREATE_TIME,
                UPDATE_BY,
@@ -36,10 +42,19 @@
     <select id="selectDocSpaceExpansionList" parameterType="DocSpaceExpansion" resultMap="DocSpaceExpansionResult">
         <include refid="selectDocSpaceExpansionVo"/>
         <where>
+            <if test="spaceId != null ">and SPACE_ID = #{spaceId}</if>
             <if test="spaceName != null  and spaceName != ''">and SPACE_NAME like concat('%', #{spaceName}, '%')</if>
             <if test="currentCap != null ">and CURRENT_CAP = #{currentCap}</if>
             <if test="expandCap != null ">and EXPAND_CAP = #{expandCap}</if>
-            <if test="expandReson != null  and expandReson != ''">and EXPAND_RESON = #{expandReson}</if>
+            <if test="expandReason != null  and expandReason != ''">and EXPAND_REASON = #{expandReason}</if>
+            <if test="expandStatus != null  and expandStatus != ''">and EXPAND_STATUS = #{expandStatus}</if>
+            <if test="description != null  and description != ''">and DESCRIPTION = #{description}</if>
+            <if test="created != null ">and CREATED = #{created}</if>
+            <if test="createBy != null  and createBy != ''">and CREATE_BY = #{createBy}</if>
+            <if test="createTime != null ">and CREATE_TIME = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and UPDATE_BY = #{updateBy}</if>
+            <if test="updateTime != null ">and UPDATE_TIME = #{updateTime}</if>
+            <if test="remark != null  and remark != ''">and REMARK = #{remark}</if>
         </where>
     </select>
 
@@ -55,7 +70,10 @@
             <if test="spaceName != null">SPACE_NAME,</if>
             <if test="currentCap != null">CURRENT_CAP,</if>
             <if test="expandCap != null">EXPAND_CAP,</if>
-            <if test="expandReson != null">EXPAND_RESON,</if>
+            <if test="expandReason != null">EXPAND_REASON,</if>
+            <if test="expandStatus != null">EXPAND_STATUS,</if>
+            <if test="description != null">DESCRIPTION,</if>
+            <if test="created != null">CREATED,</if>
             <if test="createBy != null">CREATE_BY,</if>
             <if test="createTime != null">CREATE_TIME,</if>
             <if test="updateBy != null">UPDATE_BY,</if>
@@ -67,7 +85,10 @@
             <if test="spaceName != null">#{spaceName},</if>
             <if test="currentCap != null">#{currentCap},</if>
             <if test="expandCap != null">#{expandCap},</if>
-            <if test="expandReson != null">#{expandReson},</if>
+            <if test="expandReason != null">#{expandReason},</if>
+            <if test="expandStatus != null">#{expandStatus},</if>
+            <if test="description != null">#{description},</if>
+            <if test="created != null">#{created},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -83,7 +104,10 @@
             <if test="spaceName != null">SPACE_NAME = #{spaceName},</if>
             <if test="currentCap != null">CURRENT_CAP = #{currentCap},</if>
             <if test="expandCap != null">EXPAND_CAP = #{expandCap},</if>
-            <if test="expandReson != null">EXPAND_RESON = #{expandReson},</if>
+            <if test="expandReason != null">EXPAND_REASON = #{expandReason},</if>
+            <if test="expandStatus != null">EXPAND_STATUS = #{expandStatus},</if>
+            <if test="description != null">DESCRIPTION = #{description},</if>
+            <if test="created != null">CREATED = #{created},</if>
             <if test="createBy != null">CREATE_BY = #{createBy},</if>
             <if test="createTime != null">CREATE_TIME = #{createTime},</if>
             <if test="updateBy != null">UPDATE_BY = #{updateBy},</if>

doc-biz/src/main/resources/mapper/biz/DocSpaceMapper.xml

@@ -84,6 +84,12 @@
             <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
+    <update id="addCap">
+        UPDATE doc_space
+        SET space_cap=space_cap + #{cap},
+            free_cap=space_cap - used_cap
+        WHERE space_id = #{spaceId}
+    </update>
 
     <update id="updateDocSpace" parameterType="DocSpace">
         update doc_space
@@ -102,6 +108,12 @@
         </trim>
         where SPACE_ID = #{spaceId}
     </update>
+    <update id="updateUsedCap" parameterType="Long">
+        UPDATE doc_space
+        SET used_cap=(SELECT SUM(file_size) / 1024 / 1024 / 1024 FROM doc_info where space_id = #{spaceId}),
+            free_cap=space_cap - used_cap
+        WHERE space_id = #{spaceId}
+    </update>
 
     <delete id="deleteDocSpaceBySpaceId" parameterType="Long">
         delete