venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

客户端 fixbug 开启上传日志功能

Browse Source
This commit is contained in:
limqhz
2023-12-13 23:35:01 +08:00
parent 2037793bde
commit c1eef12901
4 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/sv/netty/netty/service/impl/ServerMessageHandlerAdapter.java
View File

@@ -179,7 +179,7 @@ public class ServerMessageHandlerAdapter implements MessageService {
memberEnterVenueLogService.save(memberEnterVenueLog); memberEnterVenueLogService.save(memberEnterVenueLog);
doorLockUtil.lockDoor(doorSn); doorLockUtil.lockDoor(doorSn);
writeOffCode(barcode); writeOffCode(barcode);
logger.info("用户" + member.getNickname() + "入场"); logger.info("用户" + member.getId() + "&" + member.getNickname() + "入场");
ServerMessageUtils.INSTANCE.sendMsg(channel,new VenueMessage(MessageType.ENTER_DOOR,"OK")); ServerMessageUtils.INSTANCE.sendMsg(channel,new VenueMessage(MessageType.ENTER_DOOR,"OK"));
} }
} }

49
netty-client/src/main/java/com/sv/intergration/LogService.java
View File

@@ -2,6 +2,8 @@ package com.sv.intergration;
import com.jcraft.jsch.*; import com.jcraft.jsch.*;
import com.sv.netty.config.NettyConstant; import com.sv.netty.config.NettyConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@@ -11,30 +13,37 @@ import java.util.Date;
public class LogService { public class LogService {
private final Logger logger = LoggerFactory.getLogger(LogService.class);
private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
static Session session; static Session session;
public void uploadLog(String password) throws JSchException, FileNotFoundException, SftpException { public void uploadLog(String password) {
if (session == null){ try {
JSch jsch = new JSch(); if (session == null) {
String serverIp = System.getProperty(NettyConstant.VENUE_SERVER_IP); JSch jsch = new JSch();
session = jsch.getSession("root", serverIp, 22); String serverIp = System.getProperty(NettyConstant.VENUE_SERVER_IP);
session.setPassword(System.getProperty(NettyConstant.VENUE_CHECK_PWD)); session = jsch.getSession("root", serverIp, 22);
session.setConfig("StrictHostKeyChecking", "no"); session.setPassword(System.getProperty(NettyConstant.VENUE_CHECK_PWD));
session.connect(3000); session.setConfig("StrictHostKeyChecking", "no");
} session.connect(3000);
ChannelSftp sftp = (ChannelSftp) session.openChannel("sftp"); }
File file = new File("/home/venue/logs/common-default.log"); ChannelSftp sftp = (ChannelSftp) session.openChannel("sftp");
if (file.exists()){ File file = new File("/home/venue/logs/common-default.log");
sftp.put(new FileInputStream(file),"/home/uploadlog/" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client.log"); if (file.exists()) {
} sftp.put(new FileInputStream(file), "/home/uploadlog/" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client.log");
if (sftp != null) { logger.info("上传日志成功");
sftp.connect(); }
sftp.disconnect(); if (sftp != null) {
} sftp.connect();
if (session != null) { sftp.disconnect();
session.disconnect(); }
if (session != null) {
session.disconnect();
}
}catch (Exception e){
logger.error("上传日志失败",e);
} }
} }

9
netty-client/src/main/java/com/sv/intergration/MessageService.java
View File

@@ -1,6 +1,7 @@
package com.sv.intergration; package com.sv.intergration;
import com.sv.intergration.impl.OldDoorService; import com.sv.intergration.impl.OldDoorService;
import com.sv.netty.config.NettyConstant;
import com.sv.netty.config.VenueMessage; import com.sv.netty.config.VenueMessage;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -45,14 +46,16 @@ public class MessageService {
outDoor(); outDoor();
break; break;
case LOG: case LOG:
sendlog(); sendLog();
break;
default: default:
logger.info( "default"); logger.info( "default");
} }
} }
private void sendlog() { private void sendLog() {
// File file = new File(); LogService logService = new LogService();
logService.uploadLog(System.getProperty(NettyConstant.VENUE_CHECK_PWD));
} }
/** /**

2
service/src/main/java/com/sv/mapper/MemberEnterStatusMapper.java
View File

@@ -1,5 +1,6 @@
package com.sv.mapper; package com.sv.mapper;
import com.sv.annotation.NoPlatform;
import com.sv.entity.MemberEnterStatus; import com.sv.entity.MemberEnterStatus;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@@ -18,6 +19,7 @@ public interface MemberEnterStatusMapper {
int updateByPrimaryKey(MemberEnterStatus record); int updateByPrimaryKey(MemberEnterStatus record);
@NoPlatform
MemberEnterStatus selectByMemberVenue(@Param("memberId") Integer memberId, @Param("venueId") Integer venueId); MemberEnterStatus selectByMemberVenue(@Param("memberId") Integer memberId, @Param("venueId") Integer venueId);
List<MemberEnterStatus> findAllNeedClear(); List<MemberEnterStatus> findAllNeedClear();