From 60ea2d14e3caa51f5f7f37e49efcca6a0d4fe494 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 23 Feb 2022 17:56:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=92=8C=E5=8F=96=E6=B6=88=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OnlCgformCollectionController.java | 8 +- .../service/IOnlCgformCollectionService.java | 4 +- .../impl/OnlCgformCollectionServiceImpl.java | 8 +- .../BussDocumentLibraryEOController.java | 35 ++++++++ .../IBussDocumentLibraryEOService.java | 12 +++ .../BussDocumentLibraryEOServiceImpl.java | 84 +++++++++++++------ 6 files changed, 116 insertions(+), 35 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java index 50d19d20c..3e26ea4fe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java @@ -38,7 +38,7 @@ public class OnlCgformCollectionController extends JeroController add(@Validated @RequestBody BussDocumentLibraryEO bussDocumentLibraryEO) { - onlCgformCollectionService.add(bussDocumentLibraryEO); + public Result add(@Validated @RequestBody OnlCgformCollection onlCgformCollection) { + onlCgformCollectionService.add(onlCgformCollection); return Result.OK("添加成功！"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java index d08b97973..0862768ed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java @@ -17,10 +17,10 @@ public interface IOnlCgformCollectionService extends IService addCollect(String id) { + try { + bussDocumentLibraryEOService.addCollect(id); + } catch (Exception e) { + return Result.error("收藏失败"); + } + return Result.OK("收藏成功"); + } + + /** + * 取消收藏 + * @param id + * @return + */ + @AutoLog(value = "取消收藏") + @ApiOperation(value="取消收藏", notes="取消收藏") + @GetMapping(value = "/cancelCollect") + public Result cancelCollect(String id) { + try { + bussDocumentLibraryEOService.cancelCollect(id); + } catch (Exception e) { + return Result.error("取消收藏失败"); + } + return Result.OK("取消收藏成功"); + } + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index 69bb5a780..b074d3542 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -107,5 +107,17 @@ public interface IBussDocumentLibraryEOService extends IService parameter); + /** + * 添加收藏 + * @param id + */ + void addCollect(String id); + + /** + * 取消收藏 + * @param id + */ + void cancelCollect(String id); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index cff4b6f2e..4d83636c7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -10,6 +10,8 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.collection.entity.OnlCgformCollection; +import com.jero.modules.collection.service.IOnlCgformCollectionService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; @@ -55,6 +57,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { + //判断该条数据是否订阅 + + //处理修改代替标准,发送通知 - String id = (String) map.get("id"); - //修改时前端传参 - String replaceStandard = (String) map.get("replace_standard"); - //通过id查询数据 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BussDocumentLibraryEO::getId, id); - List> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); - if(dataList.size() != 0){ - //代替标准(根据id查询出来的) - String replaceStandardTemp = (String) dataList.get(0).get("replace_standard"); - - if(StringUtils.isNotBlank(replaceStandardTemp) && !replaceStandard.equals(replaceStandardTemp)){ - //需要向被替代标准的法规工程师发送站内通知和飞书信息，提醒内容："新标准编号"已实施，请注意更新“替代标准编号”状态 - List list = Arrays.asList(replaceStandard.split(",")); - List listTemp = Arrays.asList(replaceStandardTemp.split(",")); - List listNew = list.stream().filter(e -> !listTemp.contains(e)).collect(Collectors.toList()); - //向listNew对应的工程师发飞书通知 - - }else{ - //向replaceStandard对应的工程师发飞书通知 - - } - } - + sendMessage(map); //字段属性 List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); @@ -526,6 +510,37 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { + //处理修改代替标准,发送通知 + String id = (String) map.get("id"); + //修改时前端传参 + String replaceStandard = (String) map.get("replace_standard"); + //通过id查询数据 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BussDocumentLibraryEO::getId, id); + List> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); + if(dataList.size() != 0){ + //代替标准(根据id查询出来的) + String replaceStandardTemp = (String) dataList.get(0).get("replace_standard"); + + if(StringUtils.isNotBlank(replaceStandardTemp) && !replaceStandard.equals(replaceStandardTemp)){ + //需要向被替代标准的法规工程师发送站内通知和飞书信息，提醒内容："新标准编号"已实施，请注意更新“替代标准编号”状态 + List list = Arrays.asList(replaceStandard.split(",")); + List listTemp = Arrays.asList(replaceStandardTemp.split(",")); + List listNew = list.stream().filter(e -> !listTemp.contains(e)).collect(Collectors.toList()); + //向listNew对应的工程师发飞书通知 + + }else{ + //向replaceStandard对应的工程师发飞书通知 + + } + } + } + private String getMustValues() { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -588,7 +603,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl parameter) { //需要查询的字段 List fieldList = onlCgformFieldService.getFieldList("1"); @@ -721,4 +735,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(OnlCgformCollection::getDocumentId,id); + iOnlCgformCollectionService.remove(lambdaQueryWrapper); + //订阅表中删除数据 + } }