From e0e54f1c7081ea67a2d5e85041d0bc99661970cb Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Mon, 1 Jun 2026 20:56:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=99=AE=E6=B3=95?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nforcementEducationServicesController.java | 19 ++++++++++++++----- .../supervision/SysNoticeInfoController.java | 1 + .../vo/EnforcementEducationServicesVo.java | 6 ++++++ .../EnforcementEducationServicesMapper.java | 5 +++++ .../IEnforcementEducationServicesService.java | 5 +++++ ...forcementEducationServicesServiceImpl.java | 6 +++++- .../EnforcementEducationServicesMapper.xml | 8 ++++++++ 7 files changed, 44 insertions(+), 6 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementEducationServicesController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementEducationServicesController.java index 047a5fa7..fad28bae 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementEducationServicesController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementEducationServicesController.java @@ -40,13 +40,22 @@ public class EnforcementEducationServicesController extends BaseController { /** * 监督端-查询普法服务主表列表 */ - //@SaCheckPermission("enforcementcode:educationServices:list") + @SaCheckPermission("enforcementcode:educationServices:list") @SaIgnore @GetMapping("/list") public TableDataInfo list(EnforcementEducationServicesBo bo, PageQuery pageQuery) { return enforcementEducationServicesService.queryPageList(bo, pageQuery); } + /** + * 监督端-查询普法服务浏览总次数 + */ + @SaIgnore + @GetMapping("/selectTotalViewCount") + public R selectTotalViewCount() { + return R.ok(enforcementEducationServicesService.selectTotalViewCount()); + } + /** * 监督端-导出普法服务主表列表 */ @@ -63,7 +72,7 @@ public class EnforcementEducationServicesController extends BaseController { * * @param id 主键 */ - //@SaCheckPermission("enforcementcode:educationServices:query") + @SaCheckPermission("enforcementcode:educationServices:query") @SaIgnore @GetMapping("/details") public R details(String id) { @@ -73,7 +82,7 @@ public class EnforcementEducationServicesController extends BaseController { /** * 监督端-新增普法服务主表 */ - //@SaCheckPermission("enforcementcode:educationServices:add") + @SaCheckPermission("enforcementcode:educationServices:add") @SaIgnore @Log(title = "普法服务主表", businessType = BusinessType.INSERT) @PostMapping("/add") @@ -84,7 +93,7 @@ public class EnforcementEducationServicesController extends BaseController { /** * 监督端-修改普法服务主表 */ - //@SaCheckPermission("enforcementcode:educationServices:edit") + @SaCheckPermission("enforcementcode:educationServices:edit") @Log(title = "普法服务主表", businessType = BusinessType.UPDATE) @SaIgnore @PostMapping("/edit") @@ -97,7 +106,7 @@ public class EnforcementEducationServicesController extends BaseController { * * @param ids 主键串 */ - //@SaCheckPermission("enforcementcode:educationServices:remove") + @SaCheckPermission("enforcementcode:educationServices:remove") @SaIgnore @GetMapping("/remove") public R remove(String[] ids) { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/SysNoticeInfoController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/SysNoticeInfoController.java index ee5788a4..340aad89 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/SysNoticeInfoController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/SysNoticeInfoController.java @@ -40,6 +40,7 @@ public class SysNoticeInfoController extends BaseController { /** * 查询系统公告信息主列表 */ + @SaCheckPermission("enforcementcode:noticeInfo:list") @SaIgnore @GetMapping("/list") public TableDataInfo list(SysNoticeInfoBo bo, PageQuery pageQuery) { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementEducationServicesVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementEducationServicesVo.java index 10530b34..b68f3f8e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementEducationServicesVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementEducationServicesVo.java @@ -157,4 +157,10 @@ public class EnforcementEducationServicesVo implements Serializable { */ @ExcelProperty(value = "附件信息") private List fileList; + + /** + * 总浏览次数 + */ + @ExcelProperty(value = "总浏览次数") + private Integer totalViewCount; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementEducationServicesMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementEducationServicesMapper.java index c78ea356..cf2a9166 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementEducationServicesMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementEducationServicesMapper.java @@ -50,4 +50,9 @@ public interface EnforcementEducationServicesMapper extends BaseMapperPlus selectReadMessageIdsByUserId(@Param("messageIds") List messageIds, @Param("userId") Long userId); + + /** + * 查询总浏览次数 + */ + Integer selectTotalViewCount(); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementEducationServicesService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementEducationServicesService.java index d3c97cb3..336e5f20 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementEducationServicesService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementEducationServicesService.java @@ -88,5 +88,10 @@ public interface IEnforcementEducationServicesService { Long countUnreadEducationServices(); + /** + * 查询浏览总数 + */ + Integer selectTotalViewCount(); + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java index 19a50f92..26ff7584 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java @@ -105,7 +105,6 @@ public class EnforcementEducationServicesServiceImpl implements IEnforcementEduc LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - // 为每条记录设置字典标签和已读状态 if (result.getRecords() != null && !result.getRecords().isEmpty()) { setDictLabels(result.getRecords()); @@ -425,6 +424,11 @@ public class EnforcementEducationServicesServiceImpl implements IEnforcementEduc return 0L; } + @Override + public Integer selectTotalViewCount() { + return baseMapper.selectTotalViewCount(); + } + /** * 统计企业端未读普法消息数量 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementEducationServicesMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementEducationServicesMapper.xml index dd23fa2b..7ff17024 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementEducationServicesMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementEducationServicesMapper.xml @@ -62,4 +62,12 @@ AND smvl.is_delete = 0 + + +