zhangjiansheng hace 3 meses
padre
commit
a4391b3e01

+ 6 - 0
eitc-manage/src/main/java/com/eitc/manage/domain/SysClinicInfo.java

@@ -126,5 +126,11 @@ public class SysClinicInfo extends EitcBaseEntity
126 126
     @ApiModelProperty(value = "bug版本MD5的编码", name = "repair_code")
127 127
     private String repairCode;
128 128
 
129
+    @TableField(exist = false)
130
+    private String pageNum;
131
+
132
+    @TableField(exist = false)
133
+    private String pageSize;
134
+
129 135
 
130 136
 }

+ 11 - 14
eitc-patient-chat/src/main/java/com/eitc/patient/netty/process/MsgProcessor.java

@@ -117,17 +117,17 @@ public class MsgProcessor {
117 117
             }
118 118
             if (channels != null) {
119 119
                 for (Channel channel : channels) {//向其他人发送消息
120
-                    if (channel != client) {
121
-                        if (username.equals(client.attr(AttributeKey.valueOf("username")).get())){
122
-                            client.attr(AttributeKey.valueOf("username"));
123
-                        }else{
124
-                            request.setSender(username);
125
-                        }
126
-                    }
127
-                    //向自己发送消息
128
-                    else {
129
-                        request.setSender("MY_SELF");
130
-                    }
120
+//                    if (channel != client) {
121
+//                        if (username.equals(client.attr(AttributeKey.valueOf("username")).get())){
122
+//                            client.attr(AttributeKey.valueOf("username"));
123
+//                        }else{
124
+//                            request.setSender(username);
125
+//                        }
126
+//                    }
127
+//                    //向自己发送消息
128
+//                    else {
129
+//                        request.setSender(username);
130
+//                    }
131 131
                     //自定义IM协议解码
132 132
                     String text = encoder.encode(request);
133 133
 
@@ -149,9 +149,6 @@ public class MsgProcessor {
149 149
         historyList.forEach(x->{
150 150
             //发送消息
151 151
             IMMessage decode = decoder.decode(x);
152
-            if (username.equals(decode.getSender())){
153
-                decode.setSender("MY_SELF");
154
-            }
155 152
             String texthis = encoder.encode(decode);
156 153
             channel.writeAndFlush(new TextWebSocketFrame(texthis));
157 154
         });