diff --git a/Student/src/main/java/com/cfive/classroom/student/Center.java b/Student/src/main/java/com/cfive/classroom/student/Center.java index 918ddd4..23f63a6 100644 --- a/Student/src/main/java/com/cfive/classroom/student/Center.java +++ b/Student/src/main/java/com/cfive/classroom/student/Center.java @@ -1,6 +1,8 @@ package com.cfive.classroom.student; import com.cfive.classroom.library.database.DatabaseHelper; +import com.cfive.classroom.library.database.bean.AttStatus; +import com.cfive.classroom.library.database.util.DependenciesNotFoundException; import com.cfive.classroom.library.database.util.NoConfigException; import com.cfive.classroom.library.net.StudentNet; import com.cfive.classroom.library.net.util.MessageObject; @@ -16,6 +18,7 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.sql.SQLException; +import java.time.LocalDateTime; import java.util.Properties; public class Center { @@ -86,6 +89,7 @@ public class Center { @Override public void onReceive(MessageObject messageObject) { if (messageObject.getMessageType()==MessageType.CheckIn&&messageObject.getCode().equals(signInCode)) { + studentNet.sendMessageThread(new MessageObject(stuNo,stuName,null, null,null,AttStatus.signed,LocalDateTime.now(),null)); JOptionPane.showMessageDialog(null, "签到成功"); } else { JOptionPane.showMessageDialog(null,"签到失败"); @@ -99,7 +103,7 @@ public class Center { raiseHandButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - messageObject = new MessageObject(stuNo, stuName, null, null, null, MessageType.RaiseHand); + messageObject = new MessageObject(stuNo, stuName, null, null, null, null,null,MessageType.RaiseHand); studentNet.sendMessageThread(messageObject); JOptionPane.showMessageDialog(null,"你已经向老师举手"); } diff --git a/Student/src/main/java/com/cfive/classroom/student/Chat.java b/Student/src/main/java/com/cfive/classroom/student/Chat.java index 57f1d17..2df131e 100644 --- a/Student/src/main/java/com/cfive/classroom/student/Chat.java +++ b/Student/src/main/java/com/cfive/classroom/student/Chat.java @@ -5,10 +5,13 @@ import com.cfive.classroom.library.net.StudentNet; import com.cfive.classroom.library.net.util.MessageObject; import com.cfive.classroom.library.net.util.MessageType; import com.cfive.classroom.library.net.util.ReceiveListener; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.time.LocalDateTime; import java.util.Properties; public class Chat { @@ -21,6 +24,7 @@ public class Chat { private StudentNet studentNet; private String stuNo, stuName,host; private int port; + private static final Logger LOGGER = LogManager.getLogger(); public Chat() { @@ -29,7 +33,8 @@ public class Chat { @Override public void actionPerformed(ActionEvent e) { if(String.valueOf(sendText.getText())!=null) { - studentNet.sendMessageThread(new MessageObject(stuNo, stuName, null, String.valueOf(sendText.getText()), null, MessageType.Chat)); + LOGGER.info(LocalDateTime.now()); + studentNet.sendMessageThread(new MessageObject(stuNo, stuName, null, String.valueOf(sendText.getText()) ,null,null,LocalDateTime.now(),MessageType.Chat)); } else{ JOptionPane.showMessageDialog(null,"无发送内容","错误!",JOptionPane.ERROR_MESSAGE); @@ -41,7 +46,7 @@ public class Chat { @Override public void onReceive(MessageObject messageObject) { if(messageObject.getMessageType()==MessageType.ChatToAll){ - receiveText.setText("教师:\n"+messageObject.getMessage()); + receiveText.append("教师:\n"+messageObject.getMessage()+"\n"); } } }); diff --git a/Student/src/main/java/com/cfive/classroom/student/MainWindow.java b/Student/src/main/java/com/cfive/classroom/student/MainWindow.java index b813072..29dbd62 100644 --- a/Student/src/main/java/com/cfive/classroom/student/MainWindow.java +++ b/Student/src/main/java/com/cfive/classroom/student/MainWindow.java @@ -28,6 +28,7 @@ public class MainWindow{ private static final Logger LOGGER = LogManager.getLogger(); public MainWindow() { //登录按钮 + login.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -40,17 +41,19 @@ public class MainWindow{ }); } public boolean check(){ - String stuPassword = new String(passwordText.getPassword()); - String stuNo = new String(stuNoText.getText()); + String stuPassword = String.valueOf(passwordText.getPassword()); + String stuNo = String.valueOf(stuNoText.getText()); LOGGER.info(Long.valueOf(stuNo)); + LOGGER.info(stuPassword); //判断密码 if (stuNo.length() == 0 || stuPassword.length() == 0) { JOptionPane.showMessageDialog(null, "账号密码不能为空"); return false; } else { - boolean checkPassword=false; + boolean checkPassword = false; try { - checkPassword=DatabaseHelper.checkPasswdInStudent(Long.parseLong(stuNo),stuPassword); + LOGGER.info(DatabaseHelper.checkPasswdInStudent(Long.parseLong(stuNo), stuPassword)); + checkPassword = DatabaseHelper.checkPasswdInStudent(Long.parseLong(stuNo), stuPassword); } catch (NoConfigException e) { JOptionPane.showMessageDialog(null,"没有数据库配置文件","警告",JOptionPane.ERROR_MESSAGE); LOGGER.error("No configuration", e); diff --git a/Student/src/test/java/com/cfive/classroom/student/MyTest.java b/Student/src/test/java/com/cfive/classroom/student/MyTest.java index 252833b..8bd8447 100644 --- a/Student/src/test/java/com/cfive/classroom/student/MyTest.java +++ b/Student/src/test/java/com/cfive/classroom/student/MyTest.java @@ -4,6 +4,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Test; +import java.time.LocalDateTime; + public class MyTest { private static final Logger LOGGER = LogManager.getLogger(); @Test @@ -17,4 +19,8 @@ public class MyTest { } } + @Test + void localDateTimeTest() { + LOGGER.info(LocalDateTime.now()); + } }