From 81f17d60d7d12bc16e18b6d8d9c7344b476774bc Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 27 Sep 2023 18:09:54 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=9F=A5=E8=AF=A2=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8F=E8=A7=88=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/ILawsCommonService.java | 7 ++++++ .../service/impl/LawsCommonServiceImpl.java | 23 +++++++++++++++++++ .../controller/LawsDomesticController.java | 6 +++++ .../controller/LawsEnterpriseController.java | 1 + .../controller/LawsOverseasController.java | 1 + 5 files changed, 38 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index f93656de..9fa25059 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -147,4 +147,11 @@ public interface ILawsCommonService { * @param module */ List importExcelWithData(MultipartFile file, String module); + + /** + * @Author: liao + * @Date: 2023/9/27 18:01 + * @Description: 增加浏览记录 + **/ + void addLookHistory(String id, String type, String module); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 19f039b7..55d0fd09 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -28,7 +28,9 @@ import com.jero.modules.laws.standard.entity.LawsTreeNode; import com.jero.modules.laws.standard.service.*; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.personal.entity.LawsBrowsingHistory; import com.jero.modules.personal.entity.LawsStandardCollection; +import com.jero.modules.personal.service.ILawsBrowsingHistoryService; import com.jero.modules.personal.service.ILawsStandardCollectionService; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysDictItem; @@ -104,6 +106,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { private ILawsStandardFileService lawsStandardFileService; @Autowired private ILawsTreeNodeService lawsTreeNodeService; + @Autowired + private ILawsBrowsingHistoryService lawsBrowsingHistoryService; @Resource private EnterpriseStandardInspectContentService esInspectContentService; @@ -1375,6 +1379,25 @@ public class LawsCommonServiceImpl implements ILawsCommonService { } } + /** + * @Author: liao + * @Date: 2023/9/27 18:02 + * @Description: 增加浏览记录 + **/ + @Override + public void addLookHistory(String id, String type, String module) { + if ("1".equals(type)) { + // 详情显示 + LawsBrowsingHistory history = new LawsBrowsingHistory(); + ManyStandardSelectionBox singleStandard = getSingleStandard(null, id); + history.setStandardId(id); + history.setStandardNumber(singleStandard.getStandardNumber()); + history.setStandardName(singleStandard.getStandardName()); + history.setStandardType(module); + lawsBrowsingHistoryService.add(history); + } + } + /** * 校验导入数据有效性 * diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index 43a8ad8c..ea1736d5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -4,13 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; +import com.jero.modules.personal.entity.LawsBrowsingHistory; +import com.jero.modules.personal.service.ILawsBrowsingHistoryService; import com.jero.modules.personal.service.ILawsStandardCollectionService; import com.jero.modules.personal.service.ILawsStandardSharingService; import com.jero.modules.tag.entity.LawsTag; @@ -24,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Author: liao @@ -98,6 +103,7 @@ public class LawsDomesticController { @GetMapping(value = "getByIdAndModule") public Result> getByIdAndModule(@RequestParam(name="id") String id, @RequestParam(name="type") String type) { + lawsCommonService.addLookHistory(id, type, MODULE_VALUE); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 70aebb9d..758ec06d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -114,6 +114,7 @@ public class LawsEnterpriseController { public Result> getByIdAndModule(@RequestParam(name="id", required = false) String id, @RequestParam(name="type") String type, @RequestParam(name="standardNumber", required = false) String standardNumber) { + lawsCommonService.addLookHistory(id, type, MODULE_VALUE); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, standardNumber)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index bf45f44f..f7fa1715 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -98,6 +98,7 @@ public class LawsOverseasController { @GetMapping(value = "getByIdAndModule") public Result> getByIdAndModule(@RequestParam(name="id") String id, @RequestParam(name="type") String type) { + lawsCommonService.addLookHistory(id, type, MODULE_VALUE); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null)); }