fix: 公告优化

eitc-patient-app/src/main/java/com/eitc/patient/controller/AppNoticeManageController.java

@@ -6,6 +6,8 @@ import com.eitc.common.core.controller.BaseController;
 import com.eitc.common.core.domain.AjaxResult;
 import com.eitc.common.utils.StringUtils;
 import com.eitc.patient.domain.NoticeManage;
+import com.eitc.patient.enums.NoticeManageDisplayStatusEnum;
+import com.eitc.patient.enums.NoticeManagePublishStatusEnum;
 import com.eitc.patient.service.INoticeManageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,8 +40,8 @@ public class AppNoticeManageController extends BaseController {
     public AjaxResult list(NoticeManage noticeManage) {
         LambdaQueryWrapper<NoticeManage> wrapper = Wrappers.<NoticeManage>lambdaQuery().orderByDesc(NoticeManage::getCreateDate)
                 .like(StringUtils.isNotBlank(noticeManage.getNoticeTitle()), NoticeManage::getNoticeTitle, noticeManage.getNoticeTitle())
-                .like(NoticeManage::getPublishStatus, 1)
-                .like(NoticeManage::getDisplayStatus, 2);
+                .like(NoticeManage::getPublishStatus, NoticeManagePublishStatusEnum.PUBLISH.getCode())
+                .like(NoticeManage::getDisplayStatus, NoticeManageDisplayStatusEnum.DISPLAY_PROGRESS.getCode());
         List<NoticeManage> list = noticeManageService.list(wrapper);
         return success(list);
     }

eitc-patient-base/src/main/java/com/eitc/patient/enums/NoticeManageDisplayStatusEnum.java

@@ -0,0 +1,34 @@
+package com.eitc.patient.enums;
+
+/**
+ * NoticeManageDisplayStatusEnum
+ *
+ * @author mtx
+ * @date: 2024/07/31 17:22
+ */
+public enum NoticeManageDisplayStatusEnum {
+
+    // 显示状态(1未开始，2显示中，3已结束)
+    NOT_STARTED(1, "未开始"),
+    DISPLAY_PROGRESS(2, "显示中"),
+    IS_END(3, "已结束");
+
+    private final Integer code;
+    private final String info;
+
+    NoticeManageDisplayStatusEnum(Integer code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public Integer getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+
+}

eitc-patient-base/src/main/java/com/eitc/patient/enums/NoticeManagePublishStatusEnum.java

@@ -0,0 +1,33 @@
+package com.eitc.patient.enums;
+
+/**
+ * NoticeManagePublishStatusEnum
+ *
+ * @author mtx
+ * @date: 2024/07/31 17:22
+ */
+public enum NoticeManagePublishStatusEnum {
+
+    // 发布状态（1发布，0未发布）
+    PUBLISH(1, "发布"),
+    NO_PUBLISH(0, "未发布");
+
+    private final Integer code;
+    private final String info;
+
+    NoticeManagePublishStatusEnum(Integer code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public Integer getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+
+}

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/NoticeManageServiceImpl.java

@@ -2,6 +2,7 @@ package com.eitc.patient.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.eitc.patient.domain.NoticeManage;
+import com.eitc.patient.enums.NoticeManageDisplayStatusEnum;
 import com.eitc.patient.mapper.NoticeManageMapper;
 import com.eitc.patient.service.INoticeManageService;
 import org.springframework.stereotype.Service;
@@ -41,13 +42,13 @@ public class NoticeManageServiceImpl extends ServiceImpl<NoticeManageMapper, Not
         // 比较当前时间与通知开始时间，判断通知是否已经开始
         if (now.compareTo(noticeStartTime) >= 0 && now.compareTo(noticeEndTime) <= 0) {
             // 如果当前时间在通知的开始和结束时间之间，返回状态码2，表示通知正在进行中
-            return 2;
+            return NoticeManageDisplayStatusEnum.DISPLAY_PROGRESS.getCode();
         } else if (now.compareTo(noticeStartTime) < 0) {
             // 如果当前时间早于通知开始时间，返回状态码1，表示通知尚未开始
-            return 1;
+            return NoticeManageDisplayStatusEnum.NOT_STARTED.getCode();
         } else if (now.compareTo(noticeEndTime) > 0) {
             // 如果当前时间晚于通知结束时间，返回状态码3，表示通知已经结束
-            return 3;
+            return NoticeManageDisplayStatusEnum.IS_END.getCode();
         } else {
             // 如果无法确定通知的状态，返回null
             return null;

eitc-patient-pc/src/main/java/com/eitc/patient/controller/NoticeManageController.java

@@ -8,6 +8,7 @@ import com.eitc.common.core.domain.AjaxResult;
 import com.eitc.common.enums.BusinessType;
 import com.eitc.common.utils.StringUtils;
 import com.eitc.patient.domain.NoticeManage;
+import com.eitc.patient.enums.NoticeManagePublishStatusEnum;
 import com.eitc.patient.service.INoticeManageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +85,7 @@ public class NoticeManageController extends BaseController {
         if (Objects.isNull(noticeManage)) {
             return AjaxResult.error("公告不存在");
         }
-        if (Objects.equals(noticeManage.getPublishStatus(), 1)) {
+        if (Objects.equals(noticeManage.getPublishStatus(), NoticeManagePublishStatusEnum.PUBLISH.getCode())) {
             return AjaxResult.error("请先撤回");
         }
         noticeManage.setDisplayStatus(noticeManageService.checkDisplayStatus(noticeManage));
@@ -103,7 +104,7 @@ public class NoticeManageController extends BaseController {
             return AjaxResult.error("公告不存在");
         }
         NoticeManage notice = new NoticeManage();
-        notice.setPublishStatus(0);
+        notice.setPublishStatus(NoticeManagePublishStatusEnum.NO_PUBLISH.getCode());
         notice.setId(entry.getId());
         return toAjax(noticeManageService.updateById(notice));
     }
@@ -119,7 +120,7 @@ public class NoticeManageController extends BaseController {
         if (Objects.isNull(noticeManage)) {
             return AjaxResult.error("公告不存在");
         }
-        if (Objects.equals(noticeManage.getPublishStatus(), 1)) {
+        if (Objects.equals(noticeManage.getPublishStatus(), NoticeManagePublishStatusEnum.PUBLISH.getCode())) {
             return AjaxResult.error("请先撤回");
         }
         return toAjax(noticeManageService.removeById(id));