|
@@ -66,11 +66,11 @@ public class WindowsController {
|
|
|
DecodedJWT decodedJWT=TokenUtil.parseJWT(token);
|
|
|
User tokenUser=(User)JsonUtil.jsontoObject(decodedJWT.getSubject(),User.class);
|
|
|
try {
|
|
|
- String ipAddress=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
- windows.setIpAddress(ipAddress);
|
|
|
+ //String ipAddress=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
+ //windows.setIpAddress(ipAddress);
|
|
|
windows.setUserIdCode(tokenUser.getUserIdCode());
|
|
|
windows.setCreateDate(new Date());
|
|
|
- Windows windowsDb=windowsService.queryLastWindowsByUserIdCode(tokenUser.getUserIdCode(),ipAddress);
|
|
|
+ Windows windowsDb=windowsService.queryLastWindowsByUserIdCode(tokenUser.getUserIdCode(),null);
|
|
|
if(windowsDb!=null){
|
|
|
windows.setId(windowsDb.getId());
|
|
|
}
|
|
@@ -122,11 +122,11 @@ public class WindowsController {
|
|
|
DecodedJWT decodedJWT=TokenUtil.parseJWT(token);
|
|
|
User tokenUser=(User)JsonUtil.jsontoObject(decodedJWT.getSubject(),User.class);
|
|
|
try {
|
|
|
- String ipAddress=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
- windows.setIpAddress(ipAddress);
|
|
|
+ //String ipAddress=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
+ //windows.setIpAddress(ipAddress);
|
|
|
windows.setUserIdCode(tokenUser.getUserIdCode());
|
|
|
windows.setCreateDate(new Date());
|
|
|
- Windows windowsDb=windowsService.queryLastWindowsByUserIdCode(tokenUser.getUserIdCode(),ipAddress);
|
|
|
+ Windows windowsDb=windowsService.queryLastWindowsByUserIdCode(tokenUser.getUserIdCode(),null);
|
|
|
if(windowsDb!=null){
|
|
|
windows.setId(windowsDb.getId());
|
|
|
}
|
|
@@ -268,10 +268,10 @@ public class WindowsController {
|
|
|
return resultMap;
|
|
|
}
|
|
|
try {
|
|
|
- String ipAddress=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
+ //String ipAddress=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
DecodedJWT decodedJWT=TokenUtil.parseJWT(token);
|
|
|
User tokenUser=(User)JsonUtil.jsontoObject(decodedJWT.getSubject(),User.class);
|
|
|
- Windows windows=windowsService.queryLastWindowsByUserIdCode(tokenUser.getUserIdCode(),ipAddress);
|
|
|
+ Windows windows=windowsService.queryLastWindowsByUserIdCode(tokenUser.getUserIdCode(),null);
|
|
|
if(windows!=null){
|
|
|
resultMap.put("code", 0);
|
|
|
resultMap.put("message", "查询收费员设置成功");
|