修改邮件上限

back_recharge
duhui 2023-02-09 15:50:06 +08:00
parent 95a7801138
commit 187b429661
2 changed files with 11 additions and 21 deletions

View File

@ -25,7 +25,7 @@ public interface Global {
//mail state
int MAIL_BOX_CAPACITY = 30; // 邮箱最大容量
int MAIL_BOX_CAPACITY = 9999; // 邮箱最大容量
int MAIL_STATE_NEW = 0; // 新增邮件 未读
int MAIL_STATE_READ = 1; // 已读取
int MAIL_DRAW_ST_UNGET = 2; // 附件未领取

View File

@ -16,20 +16,19 @@ import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.MailingSystem;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.util.CBean2Proto;
import com.ljsd.jieling.util.ItemUtil;
import com.ljsd.jieling.util.MessageUtil;
import config.SErrorCodeEerverConfig;
import org.luaj.vm2.ast.Str;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import rpc.protocols.CommonProto;
import rpc.protocols.MessageTypeProto;
import rpc.protocols.PlayerInfoProto;
import com.ljsd.jieling.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import util.StringUtil;
import util.TimeUtils;
import javax.swing.plaf.nimbus.State;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
@ -62,7 +61,7 @@ public class MailLogic {
String redValue = RedisUtil.getInstence().get(RedisKey.MAIL_RED_POINT,"", String.class);
if(redValue!=null){
RedisUtil.getInstence().set(RedisKey.MAIL_RED_POINT,"",redValue+String.valueOf(userId)+",");
RedisUtil.getInstence().set(RedisKey.MAIL_RED_POINT,"",redValue+ userId +",");
}
systemMailToUserMail(systemMail,mailMap,userId);
if (mailMap.size() ==0){
@ -70,7 +69,7 @@ public class MailLogic {
}
List<Mail> cMailList = new CopyOnWriteArrayList<>();
Iterator<Map.Entry<String, Mail>> iterator = mailMap.entrySet().iterator();
int nowTime = (int)(TimeUtils.now()/1000);
int nowTime = TimeUtils.nowInt();
Set<String> removeIds = new HashSet<>();
while (iterator.hasNext()){
Map.Entry<String, Mail> next = iterator.next();
@ -97,14 +96,6 @@ public class MailLogic {
removeIds.add(cMail.getId());
continue;
}
//运营 游心gm 20019服错发邮件
// if("45u6xr9ch5dr0epw".equals(GameApplication.serverProperties.getAppId())){
// if(GameApplication.serverProperties.getId() == 20019){
// if("登录问题修复公告||".equals(cMail.getHead()) && "19#300|60#5".equals(cMail.getMailItem())){
// cMail.setMailItem("19#3|60#5");
// }
// }
// }
cMailList.add(cMail);
}
for(String removeId : removeIds){
@ -113,15 +104,14 @@ public class MailLogic {
//超过邮件上限, 删除时间最早的一封
int size = cMailList.size();
if (size > Global.MAIL_BOX_CAPACITY){
Collections.sort(cMailList, Comparator.comparingInt(Mail::getSendTime));
cMailList.sort(Comparator.comparingInt(Mail::getSendTime));
for(int i = 0; i < (size - Global.MAIL_BOX_CAPACITY); i++){
mailManager.removeMail(cMailList.get(0).getId());
cMailList.remove(0);
}
}
Collections.sort(cMailList, Comparator.comparingInt(Mail::getIsTop).reversed());
cMailList.sort(Comparator.comparingInt(Mail::getIsTop).reversed());
getAllMailProtoList(cMailList,mailList);
return mailList;
return mailList;
}
/**