Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingApprove.java

@@ -2,6 +2,9 @@ package com.usky.meeting.domain;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.squareup.moshi.Json;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -24,17 +27,19 @@ public class MeetingApprove implements Serializable {
     /**
      * 会议室预约id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long meetingId;
 
     /**
      * 申请用户id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long initiatorId;
 
     /**
      * 审批人
      */
-    private Long approveUserId;
+    private String approveUserId;
 
     /**
      * 审批结果

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingApproveUser.java

@@ -3,6 +3,8 @@ package com.usky.meeting.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -21,17 +23,19 @@ public class MeetingApproveUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
+    private Integer id;
 
     /**
      * 会议id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long meetingId;
 
     /**
      * 审批用户id
      */
-    private String dmUserId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long dmUserId;
 
     /**
      * 组织机构ID

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingAttendee.java

@@ -6,6 +6,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -35,17 +36,19 @@ public class MeetingAttendee implements Serializable {
     /**
      * 会议id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long meetingId;
 
     /**
      * 参与人id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long userId;
 
     /**
      * 是否签到(0-否 1-是)
      */
-    private Long isSign;
+    private Integer isSign;
 
     /**
      * 签到时间
@@ -55,7 +58,7 @@ public class MeetingAttendee implements Serializable {
     /**
      * 是否签退(0-否 1-是)
      */
-    private Long isSignOut;
+    private Integer isSignOut;
 
     /**
      * 签退时间
@@ -65,7 +68,7 @@ public class MeetingAttendee implements Serializable {
     /**
      * 签到方式(0.人工签到 1.人脸签到)
      */
-    private Long signType;
+    private Integer signType;
 
     /**
      * 组织机构ID

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingDevice.java

@@ -42,6 +42,7 @@ public class MeetingDevice implements Serializable {
     /**
      * 文件存储id(tool_local_storage)
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long storageId;
 
     /**
@@ -57,7 +58,8 @@ public class MeetingDevice implements Serializable {
     /**
      * 所属会议室
      */
-    private String roomId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long roomId;
 
     /**
      * 登记时间

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingFace.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -80,6 +82,7 @@ public class MeetingFace implements Serializable {
     /**
      * 用户ID
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long userId;
 
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingFile.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -27,11 +29,13 @@ public class MeetingFile implements Serializable {
     /**
      * 会议id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long meetingId;
 
     /**
      * 文件存储id(tool_local_storage)
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long storageId;
 
     /**
@@ -42,7 +46,7 @@ public class MeetingFile implements Serializable {
     /**
      * 文件类型(0-会议所需文件,1-会议记录文件,2-高层会议文件)
      */
-    private Long fileType;
+    private Integer fileType;
 
     /**
      * 上传用户(dm_user)

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingInfo.java

@@ -2,6 +2,8 @@ package com.usky.meeting.domain;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -24,6 +26,7 @@ public class MeetingInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long meetingId;
 
     /**
@@ -34,6 +37,7 @@ public class MeetingInfo implements Serializable {
     /**
      * 会议室id
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long roomId;
 
     /**
@@ -74,7 +78,7 @@ public class MeetingInfo implements Serializable {
     /**
      * 审批状态(0-审批中 1-审批通过 2-审批驳回)
      */
-    private Long approveStatus;
+    private Integer approveStatus;
 
     /**
      * 审批者意见
@@ -92,9 +96,9 @@ public class MeetingInfo implements Serializable {
     private Integer planCount;
 
     /**
-     * 是否延期(会议是否需要延期30分钟)
+     * 是否延期(会议是否需要延期30分钟)(0-否 1-是)
      */
-    private Long isDelay;
+    private Integer isDelay;
 
     /**
      * 备注
@@ -102,9 +106,9 @@ public class MeetingInfo implements Serializable {
     private String remark;
 
     /**
-     * 会议状态(未开始/进行中/已结束)
+     * 会议状态(0-未开始 1-进行中 2-已结束)
      */
-    private Long meetingStatus;
+    private Integer meetingStatus;
 
     /**
      * 创建者
@@ -137,9 +141,9 @@ public class MeetingInfo implements Serializable {
     private String procInstId;
 
     /**
-     * 是否取消
+     * 是否取消(0-否 1-是)
      */
-    private Long isCancel;
+    private Integer isCancel;
 
     /**
      * 通知类型(APP/Email/MSG短信)
@@ -149,12 +153,12 @@ public class MeetingInfo implements Serializable {
     /**
      * 会议性质(1-高层会议/0-普通会议)
      */
-    private String meetingProp;
+    private Integer meetingProp;
 
     /**
      * 是否需要审批(0-否 1-是)
      */
-    private Long isApprove;
+    private Integer isApprove;
 
     /**
      * 高层会议-指定用户
@@ -164,7 +168,7 @@ public class MeetingInfo implements Serializable {
     /**
      * 会议模式(0-线下会议 1-线上会议 2-线下同步线上会议)
      */
-    private String meetingMode;
+    private Integer meetingMode;
 
     /**
      * 租户ID

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingRoom.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -31,6 +32,7 @@ public class MeetingRoom implements Serializable {
 
     @Id
     @TableId
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long roomId;
 
     /**
@@ -41,7 +43,8 @@ public class MeetingRoom implements Serializable {
     /**
      * 所在楼层
      */
-    private String floorId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long floorId;
 
     /**
      * 会议室简介

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingRoomServiceImpl.java

@@ -89,9 +89,9 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
         page = this.page(page,queryWrapper);
         if(CollectionUtils.isNotEmpty(page.getRecords())){
             //查询楼层信息和本地存储信息
-            List<BigInteger> floorIdList = new ArrayList<>();
+            List<Long> floorIdList = new ArrayList<>();
             for (int i = 0; i < page.getRecords().size(); i++) {
-                BigInteger floorId1 = new BigInteger(page.getRecords().get(i).getFloorId());
+                Long floorId1 = page.getRecords().get(i).getFloorId();
                 if(!floorIdList.contains(floorId1)){
                     floorIdList.add(floorId1);
                 }