Browse Source

Merge remote-tracking branch 'origin/master'

limeng 3 years ago
parent
commit
243d26cc65

+ 5 - 5
leiSP-admin/src/main/resources/application-druid.yml

@@ -9,14 +9,14 @@ spring:
 #                url: jdbc:mysql://192.168.100.11:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 
 
-                url: jdbc:mysql://127.0.0.1:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: slfh
-                password: slfh123456
-
-#                url: jdbc:mysql://218.27.1.157:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://127.0.0.1:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: slfh
 #                password: slfh123456
 
+                url: jdbc:mysql://218.27.1.157:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: slfh
+                password: slfh123456
+
 
 #                url: jdbc:mysql://36.97.65.105:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: sjkj

+ 29 - 1
mybusiness/src/main/java/com/business/slfh/manager/cameramanager/controller/HikCameraController.java

@@ -5,6 +5,11 @@ import com.business.slfh.manager.cameramanager.domain.TResCamera;
 import com.business.slfh.manager.cameramanager.service.ITResCameraService;
 import com.business.slfh.manager.firemanager.domain.TUEventFire;
 import com.business.slfh.manager.firemanager.service.ITUEventFireService;
+import com.sooka.common.utils.StringUtils;
+import com.sooka.framework.util.ShiroUtils;
+import com.sooka.system.domain.SysUser;
+import com.sooka.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -34,6 +39,24 @@ public class HikCameraController {
     }
 
 
+
+    /**
+     * 与系统参数做比较,判断是否是特殊用户
+     * return boolean
+     */
+    private boolean isSpecialUsr(String userIds, SysUser user){
+        if(StringUtils.isEmpty(userIds)) return false;
+        String [] userIdArr = userIds.split(",");
+        for(int i=0;i<userIdArr.length;i++){
+            if(user.getUserId().toString().equals(userIdArr[i]))
+                return true;
+        }
+        return false;
+    }
+
+    @Autowired
+    private ISysConfigService configService;
+
     @RequestMapping("demo_window_simple_preview_wall")
     public String demo_window_simple_preview_wall(ModelMap map, HttpServletRequest request){
         List<TResCamera> cameras = cameraService.selectTResCameraList(new TResCamera());
@@ -45,8 +68,13 @@ public class HikCameraController {
                 t.getChannels().add(s[j]);
             }
         }
-
         map.put("cameras",cameras);
+        SysUser user = ShiroUtils.getSysUser();
+        if(isSpecialUsr(configService.selectConfigByKey("special_usr"),user)){
+            return "/business/bigdata/camera3/demo_window_simple_preview_wall_special_camera";
+        }
+
+
         return "/business/bigdata/camera3/demo_window_simple_preview_wall";
     }
 

+ 1 - 0
mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -670,6 +670,7 @@ public class Visualization_Event_Controller extends AppBaseController {
     }
     @Autowired
     private ISysConfigService configService;
