From 0a45445c20807d5a7220308efa92adf1b1c91d29 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 27 Feb 2019 21:31:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/common/mogodb/LjsdMongoTemplate.java | 2 +- .../com/ljsd/common/mogodb/MongoRoot.java | 2 +- .../ljsd/common/mogodb/MongoUpdateCache.java | 2 +- .../java/com/ljsd/jieling/config/SCHero.java | 2 +- .../com/ljsd/jieling/db/redis/RedisUtil.java | 31 +++++++++++++++++++ .../handler/GameGM/GMRequestHandler.java | 2 ++ .../ljsd/jieling/logic/chat/ChatLogic.java | 2 ++ .../jieling/logic/dao/WorkShopController.java | 4 +-- .../ljsd/jieling/logic/hero/HeroLogic.java | 7 +++-- .../jieling/mq/RedisRecordSendThread.java | 6 ++-- .../com/ljsd/jieling/util/CBean2Proto.java | 12 ++++--- 11 files changed, 58 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java b/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java index 86cd57a95..c3aef2227 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java +++ b/common/src/main/java/com/ljsd/common/mogodb/LjsdMongoTemplate.java @@ -88,7 +88,7 @@ public class LjsdMongoTemplate { BasicDBObject update= new BasicDBObject().append("$inc",new BasicDBObject().append(key, 1)); DBObject query = cursor.next(); DBObject result = collection.findAndModify(query, update); - return Integer.valueOf(result.get(key).toString())+1; + return Integer.parseInt(result.get(key).toString())+1; } else { searchQuery.put(key, 1); collection.insert(searchQuery); diff --git a/common/src/main/java/com/ljsd/common/mogodb/MongoRoot.java b/common/src/main/java/com/ljsd/common/mogodb/MongoRoot.java index 52e505801..bfbd7af19 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoRoot.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoRoot.java @@ -23,7 +23,7 @@ public abstract class MongoRoot { } public int _getIntId() { - return Integer.valueOf(id); + return Integer.parseInt(id); } public void setId(String id) { diff --git a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java index cf2c42f30..810be263b 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java +++ b/common/src/main/java/com/ljsd/common/mogodb/MongoUpdateCache.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; public class MongoUpdateCache { - class UpdateRequest { + static class UpdateRequest { MongoBase mongoBase; String fullKey; Object value; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java index 9fab8500f..ae2c11da4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java @@ -47,7 +47,7 @@ public class SCHero implements BaseConfig{ private Map> consumeMaterialInfoOfPositionByStar; - public class ConsumeMaterialInfo{ + public static class ConsumeMaterialInfo{ private int groupID; private int nums; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index b734e65d8..c58f2d11b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -716,6 +716,37 @@ public class RedisUtil { } return -1; } + // ===============================set================================= + public boolean sadd(String key,String member){ + try { + redisTemplate.opsForSet().add(key,member); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + public boolean sremove(String key,String member){ + try { + redisTemplate.opsForSet().remove(key,member); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + public int getSetLength(String key){ + try { + return redisTemplate.opsForSet().size(key).intValue(); + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 6830f68a2..59ee3daaf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -62,6 +62,8 @@ public class GMRequestHandler extends BaseHandler{ Mail mail = new Mail(uid,"GM","GM",prarm1+"#"+prarm2,nowTime,30*24*60*60,"GM", Global.MAIL_TYPE_GM); cUser.getMailManager().addMail(mail); break; + default: + break; } try { MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GM_RESPONSE_VALUE, null, true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/chat/ChatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/chat/ChatLogic.java index eee362147..601b6e268 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/chat/ChatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/chat/ChatLogic.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.logic.chat; import com.ljsd.jieling.config.SGameSetting; +import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.ChatProto; import com.ljsd.jieling.protocols.MessageTypeProto; @@ -28,6 +29,7 @@ public class ChatLogic { return; } //移除自己所在的频道。 + } public void sendChatInfo(ISession iSession, ChatProto.SendChatInfoRequest sendChatInfoRequest) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java index cc2bf69b1..8454cdd99 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WorkShopController.java @@ -24,11 +24,11 @@ public class WorkShopController extends MongoBase { } public void add(int type,int openId) throws Exception { - if(openBlueStateMap.containsKey(type)){ + if(!openBlueStateMap.containsKey(type)){ openBlueStateMap.put(type,new ArrayList<>()); } openBlueStateMap.get(type).add(openId); - updateString("openBlueStateMap." + type,1); + updateString("openBlueStateMap." + type, openBlueStateMap.get(type)); } public void addWorkShopExp(int addExp) throws Exception { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index b94861d7c..66f4046da 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -193,8 +193,9 @@ public class HeroLogic { Map> teamPosForHero = teamPosManager.getTeamPosForHero(); Map teamNames = teamPosManager.getTeamNames(); Map> teamPosForPoken = teamPosManager.getTeamPosForPoken(); - for(Integer teamId:teamPosForHero.keySet()){ - List teamPosHeroInfoList = teamPosForHero.get(teamId); + for(Map.Entry> item :teamPosForHero.entrySet()){ + int teamId = item.getKey(); + List teamPosHeroInfoList = item.getValue(); List teamPosForPokenInfos = teamPosForPoken.get(teamId); if(null == teamPosForPokenInfos){ teamPosForPokenInfos = new ArrayList<>(1); @@ -566,6 +567,8 @@ public class HeroLogic { case GlobalsDef.SPEED_TYPE: result = scHero.getSpeed(); break; + default: + break; } return result; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/mq/RedisRecordSendThread.java b/serverlogic/src/main/java/com/ljsd/jieling/mq/RedisRecordSendThread.java index 6f3b4dd3e..81b580995 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/mq/RedisRecordSendThread.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/mq/RedisRecordSendThread.java @@ -56,8 +56,10 @@ public class RedisRecordSendThread extends Thread{ } map.get(topic).add(new DefaultTypedTuple(itemInfo,(double)increment)); } - for(String topic : map.keySet()){ - RedisUtil.getInstence().zsetAddAall(topic,map.get(topic)); + for(Map.Entry>> item : map.entrySet()){ + String topic = item.getKey(); + Set> value = item.getValue(); + RedisUtil.getInstence().zsetAddAall(topic,value); } }catch (Exception e){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 8e3dfff91..a816339a6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -94,8 +94,10 @@ public class CBean2Proto { private static List parseFromMap(Map propertyValueByIdMap){ List result = new ArrayList<>(); - for(Integer propertyId:propertyValueByIdMap.keySet()){ - result.add(CommonProto.SpecialEffects.newBuilder().setPropertyId(propertyId).setPropertyValue(propertyValueByIdMap.get(propertyId)).build()); + for(Map.Entry item:propertyValueByIdMap.entrySet()){ + Integer propertyId = item.getKey(); + Integer propertyValue = item.getValue(); + result.add(CommonProto.SpecialEffects.newBuilder().setPropertyId(propertyId).setPropertyValue(propertyValue).build()); } return result; } @@ -104,8 +106,10 @@ public class CBean2Proto { public static CommonProto.PokemonInfo getPokemon(Pokemon pokemon) { Map comonpentsLevelMap = pokemon.getComonpentsLevelMap(); List pokemoncomonpentList = new ArrayList<>(); - for(Integer comonpentId : comonpentsLevelMap.keySet()){ - pokemoncomonpentList.add(CommonProto.Pokemoncomonpent.newBuilder().setId(comonpentId).setLevel(comonpentsLevelMap.get(comonpentId)).build()); + for( Map.Entry item: comonpentsLevelMap.entrySet()){ + Integer comonpentId = item.getKey(); + Integer value = item.getValue(); + pokemoncomonpentList.add(CommonProto.Pokemoncomonpent.newBuilder().setId(comonpentId).setLevel(value).build()); } return CommonProto.PokemonInfo.newBuilder() .setId(pokemon.getId())