网考学生端代码优化及通知自动服务的bug修复

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/NoticeCloudServiceProvider.java

@@ -67,8 +67,17 @@ public class NoticeCloudServiceProvider extends ControllerSupport implements Not
     @Override
     public DisposePublishingUserNoticeResp disposePublishingUserNotice(@RequestBody DisposePublishingUserNoticeReq
                                                                                req) {
-        NoticeRulePublishProgressBean processBean = req.getNoticeRulePublishProgress();
+        //处理发布中的通知数据，并返回下一个要处理的用户id
+        Long nextUserId = noticeService.disposePublishingUserNotice(req.getStartUserId(),
+                copytNoticeRulePublishProgressEntityFrom(req.getNoticeRulePublishProgress()));
 
+        DisposePublishingUserNoticeResp resp = new DisposePublishingUserNoticeResp();
+        resp.setNextUserId(nextUserId);
+        return resp;
+    }
+
+    //实体转换
+    private NoticeRulePublishProgressEntity copytNoticeRulePublishProgressEntityFrom(NoticeRulePublishProgressBean processBean) {
         NoticeRulePublishProgressEntity processEntity = new NoticeRulePublishProgressEntity();
         processEntity.setId(processBean.getId());
         processEntity.setMaxCommonUserId(processBean.getMaxCommonUserId());
@@ -76,12 +85,7 @@ public class NoticeCloudServiceProvider extends ControllerSupport implements Not
         processEntity.setNoticeId(processBean.getNoticeId());
         processEntity.setNoticeReceiverRuleType(processBean.getNoticeReceiverRuleType());
         processEntity.setRootOrgId(processBean.getRootOrgId());
-
-        Long nextUserId = noticeService.disposePublishingUserNotice(req.getStartUserId(), processEntity);
-
-        DisposePublishingUserNoticeResp resp = new DisposePublishingUserNoticeResp();
-        resp.setNextUserId(nextUserId);
-        return resp;
+        return processEntity;
     }
 
     @ApiOperation(value = "清理过期的通知数据")