+
     private boolean isSpecialUsr(String userIds, SysUser user){
         if(StringUtils.isEmpty(userIds)) return false;
         String [] userIdArr = userIds.split(",");

+ 411 - 0
mybusiness/src/main/resources/templates/business/bigdata/camera3/demo_window_simple_preview_wall_special_camera.html

@@ -0,0 +1,411 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>摄像头预览</title>
+</head>
+<style>
+    html, body, ul {
+        padding: 0;
+        margin: 0;
+    }
+
+    .playWnd {
+        margin: 0px 0 0 242px;
+        width: 1000px; /*播放容器的宽和高设定*/
+        height: 600px;
+        border: 1px solid red;
+        display: inline-block;
+        float: left;
+    }
+
+    .operate {
+        margin-top: 24px;
+    }
+
+    .operate::after {
+        content: '';
+        display: block;
+        clear: both;
+    }
+
+    .module {
+        float: left;
+        width: 340px;
+        /*min-height: 320px;*/
+        margin-left: 16px;
+        padding: 16px 8px;
+        box-sizing: border-box;
+        border: 1px solid #e5e5e5;
+
+    }
+
+    .module .item {
+        margin-bottom: 4px;
+    }
+
+    .module input[type="text"] {
+        box-sizing: border-box;
+        display: inline-block;
+        vertical-align: middle;
+        margin-left: 0;
+        width: 150px;
+        min-height: 20px;
+    }
+
+    .module .btn {
+        min-width: 80px;
+        min-height: 24px;
+        margin-top: 100px;
+        margin-left: 80px;
+    }
+
+    .wid-3 {
+        width: 242px;
+        font-size: 14px;
+        border: 1px solid #0e90d2;
+        list-style: none;
+        display: inline-block;
+        float: left;
+        line-height: 20px;
+        overflow-y: scroll;
+        height: 100%;
+        margin: 0;
+        position: fixed;
+        bottom: 0;
+        padding-top: 20px !important;
+        background:#000033;
+        color: #48a5b1;
+    }
+
+    .wid-3 li {
+
+        padding: 3px 20px;
+    }
+
+    .wid-3 li:hover {
+        background: #0d6aad;
+        color: #ffffff;
+        font-weight: bolder;
+        padding: 3px 20px;
+    }
+    .wid-4 span{
+        font-size: 14px;
+        background: #0e90d2;
+        color: #ffffff;
+        font-weight: bolder;
+        padding: 3px 10px;
+        margin-top: 10px;
+        margin-right: 5px;
+        display: inline-block;
+    }
+    .wid-4 span:hover{
+        font-size: 14px;
+        background: #50afd2;
+        color: #ffffff;
+        font-weight: bolder;
+        padding: 3px 10px;
+        margin-top: 10px;
+        margin-right: 5px;
+        display: inline-block;
+    }
+
+    .wid-9 {
+        width: 70%;
+    }
+</style>
+
+<body>
+<!--预览界面-->
+<div id="operate" class="operate" style="display: none">
+    <div class="module">
+        <div class="item"><span class="label">监控点编号:</span><input id="cameraIndexCode" type="text" value=""></div>
+        <div class="item" style="margin-top: 20px;margin-left: -20px;">
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <button style="width:20px;padding:0;margin:0;" id="startPreview" class="btn">预览</button>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <button style="width:90px;padding:0;margin:0;" id="stopAllPreview" class="btn">停止全部预览</button>
+        </div>
+    </div>
+</div>
+<ul id="cameras" class="wid-3">
+
+    <li th:each="cam : ${cameras}"  style="border-width: 1px;border-color: #0a2a3b;">
+        <span class="wid-4" th:each="ch,cStat : ${cam.channels}" th:value="${ch}"  th:onclick="play([[${ch}]])"><span>[[${cStat.index+1}]]</span></span>
+        <span  style='cursor:pointer;' th:onclick="goHistory([[${cam.hikCameraId}]])">[[${cam.name}]]</span>
+    </li>
+
+</ul>
+<!--视频窗口展示-->
+<div id="playWnd" class="playWnd" style="left: 109px; top: 133px;"></div>
+</body>
+
+<!--三个必要的js文件引入-->
+<script src="../../../../hikdemosindowsioplepriview/jquery-1.12.4.min.js"></script>
+<script src="../../../../hikdemosindowsioplepriview/jsencrypt.min.js"></script>            <!-- 用于RSA加密 -->
+<script src="../../../../hikdemosindowsioplepriview/jsWebControl-1.0.0.min.js"></script>   <!-- 用于前端与插件交互 -->
+
+<script type="text/javascript">
+
+    function GetRequest() {
+        var url = location.search; //获取url中"?"符后的字串
+        var theRequest = new Object();
+        if (url.indexOf("?") != -1) {
+            var str = url.substr(1);
+            strs = str.split("&");
+            for (var i = 0; i < strs.length; i++) {
+                theRequest[strs[i].split("=")[0]] = decodeURI(strs[i].split("=")[1]);
+            }
+        }
+        return theRequest;
+    }
+
+    //页面加载时创建播放实例初始化
+    $(window).load(function () {
+
+
+        initPlugin();
+
+
+    });
+
+    function play(hik_camera_id) {
+        var c = hik_camera_id.split(",")[0];
+        $("#cameraIndexCode").val(c);
+        setTimeout(function () {
+            $("#startPreview").click();
+        }, 100);
+    }
+
+
+    //声明公用变量
+    var initCount = 0;
+    var pubKey = '';
+
+    // 创建播放实例
+    function initPlugin() {
+        oWebControl = new WebControl({
+            szPluginContainer: "playWnd",                       // 指定容器id
+            iServicePortStart: 15900,                           // 指定起止端口号,建议使用该值
+            iServicePortEnd: 15909,
+            szClassId: "23BF3B0A-2C56-4D97-9C03-0CB103AA8F11",   // 用于IE10使用ActiveX的clsid
+            cbConnectSuccess: function () {                     // 创建WebControl实例成功
+                oWebControl.JS_StartService("window", {         // WebControl实例创建成功后需要启动服务
+                    dllPath: "./VideoPluginConnect.dll"         // 值"./VideoPluginConnect.dll"写死
+                }).then(function () {                           // 启动插件服务成功
+                    oWebControl.JS_SetWindowControlCallback({   // 设置消息回调
+                        cbIntegrationCallBack: cbIntegrationCallBack
+                    });
+
+                    oWebControl.JS_CreateWnd("playWnd", 1000, 600).then(function () { //JS_CreateWnd创建视频播放窗口,宽高可设定
+                        init();  // 创建播放实例成功后初始化
+                    });
+                }, function () { // 启动插件服务失败
+                });
+            },
+            cbConnectError: function () { // 创建WebControl实例失败
+                oWebControl = null;
+                $("#playWnd").html("插件未启动,正在尝试启动,请稍候...");
+                WebControl.JS_WakeUp("VideoWebPlugin://"); // 程序未启动时执行error函数,采用wakeup来启动程序
+                initCount++;
+                if (initCount < 3) {
+                    setTimeout(function () {
+                        initPlugin();
+                    }, 3000)
+                } else {
+                    $("#playWnd").html("插件启动失败,请检查插件是否安装!");
+                }
+            },
+            cbConnectClose: function (bNormalClose) {
+                // 异常断开:bNormalClose = false
+                // JS_Disconnect正常断开:bNormalClose = true
+                console.log("cbConnectClose");
+                oWebControl = null;
+            }
+        });
+    }
+
+    // 设置窗口控制回调
+    function setCallbacks() {
+        oWebControl.JS_SetWindowControlCallback({
+            cbIntegrationCallBack: cbIntegrationCallBack
+        });
+    }
+
+    // 推送消息
+    function cbIntegrationCallBack(oData) {
+        showCBInfo(JSON.stringify(oData.responseMsg));
+    }
+
+    //初始化
+    function init() {
+        getPubKey(function () {
+
+            ////////////////////////////////// 请自行修改以下变量值	////////////////////////////////////
+            var appkey = "21925239";                           //综合安防管理平台提供的appkey,必填
+            var secret = setEncrypt("8x9Ewm2UVcJqtTGvriEH");   //综合安防管理平台提供的secret,必填
+            var ip = "218.27.1.157";                           //综合安防管理平台IP地址,必填
+            var playMode = 0;                                  //初始播放模式:0-预览,1-回放
+            var port = 443;                                    //综合安防管理平台端口,若启用HTTPS协议,默认443
+            var snapDir = "D:\\SnapDir";                       //抓图存储路径
+            var videoDir = "D:\\VideoDir";                     //紧急录像或录像剪辑存储路径
+            var layout = "1x1";                                //playMode指定模式的布局
+            var enableHTTPS = 1;                               //是否启用HTTPS协议与综合安防管理平台交互,这里总是填1
+            var encryptedFields = 'secret';					   //加密字段,默认加密领域为secret
+            var showToolbar = 1;                               //是否显示工具栏,0-不显示,非0-显示
+            var showSmart = 1;                                 //是否显示智能信息(如配置移动侦测后画面上的线框),0-不显示,非0-显示
+            var buttonIDs = "0,16,257";  //自定义工具条按钮
+            ////////////////////////////////// 请自行修改以上变量值	////////////////////////////////////
+
+            oWebControl.JS_RequestInterface({
+                funcName: "init",
+                argument: JSON.stringify({
+                    appkey: appkey,                            //API网关提供的appkey
+                    secret: secret,                            //API网关提供的secret
+                    ip: ip,                                    //API网关IP地址
+                    playMode: playMode,                        //播放模式(决定显示预览还是回放界面)
+                    port: port,                                //端口
+                    snapDir: snapDir,                          //抓图存储路径
+                    videoDir: videoDir,                        //紧急录像或录像剪辑存储路径
+                    layout: layout,                            //布局
+                    enableHTTPS: enableHTTPS,                  //是否启用HTTPS协议
+                    encryptedFields: encryptedFields,          //加密字段
+                    showToolbar: showToolbar,                  //是否显示工具栏
+                    showSmart: showSmart,                      //是否显示智能信息
+                    buttonIDs: buttonIDs                       //自定义工具条按钮
+                })
+            }).then(function (oData) {
+
+
+                var nWidth = $(this).width() + $(this).scrollLeft(),
+                    nHeight = $(this).height() + $(this).scrollTop();
+
+
+                oWebControl.JS_Resize(nWidth - 242, nHeight);  // 初始化后resize一次,规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
+            });
+        });
+    }
+
+    //获取公钥
+    function getPubKey(callback) {
+        oWebControl.JS_RequestInterface({
+            funcName: "getRSAPubKey",
+            argument: JSON.stringify({
+                keyLength: 1024
+            })
+        }).then(function (oData) {
+            console.log(oData);
+            if (oData.responseMsg.data) {
+                pubKey = oData.responseMsg.data;
+                callback()
+            }
+        })
+    }
+
+    //RSA加密
+    function setEncrypt(value) {
+        var encrypt = new JSEncrypt();
+        encrypt.setPublicKey(pubKey);
+        return encrypt.encrypt(value);
+    }
+
+    // 监听resize事件,使插件窗口尺寸跟随DIV窗口变化
+    $(window).resize(function () {
+        if (oWebControl != null) {
+            oWebControl.JS_Resize(1000, 600);
+            setWndCover();
+        }
+    });
+
+    // 监听滚动条scroll事件,使插件窗口跟随浏览器滚动而移动
+    $(window).scroll(function () {
+        if (oWebControl != null) {
+            oWebControl.JS_Resize(1000, 600);
+            setWndCover();
+        }
+    });
+
+
+    // 设置窗口裁剪,当因滚动条滚动导致窗口需要被遮住的情况下需要JS_CuttingPartWindow部分窗口
+    function setWndCover() {
+        var iWidth = $(window).width();
+        var iHeight = $(window).height();
+        var oDivRect = $("#playWnd").get(0).getBoundingClientRect();
+
+        var iCoverLeft = (oDivRect.left < 0) ? Math.abs(oDivRect.left) : 0;
+        var iCoverTop = (oDivRect.top < 0) ? Math.abs(oDivRect.top) : 0;
+        var iCoverRight = (oDivRect.right - iWidth > 0) ? Math.round(oDivRect.right - iWidth) : 0;
+        var iCoverBottom = (oDivRect.bottom - iHeight > 0) ? Math.round(oDivRect.bottom - iHeight) : 0;
+
+        iCoverLeft = (iCoverLeft > 1000) ? 1000 : iCoverLeft;
+        iCoverTop = (iCoverTop > 600) ? 600 : iCoverTop;
+        iCoverRight = (iCoverRight > 1000) ? 1000 : iCoverRight;
+        iCoverBottom = (iCoverBottom > 600) ? 600 : iCoverBottom;
+
+        oWebControl.JS_RepairPartWindow(0, 0, 1001, 600);    // 多1个像素点防止还原后边界缺失一个像素条
+        if (iCoverLeft != 0) {
+            oWebControl.JS_CuttingPartWindow(0, 0, iCoverLeft, 600);
+        }
+        if (iCoverTop != 0) {
+            oWebControl.JS_CuttingPartWindow(0, 0, 1001, iCoverTop);    // 多剪掉一个像素条,防止出现剪掉一部分窗口后出现一个像素条
+        }
+        if (iCoverRight != 0) {
+            oWebControl.JS_CuttingPartWindow(1000 - iCoverRight, 0, iCoverRight, 600);
+        }
+        if (iCoverBottom != 0) {
+            oWebControl.JS_CuttingPartWindow(0, 600 - iCoverBottom, 1000, iCoverBottom);
+        }
+    }
+
+    //视频预览功能
+
+    function startPreview_start() {
+
+        var cameraIndexCode = $("#cameraIndexCode").val();     //获取输入的监控点编号值,必填
+        var streamMode = 0;                                     //主子码流标识:0-主码流,1-子码流
+        var transMode = 1;                                      //传输协议:0-UDP,1-TCP
+        var gpuMode = 0;                                        //是否启用GPU硬解,0-不启用,1-启用
+        var wndId = -1;                                         //播放窗口序号(在2x2以上布局下可指定播放窗口)
+
+        cameraIndexCode = cameraIndexCode.replace(/(^\s*)/g, "");
+        cameraIndexCode = cameraIndexCode.replace(/(\s*$)/g, "");
+
+        oWebControl.JS_RequestInterface({
+            funcName: "startPreview",
+            argument: JSON.stringify({
+                cameraIndexCode: cameraIndexCode,                //监控点编号
+                streamMode: streamMode,                         //主子码流标识
+                transMode: transMode,                           //传输协议
+                gpuMode: gpuMode,                               //是否开启GPU硬解
+                wndId: wndId                                     //可指定播放窗口
+            })
+        })
+    }
+
+
+    $("#startPreview").click(startPreview_start);
+
+    //停止全部预览
+    $("#stopAllPreview").click(function () {
+        oWebControl.JS_RequestInterface({
+            funcName: "stopAllPreview"
+        });
+    });
+
+    // 标签关闭
+    $(window).unload(function () {
+        if (oWebControl != null) {
+            oWebControl.JS_HideWnd();   // 先让窗口隐藏,规避可能的插件窗口滞后于浏览器消失问题
+            oWebControl.JS_Disconnect().then(function () {  // 断开与插件服务连接成功
+                },
+                function () {  // 断开与插件服务连接失败
+                });
+        }
+    });
+
+    function goHistory(hikCameraId){//历史回放
+        window.open('/business/manager/hikcameracontroller/demo_window_simple_playback_manager?ID='+hikCameraId)
+    }
+
+</script>
+</html>

+ 2 - 2
mybusiness/src/main/resources/templates/business/bigdata/camera3/demo_window_simple_preview_wall_special_user.html

@@ -254,9 +254,9 @@
             var encryptedFields = 'secret';					   //加密字段,默认加密领域为secret
             var showToolbar = 1;                               //是否显示工具栏,0-不显示,非0-显示
             var showSmart = 1;                                 //是否显示智能信息(如配置移动侦测后画面上的线框),0-不显示,非0-显示
-            var buttonIDs = "0,16,256,257,258,259,260,512,513,514,515,516,517,768,769";  //自定义工具条按钮
+            //var buttonIDs = "0,16,256,257,258,259,260,512,513,514,515,516,517,768,769";  //自定义工具条按钮
             ////////////////////////////////// 请自行修改以上变量值	////////////////////////////////////
-
+            var buttonIDs = "0,16,257";  //自定义工具条按钮
             oWebControl.JS_RequestInterface({
                 funcName: "init",
                 argument: JSON.stringify({

+ 1 - 1
mybusiness/src/main/resources/templates/business/visualization/event_special_usr.html

@@ -320,7 +320,7 @@
         <li class="slide2"></li>
         <li class="slide2"></li>
         <li class="slide2"></li>
-        <li class="ew_li aa"><a class="active" name="yxt"></a></li>
+        <li class="ew_li aa"><a class="active" name="yxt">影像图</a></li>
         <!--<li class="aa"><a name="lkt">轮廓图</a></li>-->
         <li class="aa"><a name="xzt">行政图</a></li>
         <!--<li class="aa"><a name="lwt">路网图</a></li>-->