changhong
/
changhongserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

master
李泽帆 2026-06-16 00:06:19 +08:00
parent eeba27679b
commit a5f2e62f27
4 changed files with 92 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web_group/src/main/java/com/group/controller/GroupRoomController.java
View File

@ -9,12 +9,9 @@ import com.group.Protocol;
import com.group.WebInterceptor; import com.group.WebInterceptor;
import com.group.service.GroupRoomService; import com.group.service.GroupRoomService;
import com.taurus.core.entity.ITObject; import com.taurus.core.entity.ITObject;
import com.taurus.core.plugin.redis.Redis;
import com.taurus.core.routes.ActionKey; import com.taurus.core.routes.ActionKey;
import com.taurus.web.Controller; import com.taurus.web.Controller;
import com.taurus.web.WebException; import com.taurus.web.WebException;
import jdk.nashorn.internal.objects.Global;
import redis.clients.jedis.Jedis;
public class GroupRoomController extends Controller { public class GroupRoomController extends Controller {

28
web_group/src/main/java/com/group/service/GroupLogService.java
View File

@ -5,8 +5,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.xml.bind.annotation.XmlElementDecl.GLOBAL;
import com.data.bean.AccountBean; import com.data.bean.AccountBean;
import com.data.bean.GroupBean; import com.data.bean.GroupBean;
import com.data.bean.GroupMemberBean; import com.data.bean.GroupMemberBean;
@ -14,7 +12,6 @@ import com.data.cache.AccountCache;
import com.data.cache.GroupCache; import com.data.cache.GroupCache;
import com.data.cache.GroupMemberCache; import com.data.cache.GroupMemberCache;
import com.data.util.ConsumeCode; import com.data.util.ConsumeCode;
import com.data.util.CountUtil;
import com.data.util.ErrorCode; import com.data.util.ErrorCode;
import com.data.util.Utility; import com.data.util.Utility;
import com.taurus.core.entity.ITArray; import com.taurus.core.entity.ITArray;
@ -23,15 +20,12 @@ import com.taurus.core.entity.TArray;
import com.taurus.core.entity.TObject; import com.taurus.core.entity.TObject;
import com.taurus.core.plugin.database.DataBase; import com.taurus.core.plugin.database.DataBase;
import com.taurus.core.plugin.redis.Redis; import com.taurus.core.plugin.redis.Redis;
import com.taurus.core.plugin.redis.RedisLock;
import com.taurus.core.util.DateUtils; import com.taurus.core.util.DateUtils;
import com.taurus.core.util.Logger; import com.taurus.core.util.Logger;
import com.taurus.core.util.StringUtil; import com.taurus.core.util.StringUtil;
import com.taurus.web.WebException; import com.taurus.web.WebException;
import jdk.nashorn.internal.objects.Global;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
import redis.clients.jedis.Pipeline;
public class GroupLogService { public class GroupLogService {
@ -955,14 +949,12 @@ public class GroupLogService {
valid_round = userData.getDouble("bigwin_cnt").intValue() > 0 valid_round = userData.getDouble("bigwin_cnt").intValue() > 0
? userData.getDouble("bigwin_cnt").intValue() ? userData.getDouble("bigwin_cnt").intValue()
: 0; : 0;
total_win = userData.getDouble("win_score").intValue() != 0 total_win = userData.getDouble("win_score").intValue() != 0 ? userData.getDouble("win_score").intValue()
? userData.getDouble("win_score").intValue()
: total_win; : total_win;
reward_hp = userData.getDouble("round_reward").intValue() > 0 reward_hp = userData.getDouble("round_reward").intValue() > 0
? userData.getDouble("round_reward").intValue() ? userData.getDouble("round_reward").intValue()
: reward_hp; : reward_hp;
} }
// if (beginTime==1753286400&&endTime==1753372800){ // if (beginTime==1753286400&&endTime==1753372800){
// param.putInt("total_round" , total_round+valid_round/100); // param.putInt("total_round" , total_round+valid_round/100);
@ -1056,18 +1048,15 @@ public class GroupLogService {
valid_round = userData.getDouble("bigwin_cnt").intValue() > 0 valid_round = userData.getDouble("bigwin_cnt").intValue() > 0
? userData.getDouble("bigwin_cnt").intValue() ? userData.getDouble("bigwin_cnt").intValue()
: 0; : 0;
total_win = userData.getDouble("win_score").intValue() !=0 total_win = userData.getDouble("win_score").intValue() != 0 ? userData.getDouble("win_score").intValue()
? userData.getDouble("win_score").intValue()
: total_win; : total_win;
} }
param.putInt("valid_round", valid_round); param.putInt("valid_round", valid_round);
param.putInt("total_round", total_round); param.putInt("total_round", total_round);
param.putInt("win_round", win_round); param.putInt("win_round", win_round);
param.putInt("total_win", total_win - xipai_cost); param.putInt("total_win", total_win - xipai_cost);
ITObject gallc = GroupService.getAllHpCache(groupId, uid, 30); ITObject gallc = GroupService.getAllHpCache(groupId, uid, 30);
param.putTObject("hpall", gallc); param.putTObject("hpall", gallc);
} else if (timeType == 2) { } else if (timeType == 2) {
@ -1103,11 +1092,9 @@ public class GroupLogService {
valid_round = userData.getDouble("bigwin_cnt").intValue() > 0 valid_round = userData.getDouble("bigwin_cnt").intValue() > 0
? userData.getDouble("bigwin_cnt").intValue() ? userData.getDouble("bigwin_cnt").intValue()
: 0; : 0;
total_win = userData.getDouble("win_score").intValue() !=0 total_win = userData.getDouble("win_score").intValue() != 0 ? userData.getDouble("win_score").intValue()
? userData.getDouble("win_score").intValue()
: total_win; : total_win;
} }
param.putInt("total_win", total_win - xipai_cost); param.putInt("total_win", total_win - xipai_cost);
param.putInt("total_round", total_round); param.putInt("total_round", total_round);
@ -1908,11 +1895,9 @@ public class GroupLogService {
valid_count = userData.getDouble("bigwin_cnt").intValue() > 0 valid_count = userData.getDouble("bigwin_cnt").intValue() > 0
? userData.getDouble("bigwin_cnt").intValue() ? userData.getDouble("bigwin_cnt").intValue()
: 0; : 0;
count = userData.getDouble("round_cnt").intValue() > 0 count = userData.getDouble("round_cnt").intValue() > 0 ? userData.getDouble("round_cnt").intValue()
? userData.getDouble("round_cnt").intValue()
: count; : count;
} }
// log.info("盟主号大赢家总数SQL:" + valid_count); // log.info("盟主号大赢家总数SQL:" + valid_count);
@ -1956,7 +1941,6 @@ public class GroupLogService {
} }
} }
// resData.putInt("pump", hp_cost); // resData.putInt("pump", hp_cost);
@ -2002,9 +1986,12 @@ public class GroupLogService {
if ((choose & CHOOSE_UPPER) != 0) { if ((choose & CHOOSE_UPPER) != 0) {
reason_sql += ConsumeCode.HP_MGR_UPPER + "," + ConsumeCode.HP_PARTNER_UPPER + ","; reason_sql += ConsumeCode.HP_MGR_UPPER + "," + ConsumeCode.HP_PARTNER_UPPER + ",";
reason_sql += ConsumeCode.HP_MGR_SUB + "," + ConsumeCode.HP_PARTNER_SUB + ","; reason_sql += ConsumeCode.HP_MGR_SUB + "," + ConsumeCode.HP_PARTNER_SUB + ",";
reason_sql += ConsumeCode.HP_TAKE_BANK + "," + ConsumeCode.HP_SAVE_BANK + ",";
} }
if ((choose & CHOOSE_SUB) != 0) { if ((choose & CHOOSE_SUB) != 0) {
reason_sql += ConsumeCode.HP_MGR_SUB + "," + ConsumeCode.HP_PARTNER_SUB + ","; reason_sql += ConsumeCode.HP_MGR_SUB + "," + ConsumeCode.HP_PARTNER_SUB + ",";
reason_sql += ConsumeCode.HP_TAKE_BANK + "," + ConsumeCode.HP_SAVE_BANK + ",";
} }
if ((choose & CHOOSE_PUMP) != 0) { if ((choose & CHOOSE_PUMP) != 0) {
reason_sql += ConsumeCode.HP_PUMP + ","; reason_sql += ConsumeCode.HP_PUMP + ",";
@ -2027,7 +2014,6 @@ public class GroupLogService {
reason_sql += ConsumeCode.HP_PARTNER_XIPAI_REWARD + ","; reason_sql += ConsumeCode.HP_PARTNER_XIPAI_REWARD + ",";
} }
// reason_sql +=ConsumeCode.HP_CLEARING+ ","; // reason_sql +=ConsumeCode.HP_CLEARING+ ",";
if (StringUtil.isNotEmpty(reason_sql)) { if (StringUtil.isNotEmpty(reason_sql)) {

15
web_group/src/main/java/com/group/service/GroupRoomService.java
View File

@ -1,8 +1,17 @@
package com.group.service; package com.group.service;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.data.bean.*; import com.data.bean.AccountBean;
import com.data.bean.GameBean;
import com.data.bean.GroupBean;
import com.data.bean.GroupMemberBean;
import com.data.bean.GroupPlayBean;
import com.data.cache.AccountCache; import com.data.cache.AccountCache;
import com.data.cache.BaseCache; import com.data.cache.BaseCache;
import com.data.cache.GameCache; import com.data.cache.GameCache;
@ -21,7 +30,6 @@ import com.taurus.core.util.Logger;
import com.taurus.core.util.StringUtil; import com.taurus.core.util.StringUtil;
import com.taurus.web.WebException; import com.taurus.web.WebException;
import jdk.nashorn.internal.objects.Global;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
public class GroupRoomService { public class GroupRoomService {
@ -1031,7 +1039,6 @@ public class GroupRoomService {
} }
} }
for (String room : rooms) { for (String room : rooms) {
try { try {
resData = publicJoinRoom(groupId, session, room, platform); resData = publicJoinRoom(groupId, session, room, platform);

76
web_group/src/main/java/com/group/service/GroupService.java
View File

@ -1,9 +1,14 @@
package com.group.service; package com.group.service;
import java.sql.SQLException; import java.util.ArrayList;
import java.util.*; import java.util.Arrays;
import java.util.HashMap;
import javax.xml.bind.annotation.XmlElementDecl.GLOBAL; import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
import com.data.bean.AccountBean; import com.data.bean.AccountBean;
import com.data.bean.GameBean; import com.data.bean.GameBean;
@ -20,7 +25,10 @@ import com.data.util.CountUtil;
import com.data.util.ErrorCode; import com.data.util.ErrorCode;
import com.data.util.Utility; import com.data.util.Utility;
import com.group.MainServer; import com.group.MainServer;
import com.taurus.core.entity.*; import com.taurus.core.entity.ITArray;
import com.taurus.core.entity.ITObject;
import com.taurus.core.entity.TArray;
import com.taurus.core.entity.TObject;
import com.taurus.core.plugin.database.DataBase; import com.taurus.core.plugin.database.DataBase;
import com.taurus.core.plugin.redis.Redis; import com.taurus.core.plugin.redis.Redis;
import com.taurus.core.plugin.redis.RedisLock; import com.taurus.core.plugin.redis.RedisLock;
@ -29,7 +37,6 @@ import com.taurus.core.util.Logger;
import com.taurus.core.util.StringUtil; import com.taurus.core.util.StringUtil;
import com.taurus.web.WebException; import com.taurus.web.WebException;
import jdk.nashorn.internal.objects.Global;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
import redis.clients.jedis.Pipeline; import redis.clients.jedis.Pipeline;
@ -681,13 +688,12 @@ public class GroupService {
return ErrorCode.GROUP_MEMBER_EXIST; return ErrorCode.GROUP_MEMBER_EXIST;
} else { } else {
String insertSql = String.format( String insertSql = String.format(
"INSERT INTO group_member(uid,groupId,join_time,parentId) VALUES(%s,%s,%s,%s)", tagId, groupId, "INSERT INTO group_member(uid,groupId,join_time,parentId) VALUES(%s,%s,%s,%s)", tagId,
time, mgn_uid); groupId, time, mgn_uid);
Utility.evtdb(groupId, 1, insertSql); Utility.evtdb(groupId, 1, insertSql);
} }
// sp_add_member(groupId, mgn_uid, tagId); // sp_add_member(groupId, mgn_uid, tagId);
Map<String, String> redis_map = memberToRedis(groupId + "", tagId, 3, 0, mgn_uid, time); Map<String, String> redis_map = memberToRedis(groupId + "", tagId, 3, 0, mgn_uid, time);
@ -1413,9 +1419,8 @@ public class GroupService {
reason = hp < 0 ? ConsumeCode.HP_PARTNER_SUB : ConsumeCode.HP_PARTNER_UPPER; reason = hp < 0 ? ConsumeCode.HP_PARTNER_SUB : ConsumeCode.HP_PARTNER_UPPER;
} }
// 扣除操作者hp // 扣除操作者hp
sql = String.format( sql = String.format("UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s ", -hp,
"UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s ", groupId, uid);
-hp,groupId, uid);
// log.info("sql1:" + sql); // log.info("sql1:" + sql);
DataBase.use().executeUpdate(sql); DataBase.use().executeUpdate(sql);
// 增加记录 // 增加记录
@ -1426,11 +1431,9 @@ public class GroupService {
// log.info("操作者sql:" + sql); // log.info("操作者sql:" + sql);
DataBase.use().executeUpdate(sql); DataBase.use().executeUpdate(sql);
// 扣除目标人物hp // 扣除目标人物hp
sql = String.format( sql = String.format("UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s ", hp, groupId,
"UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s ", tagId);
hp,groupId, tagId);
DataBase.use().executeUpdate(sql); DataBase.use().executeUpdate(sql);
// 增加记录 // 增加记录
reason = hp < 0 ? ConsumeCode.HP_MGR_SUB : ConsumeCode.HP_MGR_UPPER; reason = hp < 0 ? ConsumeCode.HP_MGR_SUB : ConsumeCode.HP_MGR_UPPER;
@ -1445,15 +1448,13 @@ public class GroupService {
reason = hp < 0 ? ConsumeCode.HP_MGR_SUB : ConsumeCode.HP_MGR_UPPER; reason = hp < 0 ? ConsumeCode.HP_MGR_SUB : ConsumeCode.HP_MGR_UPPER;
// 扣除目标人物hp // 扣除目标人物hp
sql = String.format( sql = String.format("UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s", hp, groupId,
"UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s", tagId);
hp,groupId, tagId);
DataBase.use().executeUpdate(sql); DataBase.use().executeUpdate(sql);
if (uid == tagId && otherId > 0) { if (uid == tagId && otherId > 0) {
// 扣除操作者hp // 扣除操作者hp
sql = String.format( sql = String.format("UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s", -hp,
"UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s", groupId, uid);
-hp,groupId, uid);
DataBase.use().executeUpdate(sql); DataBase.use().executeUpdate(sql);
// 增加记录 // 增加记录
sql = String.format( sql = String.format(
@ -1465,9 +1466,8 @@ public class GroupService {
} else { } else {
if (uid != tagId) { if (uid != tagId) {
// 扣除操作者hp // 扣除操作者hp
sql = String.format( sql = String.format("UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s", -hp,
"UPDATE group_member SET hp=hp+%s WHERE groupId = %s and uid=%s", groupId, uid);
-hp,groupId, uid);
DataBase.use().executeUpdate(sql); DataBase.use().executeUpdate(sql);
} }
@ -1482,7 +1482,6 @@ public class GroupService {
} }
// ------------------------邮件 ------------------- // ------------------------邮件 -------------------
ITObject mail_data = TObject.newInstance(); ITObject mail_data = TObject.newInstance();
mail_data.putInt("mgr_id", uid); mail_data.putInt("mgr_id", uid);
@ -1757,15 +1756,15 @@ public class GroupService {
int mhp = arr.get(1).intValue(); int mhp = arr.get(1).intValue();
// String sql = String.format("{call sp_take_reward_hp(%s,%s,%s,%s)}", groupId, tagId, (int) hp, mhp); // String sql = String.format("{call sp_take_reward_hp(%s,%s,%s,%s)}", groupId, tagId, (int) hp, mhp);
// Utility.evtdb(groupId, 2, sql); // Utility.evtdb(groupId, 2, sql);
String sql = String.format("update group_member set reward_hp = reward_hp-%s,hp=hp+%s where uid = %s AND groupId = %s", hp,hp, String sql = String.format(
tagId, groupId); "update group_member set reward_hp = reward_hp-%s,hp=hp+%s where uid = %s AND groupId = %s", hp,
hp, tagId, groupId);
Utility.evtdb(groupId, 1, sql); Utility.evtdb(groupId, 1, sql);
log.info("提取sql:" + sql); log.info("提取sql:" + sql);
sql = String.format( sql = String.format(
"INSERT INTO group_hp_log(gid,uid,reason,hp,cur_hp,pid,roomid,time) " "INSERT INTO group_hp_log(gid,uid,reason,hp,cur_hp,pid,roomid,time) "
+ "VALUES(%s,%s,%s,%s,%s,%s,'',%s)", + "VALUES(%s,%s,%s,%s,%s,%s,'',%s)",
groupId, tagId, ConsumeCode.HP_TAKE_REWARD, hp , _r_hp, 0, groupId, tagId, ConsumeCode.HP_TAKE_REWARD, hp, _r_hp, 0, System.currentTimeMillis() / 1000);
System.currentTimeMillis()/1000);
Utility.evtdb(groupId, 1, sql); Utility.evtdb(groupId, 1, sql);
ITObject resData = TObject.newInstance(); ITObject resData = TObject.newInstance();
@ -2001,15 +2000,15 @@ public class GroupService {
// String sql = String.format("{call sp_bank_hp(%s,%s,%s,%s)}", groupId, tagId, -(int) hp, mhp); // String sql = String.format("{call sp_bank_hp(%s,%s,%s,%s)}", groupId, tagId, -(int) hp, mhp);
// Utility.evtdb(groupId, 2, sql); // Utility.evtdb(groupId, 2, sql);
String sql = String.format("update group_member set bank_hp = bank_hp-%s,hp=hp+%s where uid = %s AND groupId = %s", String sql = String.format(
hp, hp, tagId, groupId); "update group_member set bank_hp = bank_hp-%s,hp=hp+%s where uid = %s AND groupId = %s", hp, hp,
tagId, groupId);
Utility.evtdb(groupId, 1, sql); Utility.evtdb(groupId, 1, sql);
log.info("取出sql:" + sql); log.info("取出sql:" + sql);
sql = String.format( sql = String.format(
"INSERT INTO group_hp_log(gid,uid,reason,hp,cur_hp,pid,roomid,time) " "INSERT INTO group_hp_log(gid,uid,reason,hp,cur_hp,pid,roomid,time) "
+ "VALUES(%s,%s,%s,%s,%s,%s,'',%s)", + "VALUES(%s,%s,%s,%s,%s,%s,'',%s)",
groupId, uid, ConsumeCode.HP_TAKE_BANK, -hp , b_hp, 0, groupId, uid, ConsumeCode.HP_TAKE_BANK, -hp, b_hp, 0, System.currentTimeMillis() / 1000);
System.currentTimeMillis()/1000);
Utility.evtdb(groupId, 1, sql); Utility.evtdb(groupId, 1, sql);
ITObject resData = TObject.newInstance(); ITObject resData = TObject.newInstance();
resData.putLong("hp", mhp); resData.putLong("hp", mhp);
@ -2086,18 +2085,17 @@ public class GroupService {
// String sql = String.format("{call sp_bank_hp(%s,%s,%s,%s)}", groupId, tagId, hp, mhp); // String sql = String.format("{call sp_bank_hp(%s,%s,%s,%s)}", groupId, tagId, hp, mhp);
// Utility.evtdb(groupId, 2, sql); // Utility.evtdb(groupId, 2, sql);
String sql = String.format("update group_member set bank_hp =bank_hp+ %s,hp=hp-%s where uid = %s AND groupId = %s", String sql = String.format(
hp, hp, tagId, groupId); "update group_member set bank_hp =bank_hp+ %s,hp=hp-%s where uid = %s AND groupId = %s", hp, hp,
tagId, groupId);
Utility.evtdb(groupId, 1, sql); Utility.evtdb(groupId, 1, sql);
sql = String.format( sql = String.format(
"INSERT INTO group_hp_log(gid,uid,reason,hp,cur_hp,pid,roomid,time) " "INSERT INTO group_hp_log(gid,uid,reason,hp,cur_hp,pid,roomid,time) "
+ "VALUES(%s,%s,%s,%s,%s,%s,'',%s)", + "VALUES(%s,%s,%s,%s,%s,%s,'',%s)",
groupId, uid, ConsumeCode.HP_SAVE_BANK, hp , b_hp, 0, groupId, uid, ConsumeCode.HP_SAVE_BANK, hp, b_hp, 0, System.currentTimeMillis() / 1000);
System.currentTimeMillis()/1000);
Utility.evtdb(groupId, 1, sql); Utility.evtdb(groupId, 1, sql);
ITObject resData = TObject.newInstance(); ITObject resData = TObject.newInstance();
resData.putLong("hp", mhp); resData.putLong("hp", mhp);
resData.putLong("b_hp", b_hp); resData.putLong("b_hp", b_hp);