Merge branch 'pre' into 'master'

Pre

See merge request !89

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -24,11 +24,11 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_STR="sweet:wechatUser:unionIdStr:";
     public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID="sweet:wechatUser:openId:";
     public final static String REDIS_KEY_SWEET_ANSWER_PHONE="sweet:answer:phone:";
-    public final static String REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST="sweet:cityVote:StatList";
-    public final static String REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE="sweet:cityVote:cityCode:";
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST=":StatList";
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE=":cityCode:";
     public final static String REDIS_KEY_SWEET_CITY_VOTE="sweet:cityVote";
     public final static String REDIS_KEY_SWEET_CITY_VOTE_USER=":user:";
-    public final static String REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME="sweet:cityVote:updateTime";
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME=":updateTime";
 
     public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_MODERNSKY="sweet:wechatUser:modernsky:unionId:";
     public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_STR_MODERNSKY="sweet:wechatUser:modernsky:unionIdStr:";

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -493,11 +493,13 @@ public class RedisDataUtils {
 
     // 投票
     public void setSweetCityVoteStatList(List<SweetCItyVoteStatVo> sweetCItyVoteStatVo, Integer type) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST.concat(String.valueOf(type));
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
+                .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST);
         redisUtil.set(redisKey, sweetCItyVoteStatVo);
     }
     public List<SweetCItyVoteStatVo> getSweetCityVoteStatList(Integer type) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST.concat(String.valueOf(type));
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
+                .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST);
         Object obj = redisUtil.get(redisKey);
         List<SweetCItyVoteStatVo> sweetCityVoteStatList = ObjectUtil.getSweetCItyVoteStatVoList();
         if (null != obj) {
@@ -506,11 +508,13 @@ public class RedisDataUtils {
         return sweetCityVoteStatList;
     }
     public void incrSweetCityVote(String cityCode, Integer type) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE.concat(String.valueOf(type)).concat(cityCode);
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
+                .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE).concat(cityCode);
         redisUtil.incr(redisKey, 1);
     }
     public Integer getSweetCityVote(String cityCode, Integer type) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE.concat(String.valueOf(type)).concat(cityCode);
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
+                .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE).concat(cityCode);
         Object obj = redisUtil.get(redisKey);
         if (null == obj) {
             return 0;
@@ -534,11 +538,13 @@ public class RedisDataUtils {
         }
     }
     public void setSweetCityVoteStatUpdateTime(Integer type) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME.concat(String.valueOf(type));
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
+                .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME);
         redisUtil.set(redisKey, DateUtil.getNowTime());
     }
     public String getSweetCityVoteStatUpdateTime(Integer type) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME.concat(String.valueOf(type));
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE.concat(String.valueOf(type))
+                .concat(SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME);
         Object obj = redisUtil.get(redisKey);
         if (null == obj) {
             return "";