监督端-普法服务

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<EnforcementEducationServicesVo> list(EnforcementEducationServicesBo bo, PageQuery pageQuery) {
         return enforcementEducationServicesService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 监督端-查询普法服务浏览总次数
+     */
+    @SaIgnore
+    @GetMapping("/selectTotalViewCount")
+    public R<Integer> 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<EnforcementEducationServicesVo> 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<Void> remove(String[] ids) {

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<SysNoticeInfoVo> list(SysNoticeInfoBo bo, PageQuery pageQuery) {

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<ZdxtFileVo> fileList;
+
+    /**
+     * 总浏览次数
+     */
+    @ExcelProperty(value = "总浏览次数")
+    private Integer totalViewCount;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementEducationServicesMapper.java

@@ -50,4 +50,9 @@ public interface EnforcementEducationServicesMapper extends BaseMapperPlus<Enfor
      * @return 已读的消息ID列表
      */
     List<String> selectReadMessageIdsByUserId(@Param("messageIds") List<String> messageIds, @Param("userId") Long userId);
+
+    /**
+     * 查询总浏览次数
+     */
+    Integer selectTotalViewCount();
 }

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();
+
 
 }

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<EnforcementEducationServices> lqw = buildQueryWrapper(bo);
         Page<EnforcementEducationServicesVo> 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();
+    }
+
     /**
      * 统计企业端未读普法消息数量
      *

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementEducationServicesMapper.xml

@@ -62,4 +62,12 @@
         AND smvl.is_delete = 0
     </select>
 
+
+    <!-- 查询总浏览次数 -->
+    <select id="selectTotalViewCount" resultType="java.lang.Integer">
+        SELECT SUM(ees.view_count)
+        FROM enforcement_education_services ees
+        WHERE ees.is_delete = 0
+          AND ees.status = 2
+    </select>
 </mapper>