src/main/java/com/whyc/mapper/DevUpdateStateMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DevUpdateStateService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/FgcdFiledownloadService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/websocket/DfuSocket.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/websocket/FileDownloadSocket.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/DevUpdateStateMapper.java
@@ -1,4 +1,6 @@ package com.whyc.mapper; import com.whyc.pojo.DevUpdateState; public interface DevUpdateStateMapper extends CustomMapper<DevUpdateState>{ } src/main/java/com/whyc/service/DevUpdateStateService.java
@@ -1,5 +1,6 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.whyc.mapper.DevUpdateStateMapper; import com.whyc.pojo.DevUpdateState; @@ -64,4 +65,13 @@ mapper.update(null,wrapper); return new Response().set(1,true); } //dfu远程升级的websocket实时推送设备升级 public Response getDfuStatus(int devId) { QueryWrapper queryWrapper=new QueryWrapper(); queryWrapper.eq("dev_id",devId); queryWrapper.last("limit 1"); DevUpdateState dfu=mapper.selectOne(queryWrapper); return new Response().setII(1,dfu!=null,dfu,"下载成功返回数据"); } } src/main/java/com/whyc/service/FgcdFiledownloadService.java
@@ -112,4 +112,12 @@ return new Response().set(1,bl,"下载失败"); } } //filedownload的websocket实时推送文件下载情况 public Response getDownloadFileStatus(int devId) { QueryWrapper queryWrapper=new QueryWrapper(); queryWrapper.eq("dev_id",devId); queryWrapper.last("limit 1"); FgcdFiledownload fgcd=mapper.selectOne(queryWrapper); return new Response().setII(1,fgcd!=null,fgcd,"下载成功返回数据"); } } src/main/java/com/whyc/websocket/DfuSocket.java
New file @@ -0,0 +1,100 @@ package com.whyc.websocket; import com.whyc.config.WebSocketConfig; import com.whyc.pojo.Response; import com.whyc.service.DevUpdateStateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.websocket.*; import javax.websocket.server.ServerEndpoint; import java.util.HashMap; import java.util.Map; @Component @ServerEndpoint(value = "/dfu",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class) public class DfuSocket { private Session session; private static final int executeTime = 2000; private Thread thread; private volatile boolean runFlag=true; private volatile Map<String,Thread> threadMap = new HashMap<>(); private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>(); private static DevUpdateStateService updateStateService; @Autowired public void setHistoryService(DevUpdateStateService updateStateService){ DfuSocket.updateStateService=updateStateService; } @OnOpen public void onOpen(Session session){ this.session=session; } @OnMessage public void onMessage(Session session, String message){ this.session=session; int devId=Integer.valueOf(message); thread = new Thread("Thread_Version") { @Override public void run() { while (runFlag && !isInterrupted()) { Thread thread = currentThread(); threadFlagMap.put(thread.getId(), true); try { Response res = updateStateService.getDfuStatus(devId); if (session.isOpen()) { //推送信息 synchronized (session) { session.getBasicRemote().sendObject(res); } threadFlagMap.put(thread.getId(), false); } sleep(executeTime); //} catch (IOException | InterruptedException | EncodeException e) { } catch (Exception e) { interrupt(); } } } }; thread.start(); threadFlagMap.put(thread.getId(),true); //停止老的socket线程 Thread threadBefore = threadMap.get(session.getId()); if(threadBefore !=null && threadBefore.isAlive()){ while (threadFlagMap.get(threadBefore.getId())){ } threadBefore.interrupt(); } //将线程存储,便于调用定位 threadMap.put(session.getId(), this.thread); } @OnClose public void onClose(CloseReason closeReason){ System.err.println("closeReason = " + closeReason); runFlag = false; if (thread != null && thread.isAlive()) { thread.interrupt(); } threadMap.remove(session.getId()); } @OnError public void onError(Throwable error) { error.printStackTrace(); if (thread != null && thread.isAlive()) { thread.interrupt(); } threadMap.remove(session.getId()); } } src/main/java/com/whyc/websocket/FileDownloadSocket.java
New file @@ -0,0 +1,101 @@ package com.whyc.websocket; import com.whyc.config.WebSocketConfig; import com.whyc.pojo.Response; import com.whyc.service.FgcdFiledownloadService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.websocket.*; import javax.websocket.server.ServerEndpoint; import java.util.HashMap; import java.util.Map; @Component @ServerEndpoint(value = "/fileDownload",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class) public class FileDownloadSocket { private Session session; private static final int executeTime = 2000; private Thread thread; private volatile boolean runFlag=true; private volatile Map<String,Thread> threadMap = new HashMap<>(); private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>(); private static FgcdFiledownloadService filedownloadService; @Autowired public void setHistoryService(FgcdFiledownloadService filedownloadService){ FileDownloadSocket.filedownloadService=filedownloadService; } @OnOpen public void onOpen(Session session){ this.session=session; } @OnMessage public void onMessage(Session session, String message){ this.session=session; int devId=Integer.valueOf(message); thread = new Thread("Thread_Version") { @Override public void run() { while (runFlag && !isInterrupted()) { Thread thread = currentThread(); threadFlagMap.put(thread.getId(), true); try { Response res = filedownloadService.getDownloadFileStatus(devId); if (session.isOpen()) { //推送信息 synchronized (session) { session.getBasicRemote().sendObject(res); } threadFlagMap.put(thread.getId(), false); } sleep(executeTime); //} catch (IOException | InterruptedException | EncodeException e) { } catch (Exception e) { interrupt(); } } } }; thread.start(); threadFlagMap.put(thread.getId(),true); //停止老的socket线程 Thread threadBefore = threadMap.get(session.getId()); if(threadBefore !=null && threadBefore.isAlive()){ while (threadFlagMap.get(threadBefore.getId())){ } threadBefore.interrupt(); } //将线程存储,便于调用定位 threadMap.put(session.getId(), this.thread); } @OnClose public void onClose(CloseReason closeReason){ System.err.println("closeReason = " + closeReason); runFlag = false; if (thread != null && thread.isAlive()) { thread.interrupt(); } threadMap.remove(session.getId()); } @OnError public void onError(Throwable error) { error.printStackTrace(); if (thread != null && thread.isAlive()) { thread.interrupt(); } threadMap.remove(session.getId()); } }