diff --git a/src/main/java/com/huaheng/framework/shiro/web/filter/online/OnlineSessionFilter.java b/src/main/java/com/huaheng/framework/shiro/web/filter/online/OnlineSessionFilter.java index 5640c65..4a49b37 100644 --- a/src/main/java/com/huaheng/framework/shiro/web/filter/online/OnlineSessionFilter.java +++ b/src/main/java/com/huaheng/framework/shiro/web/filter/online/OnlineSessionFilter.java @@ -1,20 +1,9 @@ package com.huaheng.framework.shiro.web.filter.online; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.File; import java.io.IOException; -import javax.imageio.ImageIO; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import com.huaheng.api.erp.domain.CapturePictureModule; -import com.huaheng.api.erp.service.DisConnect; -import com.huaheng.api.erp.service.HaveReConnect; -import com.huaheng.common.constant.QuantityConstant; -import com.netsdk.demo.module.LoginModule; -import com.netsdk.lib.NetSDKLib; -import com.sun.jna.Pointer; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.AccessControlFilter; @@ -68,14 +57,6 @@ public class OnlineSessionFilter extends AccessControlFilter User user = ShiroUtils.getUser(); if (user != null) { - DisConnect disConnect = new DisConnect(); - HaveReConnect haveReConnect = new HaveReConnect(); - /*LoginModule.init(disConnect,haveReConnect); - String camera1 = LoginModule.login("10.34.101.55", 37777, "admin", "hk999999"); - String camera2 = LoginModule.login("10.34.101.59", 37777, "admin", "hk999999"); - CapturePictureModule.setSnapRevCallBack(OnlineSessionFilter.m_CaptureReceiveCB); - onlineSession.setCamera1(camera1); - onlineSession.setCamera2(camera2);*/ onlineSession.setUserId(user.getId()); onlineSession.setLoginName(user.getLoginName()); onlineSession.setDeptName(user.getDept().getDeptName()); @@ -90,34 +71,6 @@ public class OnlineSessionFilter extends AccessControlFilter } return true; } - public static final fCaptureReceiveCB m_CaptureReceiveCB = new fCaptureReceiveCB(); - public static class fCaptureReceiveCB implements NetSDKLib.fSnapRev{ - BufferedImage bufferedImage = null; - @Override - public void invoke(NetSDKLib.LLong lLoginID, Pointer pBuf, int RevLen, int EncodeType, int CmdSerial, Pointer dwUser) { - if(pBuf != null && RevLen > 0) { - File path1 = new File("static/img/Capture"); - if (!path1.exists()) { - path1.mkdir(); - } - String imgPath = null; - imgPath =this.getClass().getResource("/").getPath()+ "static/img/Capture/carInfo.jpg"; - File file = new File(imgPath); -// file.delete(); - byte[] buf = pBuf.getByteArray(0, RevLen); - ByteArrayInputStream byteArrInput = new ByteArrayInputStream(buf); - try { - bufferedImage = ImageIO.read(byteArrInput); - if(bufferedImage == null) { - return; - } - ImageIO.write(bufferedImage, "jpg", new File(imgPath)); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } /** * 表示当访问拒绝时是否已经处理了;如果返回true表示需要继续处理;如果返回false表示该拦截器实例已经处理了,将直接返回即可。 diff --git a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java index f7e6b6e..086ed14 100644 --- a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java +++ b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java @@ -596,7 +596,7 @@ public class RyTask extends BaseController { return RyTaskHolder.instance; } - public static final OnlineSessionFilter.fCaptureReceiveCB m_CaptureReceiveCB = new OnlineSessionFilter.fCaptureReceiveCB(); + public static final fCaptureReceiveCB m_CaptureReceiveCB = new fCaptureReceiveCB(); public static class fCaptureReceiveCB implements NetSDKLib.fSnapRev{ BufferedImage bufferedImage = null; @@ -619,7 +619,7 @@ public class RyTask extends BaseController { imgName = "material"; break; } - File path1 = new File("static/img/Capture"); + File path1 = new File(this.getClass().getResource("/").getPath()+ "static/img/Capture"); if (!path1.exists()) { path1.mkdir(); }