|
|
@@ -5,6 +5,7 @@ import com.mes.component.MesRadio;
|
|
|
import com.mes.component.MesWebView;
|
|
|
import com.mes.util.Base64Utils;
|
|
|
import com.mes.util.HttpUtils;
|
|
|
+import com.mes.util.AppLog;
|
|
|
|
|
|
import javax.swing.*;
|
|
|
import java.awt.*;
|
|
|
@@ -32,6 +33,7 @@ public class LoginFarme extends JFrame {
|
|
|
@Override
|
|
|
public void windowClosing(WindowEvent e) {
|
|
|
if (MesClient.confirmClose(LoginFarme.this)) {
|
|
|
+ AppLog.markUserClose();
|
|
|
System.exit(0);
|
|
|
}
|
|
|
}
|
|
|
@@ -104,6 +106,7 @@ public class LoginFarme extends JFrame {
|
|
|
String user_str = userNameTxt.getText().toString();
|
|
|
String password_str = userPasswordTxt.getText().toString();
|
|
|
if(user_str.equalsIgnoreCase("")||password_str.equalsIgnoreCase("")) {
|
|
|
+ AppLog.login(user_str, "用户名密码", false);
|
|
|
JOptionPane.showMessageDialog(MesClient.mesClientFrame,"用户名或密码不能为空","提示窗口", JOptionPane.INFORMATION_MESSAGE);
|
|
|
return;
|
|
|
}
|
|
|
@@ -113,6 +116,7 @@ public class LoginFarme extends JFrame {
|
|
|
String url = "http://"+MesClient.mes_server_ip+":8980/js/a/login?__ajax=json&username="+username+"&password="+password+"&validCode=&__sid=";
|
|
|
String loginResult = HttpUtils.sendRequest(url);
|
|
|
if(loginResult.equalsIgnoreCase("false")) {
|
|
|
+ AppLog.login(user_str, "用户名密码", false);
|
|
|
JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录异常,请检查网络或联系网络管理员","提示窗口", JOptionPane.INFORMATION_MESSAGE);
|
|
|
return;
|
|
|
}else {
|
|
|
@@ -121,6 +125,7 @@ public class LoginFarme extends JFrame {
|
|
|
//检查用户权限是否可登录界面
|
|
|
checkUserAuthority(retObj);
|
|
|
}else {
|
|
|
+ AppLog.login(user_str, "用户名密码", false);
|
|
|
//ret = "msg save error";
|
|
|
//ret = false;
|
|
|
JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录失败,用户名或密码错误","提示窗口", JOptionPane.INFORMATION_MESSAGE);
|
|
|
@@ -135,10 +140,12 @@ public class LoginFarme extends JFrame {
|
|
|
String scanContent = JOptionPane.showInputDialog(null, "请扫码工牌二维码");
|
|
|
System.out.println("scanContent="+scanContent);
|
|
|
if(scanContent!=null&&!scanContent.equalsIgnoreCase("")) {
|
|
|
+ AppLog.scan("工牌", scanContent);
|
|
|
String url = "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesLogin/login?__login=true&__ajax=json&username="+scanContent;
|
|
|
String loginResult = HttpUtils.sendRequest(url);
|
|
|
System.out.println("loginResult="+loginResult);
|
|
|
if(loginResult.equalsIgnoreCase("false")) {
|
|
|
+ AppLog.login(scanContent, "扫码", false);
|
|
|
JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录异常,请检查网络或联系网络管理员","提示窗口", JOptionPane.INFORMATION_MESSAGE);
|
|
|
return;
|
|
|
}else {
|
|
|
@@ -147,11 +154,13 @@ public class LoginFarme extends JFrame {
|
|
|
//检查用户权限是否可登录界面
|
|
|
checkUserAuthority(retObj);
|
|
|
}else {
|
|
|
+ AppLog.login(scanContent, "扫码", false);
|
|
|
JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录失败,用户名或密码错误","提示窗口", JOptionPane.INFORMATION_MESSAGE);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
}else {
|
|
|
+ AppLog.login("", "扫码", false);
|
|
|
JOptionPane.showMessageDialog(MesClient.mesClientFrame,"扫码内容错误","提示窗口", JOptionPane.INFORMATION_MESSAGE);
|
|
|
return;
|
|
|
}
|
|
|
@@ -175,10 +184,12 @@ public class LoginFarme extends JFrame {
|
|
|
JSONObject authObjTmp = JSONObject.parseObject(authorityObj.get("data").toString());
|
|
|
MesClient.mes_auth = Integer.parseInt(authObjTmp.getString("auth").toString());
|
|
|
if(MesClient.mes_auth==0) {
|
|
|
+ AppLog.login(user_id, "权限校验", false);
|
|
|
//无权限登录
|
|
|
JOptionPane.showMessageDialog(MesClient.mesClientFrame,"您无权登录该工位","提示窗口", JOptionPane.INFORMATION_MESSAGE);
|
|
|
return;
|
|
|
}else if(MesClient.mes_auth==1||MesClient.mes_auth==2) {
|
|
|
+ AppLog.login(user_id, "权限校验", true);
|
|
|
// 获取等于所处时间-当前小时
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
MesClient.userLoginHours = now.getHour();
|
|
|
@@ -221,6 +232,7 @@ public class LoginFarme extends JFrame {
|
|
|
}
|
|
|
|
|
|
}else {
|
|
|
+ AppLog.login(user_id, "权限校验", false);
|
|
|
JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录失败,用户名或密码错误","提示窗口", JOptionPane.INFORMATION_MESSAGE);
|
|
|
return;
|
|
|
}
|