diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 3d032117..4ac033f7 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -1,6 +1,5 @@ package com.jero.modules.compare.controller; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,11 +11,9 @@ import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; -import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.compare.entity.SarFileCompareDetailVO; import com.jero.modules.compare.entity.SarFileCompareInfo; @@ -55,12 +52,12 @@ import java.util.stream.Collectors; /** - * @Description: 文档对比信息表 + * @Description: 新旧拆分单对比 * @Author: jero-boot * @Date: 2022-08-02 * @Version: V1.0 */ -@Api(tags = "文档对比信息表") +@Api(tags = "新旧拆分单对比") @ApiSupport(order = 306) @RestController @RequestMapping("/compare/sarFileCompareInfo") @@ -83,8 +80,8 @@ public class SarFileCompareInfoController extends JeroController queryPageList(@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -194,74 +191,14 @@ public class SarFileCompareInfoController extends JeroController> queryList() { @@ -275,8 +212,8 @@ public class SarFileCompareInfoController extends JeroController add(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { @@ -290,8 +227,8 @@ public class SarFileCompareInfoController extends JeroController edit(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { @@ -303,8 +240,8 @@ public class SarFileCompareInfoController extends JeroController delete(@RequestBody IdMapBody mapBody) { @@ -316,8 +253,8 @@ public class SarFileCompareInfoController extends JeroController deleteBatch(@RequestBody IdsMapBody mapBody) { @@ -331,8 +268,8 @@ public class SarFileCompareInfoController extends JeroController queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { @@ -351,7 +288,7 @@ public class SarFileCompareInfoController extends JeroController fullTextComparison(@ApiParam("JSONObject格式数据") @RequestBody JSONObject json) { @@ -405,8 +342,8 @@ public class SarFileCompareInfoController extends JeroController changeState(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { @@ -425,8 +362,8 @@ public class SarFileCompareInfoController extends JeroController editComments(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java index dad779d7..70aad410 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java @@ -29,12 +29,12 @@ import java.util.List; /** - * @Description: 文档对比信息条款评论表 + * @Description: 新旧拆分单对比条款评论表 * @Author: jero-boot * @Date: 2022-08-05 * @Version: V1.0 */ -@Api(tags = "文档对比信息条款评论表") +@Api(tags = "新旧拆分单对比条款评论表") @RestController @RequestMapping("/compare/sarFileCompareItemComment") @Slf4j @@ -51,8 +51,8 @@ public class SarFileCompareItemCommentController extends JeroController queryPageList(SarFileCompareItemComment sarFileCompareItemComment, @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -69,8 +69,8 @@ public class SarFileCompareItemCommentController extends JeroController> queryList() { List list = sarFileCompareItemCommentService.queryList(); @@ -84,8 +84,8 @@ public class SarFileCompareItemCommentController extends JeroController add(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { sarFileCompareItemCommentService.add(sarFileCompareItemComment); @@ -112,8 +112,8 @@ public class SarFileCompareItemCommentController extends JeroController edit(@Validated @RequestBody SarFileCompareItemComment sarFileCompareItemComment) { sarFileCompareItemCommentService.editById(sarFileCompareItemComment); @@ -124,8 +124,8 @@ public class SarFileCompareItemCommentController extends JeroController delete(@RequestBody IdMapBody mapBody) { sarFileCompareItemCommentService.deleteById(mapBody.getId()); @@ -135,8 +135,8 @@ public class SarFileCompareItemCommentController extends JeroController deleteBatch(@RequestBody IdsMapBody mapBody) { this.sarFileCompareItemCommentService.deleteByIds(Arrays.asList(mapBody.getIds().split(","))); @@ -149,8 +149,8 @@ public class SarFileCompareItemCommentController extends JeroController queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { SarFileCompareItemComment sarFileCompareItemComment = sarFileCompareItemCommentService.queryById(id); @@ -166,8 +166,8 @@ public class SarFileCompareItemCommentController extends JeroController queryCompareResult(@ApiParam("文档对比id") @RequestParam(name = "infoId", required = true) String infoId, @ApiParam("评论") @RequestParam(name = "comment", required = false) String comment) { @@ -176,8 +176,8 @@ public class SarFileCompareItemCommentController extends JeroController queryPageList(SarFileCompareItem sarFileCompareItem, @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -66,8 +66,8 @@ public class SarFileCompareItemController extends JeroController> queryList() { List list = sarFileCompareItemService.queryList(); @@ -80,8 +80,8 @@ public class SarFileCompareItemController extends JeroController add(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) { sarFileCompareItemService.add(sarFileCompareItem); @@ -94,8 +94,8 @@ public class SarFileCompareItemController extends JeroController edit(@Validated @RequestBody SarFileCompareItem sarFileCompareItem) { sarFileCompareItemService.editById(sarFileCompareItem); @@ -108,8 +108,8 @@ public class SarFileCompareItemController extends JeroController delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) { sarFileCompareItemService.deleteById(id); @@ -122,8 +122,8 @@ public class SarFileCompareItemController extends JeroController deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) { this.sarFileCompareItemService.deleteByIds(Arrays.asList(ids.split(","))); @@ -136,8 +136,8 @@ public class SarFileCompareItemController extends JeroController queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { SarFileCompareItem sarFileCompareItem = sarFileCompareItemService.queryById(id); @@ -155,7 +155,7 @@ public class SarFileCompareItemController extends JeroController clauseComparison(@ApiParam("左侧id") @RequestParam(name="leftId",required=true) String leftId, diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java index 5665ffc1..36f92082 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java @@ -25,12 +25,12 @@ import java.util.List; /** - * @Description: 文档对比信息目录表 + * @Description: 新旧拆分单对比目录表 * @Author: jero-boot * @Date: 2022-08-03 * @Version: V1.0 */ -@Api(tags="文档对比信息目录表") +@Api(tags="新旧拆分单对比目录表") @RestController @RequestMapping("/compare/sarFileCompareMenu") @Slf4j @@ -47,8 +47,8 @@ public class SarFileCompareMenuController extends JeroController queryPageList(SarFileCompareMenu sarFileCompareMenu, @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -65,8 +65,8 @@ public class SarFileCompareMenuController extends JeroController> queryList() { List list = sarFileCompareMenuService.queryList(); @@ -79,8 +79,8 @@ public class SarFileCompareMenuController extends JeroController add(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) { sarFileCompareMenuService.add(sarFileCompareMenu); @@ -93,8 +93,8 @@ public class SarFileCompareMenuController extends JeroController edit(@Validated @RequestBody SarFileCompareMenu sarFileCompareMenu) { sarFileCompareMenuService.editById(sarFileCompareMenu); @@ -107,8 +107,8 @@ public class SarFileCompareMenuController extends JeroController delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) { sarFileCompareMenuService.deleteById(id); @@ -121,8 +121,8 @@ public class SarFileCompareMenuController extends JeroController deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) { this.sarFileCompareMenuService.deleteByIds(Arrays.asList(ids.split(","))); @@ -135,8 +135,8 @@ public class SarFileCompareMenuController extends JeroController queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { SarFileCompareMenu sarFileCompareMenu = sarFileCompareMenuService.queryById(id); @@ -154,7 +154,7 @@ public class SarFileCompareMenuController extends JeroController queryPageList(SarFileCompareResComment sarFileCompareResComment, @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -67,8 +67,8 @@ public class SarFileCompareResCommentController extends JeroController> queryList() { List list = sarFileCompareResCommentService.queryList(); @@ -81,8 +81,8 @@ public class SarFileCompareResCommentController extends JeroController add(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) { @@ -96,8 +96,8 @@ public class SarFileCompareResCommentController extends JeroController edit(@Validated @RequestBody SarFileCompareResComment sarFileCompareResComment) { sarFileCompareResCommentService.editById(sarFileCompareResComment); @@ -110,8 +110,8 @@ public class SarFileCompareResCommentController extends JeroController delete(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { sarFileCompareResCommentService.deleteById(id); @@ -124,8 +124,8 @@ public class SarFileCompareResCommentController extends JeroController deleteBatch(@ApiParam("ids") @RequestParam(name = "ids", required = true) String ids) { this.sarFileCompareResCommentService.deleteByIds(Arrays.asList(ids.split(","))); @@ -138,8 +138,8 @@ public class SarFileCompareResCommentController extends JeroController queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) { SarFileCompareResComment sarFileCompareResComment = sarFileCompareResCommentService.queryById(id); @@ -157,7 +157,7 @@ public class SarFileCompareResCommentController extends JeroController> queryListByInfoId(@ApiParam("id") @RequestParam(name = "id", required = true) String id, @ApiParam("字符") @RequestParam(name = "str", required = false) String str) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index 6b220299..29d597fa 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -1,6 +1,8 @@ package com.jero.modules.laws.documenttool.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; @@ -35,10 +37,11 @@ import java.util.Map; /** * @Author: yjz * @Date: 2023/10/12/23:03 - * @Description: 文档拆分 + * @Description: 标准拆分 */ -@Api(tags="文档拆分") +@Api(tags="标准拆分") +@ApiSupport(order = 302) @RestController @RequestMapping("/laws/DocumentTool/documentSplit") @Slf4j @@ -54,14 +57,15 @@ public class DocumentSplitController { } /** - * 文档拆分-分页列表查询 + * 标准拆分-分页列表查询 * * @return */ - @AutoLog(value = "文档拆分-分页列表查询") - @ApiOperation(value="文档拆分-分页列表查询", notes="文档拆分-分页列表查询") + @AutoLog(value = "标准拆分-分页列表查询") + @ApiOperation(value="标准拆分-分页列表查询", notes="标准拆分-分页列表查询") @GetMapping(value = "/queryByPage") @RequiresPermissions("split:sarFileSplitInfo:search") + @ApiOperationSupport(order = 1) public Result> queryByPage(DocumentSplitInfo documentSplitInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @@ -69,14 +73,15 @@ public class DocumentSplitController { } /** - * 文档拆分-拆分已入库文本 + * 标准拆分-拆分已入库文本 * * @return */ - @AutoLog(value = "文档拆分-拆分已入库文本分页列表查询") - @ApiOperation(value="文档拆分-拆分已入库文本分页列表查询", notes="文档拆分-拆分已入库文本分页列表查询") + @AutoLog(value = "标准拆分-拆分已入库文本分页列表查询") + @ApiOperation(value="标准拆分-拆分已入库文本分页列表查询", notes="标准拆分-拆分已入库文本分页列表查询") @GetMapping(value = "/querySplitFileInfoByPage") @RequiresPermissions("split:sarFileSplitInfo:splitFile") + @ApiOperationSupport(order = 2) public Result> querySplitFileInfoByPage(SplitFileInfo splitFileInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @@ -84,27 +89,29 @@ public class DocumentSplitController { } /** - * 文档拆分-查看 + * 标准拆分-查看 * * @return */ - @AutoLog(value = "文档拆分-查看") - @ApiOperation(value="文档拆分-查看", notes="文档拆分-查看") + @AutoLog(value = "标准拆分-查看") + @ApiOperation(value="标准拆分-查看", notes="标准拆分-查看") @PostMapping(value = "/queryView") @RequiresPermissions("split:sarFileSplitItems:page") + @ApiOperationSupport(order = 3) public Result queryView(@RequestBody @ApiParam("标签管理") Map parameter) { return Result.OK(documentSplitService.queryView(parameter)); } /** - * 文档拆分-通过文档拆分id查询目录树形结构 + * 标准拆分-通过标准拆分id查询目录树形结构 * * @return */ - @AutoLog(value = "文档拆分-通过文档拆分id查询目录树形结构") - @ApiOperation(value="文档拆分-通过文档拆分id查询目录树形结构", notes="文档拆分-通过文档拆分id查询目录树形结构") + @AutoLog(value = "标准拆分-通过标准拆分id查询目录树形结构") + @ApiOperation(value="标准拆分-通过标准拆分id查询目录树形结构", notes="标准拆分-通过标准拆分id查询目录树形结构") @GetMapping(value = "/queryTreeMenuByInfoId") - public Result> queryTreeMenuByInfoId(@ApiParam("文档拆分id") String infoId) { + @ApiOperationSupport(order = 4) + public Result> queryTreeMenuByInfoId(@ApiParam("标准拆分id") String infoId) { return Result.OK(documentSplitService.queryTreeMenuByInfoId(infoId)); } @@ -114,10 +121,11 @@ public class DocumentSplitController { * @param documentSplitInfo * @return */ - @AutoLog(value = "文档拆分-更改权限") - @ApiOperation(value="文档拆分-更改权限", notes="文档拆分-更改权限") + @AutoLog(value = "标准拆分-更改权限") + @ApiOperation(value="标准拆分-更改权限", notes="标准拆分-更改权限") @PostMapping(value = "/updatePermissions") @RequiresPermissions("split:sarFileSplitInfo:changePermissions") + @ApiOperationSupport(order = 5) public Result updatePermissions(@Validated @RequestBody DocumentSplitInfo documentSplitInfo) { documentSplitService.updatePermissions(documentSplitInfo); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -129,10 +137,11 @@ public class DocumentSplitController { * @param sarFileSplitInfoEO * @return */ - @AutoLog(value = "文档拆分-拆分") - @ApiOperation(value="文档拆分-拆分", notes="文档拆分-拆分") + @AutoLog(value = "标准拆分-拆分") + @ApiOperation(value="标准拆分-拆分", notes="标准拆分-拆分") @PostMapping(value = "/split") @RequiresPermissions("split:sarFileSplitInfo:splitFile") + @ApiOperationSupport(order = 6) public Result split(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { documentSplitService.add(sarFileSplitInfoEO); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -144,10 +153,11 @@ public class DocumentSplitController { * @param parameter * @return */ - @AutoLog(value = "文档拆分-发布") - @ApiOperation(value="文档拆分-发布", notes="文档拆分-发布") + @AutoLog(value = "标准拆分-发布") + @ApiOperation(value="标准拆分-发布", notes="标准拆分-发布") @PostMapping(value = "/publish") @RequiresPermissions("split:sarFileSplitInfo:release") + @ApiOperationSupport(order = 7) public Result publish(@RequestBody @ApiParam("标签管理") Map parameter) { documentSplitService.publish(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -159,10 +169,11 @@ public class DocumentSplitController { * @param parameter * @return */ - @AutoLog(value = "文档拆分-撤回") - @ApiOperation(value="文档拆分-撤回", notes="文档拆分-撤回") + @AutoLog(value = "标准拆分-撤回") + @ApiOperation(value="标准拆分-撤回", notes="标准拆分-撤回") @PostMapping(value = "/revocation") @RequiresPermissions("split:sarFileSplitInfo:withdraw") + @ApiOperationSupport(order = 8) public Result revocation(@RequestBody @ApiParam("标签管理") Map parameter) { documentSplitService.revocation(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -173,10 +184,11 @@ public class DocumentSplitController { * * @return */ - @AutoLog(value = "文档拆分-通过id删除") - @ApiOperation(value="文档拆分-通过id删除", notes="文档拆分-通过id删除") + @AutoLog(value = "标准拆分-通过id删除") + @ApiOperation(value="标准拆分-通过id删除", notes="标准拆分-通过id删除") @PostMapping(value = "/delete") @RequiresPermissions("split:sarFileSplitInfo:delete") + @ApiOperationSupport(order = 9) public Result delete(@RequestBody IdMapBody map) { if (StringUtils.isNotBlank(map.getId())) { String id = map.getId(); @@ -191,10 +203,11 @@ public class DocumentSplitController { * * @return */ - @AutoLog(value = "文档拆分-批量删除") - @ApiOperation(value="文档拆分-批量删除", notes="文档拆分-批量删除") + @AutoLog(value = "标准拆分-批量删除") + @ApiOperation(value="标准拆分-批量删除", notes="标准拆分-批量删除") @PostMapping(value = "/deleteBatch") @RequiresPermissions("split:sarFileSplitInfo:deleteBatch") + @ApiOperationSupport(order = 10) public Result deleteBatch(@RequestBody Map map) { if (map.containsKey("ids")) { String ids = (String) map.get("ids"); @@ -206,14 +219,15 @@ public class DocumentSplitController { } /** - * 文档拆分详情-分页列表查询 + * 标准拆分详情-分页列表查询 * @param parameter * @return */ - @AutoLog(value = "文档拆分详情-分页列表查询") - @ApiOperation(value = "文档拆分详情-分页列表查询") + @AutoLog(value = "标准拆分详情-分页列表查询") + @ApiOperation(value = "标准拆分详情-分页列表查询") @PostMapping("/queryDocumentSplitDetail") @RequiresPermissions("split:sarFileSplitItems:search") + @ApiOperationSupport(order = 11) public Result>> queryDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map parameter) { try { IPage> data = documentSplitService.queryDocumentSplitDetail(parameter); @@ -224,65 +238,70 @@ public class DocumentSplitController { } /** - * 文档拆分详情-根据id查询 + * 标准拆分详情-根据id查询 * @param id * @return */ - @AutoLog(value = "文档拆分详情-根据id查询") - @ApiOperation(value = "文档拆分详情-根据id查询") + @AutoLog(value = "标准拆分详情-根据id查询") + @ApiOperation(value = "标准拆分详情-根据id查询") @GetMapping("/queryDocumentSplitDetailById") @RequiresPermissions("split:sarFileSplitItems:update") + @ApiOperationSupport(order = 12) public Result> queryDocumentSplitDetailById(String id) { return Result.OK(documentSplitService.queryDocumentSplitDetailById(id)); } /** - * 文档拆分详情-条目信息列表 + * 标准拆分详情-条目信息列表 * @param id * @return */ - @AutoLog(value = "文档拆分详情-条目信息列表") - @ApiOperation(value = "文档拆分详情-条目信息列表") + @AutoLog(value = "标准拆分详情-条目信息列表") + @ApiOperation(value = "标准拆分详情-条目信息列表") @GetMapping("/queryItemsValList") + @ApiOperationSupport(order = 12) public Result> queryItemsValList(String id) { return Result.OK(documentSplitService.queryItemsValList(id)); } /** - * 文档拆分详情-条文解读列表 + * 标准拆分详情-条文解读列表 * @param id * @return */ - @AutoLog(value = "文档拆分详情-条文解读列表") - @ApiOperation(value = "文档拆分详情-条文解读列表") + @AutoLog(value = "标准拆分详情-条文解读列表") + @ApiOperation(value = "标准拆分详情-条文解读列表") @GetMapping("/queryInterpretationArticlesList") + @ApiOperationSupport(order = 13) public Result> queryInterpretationArticlesList(String id) { return Result.OK(documentSplitService.queryInterpretationArticlesList(id)); } /** - * 文档拆分详情-编辑 + * 标准拆分详情-编辑 * @param parameter * @return */ - @AutoLog(value = "文档拆分详情-编辑") - @ApiOperation(value = "文档拆分详情-编辑") + @AutoLog(value = "标准拆分详情-编辑") + @ApiOperation(value = "标准拆分详情-编辑") @PostMapping("/editDocumentSplitDetail") @RequiresPermissions("split:sarFileSplitItems:update") + @ApiOperationSupport(order = 14) public Result editDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map parameter) { documentSplitService.editDocumentSplitDetail(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** - * 文档拆分详情-批量编辑 + * 标准拆分详情-批量编辑 * @param parameter * @return */ - @AutoLog(value = "文档拆分详情-批量编辑") - @ApiOperation(value = "文档拆分详情-批量编辑") + @AutoLog(value = "标准拆分详情-批量编辑") + @ApiOperation(value = "标准拆分详情-批量编辑") @PostMapping("/editBatchDocumentSplitDetail") @RequiresPermissions("split:sarFileSplitItems:batchDelete") + @ApiOperationSupport(order = 15) public Result editBatchDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map parameter) { try { documentSplitService.editBatchDocumentSplitDetail(parameter); @@ -294,93 +313,99 @@ public class DocumentSplitController { } /** - * 文档拆分详情-删除 + * 标准拆分详情-删除 * * @return */ - @AutoLog(value = "文档拆分详情-删除") - @ApiOperation(value="文档拆分详情-删除", notes="文档拆分详情-删除") + @AutoLog(value = "标准拆分详情-删除") + @ApiOperation(value="标准拆分详情-删除", notes="标准拆分详情-删除") @PostMapping(value = "/deleteDocumentSplitDetail") @RequiresPermissions("split:sarFileSplitItems:delete") + @ApiOperationSupport(order = 16) public Result deleteDocumentSplitDetail(@RequestBody Map parameter) { documentSplitService.deleteDocumentSplitDetail(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** - * 文档拆分详情-批量删除 + * 标准拆分详情-批量删除 * * @return */ - @AutoLog(value = "文档拆分详情-批量删除") - @ApiOperation(value="文档拆分详情-批量删除", notes="文档拆分详情-批量删除") + @AutoLog(value = "标准拆分详情-批量删除") + @ApiOperation(value="标准拆分详情-批量删除", notes="标准拆分详情-批量删除") @PostMapping(value = "/deleteBatchDocumentSplitDetail") + @ApiOperationSupport(order = 17) public Result deleteBatchDocumentSplitDetail(@RequestBody Map parameter) { documentSplitService.deleteBatchDocumentSplitDetail(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** - * 文档拆分详情-合并条款 + * 标准拆分详情-合并条款 * @param parameter * @return */ - @AutoLog(value = "文档拆分详情-合并条款") - @ApiOperation(value = "文档拆分详情-合并条款") + @AutoLog(value = "标准拆分详情-合并条款") + @ApiOperation(value = "标准拆分详情-合并条款") @PostMapping("/mergeDocumentSplitDetail") @RequiresPermissions("split:sarFileSplitItems:merge") + @ApiOperationSupport(order = 18) public Result mergeDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map parameter) { documentSplitService.mergeDocumentSplitDetail(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** - * 文档拆分详情-复制 + * 标准拆分详情-复制 * @param id * @return */ - @AutoLog(value = "文档拆分详情-复制") - @ApiOperation(value = "文档拆分详情-复制") + @AutoLog(value = "标准拆分详情-复制") + @ApiOperation(value = "标准拆分详情-复制") @GetMapping("/copyDocumentSplitDetail") @RequiresPermissions("split:sarFileSplitItems:copy") + @ApiOperationSupport(order = 19) public Result copyDocumentSplitDetail(String id) { documentSplitService.copyDocumentSplitDetail(id); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** - * 文档拆分详情-批量复制 + * 标准拆分详情-批量复制 * @param ids * @return */ - @AutoLog(value = "文档拆分详情-批量复制") - @ApiOperation(value = "文档拆分详情-批量复制") + @AutoLog(value = "标准拆分详情-批量复制") + @ApiOperation(value = "标准拆分详情-批量复制") @GetMapping("/copyBatchDocumentSplitDetail") @RequiresPermissions("split:sarFileSplitItems:batchCopy") + @ApiOperationSupport(order = 20) public Result copyBatchDocumentSplitDetail(String ids) { documentSplitService.copyBatchDocumentSplitDetail(ids); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** - * 文档拆分详情-模板下载 + * 标准拆分详情-模板下载 * @param request * @param response */ - @AutoLog(value = "文档拆分详情-模板下载") - @ApiOperation(value = "文档拆分详情-模板下载") + @AutoLog(value = "标准拆分详情-模板下载") + @ApiOperation(value = "标准拆分详情-模板下载") @GetMapping("/downloadImportTemplate") @RequiresPermissions("split:sarFileSplitItems:template") + @ApiOperationSupport(order = 21) public void downloadImportTemplate(HttpServletRequest request, HttpServletResponse response) { documentSplitService.downloadImportTemplate(request, response); } /** - * 文档拆分详情-导出 + * 标准拆分详情-导出 * @param request * @param response - * @AutoLog(value = "文档拆分详情-导出") - * @ApiOperation(value = "文档拆分详情-导出") + * @AutoLog(value = "标准拆分详情-导出") + * @ApiOperation(value = "标准拆分详情-导出") * @GetMapping("/exportDocumentSplitDetail") * public void exportDocumentSplitDetail(@RequestBody Map parameter, HttpServletRequest request, HttpServletResponse response) { * documentSplitService.exportDocumentSplitDetail(parameter, request, response); diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index 9f52a86c..3fce5c36 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -2,7 +2,6 @@ package com.jero.modules.split.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; @@ -21,7 +20,6 @@ import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -43,7 +41,7 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("/split/sarFileSplitItems") -@Api(tags = "文档拆分条款信息") +@Api(tags = "标准拆分条款信息") public class FileSplitItemsEOController extends JeroController { @Autowired private FileSplitItemsEOServiceImpl fileSplitItemsEOService; @@ -58,25 +56,6 @@ public class FileSplitItemsEOController extends JeroController page(@ApiParam("标签管理") @RequestBody Map parameter) throws Exception { - IPage infoPage = fileSplitItemsEOService.getInfoPage(parameter); - return Result.OK(infoPage); - } - - @AutoLog(value = "根据id查询") - @ApiOperation(value = "根据id查询") - @GetMapping("/getSplitItemsById") - @RequiresPermissions("split:sarFileSplitItems:update") - public Result getSplitItemsById(@ApiParam("id") String id){ - Map item = fileSplitItemsEOService.getInfoById(id); - return Result.OK(item); - } - @AutoLog(value = "新增") @ApiOperation(value = "新增") @PostMapping("/addSplitItems") @@ -108,160 +87,15 @@ public class FileSplitItemsEOController extends JeroController updateSplitItems(@ApiParam("标签管理") @RequestBody Map parameter) { - List itemValEOList = (List) parameter.get("itemValEOList"); - if (CollectionUtils.isNotEmpty(itemValEOList)) { - List valEOList = new ArrayList<>(); - for (Object object : itemValEOList) { - String jsonStr = JSON.toJSONString(object); - SarFileSplitItemsValEO itemValEO = JSONObject.parseObject(jsonStr, SarFileSplitItemsValEO.class); - valEOList.add(itemValEO); - } - - if (CollectionUtils.isNotEmpty(valEOList)) { - List itemValEOListNew = new ArrayList<>(); - for (SarFileSplitItemsValEO itemsValEO : valEOList) { - itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); - itemValEOListNew.add(itemsValEO); - } - parameter.put("itemValEOList", itemValEOListNew); - } - } - int resultCount = fileSplitItemsEOService.updateItemContent(parameter); - if (resultCount > 0) { - return Result.OK("修改成功",parameter); - } else { - return Result.error("修改失败"); - } - } - - @AutoLog(value = "批量删除") - @ApiOperation(value = "批量删除") - @PostMapping("/batchDeleteItems") - @RequiresPermissions("split:sarFileSplitItems:delete") - public Result batchDeleteItems(@ApiParam("ids") String ids) { - if (StringUtils.isNotEmpty(ids)) { - int result = fileSplitItemsEOService.batchDeleteItems(ids); - if (result > 0) { - return Result.OK("删除成功",null); - } else { - return Result.error("删除失败"); - } - } else { - return Result.error("请选择要删除的数据"); - } - } - - @AutoLog(value = "批量设置表单中英文切换") - @ApiOperation(value="批量设置表单中英文切换", notes="批量设置表单中英文切换") - @GetMapping(value = "/getBatchSetForm") - public Result>> getBatchSetForm(@ApiParam("数据库表") @RequestParam(name = "flag") String flag, - @ApiParam("国际化") @RequestParam(name = "cut") String cut) { - List> list = fileSplitItemsEOService.getBatchSetForm(flag, cut); - return Result.OK(list); - } - - @AutoLog(value = "文档拆分条款信息-判断包含子节点") - @ApiOperation(value = "文档拆分条款信息-判断包含子节点") - @GetMapping("/judgeContainChilds") - public Result> judgeContainChilds(@ApiParam("ids") String ids) { - Map result = fileSplitItemsEOService.judgeContainChilds(ids); - return Result.OK(result); - } - - @AutoLog(value = "文档拆分条款信息-复制") - @ApiOperation(value = "文档拆分条款信息-复制") - @GetMapping("/batchCopyItems") - @RequiresPermissions("split:sarFileSplitItems:copy") - public Result batchCopyItems(@ApiParam("ids") @RequestParam(value = "ids",required = false) String ids, - @ApiParam("目录ids") @RequestParam(value = "menuids",required = false) String menuIds, - @ApiParam("文档拆分ids") @RequestParam(value = "infoIds",required = false) String infoIds) { - int result = fileSplitItemsEOService.batchCopyItems(ids,menuIds,infoIds); - return Result.OK("复制成功", result); - } - - @AutoLog(value = "文档拆分条款信息-批量合并") - @ApiOperation(value = "文档拆分条款信息-批量合并") - @GetMapping("/batchMergeItems") - @RequiresPermissions("split:sarFileSplitItems:merge") - public Result> batchMergeItems(@ApiParam("ids") String ids) { - Map result = fileSplitItemsEOService.batchMergeItems(ids); - return Result.OK("合并成功", result); - } - - @AutoLog(value = "文档拆分条款信息-批量设置") - @ApiOperation(value = "文档拆分条款信息-批量设置") - @PostMapping("/batchSet") - @RequiresPermissions("split:sarFileSplitItems:set") - public Result batchSet(@ApiParam("标签管理") @RequestBody Map parameter) { - int result = fileSplitItemsEOService.batchSet(parameter); // ids, technology_territory, function_territory, information_category - return Result.OK("设置成功", result); - } - - @AutoLog(value = "模板下载") - @ApiOperation(value = "模板下载") - @GetMapping(value = "/exportTemplate") - @RequiresPermissions("split:sarFileSplitItems:template") - public void exportTemplate(@ApiParam("国际化") @RequestParam(name = "cut") String cut, HttpServletResponse response, HttpServletRequest request) throws Exception { - fileSplitItemsEOService.exportTemplate(cut,response,request); - } - - @ApiOperation(value = "文档拆分条款信息-导出") - @GetMapping(value = "/exportSplitInfoZip") - @RequiresPermissions("split:sarFileSplitItems:export") - public void exportSplitInfoZip(@ApiParam("国际化") @RequestParam(value = "cut") String cut, - @ApiParam("idList") @RequestParam(value = "idList", required = false) String idList, - @ApiParam("导出名") @RequestParam(value = "exportName", required = false) String exportName, - @ApiParam("标签管理") @RequestParam(value = "parameter") String parameter, - HttpServletResponse response, - HttpServletRequest request) { - try { - Map parameterMap = JSONObject.parseObject(parameter); - fileSplitItemsEOService.exportSplitInfo(cut, idList, parameterMap, exportName, response, request); - }catch (Exception e){ - throw new JeroBootException(MessageUtils.getMessage(ResultCommon.ERROR)); - } - } - - @ApiOperation(value = "文档拆分条款信息-导入拆分结果") + @ApiOperation(value = "标准拆分条款信息-导入拆分结果") @PostMapping(value = "/importSplitResult") @RequiresPermissions("split:sarFileSplitInfo:splitResult") - public Result importSplitResult(@ApiParam("文档拆分条id") String splitFileId, + public Result importSplitResult(@ApiParam("标准拆分条id") String splitFileId, @ApiParam("国际化") String cut, SarFileSplitInfoEO splitInfoEO) throws IOException { return fileSplitItemsEOService.importSplitResult(splitFileId, cut,splitInfoEO); } - @AutoLog(value = "文档拆分条款信息-导入") - @ApiOperation(value = "文档拆分条款信息-导入") - @PostMapping(value = "/importSplitItems") - @RequiresPermissions("split:sarFileSplitItems:import") - public Result importSplitItems(@ApiParam("文件对象") MultipartFile file, - @ApiParam("国际化") @RequestParam(value = "cut") String cut, - @ApiParam("菜单id") @RequestParam(value = "menuId") String menuId, - @ApiParam("文档拆分id") @RequestParam(value = "infoId") String infoId) throws Exception { - return fileSplitItemsEOService.importSplitItems(file, cut, menuId, infoId); - } - - /** - * 表头中英文切换 - * - * @return - */ - @AutoLog(value = "表头中英文切换") - @ApiOperation(value="表头中英文切换", notes="表头中英文切换") - @GetMapping(value = "/getHeader") - @RequiresPermissions("split:sarFileSplitItems:page") - public Result>> getHeader(@ApiParam("数据库表") @RequestParam(name = "flag") String flag, - @ApiParam("国际化") @RequestParam(name = "cut") String cut){ - List> list = fileSplitItemsEOService.getHeader(flag, cut); - return Result.OK(list); - } - /** * 文件上传统一方法 * @@ -278,4 +112,31 @@ public class FileSplitItemsEOController extends JeroController importSplitItems(@ApiParam("文件对象") MultipartFile file, + @ApiParam("国际化") @RequestParam(value = "cut") String cut, + @ApiParam("菜单id") @RequestParam(value = "menuId") String menuId, + @ApiParam("标准拆分id") @RequestParam(value = "infoId") String infoId) throws Exception { + return fileSplitItemsEOService.importSplitItems(file, cut, menuId, infoId); + } + + @ApiOperation(value = "标准拆分条款信息-导出") + @GetMapping(value = "/exportSplitInfoZip") + @RequiresPermissions("split:sarFileSplitItems:export") + public void exportSplitInfoZip(@ApiParam("国际化") @RequestParam(value = "cut") String cut, + @ApiParam("idList") @RequestParam(value = "idList", required = false) String idList, + @ApiParam("导出名") @RequestParam(value = "exportName", required = false) String exportName, + @ApiParam("标签管理") @RequestParam(value = "parameter") String parameter, + HttpServletResponse response, + HttpServletRequest request) { + try { + Map parameterMap = JSONObject.parseObject(parameter); + fileSplitItemsEOService.exportSplitInfo(cut, idList, parameterMap, exportName, response, request); + }catch (Exception e){ + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.ERROR)); + } + } } 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 deleted file mode 100644 index 92d6cec6..00000000 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ /dev/null @@ -1,355 +0,0 @@ -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.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.common.util.LineHumpUtil; -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; -import com.jero.modules.system.entity.SysUser; -import com.jero.modules.system.service.ISysUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -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; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - - -/** - * @Description: 文档拆分表 - * @Author: wcj - * @Date: 2022-03-03 - * @Version: V1.0 - */ -@ApiSupport(order = 302) -@Api(tags="标准拆分") -@RestController -@RequestMapping("/split/sarFileSplitInfo") -@Slf4j -public class SarFileSplitInfoController extends JeroController { - @Autowired - private ISarFileSplitInfoService sarFileSplitInfoService; - - @Autowired - private IBussDocumentLibraryEOService bussDocumentLibraryEOService; - - @Autowired - private IOSSFileService ossFileService; - - @Autowired - private ISysUserService sysUserService; - - /** - * 分页列表查询 - * @param sarFileSplitInfoEOPage - * @return - */ - @RequiresPermissions("docComparsion:initiate:search") - @AutoLog(value = "文档拆分表-分页列表查询Y") - @ApiOperationSupport(order = 1) - @ApiOperation(value="文档拆分表-分页列表查询", notes="文档拆分表-分页列表查询") - @GetMapping(value = "/page") -// @RequiresPermissions("split:sarFileSplitInfo:page") - public Result> queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumberOrName())){ - sarFileSplitInfoEOPage.setSerialNumberOrName(sarFileSplitInfoEOPage.getSerialNumberOrName().replace("%","\\%")); - } - if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getAuthor())){ - sarFileSplitInfoEOPage.setAuthor(sarFileSplitInfoEOPage.getAuthor().replace("%","\\%")); - } - if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getFileId())){//判断是不是以及传回文档库 - queryWrapper.lambda().isNotNull(SarFileSplitInfoEO::getFileId); - } - if(StringUtils.isNotBlank(sarFileSplitInfoEOPage.getOrderByField())){ - sarFileSplitInfoEOPage.setOrderByField(LineHumpUtil.humpToLine2(sarFileSplitInfoEOPage.getOrderByField())); - } - - // 标准编号/标准名称 - if (StringUtils.isNotBlank(sarFileSplitInfoEOPage.getSerialNumberOrName())){ - queryWrapper.and(qw -> - qw.lambda().like(SarFileSplitInfoEO::getSerialNumber, sarFileSplitInfoEOPage.getSerialNumberOrName()) - .or().like(SarFileSplitInfoEO::getTitle, sarFileSplitInfoEOPage.getSerialNumberOrName())); - } - queryWrapper.lambda().eq(StringUtils.isNotBlank(sarFileSplitInfoEOPage.getSplitStatus()), SarFileSplitInfoEO::getSplitStatus, sarFileSplitInfoEOPage.getSplitStatus()); - if (StringUtils.isNotBlank(sarFileSplitInfoEOPage.getAuthor())){ - List list = sysUserService.list(new LambdaQueryWrapper().like(SysUser::getRealname, sarFileSplitInfoEOPage.getAuthor())); - if (!list.isEmpty()){ - List userIds = list.stream().map(SysUser::getId).collect(Collectors.toList()); - queryWrapper.lambda().in(SarFileSplitInfoEO::getAuthor, userIds); - } - } - queryWrapper.orderBy(StringUtils.isNotBlank(sarFileSplitInfoEOPage.getOrderByField()), "1".equals(sarFileSplitInfoEOPage.getOrderBy())?true:false, sarFileSplitInfoEOPage.getOrderByField()) - .orderBy(StringUtils.isBlank(sarFileSplitInfoEOPage.getOrderByField()), false, "create_time"); - Page page = new Page<>(sarFileSplitInfoEOPage.getPageNo(), sarFileSplitInfoEOPage.getPageSize()); - IPage pageList = sarFileSplitInfoService.page(page, queryWrapper); - List rows = pageList.getRecords(); - sarFileSplitInfoService.dataProcessing(sarFileSplitInfoEOPage.getCut(), rows); - return Result.OK(pageList); - } - - @AutoLog(value = "文档拆分表-回传至文档库") - @ApiOperationSupport(order = 2) - @ApiOperation(value="文档拆分表-回传至文档库", notes="文档拆分表-回传至文档库") - @GetMapping(value = "/bindToDocumentLibrary") -// @RequiresPermissions("split:sarFileSplitInfo:bind") - public Result bindToDocumentLibrary(@ApiParam("id") String id, - @ApiParam("文件关联id") String connectId, - @ApiParam("文件名") String fileName) { - // 设置fileId - boolean bindState = sarFileSplitInfoService.bindToDocumentLibrary(id, connectId, fileName); - if(bindState){ - return Result.OK("回传成功"); - } else { - return Result.error("文档库不存在当前文档，回传失败！"); - } - } - - /** - * 添加 - * - * @param sarFileSplitInfoEO - * @return - */ - @AutoLog(value = "文档拆分表-添加") - @ApiOperationSupport(order = 3) - @ApiOperation(value="文档拆分表-添加", notes="文档拆分表-添加") - @PostMapping(value = "/add") -// @RequiresPermissions("split:sarFileSplitInfo:add") - public Result add(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { -// String id = sarFileSplitInfoEO.getId(); -// if (StringUtils.isBlank(id)){ -// throw new JeroBootException("请选择文本!"); -// } -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(SarFileSplitInfoEO::getFileId, id); -// wrapper.last("limit 1"); -// SarFileSplitInfoEO splitInfoEO = sarFileSplitInfoService.getOne(wrapper); - sarFileSplitInfoEO.setStartNumber(0); - sarFileSplitInfoEO.setStopNumber(0); - sarFileSplitInfoService.add(sarFileSplitInfoEO); - return Result.OK("添加成功！"); - } - - /** - * 添加 - * - * @param sarFileSplitInfoEO - * @return - * @PostMapping(value = "/add1") - * public Result add1(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { - * sarFileSplitInfoEO.setStartNumber(0); - * sarFileSplitInfoEO.setStopNumber(0); - * sarFileSplitInfoService.add1(sarFileSplitInfoEO); - * return Result.OK("添加成功！"); - * } - */ - - - /** - * 更改权限 - * - * @param sarFileSplitInfoEO - * @return - */ - @AutoLog(value = "文档拆分表-更改权限") - @ApiOperationSupport(order = 4) - @ApiOperation(value="文档拆分表-更改权限", notes="文档拆分表-更改权限") - @PostMapping(value = "/updatePermissions") - public Result updatePermissions(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - if (StringUtils.isNotBlank(sarFileSplitInfoEO.getIds())){ - updateWrapper.in(SarFileSplitInfoEO::getId, Arrays.asList(sarFileSplitInfoEO.getIds().split(","))); - } - updateWrapper.set(SarFileSplitInfoEO::getCreateBy, sarFileSplitInfoEO.getCreateBy()); - sarFileSplitInfoService.update(updateWrapper); - return Result.OK("操作成功!"); - } - - /** - * 发布 - * - * @param sarFileSplitInfoEO - * @return - */ - @AutoLog(value = "文档拆分表-发布") - @ApiOperationSupport(order = 5) - @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删除 - * - * @param id - * @return - */ - @AutoLog(value = "文档拆分表-通过id删除") - @ApiOperationSupport(order = 6) - @ApiOperation(value="文档拆分表-通过id删除", notes="文档拆分表-通过id删除") - @PostMapping(value = "/delete") -// @RequiresPermissions("split:sarFileSplitInfo:delete") - public Result delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) { - sarFileSplitInfoService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "文档拆分表-批量删除") - @ApiOperationSupport(order = 7) - @ApiOperation(value="文档拆分表-批量删除", notes="文档拆分表-批量删除") - @PostMapping(value = "/deleteBatch") -// @RequiresPermissions("split:sarFileSplitInfo:deleteBatch") - public Result deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) { - this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "文档拆分表-通过id查询") - @ApiOperationSupport(order = 8) - @ApiOperation(value="文档拆分表-通过id查询", notes="文档拆分表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) { - SarFileSplitInfoEO sarFileSplitInfoEO = sarFileSplitInfoService.queryById(id); - if(sarFileSplitInfoEO ==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(sarFileSplitInfoEO); - } - - /** - * 拆分已入库文本 - * @return - */ - @AutoLog(value = "拆分已入库文本-分页查询") - @ApiOperationSupport(order = 9) - @ApiOperation(value="拆分已入库文本-分页查询", notes="拆分已入库文本-分页查询") - @GetMapping(value = "/splitFilePageInfo") -// @RequiresPermissions("split:sarFileSplitInfo:splitFile") - public Result> splitFilePageInfo(SplitFilePageInfoParam param, - @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest request) { - Page page = new Page<>(pageNo,pageSize); - Page ossFilePage = sarFileSplitInfoService.splitFilePageInfoList(page, request, param); - - return Result.OK(ossFilePage); - } - - /** - * 拆分调取已入库文件 - * @param parameter - * @return - */ - @AutoLog(value = "导入拆分结果-分页查询") - @ApiOperationSupport(order = 10) - @ApiOperation(value="导入拆分结果-分页查询", notes="导入拆分结果-分页查询") - @PostMapping(value = "/splitResultPageInfo") - @ResponseBody -// @RequiresPermissions("split:sarFileSplitInfo:splitResult") - public Result>> splitResultPageInfo(@ApiParam("标签管理") @RequestBody Map parameter) { -// IPage> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter); - - // TODO 数据获取需要从企标和国标里拿，需要重写 - IPage> infoPage = new Page<>(); - return Result.OK(infoPage); - } - - /** - * 导出excel - * - * @param request - * @param sarFileSplitInfoEO - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, SarFileSplitInfoEO sarFileSplitInfoEO) { - return super.exportXls(request, sarFileSplitInfoEO, SarFileSplitInfoEO.class, "文档拆分表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, SarFileSplitInfoEO.class); - } - - /** - * 表头中英文切换 - * - * @return - */ - @AutoLog(value = "表头中英文切换") - @ApiOperationSupport(order = 11) - @ApiOperation(value="表头中英文切换", notes="表头中英文切换") - @GetMapping(value = "/getHeader") -// @RequiresPermissions("split:sarFileSplitInfo:page") - public Result>> getHeader(@ApiParam("数据库表") @RequestParam(name = "flag") String flag, - @ApiParam("国际化") @RequestParam(name = "cut") String cut) { - List> list = sarFileSplitInfoService.getHeader(flag, cut); - return Result.OK(list); - } - -// /** -// * 查询条件中英文切换 -// * -// * @return -// */ -// @AutoLog(value = "查询条件中英文切换") -// @ApiOperation(value="查询条件中英文切换", notes="查询条件中英文切换") -// @GetMapping(value = "/queryCondition") -//// @RequiresPermissions("split:sarFileSplitInfo:page") -// public Result>> queryCondition(@RequestParam(name = "flag") String flag, -// @RequestParam(name = "cut") String cut) { -// List> list = languageSwitchService.queryCondition(flag, cut); -// return Result.OK(list); -// } -} diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java deleted file mode 100644 index 8e645274..00000000 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.jero.modules.split.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.split.entity.SarFileSplitItemsValEO; -import com.jero.modules.split.page.SarFileSplitItemsValEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsValEOService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/split/sarFileSplitItemsVal") -@Api(tags = "文档拆分条目信息") -public class SarFileSplitItemsValEOController extends JeroController { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsValEOController.class); - - @Autowired - private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService; - -// @ApiOperation(value = "|SarFileSplitItemsValEO|分页查询") -// @GetMapping("/page") -// @RequiresPermissions("lawss:sarFileSplitItemsVal:page") -// public Result> page(SarFileSplitItemsValEOPage page) throws Exception { -// List rows = sarFileSplitItemsValEOService.queryByPage(page); -// IPage pageList = null; -// pageList.setRecords(rows); -// pageList.setCurrent(page.getPage()); -// pageList.setSize(page.getPageSize()); -// pageList.setTotal(sarFileSplitItemsValEOService.queryByCount(page)); -// return Result.OK(pageList); -// } - - @ApiOperation(value = "文档拆分条目信息-查询Y") - @GetMapping("/getItemsValList") - @RequiresPermissions("split:sarFileSplitItems:update") - public Result> list(SarFileSplitItemsValEOPage page) throws Exception { - page.setOrderBy("DISPLAY_SEQ,ID"); - List getList = sarFileSplitItemsValEOService.queryByList(page); - if (getList != null && !getList.isEmpty()) { - for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) { - String imgPath = sarFileSplitItemsValEO.getItemContent(); - if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) { - String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length()); -// String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.lastIndexOf("’")); - sarFileSplitItemsValEO.setImgName(imgName); - } - /*else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) { - SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); - tablePage.setItemsValId(sarFileSplitItemsValEO.getId()); - List tableList = sarFileSplitItemsTableEOService.queryByList(tablePage); - List tableListRow = sarFileSplitItemsTableEOService.queryByRowNum(tablePage); - sarFileSplitItemsValEO.setTableList(tableList); - if (tableListRow != null && !tableListRow.isEmpty()) { - List> getTableList = new ArrayList<>(); - for (int i=1; i <= tableListRow.size();i++) { - List rowList = new ArrayList<>(); - for (int j=0; j < tableList.size();j++) { - if (tableList.get(j).getRowNum() == i) { - rowList.add(tableList.get(j)); - } - } - getTableList.add(rowList); - } - sarFileSplitItemsValEO.setTableListShow(getTableList); - } - }*/ - } - } - return Result.OK(getList); - } - -// @ApiOperation(value = "|SarFileSplitItemsValEO|详情") -// @GetMapping("/{id}") -// @RequiresPermissions("lawss:sarFileSplitItemsVal:get") -// public Result find(@PathVariable String id) throws Exception { -// return Result.OK(sarFileSplitItemsValEOService.selectByPrimaryKey(id)); -// } -// -// @ApiOperation(value = "|SarFileSplitItemsValEO|新增") -// @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) -// @RequiresPermissions("lawss:sarFileSplitItemsVal:save") -// public Result create(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { -// sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO); -// return Result.OK(sarFileSplitItemsValEO); -// } -// -// @ApiOperation(value = "|SarFileSplitItemsValEO|修改") -// @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) -// @RequiresPermissions("lawss:sarFileSplitItemsVal:update") -// public Result update(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { -// sarFileSplitItemsValEOService.updateByPrimaryKeySelective(sarFileSplitItemsValEO); -// return Result.OK(sarFileSplitItemsValEO); -// } -// -// @ApiOperation(value = "|SarFileSplitItemsValEO|删除") -// @PostMapping("/{id}") -// @RequiresPermissions("lawss:sarFileSplitItemsVal:delete") -// public Result delete(@PathVariable String id) throws Exception { -// sarFileSplitItemsValEOService.deleteByPrimaryKey(id); -// logger.info("delete from SAR_FILE_SPLIT_ITEMS_VAL where id = {}", id); -// return Result.OK(); -// } - -// @ApiOperation(value = "文档拆分条目信息-根据目录查询") -// @GetMapping("/getSplitItemsByMenu") -//// @RequiresPermissions("lawss:sarFileSplitItems:page") -// public Result> getSplitItemsByMenu(String menuId, String infoId) throws Exception { -// List getList = sarFileSplitItemsValEOService.getSplitItemsByMenu(menuId,infoId); -// return Result.OK(getList); -// } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java index 8453a758..e5699710 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -10,7 +10,6 @@ import com.jero.modules.split.service.ISarFileSplitMenuEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.slf4j.Logger; @@ -18,12 +17,11 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; @RestController @RequestMapping("/split/sarFileSplitMenu") -@Api(tags = "文档拆分条款目录") +@Api(tags = "标准拆分条款目录") public class SarFileSplitMenuEOController extends JeroController { private static final Logger logger = LoggerFactory.getLogger(SarFileSplitMenuEOController.class); @@ -34,102 +32,17 @@ public class SarFileSplitMenuEOController extends JeroController> list(SarFileSplitMenuEOPage page) throws Exception { -// page.setName(null); page.setValidFlag("0"); - // page.setOrderBy("regexp_replace(replace('.'||NAME, '.', '.00000000'), '0+([^\\.]{8})', '\\1')"); page.setOrderBy("display_seq asc"); List getList = sarFileSplitMenuEOService.queryByList(page); - //转树结构 -// List menuEOS = new ArrayList<>(); -// if (StringUtils.isBlank(temporaryName)){ -// menuEOS = convertToTree(getList); -// } -// if (StringUtils.isNotBlank(temporaryName)){ -// menuEOS = convertToTree(getList, temporaryName); -// } return Result.OK(getList); - } - - public List convertToTree(List menuList, String name) { - Set menuIds = new HashSet<>(); - for (SarFileSplitMenuEO menuEO : menuList) { - String eoName = menuEO.getName(); - if (eoName.contains(name)){ - menuIds.add(menuEO.getId()); - String pId = menuEO.getPId(); - if (StringUtils.isNotBlank(pId)){ - SarFileSplitMenuEO eo = menuList.stream().filter(vo -> vo.getId().equals(pId)).collect(Collectors.toList()).get(0); - menuIds.add(eo.getId()); - String pId1 = eo.getPId(); - if (StringUtils.isNotBlank(pId1)){ - SarFileSplitMenuEO eo2 = menuList.stream().filter(vo -> vo.getId().equals(pId1)).collect(Collectors.toList()).get(0); - menuIds.add(eo2.getId()); - String pId2 = eo2.getPId(); - if (StringUtils.isNotBlank(pId2)){ - SarFileSplitMenuEO eo3 = menuList.stream().filter(vo -> vo.getId().equals(pId2)).collect(Collectors.toList()).get(0); - menuIds.add(eo3.getId()); - String pId3 = eo3.getPId(); - if (StringUtils.isNotBlank(pId3)){ - SarFileSplitMenuEO eo4 = menuList.stream().filter(vo -> vo.getId().equals(pId3)).collect(Collectors.toList()).get(0); - menuIds.add(eo4.getId()); - String pId4 = eo4.getPId(); - if (StringUtils.isNotBlank(pId4)){ - SarFileSplitMenuEO eo5 = menuList.stream().filter(vo -> vo.getId().equals(pId4)).collect(Collectors.toList()).get(0); - menuIds.add(eo5.getId()); - String pId5 = eo5.getPId(); - if (StringUtils.isNotBlank(pId5)){ - SarFileSplitMenuEO eo6 = menuList.stream().filter(vo -> vo.getId().equals(pId5)).collect(Collectors.toList()).get(0); - menuIds.add(eo6.getId()); - } - } - } - } - } - } - } - } - List sarFileSplitMenuEOS = menuList.stream().filter(vo -> menuIds.contains(vo.getId())).collect(Collectors.toList()); - for (SarFileSplitMenuEO sarFileSplitMenuEO : sarFileSplitMenuEOS) { - sarFileSplitMenuEO.setChildren(null); - } - List menuEOList = convertToTree(sarFileSplitMenuEOS); - return menuEOList; } - public List convertToTree(List menuList) { - // 创建一个Map来保存id与SarFileSplitMenuEO对象的映射关系 - Map menuMap = new HashMap<>(); - for (SarFileSplitMenuEO menu : menuList) { - menuMap.put(menu.getId(), menu); - } - List rootNodes = new ArrayList<>(); - for (SarFileSplitMenuEO menu : menuList) { - String parentId = menu.getPId(); - if (parentId == null) { - // 如果pid为空，将其作为根节点添加到结果集 - rootNodes.add(menu); - } else { - // 如果pid不为空，将其作为子节点添加到父节点中 - SarFileSplitMenuEO parentMenu = menuMap.get(parentId); - if (parentMenu != null) { - List childList = parentMenu.getChildren(); - if (childList == null) { - childList = new ArrayList(); - parentMenu.setChildren(childList); - } - childList.add(menu); - } - } - } - return rootNodes; - } - - @ApiOperation(value = "文档拆分条款目录-新增Y") + @ApiOperation(value = "标准拆分条款目录-新增Y") @PostMapping("/addMenu") @RequiresPermissions("split:sarFileSplitMenu:add") public Result create(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { @@ -137,7 +50,7 @@ public class SarFileSplitMenuEOController extends JeroController update(@RequestBody SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { @@ -145,18 +58,18 @@ public class SarFileSplitMenuEOController extends JeroController