From 0805fca7af597898323bcf1e8d5acc799e3d2676 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Tue, 26 Dec 2023 14:47:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=88=E6=9C=8D=E5=90=8E=E4=BB=8E=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=8A=B6=E6=80=81=E8=B7=9F=E7=9D=80=E4=B8=BB?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=80=E8=B5=B7=E5=8F=98=E5=8C=96?= =?UTF-8?q?=202.=E5=90=88=E6=9C=8D=E5=90=8E=E9=82=AE=E4=BB=B6=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E5=87=BA=E5=8E=BB=EF=BC=8C=E5=8F=96=E6=B6=88=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jmfy/controller/MailController.java | 2 +- .../com/jmfy/controller/ServerInfoController.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/jmfy/controller/MailController.java b/src/main/java/com/jmfy/controller/MailController.java index 083e52a..ea4f508 100644 --- a/src/main/java/com/jmfy/controller/MailController.java +++ b/src/main/java/com/jmfy/controller/MailController.java @@ -266,7 +266,7 @@ public class MailController { String[] split = mail.getUserId().split("#"); for (int i = 0; i < split.length; i++) { CUserInfo cUserInfo = userInfoDao.findUserInfoById(split[i]); - if (cUserInfo == null || cUserInfo.getServerid() != Integer.parseInt(mail.getServerId())){ + if (cUserInfo == null ){ //|| cUserInfo.getServerid() != Integer.parseInt(mail.getServerId()) TODO 合服后发邮件发不出去 return 3; } } diff --git a/src/main/java/com/jmfy/controller/ServerInfoController.java b/src/main/java/com/jmfy/controller/ServerInfoController.java index facf93e..cbe0cfa 100644 --- a/src/main/java/com/jmfy/controller/ServerInfoController.java +++ b/src/main/java/com/jmfy/controller/ServerInfoController.java @@ -1,14 +1,12 @@ package com.jmfy.controller; +import com.jmfy.dao.CHefuDao; import com.jmfy.dao.CUserDao; import com.jmfy.dao.ServerInfoDao; import com.jmfy.handler.GMHandler; import com.jmfy.handler.HeFuManager; import com.jmfy.handler.RedisLogic; -import com.jmfy.model.AssSetting; -import com.jmfy.model.CAdmin; -import com.jmfy.model.CServerOpenTime; -import com.jmfy.model.ServerInfo; +import com.jmfy.model.*; import com.jmfy.model.vo.IdentityEnum; import com.jmfy.model.vo.PowersEnum; import com.jmfy.model.vo.ServerInfoVo; @@ -45,6 +43,8 @@ public class ServerInfoController { private ServerInfoDao serverInfoDao; @Resource private CUserDao cUserDao; + @Resource + private CHefuDao hefuDao; // private static int state = 0; @@ -257,6 +257,13 @@ public class ServerInfoController { return 2; } } + //更改主服状态信息时,也更新从服状态信息 + CHefuInfo hefuInfo = hefuDao.findHefuByServerID(vo.getServerId()); + for(int slaveId:hefuInfo.getSlaveServerIds()){ + ServerInfo slaveInfo = serverInfoDao.getServerInfo(String.valueOf(slaveId)); + slaveInfo.setStatus(vo.getStatus()); + serverInfoDao.updateServerInfo(slaveInfo); + } // 1. 修改服务器信息 serverInfoDao.updateServerInfo(vo);