websocket 推送

src/main/java/im/zhaojun/common/config/ShiroConfig.java → src/main/java/im/zhaojun/common/config/RedisConfig.java

@@ -36,7 +36,7 @@ import java.util.Arrays;
 import java.util.Map;
 
 @Configuration
-public class ShiroConfig {
+public class RedisConfig {
 
     @Resource
     private OAuth2Helper oAuth2Helper;

src/main/resources/mapper/DeptMapper.xml

@@ -212,7 +212,7 @@
 
 
     <select id="listAllvideoIdsByDeptid" resultType="java.util.HashMap">
-      select sbbh||'_'||tdbh vidoid
+      select concat(sbbh,'_',tdbh) vidoid
        from  sbtdspsr a
         where  a.xzbh in (
        select t1.dept_id
@@ -248,7 +248,7 @@
                limit 1) "deptname",
                  (select tdmc
               from sbtdspsr c
-             where c.sbbh||'_'||tdbh = b.videoid
+             where  concat(c.sbbh,'_',tdbh) = b.videoid
                limit 1) "videoname"
       from deptdefaultvideo b
               where b.xzbh=#{deptId}
@@ -292,10 +292,10 @@
         <include refid="Base_Column_List"/>
         from
         (
-        SELECT A.sbbh || '_' || tdbh dept_id,
+        SELECT concat(A.sbbh, '_',tdbh) dept_id,
         A.tdmc dept_name,
         TO_CHAR(a.xzbh) parent_id,
-        to_number(t.levels) + 1 || '' LEVELS,
+        to_number(t.levels) + 1  LEVELS,
         (select max(order_num) from dept) + (@rownum := @rownum + 1) order_num,
         a.cjrq create_time,
         a.xgrq modify_time
@@ -321,7 +321,7 @@
                     and  a.parent_id = #{parent_id,jdbcType=INTEGER}
                 </when>
                 <otherwise>
-                    and a.parent_id||'' =0
+                    and a.parent_id =0
                 </otherwise>
             </choose>
         </where>

src/main/resources/mapper/traffdevicewriteresult.xml

@@ -16,7 +16,7 @@
         left join ptxzs p on p.xzbh = ta.xzbh
         <where>
         <if test="sbbh !=null and sbbh != ''">
-            and (ta.sbbh like '%'||#{sbbh}||'%' OR ta.tdmc like '%'||#{sbbh}||'%' OR ta.tdmcpy like '%'||#{sbbh}||'%' )
+            and (ta.sbbh like concat('%',#{sbbh},'%') OR ta.tdmc like '%'||#{sbbh}||'%' OR ta.tdmcpy like '%'||#{sbbh}||'%' )
         </if>
         <if test="xzbh !=null and xzbh != ''">
             AND ta.xzbh IN

src/main/resources/static/js/sjcx/sjcx.js

+let state_sj=true;
 let vue_sjcx = new Vue({
     el: '#sjcx',
     data: {
@@ -338,7 +339,8 @@ let vue_sjcx = new Vue({
         },
  			zdtx:function () {
                     state_sj=document.getElementById('status').checked;
-                }    },
+                }    }
+                ,
     mounted(){
         $("#kssj").val(getTime_extent(6).pre_rq_start + ' - ' + getTime().jssj);
         $.ajax({
@@ -746,7 +748,7 @@ $('[data-gallery=manual]').click(function (e) {
     new PhotoViewer(items, options);
 });
 let d = new Date().getTime();
-let web_ip = "ws:/172.16.24.153:8089/websocket/" + d;
+let web_ip = "ws:/localhost:8089/websocket/" + d;
 let wss = new WebSocket(web_ip);
 wss.onopen = function () {
     console.log("连接成功");
@@ -767,7 +769,7 @@ wss.onmessage = function (evt) {
             //jk_video_id为监控id
             // let a_id = data.data.video_id.slice(0, data.data.video_id.length - 1) + (parseInt(data.data.video_id.slice(data.data.video_id.length - 1, data.data.video_id.length)) + 1) + '';
 
-            let jk_video_id = data.fdid + "_" + data.channelid;
+            let jk_video_id = data.videoid;
             // let jk_video_id = data.data.video_id;
             vue_sjcx.jk_s.forEach((item, index) => {
                 if (item.VIDOID == jk_video_id) {
@@ -782,7 +784,7 @@ wss.onmessage = function (evt) {
                 //事件类型
                 let bjlx = '';
                 //事件等级
-                let sjdj = '';
+                let sjdj = data.sjdj;
                 // vue_sjcx.data_sjlxs.forEach((item, index) => {
                 //     if (item.id.toLowerCase() == data.data.incident_type.toLowerCase()) {
                 //         bjlx = item.name;
@@ -791,7 +793,7 @@ wss.onmessage = function (evt) {
                 // });
 
                 //监控名称
-                let jkmc = '';
+                let jkmc ='';
                 vue_sjcx.jk_arr.forEach((item, index) => {
                     if (item.href == jk_video_id) {
                         jkmc = item.text;
@@ -799,7 +801,7 @@ wss.onmessage = function (evt) {
                 });
                 //违法图片
                 let wfsp = [];
-                data.imageData.forEach((item, index) => {
+                data.data.imageData.forEach((item, index) => {
                     let src = 'data:image/jpg;base64,' + item;
                     wfsp.push({img_src: src});
                 });