发布状态枚举重命名

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/bean/AddNoticeDomain.java

@@ -9,7 +9,6 @@ package cn.com.qmth.examcloud.core.examwork.api.controller.bean;
 
 import cn.com.qmth.examcloud.api.commons.enums.NoticeReceiverRuleType;
 import cn.com.qmth.examcloud.api.commons.enums.NoticeStatus;
-import cn.com.qmth.examcloud.api.commons.enums.PublishStatus;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
@@ -17,7 +16,6 @@ import org.hibernate.validator.constraints.Length;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 
 /**
  * 添加通知信息实体

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/bean/NoticeDomain.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.examwork.api.controller.bean;
 
-import cn.com.qmth.examcloud.api.commons.enums.PublishStatus;
+import cn.com.qmth.examcloud.api.commons.enums.NoticePublishStatus;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -48,7 +48,7 @@ public class NoticeDomain implements JsonSerializable {
      * 发送状态
      */
     @ApiModelProperty("发送状态")
-    private PublishStatus publishStatus;
+    private NoticePublishStatus publishStatus;
 
     public Long getId() {
         return id;
@@ -90,11 +90,11 @@ public class NoticeDomain implements JsonSerializable {
         this.publishTime = publishTime;
     }
 
-    public PublishStatus getPublishStatus() {
+    public NoticePublishStatus getPublishStatus() {
         return publishStatus;
     }
 
-    public void setPublishStatus(PublishStatus publishStatus) {
+    public void setPublishStatus(NoticePublishStatus publishStatus) {
         this.publishStatus = publishStatus;
     }
 }

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/NoticePublishScheduleRepo.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.examcloud.core.examwork.dao;
 
-import cn.com.qmth.examcloud.api.commons.enums.PublishStatus;
+import cn.com.qmth.examcloud.api.commons.enums.NoticePublishStatus;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.NoticePublishScheduleEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -13,11 +12,11 @@ import java.util.List;
 
 public interface NoticePublishScheduleRepo extends JpaRepository<NoticePublishScheduleEntity, Long>,
         QueryByExampleExecutor<NoticePublishScheduleEntity>, JpaSpecificationExecutor<NoticePublishScheduleEntity> {
-    List<NoticePublishScheduleEntity> findByRootOrgIdAndPublishStatus(Long rootOrgId, PublishStatus publishStatus);
+    List<NoticePublishScheduleEntity> findByRootOrgIdAndPublishStatus(Long rootOrgId, NoticePublishStatus publishStatus);
 
     NoticePublishScheduleEntity findByRootOrgIdAndNoticeId(Long rootOrgId,Long noticeId);
 
-    List<NoticePublishScheduleEntity> findByPublishStatus(PublishStatus publishStatus);
+    List<NoticePublishScheduleEntity> findByPublishStatus(NoticePublishStatus publishStatus);
 
     @Modifying
     int deleteByRootOrgIdAndNoticeIdIn(Long rootOrgId,List<Long> noticeId);

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/NoticePublishScheduleEntity.java

@@ -1,17 +1,10 @@
 package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.Table;
-
-import cn.com.qmth.examcloud.api.commons.enums.PublishStatus;
-import cn.com.qmth.examcloud.web.jpa.JpaEntity;
+import cn.com.qmth.examcloud.api.commons.enums.NoticePublishStatus;
 import cn.com.qmth.examcloud.web.jpa.WithIdJpaEntity;
 
+import javax.persistence.*;
+
 /**
  * 公告发布进度实体
  * 
@@ -42,7 +35,7 @@ public class NoticePublishScheduleEntity extends WithIdJpaEntity {
 	 */
 	@Column(nullable = false)
 	@Enumerated(EnumType.STRING)
-	private PublishStatus publishStatus;
+	private NoticePublishStatus publishStatus;
 
 	/**
 	 * 已发布的最大用户id
@@ -70,11 +63,11 @@ public class NoticePublishScheduleEntity extends WithIdJpaEntity {
 		this.rootOrgId = rootOrgId;
 	}
 
-	public PublishStatus getPublishStatus() {
+	public NoticePublishStatus getPublishStatus() {
 		return publishStatus;
 	}
 
-	public void setPublishStatus(PublishStatus publishStatus) {
+	public void setPublishStatus(NoticePublishStatus publishStatus) {
 		this.publishStatus = publishStatus;
 	}
 

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/bean/NoticeInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.examwork.service.bean;
 
-import cn.com.qmth.examcloud.api.commons.enums.PublishStatus;
+import cn.com.qmth.examcloud.api.commons.enums.NoticePublishStatus;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -51,7 +51,7 @@ public class NoticeInfo implements JsonSerializable {
      * 发送状态
      */
     @ApiModelProperty("发送状态")
-    private PublishStatus publishStatus;
+    private NoticePublishStatus publishStatus;
 
     public Long getId() {
         return id;
@@ -93,11 +93,11 @@ public class NoticeInfo implements JsonSerializable {
         this.publishTime = publishTime;
     }
 
-    public PublishStatus getPublishStatus() {
+    public NoticePublishStatus getPublishStatus() {
         return publishStatus;
     }
 
-    public void setPublishStatus(PublishStatus publishStatus) {
+    public void setPublishStatus(NoticePublishStatus publishStatus) {
         this.publishStatus = publishStatus;
     }
 }

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/bean/NoticeInfoQuery.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.examwork.service.bean;
 
-import cn.com.qmth.examcloud.api.commons.enums.PublishStatus;
+import cn.com.qmth.examcloud.api.commons.enums.NoticePublishStatus;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -37,7 +37,7 @@ public class NoticeInfoQuery implements JsonSerializable {
      * 发送状态
      */
     @ApiModelProperty("发送状态")
-    private PublishStatus publishStatus;
+    private NoticePublishStatus publishStatus;
 
     public Long getRootOrgId() {
         return rootOrgId;
@@ -63,11 +63,11 @@ public class NoticeInfoQuery implements JsonSerializable {
         this.title = title;
     }
 
-    public PublishStatus getPublishStatus() {
+    public NoticePublishStatus getPublishStatus() {
         return publishStatus;
     }
 
-    public void setPublishStatus(PublishStatus publishStatus) {
+    public void setPublishStatus(NoticePublishStatus publishStatus) {
         this.publishStatus = publishStatus;
     }
 }

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/NoticeServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.com.qmth.examcloud.core.examwork.service.impl;
 
+import cn.com.qmth.examcloud.api.commons.enums.NoticePublishStatus;
 import cn.com.qmth.examcloud.api.commons.enums.NoticeReceiverRuleType;
 import cn.com.qmth.examcloud.api.commons.enums.NoticeStatus;
-import cn.com.qmth.examcloud.api.commons.enums.PublishStatus;
 import cn.com.qmth.examcloud.api.commons.exchange.PageInfo;
 import cn.com.qmth.examcloud.api.commons.security.bean.UserType;
 import cn.com.qmth.examcloud.api.commons.security.enums.RoleMeta;
@@ -27,7 +27,6 @@ import com.mysql.cj.util.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.assertj.core.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -189,7 +188,7 @@ public class NoticeServiceImpl implements NoticeService {
         if (publishSchedule == null) {
             throw new StatusException("501007", "找不到通知id为:" + info.getId() + "的通知进度数据");
         }
-        if (publishSchedule.getPublishStatus() != PublishStatus.UNPUBLISHED) {
+        if (publishSchedule.getPublishStatus() != NoticePublishStatus.UNPUBLISHED) {
             throw new StatusException("501008", "发布中或已发布的通知不允许修改");
         }
 
@@ -224,7 +223,7 @@ public class NoticeServiceImpl implements NoticeService {
 
     @Override
     public void disposePublishingUserNotice() {
-        List<NoticePublishScheduleEntity> publishingScheduleList = noticePublishScheduleRepo.findByPublishStatus(PublishStatus.PUBLISHING);
+        List<NoticePublishScheduleEntity> publishingScheduleList = noticePublishScheduleRepo.findByPublishStatus(NoticePublishStatus.PUBLISHING);
         //如果没有状态为发布中的数据，则直接返回
         if (publishingScheduleList == null || publishingScheduleList.isEmpty()) {
             return;
@@ -350,7 +349,7 @@ public class NoticeServiceImpl implements NoticeService {
             userNoticeList.add(userNotice);
         }
         userNoticeRepo.saveAll(userNoticeList);
-        publishSchedule.setPublishStatus(PublishStatus.PUBLISHED);
+        publishSchedule.setPublishStatus(NoticePublishStatus.PUBLISHED);
         noticePublishScheduleRepo.save(publishSchedule);
     }
 
@@ -495,7 +494,7 @@ public class NoticeServiceImpl implements NoticeService {
      * @param ne
      * @return 发布状态枚举
      */
-    private PublishStatus getNoticePublishStatus(Long rootOrgId, NoticeEntity ne) {
+    private NoticePublishStatus getNoticePublishStatus(Long rootOrgId, NoticeEntity ne) {
         NoticePublishScheduleEntity publishSchedule =
                 noticePublishScheduleRepo.findByRootOrgIdAndNoticeId(rootOrgId, ne.getId());
 
@@ -602,9 +601,9 @@ public class NoticeServiceImpl implements NoticeService {
         publishScheduleEntity.setRootOrgId(addNoticeInfo.getRootOrgId());
         publishScheduleEntity.setNoticeId(noticeId);
         if (addNoticeInfo.getNoticeStatus() == NoticeStatus.PUBLISH) {
-            publishScheduleEntity.setPublishStatus(PublishStatus.PUBLISHING);
+            publishScheduleEntity.setPublishStatus(NoticePublishStatus.PUBLISHING);
         } else {
-            publishScheduleEntity.setPublishStatus(PublishStatus.UNPUBLISHED);
+            publishScheduleEntity.setPublishStatus(NoticePublishStatus.UNPUBLISHED);
         }
         return publishScheduleEntity;
     }
@@ -671,9 +670,9 @@ public class NoticeServiceImpl implements NoticeService {
         publishScheduleEntity.setRootOrgId(info.getRootOrgId());
         publishScheduleEntity.setNoticeId(info.getId());
         if (info.getNoticeStatus() == NoticeStatus.PUBLISH) {
-            publishScheduleEntity.setPublishStatus(PublishStatus.PUBLISHING);
+            publishScheduleEntity.setPublishStatus(NoticePublishStatus.PUBLISHING);
         } else {
-            publishScheduleEntity.setPublishStatus(PublishStatus.UNPUBLISHED);
+            publishScheduleEntity.setPublishStatus(NoticePublishStatus.UNPUBLISHED);
         }
         return publishScheduleEntity;
     }