add 查询法规添加浏览记录

This commit is contained in:
liao
2023-09-27 18:09:54 +08:00
parent 7a2389c55a
commit 81f17d60d7
5 changed files with 38 additions and 0 deletions
@@ -147,4 +147,11 @@ public interface ILawsCommonService {
* @param module * @param module
*/ */
List<String> importExcelWithData(MultipartFile file, String module); List<String> importExcelWithData(MultipartFile file, String module);
/**
* @Author: liao
* @Date: 2023/9/27 18:01
* @Description: 增加浏览记录
**/
void addLookHistory(String id, String type, String module);
} }
@@ -28,7 +28,9 @@ import com.jero.modules.laws.standard.entity.LawsTreeNode;
import com.jero.modules.laws.standard.service.*; import com.jero.modules.laws.standard.service.*;
import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService; 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.entity.LawsStandardCollection;
import com.jero.modules.personal.service.ILawsBrowsingHistoryService;
import com.jero.modules.personal.service.ILawsStandardCollectionService; import com.jero.modules.personal.service.ILawsStandardCollectionService;
import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysDepart;
import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysDictItem;
@@ -104,6 +106,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
private ILawsStandardFileService lawsStandardFileService; private ILawsStandardFileService lawsStandardFileService;
@Autowired @Autowired
private ILawsTreeNodeService lawsTreeNodeService; private ILawsTreeNodeService lawsTreeNodeService;
@Autowired
private ILawsBrowsingHistoryService lawsBrowsingHistoryService;
@Resource @Resource
private EnterpriseStandardInspectContentService esInspectContentService; 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);
}
}
/** /**
* 校验导入数据有效性 * 校验导入数据有效性
* *
@@ -4,13 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.common.service.ILawsCommonService; 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.entity.LawsUpdateRecord;
import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsNodeRelationService;
import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; 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.ILawsStandardCollectionService;
import com.jero.modules.personal.service.ILawsStandardSharingService; import com.jero.modules.personal.service.ILawsStandardSharingService;
import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.entity.LawsTag;
@@ -24,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* @Author: liao * @Author: liao
@@ -98,6 +103,7 @@ public class LawsDomesticController {
@GetMapping(value = "getByIdAndModule") @GetMapping(value = "getByIdAndModule")
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id") String id, public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id") String id,
@RequestParam(name="type") String type) { @RequestParam(name="type") String type) {
lawsCommonService.addLookHistory(id, type, MODULE_VALUE);
return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null)); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null));
} }
@@ -114,6 +114,7 @@ public class LawsEnterpriseController {
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id", required = false) String id, public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id", required = false) String id,
@RequestParam(name="type") String type, @RequestParam(name="type") String type,
@RequestParam(name="standardNumber", required = false) String standardNumber) { @RequestParam(name="standardNumber", required = false) String standardNumber) {
lawsCommonService.addLookHistory(id, type, MODULE_VALUE);
return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, standardNumber)); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, standardNumber));
} }
@@ -98,6 +98,7 @@ public class LawsOverseasController {
@GetMapping(value = "getByIdAndModule") @GetMapping(value = "getByIdAndModule")
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id") String id, public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id") String id,
@RequestParam(name="type") String type) { @RequestParam(name="type") String type) {
lawsCommonService.addLookHistory(id, type, MODULE_VALUE);
return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null)); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null));
} }