From 3d02d40509c0e2917971dae5af6eee4160e64e83 Mon Sep 17 00:00:00 2001 From: caozhen <18736171426@139.com> Date: Tue, 12 Sep 2023 09:55:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E3=80=81=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E3=80=81=E5=88=86=E4=BA=AB=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8B=86=E5=88=86=E4=B8=BA=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E3=80=81=E6=B5=B7=E5=A4=96=E3=80=81=E4=BC=81=E4=B8=9A=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsStandardCollectionController.java | 66 ++++++++++++++-- .../LawsStandardSharingController.java | 76 ++++++++++++++++++- 2 files changed, 130 insertions(+), 12 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java index afa03e53..7a828f1b 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java @@ -49,10 +49,10 @@ public class LawsStandardCollectionController extends JeroController add(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { + @AutoLog(value = "标准收藏-国内收藏") + @ApiOperation(value="标准收藏-国内收藏", notes="标准收藏-国内收藏") + @PostMapping(value = "/domestic/add") + public Result domesticAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { lawsStandardCollectionService.add(lawsStandardCollection); return Result.OK("操作成功!"); } @@ -60,10 +60,10 @@ public class LawsStandardCollectionController extends JeroController delete(@RequestBody Map map) { + @AutoLog(value = "标准收藏-国内取消收藏") + @ApiOperation(value="标准收藏-国内取消收藏", notes="标准收藏-国内取消收藏") + @PostMapping(value = "/domestic/delete") + public Result domesticDelete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ return Result.error("请选择数据!"); } @@ -71,4 +71,54 @@ public class LawsStandardCollectionController extends JeroController overseasAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { + lawsStandardCollectionService.add(lawsStandardCollection); + return Result.OK("操作成功!"); + } + + /** + * 取消收藏 + */ + @AutoLog(value = "标准收藏-海外取消收藏") + @ApiOperation(value="标准收藏-海外取消收藏", notes="标准收藏-海外取消收藏") + @PostMapping(value = "/overseas/delete") + public Result overseasDelete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + return Result.error("请选择数据!"); + } + lawsStandardCollectionService.deleteById(map.get("id")); + return Result.OK("删除成功!"); + } + + /** + * 收藏 + */ + @AutoLog(value = "标准收藏-企标收藏") + @ApiOperation(value="标准收藏-企标收藏", notes="标准收藏-企标收藏") + @PostMapping(value = "/enterprise/add") + public Result enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { + lawsStandardCollectionService.add(lawsStandardCollection); + return Result.OK("操作成功!"); + } + + /** + * 取消收藏 + */ + @AutoLog(value = "标准收藏-企标取消收藏") + @ApiOperation(value="标准收藏-企标取消收藏", notes="标准收藏-企标取消收藏") + @PostMapping(value = "/enterprise/delete") + public Result enterpriseDelete(@RequestBody Map map) { + if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ + return Result.error("请选择数据!"); + } + lawsStandardCollectionService.deleteById(map.get("id")); + return Result.OK("删除成功!"); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index 496e74c5..7b1f5b19 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -72,10 +72,10 @@ public class LawsStandardSharingController extends JeroController add(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { + @AutoLog(value = "标准分享-国内分享") + @ApiOperation(value="标准分享-国内分享", notes="标准分享-国内分享") + @PostMapping(value = "/domestic/add") + public Result domesticAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String recipientId = lawsStandardSharing.getRecipientId(); String recipientName = lawsStandardSharing.getRecipientName(); @@ -103,6 +103,74 @@ public class LawsStandardSharingController extends JeroController overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String recipientId = lawsStandardSharing.getRecipientId(); + String recipientName = lawsStandardSharing.getRecipientName(); + Date date = new Date(); + List sharings = new ArrayList<>(); + List recipientIdList = Arrays.asList(recipientId.split(",")); + List recipientNameList = Arrays.asList(recipientName.split(",")); + for (int i = 0; i < recipientIdList.size(); i++) { + LawsStandardSharing sharing = new LawsStandardSharing(); + sharing.setSource(lawsStandardSharing.getSource()); + sharing.setStandardId(lawsStandardSharing.getStandardId()); + sharing.setStandardName(lawsStandardSharing.getStandardName()); + sharing.setStandardNum(lawsStandardSharing.getStandardNum()); + sharing.setSharerId(sysUser.getId()); + sharing.setSharerName(lawsStandardSharing.getSharerName()); + sharing.setRecipientId(recipientIdList.get(i)); + sharing.setRecipientName(recipientNameList.get(i)); + sharing.setSharingTime(date); + sharing.setShareDescription(lawsStandardSharing.getShareDescription()); + sharing.setReadingStatus("1"); + sharing.setDelFlag("0"); + sharings.add(sharing); + } + lawsStandardSharingService.saveBatch(sharings); + return Result.OK("操作成功!"); + } + + /** + * 添加 + */ + @AutoLog(value = "标准分享-企标分享") + @ApiOperation(value="标准分享-企标分享", notes="标准分享-企标分享") + @PostMapping(value = "/enterprise/add") + public Result enterpriseAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String recipientId = lawsStandardSharing.getRecipientId(); + String recipientName = lawsStandardSharing.getRecipientName(); + Date date = new Date(); + List sharings = new ArrayList<>(); + List recipientIdList = Arrays.asList(recipientId.split(",")); + List recipientNameList = Arrays.asList(recipientName.split(",")); + for (int i = 0; i < recipientIdList.size(); i++) { + LawsStandardSharing sharing = new LawsStandardSharing(); + sharing.setSource(lawsStandardSharing.getSource()); + sharing.setStandardId(lawsStandardSharing.getStandardId()); + sharing.setStandardName(lawsStandardSharing.getStandardName()); + sharing.setStandardNum(lawsStandardSharing.getStandardNum()); + sharing.setSharerId(sysUser.getId()); + sharing.setSharerName(lawsStandardSharing.getSharerName()); + sharing.setRecipientId(recipientIdList.get(i)); + sharing.setRecipientName(recipientNameList.get(i)); + sharing.setSharingTime(date); + sharing.setShareDescription(lawsStandardSharing.getShareDescription()); + sharing.setReadingStatus("1"); + sharing.setDelFlag("0"); + sharings.add(sharing); + } + lawsStandardSharingService.saveBatch(sharings); + return Result.OK("操作成功!"); + } + /** * 批量删除 */