mozhe
/
school-file-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加定稿状态，修复bug

This commit is contained in:
cjw 2024-07-17 14:59:24 +08:00
parent 059148d97b
commit ba2eec3a0c
8 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java
View File

@ -42,7 +42,7 @@ public class SysCatalogResourceController extends BaseController {
/**
* 查询目录-专题资源列表
*/
@SaCheckPermission("catalog:resource:list")
//@SaCheckPermission("catalog:resource:list")
@GetMapping("/list")
public R<List<SysCatalogResourceVo>> list(SysCatalogResourceBo bo) {
List<SysCatalogResourceVo> list = resourceService.queryList(bo);

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java
View File

@ -39,7 +39,7 @@ public class SysCatalogTextbookController extends BaseController {
/**
* 查询目录-同步教材列表
*/
@SaCheckPermission("catalog:textbook:list")
//@SaCheckPermission("catalog:textbook:list")
@GetMapping("/list")
public R<List<SysCatalogTextbookVo>> list(SysCatalogTextbookBo bo) {
List<SysCatalogTextbookVo> list = textbookService.queryList(bo);

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java
View File

@ -131,9 +131,7 @@ public class SysOssPersonController extends BaseController {
/**
* 预览
*
* @param id
* @return
* @throws Exception
* @param id 主键
*/
@SaCheckPermission("file:person:preview")
@PostMapping("/preview/{id}")

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java
View File

@ -61,6 +61,11 @@ public class SysOssTextbook extends TenantEntity {
*/
private Integer status;
/**
* 定稿状态
*/
private Integer finalizeStatus;
private Long downloadNum;
private Long previewNum;
private Long likeNum;

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java
View File

@ -67,6 +67,11 @@ public class SysOssTextbookVo implements Serializable {
*/
private Integer status;
/**
* 定稿状态
*/
private Integer finalizeStatus;
private Long downloadNum;
private Long previewNum;
private Long likeNum;

1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java
View File

@ -231,6 +231,7 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService {
public boolean share(SysOssPersonBo bo) {
SysOssPerson ossPerson = baseMapper.selectById(bo.getId());
SysOssTextbook date = new SysOssTextbook();
date.setOssId(ossPerson.getOssId());
String path = catalogTextbookService.selectCatalogNameById(bo.getCatalogId());
date.setCatalogId(bo.getCatalogId());
date.setFileName(ossPerson.getFileName());

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java
View File

@ -163,7 +163,8 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService {
add.setFileSuffix(suffix);
String path = catalogService.selectCatalogNameById(add.getCatalogId());
add.setFilePath(path);
add.setStatus(-1);
//add.setStatus(-1);
add.setStatus(1);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setOssId(add.getOssId());

12
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java
View File

@ -183,7 +183,9 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
add.setFileSuffix(suffix);
String path = catalogService.selectCatalogNameById(add.getCatalogId());
add.setFilePath(path);
add.setStatus(-1);
//add.setStatus(-1);
add.setStatus(1);
add.setFinalizeStatus(StatusConstants.DISABLED);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setOssId(add.getOssId());
@ -355,7 +357,8 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
@Override
public Boolean finalize(SysOssTextbookBo bo) {
SysOssTextbook ossTextbook = baseMapper.selectById(bo.getId());
Long id = bo.getId();
SysOssTextbook ossTextbook = baseMapper.selectById(id);
SysOssTextbook date = new SysOssTextbook();
date.setOssId(ossTextbook.getOssId());
date.setCatalogId(ossTextbook.getCatalogId());
@ -365,9 +368,14 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
date.setType(ossTextbook.getType());
date.setOssType(2);
date.setStatus(ossTextbook.getStatus());
date.setFinalizeStatus(StatusConstants.DISABLED);
date.setCreateDept(ossTextbook.getCreateDept());
date.setCreateBy(ossTextbook.getCreateBy());
date.setUpdateBy(LoginHelper.getUserId());
SysOssTextbook update = new SysOssTextbook();
update.setId(id);
update.setFinalizeStatus(StatusConstants.IN_USE);
baseMapper.updateById(update);
return baseMapper.insert(date) > 0;
}