十绝阵排行修改
parent
2cfe662de8
commit
07cb65d63a
|
@ -210,6 +210,7 @@ public class DeathPathLogic {
|
||||||
startTime = (int)(TimeUtils.getAppointTime(guildWarTime[status-1][0],guildWarTime[status-1][1])/1000);
|
startTime = (int)(TimeUtils.getAppointTime(guildWarTime[status-1][0],guildWarTime[status-1][1])/1000);
|
||||||
overTime = (int)(TimeUtils.getAppointTime(guildWarTime[status][0],guildWarTime[status][1])/1000);
|
overTime = (int)(TimeUtils.getAppointTime(guildWarTime[status][0],guildWarTime[status][1])/1000);
|
||||||
if (taskExecutor == null) {
|
if (taskExecutor == null) {
|
||||||
|
tasks.clear();
|
||||||
taskExecutor = new DeathPathExecutor(tasks);
|
taskExecutor = new DeathPathExecutor(tasks);
|
||||||
taskExecutor.start();
|
taskExecutor.start();
|
||||||
}
|
}
|
||||||
|
@ -345,8 +346,9 @@ public class DeathPathLogic {
|
||||||
try {
|
try {
|
||||||
DeathPathTask task= blockingQueue.take();
|
DeathPathTask task= blockingQueue.take();
|
||||||
taskDoExecute(task);
|
taskDoExecute(task);
|
||||||
} catch (InterruptedException e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
LOGGER.error(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -417,7 +419,11 @@ public class DeathPathLogic {
|
||||||
|
|
||||||
Family.DeathPathFirstChangeIndication indication = Family.DeathPathFirstChangeIndication.newBuilder().setChangeInfo(info).build();
|
Family.DeathPathFirstChangeIndication indication = Family.DeathPathFirstChangeIndication.newBuilder().setChangeInfo(info).build();
|
||||||
|
|
||||||
|
if(guildInfo!=null){
|
||||||
GuildLogic.sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.DEATH_PATH_FIRST_CHANGE_INDICATION,indication);
|
GuildLogic.sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.DEATH_PATH_FIRST_CHANGE_INDICATION,indication);
|
||||||
|
}else{
|
||||||
|
LOGGER.error("Exception公会信息为空,不能发送推送,公会id为{}",n.getValue());
|
||||||
|
}
|
||||||
});
|
});
|
||||||
LOGGER.info("信息修改,需要推送");
|
LOGGER.info("信息修改,需要推送");
|
||||||
}
|
}
|
||||||
|
|
|
@ -1063,6 +1063,10 @@ public class GuildLogic {
|
||||||
* @param generatedMessage
|
* @param generatedMessage
|
||||||
*/
|
*/
|
||||||
public static void sendIndicationToMember(GuildInfo guildInfo, MessageTypeProto.MessageType messageType, GeneratedMessage generatedMessage){
|
public static void sendIndicationToMember(GuildInfo guildInfo, MessageTypeProto.MessageType messageType, GeneratedMessage generatedMessage){
|
||||||
|
if(guildInfo==null){
|
||||||
|
LOGGER.error("Exception工会信息已被清空");
|
||||||
|
return;
|
||||||
|
}
|
||||||
Map<Integer, Set<Integer>> members = guildInfo.getMembers();
|
Map<Integer, Set<Integer>> members = guildInfo.getMembers();
|
||||||
for(Set<Integer> items : members.values()){
|
for(Set<Integer> items : members.values()){
|
||||||
for(Integer sendUid : items){
|
for(Integer sendUid : items){
|
||||||
|
@ -1075,6 +1079,10 @@ public class GuildLogic {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public static void sendIndicationToMemberWithoutUser(GuildInfo guildInfo, MessageTypeProto.MessageType messageType, GeneratedMessage generatedMessage,int withOutUId){
|
public static void sendIndicationToMemberWithoutUser(GuildInfo guildInfo, MessageTypeProto.MessageType messageType, GeneratedMessage generatedMessage,int withOutUId){
|
||||||
|
if(guildInfo==null){
|
||||||
|
LOGGER.error("Exception工会信息已被清空");
|
||||||
|
return;
|
||||||
|
}
|
||||||
Map<Integer, Set<Integer>> members = guildInfo.getMembers();
|
Map<Integer, Set<Integer>> members = guildInfo.getMembers();
|
||||||
for(Set<Integer> items : members.values()){
|
for(Set<Integer> items : members.values()){
|
||||||
for(Integer sendUid : items){
|
for(Integer sendUid : items){
|
||||||
|
|
Loading…
Reference in New Issue