refactor: 通知状态和接收者类型从字符串改为数值型

@@ -72,14 +72,14 @@ public interface FastIotConstants {
   }
   }
 
 
   interface ReceiverType {
   interface ReceiverType {
-    String PERSONAL = "3";
-    String DEPARTMENT = "2";
-    String ORGANIZATION = "1";
-    String ALL = "0";
+    int PERSONAL = 3;
+    int DEPARTMENT = 2;
+    int ORGANIZATION = 1;
+    int ALL = 0;
   }
   }
 
 
   interface DraftStatus {
   interface DraftStatus {
-    String PUBLISHED = "1";
-    String DRAFT = "0";
+    int PUBLISHED = 1;
+    int DRAFT = 0;
   }
   }
 }
 }

@@ -31,13 +31,13 @@ public class SysNoticeDTO extends TenantDTO {
   private String content;
   private String content;
 
 
   @ApiModelProperty(value = "接收者（字典值receiver_type）  0：全部  1：组织  2：部门  3：个人",required = true)
   @ApiModelProperty(value = "接收者（字典值receiver_type）  0：全部  1：组织  2：部门  3：个人",required = true)
-  private String receiverType;
+  private Integer receiverType;
 
 
   @ApiModelProperty(value = "根据receiverType不同变化，0:传null，1:组织id，2:部门id，3:用户id",required = true)
   @ApiModelProperty(value = "根据receiverType不同变化，0:传null，1:组织id，2:部门id，3:用户id",required = true)
   private String pointId;
   private String pointId;
 
 
   @ApiModelProperty(value = "发送状态（字典值draft_status）  0：草稿  1：已发布")
   @ApiModelProperty(value = "发送状态（字典值draft_status）  0：草稿  1：已发布")
-  private String status;
+  private Integer status;
 
 
   @ApiModelProperty(value = "发送者")
   @ApiModelProperty(value = "发送者")
   private String senderName;
   private String senderName;

@@ -27,9 +27,9 @@ public class SysNotice extends TenantBaseEntity {
   /** 内容 */
   /** 内容 */
   private String content;
   private String content;
   /** 接收者（字典值receiver_type） 0：全部 1：组织 2：部门 3：个人 */
   /** 接收者（字典值receiver_type） 0：全部 1：组织 2：部门 3：个人 */
-  private String receiverType;
+  private int receiverType;
   /** 发送状态（字典值draft_status） 0：草稿 1：已发布 */
   /** 发送状态（字典值draft_status） 0：草稿 1：已发布 */
-  private String status;
+  private int status;
   /** 发送者 */
   /** 发送者 */
   private String senderName;
   private String senderName;
   /** 发送时间 */
   /** 发送时间 */

@@ -30,5 +30,5 @@ public class SysNoticeUser extends TenantBaseEntity {
   /** 阅读时间 */
   /** 阅读时间 */
   private LocalDateTime readDate;
   private LocalDateTime readDate;
   /** 通知用户状态: 0 草稿 1已发布 */
   /** 通知用户状态: 0 草稿 1已发布 */
-  private String status;
+  private Integer status;
 }
 }

@@ -73,7 +73,7 @@ public class SysNoticeUserServiceImpl
 
 
     @Override
     @Override
     public void saveSysNoticeUser(
     public void saveSysNoticeUser(
-            List<String> userIds, String tenantId, String noticeId, String status) {
+            List<String> userIds, String tenantId, String noticeId, Integer status) {
         List<User> userList = userMapper
         List<User> userList = userMapper
                 .selectList(
                 .selectList(
                         new LambdaQueryWrapper<User>().in(User::getId, userIds))
                         new LambdaQueryWrapper<User>().in(User::getId, userIds))
@@ -108,8 +108,8 @@ public class SysNoticeUserServiceImpl
     }
     }
 
 
     @Override
     @Override
-    public boolean updateSysNoticeUsersStatusByNoticeId(String id, String status) {
-        if (StringUtils.isAllEmpty(id) || StringUtils.isAllEmpty(status)) {
+    public boolean updateSysNoticeUsersStatusByNoticeId(String id, Integer status) {
+        if (StringUtils.isAllEmpty(id) || status == null) {
             throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.name());
             throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.name());
         }
         }
         return baseMapper.updateSysNoticeUsersStatusByNoticeId(id, status);
         return baseMapper.updateSysNoticeUsersStatusByNoticeId(id, status);

@@ -30,7 +30,7 @@ public interface SysNoticeUserMapper extends BaseMapper<SysNoticeUser> {
    */
    */
   SysNoticeUserDTO get(@Param("id") String id, @Param("tenantId") String tenantId);
   SysNoticeUserDTO get(@Param("id") String id, @Param("tenantId") String tenantId);
 
 
-  boolean updateSysNoticeUsersStatusByNoticeId(@Param("noticeId")String noticeId, @Param("status")String status);
+  boolean updateSysNoticeUsersStatusByNoticeId(@Param("noticeId")String noticeId, @Param("status")Integer status);
 
 
 
 
 }
 }

@@ -21,11 +21,11 @@ public interface SysNoticeUserService extends BaseService<SysNoticeUser>{
 
 
     SysNoticeUserDTO get(String id,String tenantId);
     SysNoticeUserDTO get(String id,String tenantId);
 
 
-    void saveSysNoticeUser (List<String> userIds, String tenantId,String noticeId,String status);
+    void saveSysNoticeUser (List<String> userIds, String tenantId,String noticeId,Integer status);
 
 
     List<String> getSysNoticeUserIdsByNoticeId(String noticeId);
     List<String> getSysNoticeUserIdsByNoticeId(String noticeId);
 
 
-    boolean updateSysNoticeUsersStatusByNoticeId(String noticeId, String status);
+    boolean updateSysNoticeUsersStatusByNoticeId(String noticeId, Integer status);
 
 
     boolean deleteNoticUserByNoticeId(List<String> noticeId);
     boolean deleteNoticUserByNoticeId(List<String> noticeId);
 }
 }

@@ -32,15 +32,15 @@
         sn.id id,
         sn.id id,
         sn.type AS type,
         sn.type AS type,
         sn.title title,
         sn.title title,
-        sn.content AS content,
-        (
-        <include refid="dict"/>
-        AND sd.dict_code = 'receiver_type' AND sdi.item_value = sn.receiver_type
-        ) receiver_type,
-        (
-        <include refid="dict"/>
-        AND sd.dict_code = 'draft_status' AND sdi.item_value = sn.status
-        ) status,
+        sn.content AS content,sn.receiver_type,sn.status,
+<!--        (-->
+<!--        <include refid="dict"/>-->
+<!--        AND sd.dict_code = 'receiver_type' AND sdi.item_value = sn.receiver_type-->
+<!--        ) receiver_type,-->
+<!--        (-->
+<!--        <include refid="dict"/>-->
+<!--        AND sd.dict_code = 'draft_status' AND sdi.item_value = sn.status-->
+<!--        ) status,-->
         sn.sender_name sender_name,
         sn.sender_name sender_name,
         sn.sender_date sender_date,
         sn.sender_date sender_date,
         sn.creator creator,
         sn.creator creator,