完善代码

ibznotify-core/src/main/java/cn/ibizlab/core/extensions/service/NotifyCoreService.java

@@ -41,6 +41,8 @@ import org.springframework.http.HttpEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
@@ -111,8 +113,6 @@ public class NotifyCoreService {
         createWorkRecordClient=new DefaultDingTalkClient(dingTalkCreateWorkRecordApi);
         finishWorkRecordClient = new DefaultDingTalkClient(dingTalkFinishWorkRecordApi);
     }
-    @Value("${ibiz.notify.pagesize:10}")
-    private int pageSize;
 
     @Value("${ibiz.notify.expiretime:300000}")
     private Long expireTime;
@@ -658,10 +658,15 @@ public class NotifyCoreService {
      * 获取某个用户全量存储催办消息
      * @return
      */
-    public Page<MsgBody> getBacklogAllContent(String toUserId) {
+    public Page<MsgBody> getBacklogAllContent(String toUserId,int msgType) {
+        if(StringUtils.isEmpty(toUserId))
+            throw new BadRequestAlertException("无效用户ID","NotifyCoreService","getBacklogAllContent");
+        if(ObjectUtils.isEmpty(msgType))
+            throw new BadRequestAlertException("无效消息种类","NotifyCoreService","getBacklogAllContent");
+
         MsgBodySearchContext context = new MsgBodySearchContext();
-        context.setN_tousers_in(toUserId);
         context.setSize(Integer.MAX_VALUE);
+        context.setN_msgtype_eq(msgType);
         context.setN_tousers_eq(toUserId);
         Page<MsgBody> result = msgBodyService.searchDefault(context);
         return result;
@@ -671,13 +676,10 @@ public class NotifyCoreService {
      * 获取某个用户分页存储催办消息
      * @return
      */
-    public Page<MsgBody> getBacklogPageContent(String toUserId) {
-        MsgBodySearchContext context = new MsgBodySearchContext();
-        context.setSize(pageSize);
-        context.setN_tousers_eq(toUserId);
+    public Page<MsgBody> getBacklogPageContent(MsgBodySearchContext context) {
         Page<MsgBody> result = msgBodyService.searchDefault(context);
-        msgMap.put(toUserId,result);
-        expireMap.put(toUserId,System.currentTimeMillis()) ;
+        msgMap.put(context.getN_tousers_eq(),result);
+        expireMap.put(context.getN_tousers_eq(),System.currentTimeMillis()) ;
         return result;
     }
 
@@ -685,14 +687,21 @@ public class NotifyCoreService {
      * 缓存某个用户分页催办消息
      * @return
      */
-    public Page<MsgBody> getBacklogByPage(String toUserId) {
+    public Page<MsgBody> getBacklogByPage(MsgBodySearchContext context) {
+        if(ObjectUtils.isEmpty(context))
+            throw new BadRequestAlertException("无效消息上下文","NotifyCoreService","getBacklogAllContent");
+
+        String toUserId = context.getN_tousers_eq();
         if(!msgMap.containsKey(toUserId) && !expireMap.containsKey(toUserId)){
-            return getBacklogPageContent(toUserId);
+            return getBacklogPageContent(context);
         }else {
+            if(msgMap.get(toUserId).getSize() != context.getSize()){
+                return getBacklogPageContent(context);
+            }
             if(System.currentTimeMillis() - expireMap.get(toUserId) <= expireTime){
                 return msgMap.get(toUserId);
             }else {
-              return getBacklogPageContent(toUserId);
+                return getBacklogPageContent(context);
             }
         }
     }

ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/NotifyCoreResource.java

@@ -6,6 +6,7 @@ import cn.ibizlab.core.extensions.domain.Template;
 import cn.ibizlab.core.extensions.service.NotifyCoreService;
 import cn.ibizlab.core.notify.domain.MsgBody;
 import cn.ibizlab.core.notify.filter.MsgBodySearchContext;
+import cn.ibizlab.core.notify.filter.MsgOpenAccessSearchContext;
 import cn.ibizlab.core.notify.filter.MsgUserAccountSearchContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -78,9 +79,9 @@ public class NotifyCoreResource {
      * @param
      * @return
      */
-    @RequestMapping(method = RequestMethod.POST,value = "/notify/msgbody/getbacklogbypage/{tousers}")
-    public ResponseEntity<Page> getAllBacklogAll(@Validated @NotNull @PathVariable("tousers") String toUsers){
-        Page page = notifyCoreService.getBacklogAllContent(toUsers);
+    @RequestMapping(method = RequestMethod.POST,value = "/notify/msgbody/getallbacklogall")
+    public ResponseEntity<Page> getAllBacklogAll(@RequestBody MsgBodyDTO dto){
+        Page page = notifyCoreService.getBacklogAllContent(dto.getToUsers(),dto.getMsgType());
         return ResponseEntity.status(HttpStatus.OK).body(new PageImpl(mapping.toDto(page.getContent()), page.getPageable(), page.getTotalElements()));
     }
     /**
@@ -88,9 +89,9 @@ public class NotifyCoreResource {
      * @param
      * @return
      */
-    @RequestMapping(method = RequestMethod.POST,value = "/notify/msgbody/getbacklogbypage/{tousers}")
-    public ResponseEntity<Page> getBacklogByPage(@Validated @NotNull @PathVariable("tousers") String toUsers) {
-        Page page = notifyCoreService.getBacklogByPage(toUsers);
+    @RequestMapping(method = RequestMethod.POST,value = "/notify/msgbody/getbacklogbypage")
+    public ResponseEntity<Page> getBacklogByPage(@RequestBody MsgBodySearchContext context) {
+        Page page = notifyCoreService.getBacklogByPage(context);
         return ResponseEntity.status(HttpStatus.OK).body(new PageImpl(mapping.toDto(page.getContent()), page.getPageable(), page.getTotalElements()));
     }
 }