通知详情修改

gic-platform-enterprise-service/pom.xml

@@ -70,8 +70,8 @@
 
         <dependency>
             <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.5</version>
+            <artifactId>pagehelper</artifactId>
+            <version>5.1.9</version>
         </dependency>
 
         <dependency>

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/PushMessageService.java

@@ -13,9 +13,11 @@ public interface PushMessageService {
 
     int delete(Integer id);
 
-    Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime, Integer pushClassifyId);
+    Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime,
+                                        Integer pushClassifyId);
 
-    Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime, Integer pushClassifyId, Integer userId);
+    Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime,
+                                         Integer pushClassifyId, Integer userId, Integer pageNum, Integer pageSize);
 
     int readCount(Integer messageId);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PushMessageServiceImpl.java

@@ -7,6 +7,7 @@ import com.gic.enterprise.entity.TabPushMessage;
 import com.gic.enterprise.service.PushMessageService;
 import com.gic.enterprise.service.PushTypeService;
 import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,14 +44,16 @@ public class PushMessageServiceImpl implements PushMessageService {
     }
 
     @Override
-    public Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime, Integer pushClassifyId) {
+    public Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime,
+                                               Integer pushClassifyId) {
         return this.tabPushMessageMapper.pagePushMesage(search, pushStatus, startTime, endTime, pushClassifyId);
     }
 
     @Override
     public Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime,
-                                                Integer pushClassifyId, Integer userId) {
+                                                Integer pushClassifyId, Integer userId, Integer pageNum, Integer pageSize) {
         TabPushClassify byId = this.pushTypeService.getById(pushClassifyId);
+        PageHelper.startPage(pageNum, pageSize);
         return this.tabPushMessageMapper.pageUserMessage(search, status, startTime, endTime, byId == null ? null : byId.getClassifyName(), userId);
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/PushMessageApiServiceImpl.java

@@ -148,10 +148,8 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
     public ServiceResponse<Page<UserMessageDTO>> pageUserMessage(Integer userId, String search, Integer status,
                                                                  Date startTime, Date endTime, Integer pushClassifyId,
                                                                  Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        log.info("pageNum:{},pageSize:{}", pageNum, pageSize);
         com.github.pagehelper.Page<UserMessageDTO> page = this.pushMessageService.pageUserMessage(search, status,
-                startTime, endTime, pushClassifyId, userId);
+                startTime, endTime, pushClassifyId, userId, pageNum, pageSize);
         Page<UserMessageDTO> userMessageDTOPage = PageHelperUtils.changePageHelperToCurrentPage(page);
         return ServiceResponse.success(userMessageDTOPage);
     }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -59,11 +59,11 @@ public class IndexModuleController {
         try {
             ServiceResponse<Page<UserMessageDTO>> response = this.pushMessageApiService.pageUserMessage(userId, search, status, StringUtils.isBlank(startTime) ? null : sdf.parse(startTime+" 00:00:00"),
                     StringUtils.isBlank(endTime) ? null : sdf.parse(endTime+" 23:59:59"), pushClassifyId, pageQO.getCurrentPage(), pageQO.getPageSize());
-            //ServiceResponse<Integer> unReadResponse = this.pushMessageApiService.totalUserMessage(userId, search, 1, StringUtils.isBlank(startTime) ? null : sdf.parse(startTime+" 00:00:00"),
-                    //StringUtils.isBlank(endTime) ? null : sdf.parse(endTime+" 23:59:59"), pushClassifyId);
+            ServiceResponse<Integer> unReadResponse = this.pushMessageApiService.totalUserMessage(userId, search, 1, StringUtils.isBlank(startTime) ? null : sdf.parse(startTime+" 00:00:00"),
+                    StringUtils.isBlank(endTime) ? null : sdf.parse(endTime+" 23:59:59"), pushClassifyId);
             Map<String, Object> result = new HashMap<>();
             result.put("page", response.getResult());
-            //result.put("unReadCount", unReadResponse.getResult());
+            result.put("unReadCount", unReadResponse.getResult());
             return RestResponse.success(result);
         } catch (ParseException e) {
             log.warn("异常", e);