From 84cdd226491b21d6a8f78728d390f742abba56b1 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 12 Oct 2023 15:48:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=9D=83=E9=99=90=E3=80=81=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileSplitInfoController.java | 54 +++++++++++++------ .../service/ISarFileSplitInfoService.java | 3 ++ .../impl/SarFileSplitInfoServiceImpl.java | 8 +++ 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index a80c28c7..823f88c9 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -2,6 +2,7 @@ package com.jero.modules.split.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; @@ -12,6 +13,7 @@ import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.entity.SarFileSplitInfoEO; +import com.jero.modules.split.enums.SplitEnum; import com.jero.modules.split.page.SarFileSplitInfoEOPage; import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.split.vo.SplitFilePageInfoParam; @@ -21,6 +23,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -68,7 +71,7 @@ public class SarFileSplitInfoController extends JeroController queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) { + public Result> queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) { QueryWrapper queryWrapper = new QueryWrapper<>(); if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumberOrName())){ sarFileSplitInfoEOPage.setSerialNumberOrName(sarFileSplitInfoEOPage.getSerialNumberOrName().replace("%","\\%")); @@ -123,7 +126,7 @@ public class SarFileSplitInfoController extends JeroController bindToDocumentLibrary(String id, String connectId, String fileName) { + public Result bindToDocumentLibrary(String id, String connectId, String fileName) { // 设置fileId boolean bindState = sarFileSplitInfoService.bindToDocumentLibrary(id, connectId, fileName); if(bindState){ @@ -143,7 +146,7 @@ public class SarFileSplitInfoController extends JeroController add(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { + public Result add(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { // String id = sarFileSplitInfoEO.getId(); // if (StringUtils.isBlank(id)){ // throw new JeroBootException("请选择文本!"); @@ -159,19 +162,40 @@ public class SarFileSplitInfoController extends JeroController edit(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { - sarFileSplitInfoService.editById(sarFileSplitInfoEO); - return Result.OK("编辑成功!"); + @AutoLog(value = "文档拆分表-更改权限") + @ApiOperation(value="文档拆分表-更改权限", notes="文档拆分表-更改权限") + @PostMapping(value = "/updatePermissions") + public Result updatePermissions(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { + sarFileSplitInfoService.update( + new LambdaUpdateWrapper() + .eq(SarFileSplitInfoEO::getId, sarFileSplitInfoEO.getId()) + .set(SarFileSplitInfoEO::getCreateBy, sarFileSplitInfoEO.getUpdateBy())); + return Result.OK("操作成功!"); } + /** + * 发布 + * + * @param sarFileSplitInfoEO + * @return + */ + @AutoLog(value = "文档拆分表-发布") + @ApiOperation(value="文档拆分表-发布", notes="文档拆分表-发布") + @PostMapping(value = "/publish") + public Result publish(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { + sarFileSplitInfoService.update( + new LambdaUpdateWrapper() + .eq(SarFileSplitInfoEO::getId, sarFileSplitInfoEO.getId()) + .set(SarFileSplitInfoEO::getSplitStatus, SplitEnum.SPLIT_STATUS2.getValue())); + return Result.OK("发布成功!"); + } + + /** * 通过id删除 * @@ -180,9 +204,9 @@ public class SarFileSplitInfoController extends JeroController delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestParam(name="id",required=true) String id) { sarFileSplitInfoService.deleteById(id); return Result.OK("删除成功!"); } @@ -197,7 +221,7 @@ public class SarFileSplitInfoController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -211,7 +235,7 @@ public class SarFileSplitInfoController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { + public Result queryById(@RequestParam(name="id",required=true) String id) { SarFileSplitInfoEO sarFileSplitInfoEO = sarFileSplitInfoService.queryById(id); if(sarFileSplitInfoEO ==null) { return Result.error("未找到对应数据"); @@ -274,7 +298,7 @@ public class SarFileSplitInfoController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, SarFileSplitInfoEO.class); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java index e22b55a4..9b059876 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java @@ -76,4 +76,7 @@ public interface ISarFileSplitInfoService extends IService { void batchUpdateByDocumentSerialNumber(String oldSerialNumber,String newSerialNumber,String newTitle,String newTitleEn); Page splitFilePageInfoList(Page page, HttpServletRequest request, SplitFilePageInfoParam param); + + // 同步更新文档拆分标准名称 + void updateTitleByStandardId(String standardId, String title); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 1955a6eb..88dfc1e7 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.LanguageEnum; @@ -427,5 +428,12 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl() + .set(SarFileSplitInfoEO::getTitle, title) + .eq(SarFileSplitInfoEO::getStandardId, standardId)); + } + }