DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

进度+文件上传重构+文件权限控制

Browse Source
This commit is contained in:
hdka
2025-05-10 22:17:04 +08:00
parent ca3724ff32
commit 9825e0ba1d
49 changed files with 758 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectScheduleStepController.java
View File

@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.ruoyi.oa.domain.bo.BatchBo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -86,6 +87,16 @@ public class OaProjectScheduleStepController extends BaseController {
return toAjax(iOaProjectScheduleStepService.updateByBo(bo));
}
/**
* 修改项目进度步骤跟踪
*/
@RepeatSubmit()
@PutMapping("/change-batch")
public R<Void> changeBatch(@Validated(EditGroup.class) @RequestBody BatchBo batchBo) {
return toAjax(iOaProjectScheduleStepService.changeBatch(batchBo));
}
/**
* 删除项目进度步骤跟踪
*

102
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFileController.java
View File

@@ -1,102 +0,0 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
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.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.SysOaFileVo;
import com.ruoyi.oa.domain.bo.SysOaFileBo;
import com.ruoyi.oa.service.ISysOaFileService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 文件存储
*
* @author hdka
* @date 2024-12-15
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oaFile")
public class SysOaFileController extends BaseController {
private final ISysOaFileService iSysOaFileService;
/**
* 查询文件存储列表
*/
@GetMapping("/list")
public TableDataInfo<SysOaFileVo> list(SysOaFileBo bo, PageQuery pageQuery) {
return iSysOaFileService.queryPageList(bo, pageQuery);
}
/**
* 导出文件存储列表
*/
@Log(title = "文件存储", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaFileBo bo, HttpServletResponse response) {
List<SysOaFileVo> list = iSysOaFileService.queryList(bo);
ExcelUtil.exportExcel(list, "文件存储", SysOaFileVo.class, response);
}
/**
* 获取文件存储详细信息
*
* @param fileId 主键
*/
@GetMapping("/{fileId}")
public R<SysOaFileVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long fileId) {
return R.ok(iSysOaFileService.queryById(fileId));
}
/**
* 新增文件存储
*/
@Log(title = "文件存储", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaFileBo bo) {
return toAjax(iSysOaFileService.insertByBo(bo));
}
/**
* 修改文件存储
*/
@Log(title = "文件存储", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaFileBo bo) {
return toAjax(iSysOaFileService.updateByBo(bo));
}
/**
* 删除文件存储
*
* @param fileIds 主键串
*/
@Log(title = "文件存储", businessType = BusinessType.DELETE)
@DeleteMapping("/{fileIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] fileIds) {
return toAjax(iSysOaFileService.deleteWithValidByIds(Arrays.asList(fileIds), true));
}
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
View File

@@ -6,13 +6,11 @@ import java.util.Arrays;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo;
import com.ruoyi.oa.domain.vo.SysOaFileVo;
import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo;
import com.ruoyi.oa.mapper.SysOaTaskMapper;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;

2
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java
View File

@@ -114,7 +114,7 @@ public class SysOaWarehouseController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaWarehouseBo bo) {
return toAjax(iSysOaWarehouseService.insertByBo(bo));
return toAjax(iSysOaWarehouseService.insertByBo(bo)>0);
}

14
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
View File

@@ -55,15 +55,6 @@ public class SysOaWarehouseMasterController extends BaseController {
return iSysOaWarehouseMasterService.queryPageList(bo, pageQuery);
}
/**
* 查询出库单管理列表
*/
@GetMapping("/list-task")
public TableDataInfo<SysOaWarehouseMasterVo> listTask(SysOaWarehouseMasterBo bo, PageQuery pageQuery) {
bo.setType(2L);
return iSysOaWarehouseMasterService.queryPageList(bo, pageQuery);
}
/**
* 导出出库单管理列表
*/
@@ -102,8 +93,9 @@ public class SysOaWarehouseMasterController extends BaseController {
@RepeatSubmit()
@PostMapping("/in")
public R<Void> addIn(@Validated(AddGroup.class) @RequestBody SysOaWarehouseBo bo) {
warehouseService.insertByBo(bo);
return toAjax(iSysOaWarehouseMasterService.insertInWarehouse(bo));
Long id = warehouseService.insertByBo(bo);
System.out.println(warehouseService.queryById(id));
return toAjax(iSysOaWarehouseMasterService.insertInWarehouse(bo,id));
}
/**

61
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOssAclController.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.oa.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.oa.domain.vo.SysUserVo;
import com.ruoyi.oa.service.SysOssAclService;
import lombok.Data;
import org.flowable.spring.security.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
import java.util.List;
@RestController
@RequestMapping("/oa/oss/acl")
public class SysOssAclController {
@Autowired
private SysOssAclService aclService;
/** 授权 */
@PostMapping("/grant")
public R<?> grant(@RequestBody GrantDto dto) {
aclService.grant(dto.getOssId(), dto.getUserId(), dto.getGrantBy());
return R.ok();
}
/** 取消共享 */
@DeleteMapping("/revoke")
public R<?> revoke(@RequestBody RevokeDto dto) {
aclService.revoke(dto.getOssId(), dto.getUserId());
return R.ok();
}
/** 判断权限（示例） */
@GetMapping("/check")
public R<Boolean> check(@RequestParam Long ossId,
@RequestParam Long userId) {
return R.ok(aclService.hasPerm(userId, ossId));
}
@GetMapping("/list")
public R<List<SysUserVo>> list(@RequestParam Long ossId) {
return R.ok(aclService.listUsersByOssId(ossId));
}
// ====================== DTO ======================
@Data
public static class GrantDto {
@NotNull private Long ossId;
@NotNull private Long userId;
@NotNull private Long grantBy;
}
@Data
public static class RevokeDto {
@NotNull private Long ossId;
@NotNull private Long userId;
}
}