改为跟胡taskno 去执行服务

src/main/java/im/zhaojun/system/model/Traffpicture.java

@@ -54,8 +54,15 @@ public class Traffpicture {
     private String faceimagedata;
 
     private String index;
+    private Integer targetnum;
 
+    public Integer getTargetnum() {
+        return targetnum;
+    }
 
+    public void setTargetnum(Integer targetnum) {
+        this.targetnum = targetnum;
+    }
 
     public String getImageid() {
         return imageid;

src/main/java/im/zhaojun/system/model/TraffpictureParam.java

@@ -45,6 +45,15 @@ public class TraffpictureParam extends Traffpicture {
     @JsonIgnore
     private Integer manualstatus;
     private  String  imagedata;
+    private Integer  alarmnum;
+
+    public Integer getAlarmnum() {
+        return alarmnum;
+    }
+
+    public void setAlarmnum(Integer alarmnum) {
+        this.alarmnum = alarmnum;
+    }
 
     private Integer objx;
     private Integer objy;

src/main/resources/mapper/TrafficStatisticsMapper.xml

@@ -665,14 +665,14 @@
 
 
     <select id="queryTraffalarmrecordByPage" resultType="im.zhaojun.system.model.TraffpictureParam">
-
         SELECT
         TA.*,
         TA.createtime recordtime,
         (select tdmc from  sbtdspsr where sbbh=fdid and tdbh=channelid limit 1)tdmc,
         ( SELECT dept_name FROM dept b WHERE b.dept_id = TA.areaid LIMIT 1 ) xzmc,
         ( SELECT b.NAME FROM  t_code b where  TA.recordtype = LOWER( b.KEY ) and type=2 LIMIT 1 ) recordname,
-        ( SELECT b.alarmlevel FROM  t_code b where  TA.recordtype = LOWER( b.KEY ) and type=2 LIMIT 1) recordlevel
+        ( SELECT b.alarmlevel FROM  t_code b where  TA.recordtype = LOWER( b.KEY ) and type=2 LIMIT 1) recordlevel,
+        ( SELECT b.alarmnum FROM  t_code b where  TA.recordtype = LOWER( b.KEY ) and type=2 LIMIT 1) alarmnum
         FROM
         traffpicture TA
         where  (TA.fdid, TA.channelid, recordtype) in(
@@ -710,13 +710,6 @@
                 </foreach>
             </if>
 
-            <if test="construction!=null and construction==1">
-                AND TA.recordtype in ('roadworks_out_of_line','roadworks')
-            </if>
-            <if test="construction!=null and construction==2">
-                AND TA.recordtype not in ('roadworks_out_of_line','roadworks')
-            </if>
-
             <if test="deptid!=null and deptid != ''">
                 AND TA.areaid in (
                 select t1.dept_id

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

@@ -324,7 +324,7 @@ let vue_sjcx = new Vue({
         getChange: function () {
             setTimeout(function () {
                 vue_sjcx.query(1, true);
-            }, 200);
+            }, 100);
         },
         cli_input: function () {
             vue_sjcx.state_arr = [];
@@ -896,8 +896,8 @@ $('[data-gallery=manual]').click(function (e) {
     new PhotoViewer(items, options);
 });
 let d = new Date().getTime();
-let web_ip = "ws:/172.16.24.29:8089/websocket/" + d;
-// let web_ip = "ws:/localhost:8089/websocket/" + d;
+// let web_ip = "ws:/172.16.24.29:8089/websocket/" + d;
+let web_ip = "ws:/localhost:8089/websocket/" + d;
 let wss = new WebSocket(web_ip);
 wss.onopen = function () {
     console.log("连接成功");
@@ -932,7 +932,7 @@ wss.onmessage = function (evt) {
         //事件id
         let sjid = data.id;
         //报警时间
-        let sj = data.createtime;
+        let sj =new Date(data.createtime);
         //事件类型
         let bjlx = '';
         //事件等级

src/main/resources/templates/page/sjcx.html

@@ -106,6 +106,12 @@
                                             <span>辖区名称：</span>
                                             <span v-text="item.xzmc"></span>
                                         </div>
+                                        <div v-show="item.targetnum!=null && item.targetnum>0">
+                                            <span>人员密度：</span>
+                                            <span v-text="item.targetnum"></span>
+                                            <span>警界值：</span>
+                                            <span v-text="item.alarmnum"></span>
+                                        </div>
                                     </div>
                                     <div class="li-bottom">
                                         <img src="../img/sjcx/lssp.png" v-show="item.videopath==null?false:true">
@@ -147,11 +153,11 @@
                             <div style="float: right;margin-top: 21px;margin-right: 30px;width: 111px;line-height: 36px;font-weight: 900;">
                                 <span style="float: left;width: 34px;">每页</span>
                                 <select class="form-control selectpicker" v-model="fy_select" style="width: 50px;padding: 0px 3px;float: left;"v-on:change="getChange()">
-                                    <option>10</option>
-                                    <option>20</option>
-                                    <option>30</option>
-                                    <option>40</option>
-                                    <option>50</option>
+                                    <option>12</option>
+                                    <option>24</option>
+                                    <option>36</option>
+                                    <option>48</option>
+                                    <option>60</option>
                                 </select>
                                 <span style="float: left;margin-left: 8px;">条</span>
                             </div>
@@ -666,10 +672,10 @@
                 <div class="modal-body">
                     <div>
                         <div class="top-video">
-                            <video controls style="height: 100%;width: 100%;object-fit:fill;pointer-events: none;"
-                                   class="video-js" autoplay muted id="my_video_1" ref='video'
-                                   v-show="shows">
-                            </video>
+                            <!--<video controls style="height: 100%;width: 100%;object-fit:fill;pointer-events: none;"-->
+                                   <!--class="video-js" autoplay muted id="my_video_1" ref='video'-->
+                                   <!--v-show="shows">-->
+                            <!--</video>-->
                             <img :src="src_img" v-show="!shows" style="width: 100%;height: 100%;cursor: zoom-in;"
                                  data-gallery="manual">
                         </div>
@@ -679,8 +685,8 @@
                             </div>
                         </div>
                         <div class="pub-div">
-                            <button type="button" class="btn btn-sm" v-bind:class=class_s @click="sp_qh(1)">实时视频
-                            </button>
+                            <!--<button type="button" class="btn btn-sm" v-bind:class=class_s @click="sp_qh(1)">实时视频-->
+                            <!--</button>-->
                             <button type="button" class="btn btn-sm" v-bind:class=class_s1 @click="sp_qh(2)">事件图片</button>
                         </div>
                         <div style="color: #5d5d5d;" class="pub-div">