安全驾驶图像信息（当日）加入异常类型未带口罩，抽烟打电话

ljq
1 parent 037e3cd9
Showing 4 changed files with 158 additions and 104 deletions
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/safeDriving.html
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
@@ -45,8 +45,10 @@ public class SafeDrivCenter implements ApplicationContextAware {
     private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
     public static void put(SafeDriv sd){
         sd.setTs(fmt.parseMillis(sd.getStartime()));
-
-        if(sd.getYczltype().indexOf("A") == -1)
+        if(Integer.parseInt(sd.getYczltype()) == 5 && Integer.parseInt(sd.getJctype()) == 4
+                || Integer.parseInt(sd.getYczltype()) == 6 && Integer.parseInt(sd.getJctype()) == 4)
+            sd.setJctype("B" +  sd.getJctype());
+        else if(sd.getYczltype().indexOf("A") == -1)
             sd.setYczltype("A" + sd.getYczltype());
         //SafeDriv old = safeMap.get(sd.getClzbh());
@@ -114,10 +114,10 @@ public class GpsServiceImpl implements GpsService {
     @Autowired
     LineRepository lineRepository;
-    
+
     @Autowired
     LsStationRouteRepository lsStationRouteRepository;
-    
+
     @Autowired
     LsSectionRouteRepository lsSectionRouteRepository;
@@ -275,25 +275,25 @@ public class GpsServiceImpl implements GpsService {
         List<Map<String, Object>> gpsEqualsZeroList=new ArrayList<>();
         Map<String, Object> map = null;
         int oldLineId = -1, oldGpsValid = -1, oldLonlat = -1;
-        
+
         // 默认加入一个线路切换信息
         Map<String, Object> fls = new HashMap<String, Object>();
         fls.put("abnormalType", "normal");
         fls.put("st", "-1");
         lineSwitch.add(fls);
-        
+
         // 默认加入一个GPS无效异常信息
         Map<String, Object> fgv = new HashMap<String, Object>();
         fgv.put("abnormalType", "normal");
         fgv.put("st", "-1");
         gpsNotValidList.add(fgv);
-        
+
         // 默认加入一个经纬度为零异常信息
         Map<String, Object> fgez = new HashMap<String, Object>();
         fgez.put("abnormalType", "normal");
         fgez.put("st", "-1");
         gpsEqualsZeroList.add(fgez);
-        
+
         for(Map<String, Object> rs : dataList) {
         	Object lineId = rs.get("LINE_ID");
         	// 线路ID发生变化时补全线路切换信息 并新加入一个
@@ -301,12 +301,12 @@ public class GpsServiceImpl implements GpsService {
         		String lineName = BasicData.lineCode2NameMap.get(lineId.toString());
         		lineSwitch.get(lineSwitch.size() - 1).put("line2", lineName);
         		lineSwitch.get(lineSwitch.size() - 1).put("et", rs.get("TS"));
-        		
+
         		Map<String, Object> ls = new HashMap<String, Object>();
                 ls.put("abnormalType", "lineSwitch");
                 ls.put("line1", lineName);
                 lineSwitch.add(ls);
-                
+
                 lineSet.add((Integer)lineId);
                 oldLineId = (Integer)lineId;
         	}
@@ -314,12 +314,12 @@ public class GpsServiceImpl implements GpsService {
             // GPS状态发生变化时补全信息 并新加入一个
             if (getGpsValid(serviceState) != oldGpsValid) {
             	gpsNotValidList.get(gpsNotValidList.size() - 1).put("et", rs.get("TS"));
-            	
+
             	Map<String, Object> gv = new HashMap<String, Object>();
                 gv.put("abnormalType", getGpsValid(serviceState) == 0 ? "normal" : "gpsNotValid");
                 gv.put("st", rs.get("TS"));
                 gpsNotValidList.add(gv);
-                
+
                 oldGpsValid = getGpsValid(serviceState);
             }
@@ -329,15 +329,15 @@ public class GpsServiceImpl implements GpsService {
             // 经纬度为零
             if ((lon == 0 || lat == 0 ? 1 : 0) != oldLonlat){
             	gpsEqualsZeroList.get(gpsEqualsZeroList.size() - 1).put("et", rs.get("TS"));
-            	
+
             	Map<String, Object> gez = new HashMap<String, Object>();
                 gez.put("abnormalType", (lon == 0 || lat == 0 ? 1 : 0) == 0 ? "normal" : "gpsZero");
                 gez.put("st", rs.get("TS"));
                 gpsEqualsZeroList.add(gez);
-                
+
                 oldLonlat = (lon == 0 || lat == 0 ? 1 : 0);
             }
-            
+
             // 高德坐标
             gdLoc = TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(lon, lat));
             map.put("gcj_lon", gdLoc.getLng());
@@ -358,7 +358,7 @@ public class GpsServiceImpl implements GpsService {
             map.put("lineId", map_get_str(rs, "LINE_ID"));
             map.put("speed", map_get_float(rs,"SPEED_GPS"));
-            
+
             inOutStop = Integer.parseInt(rs.get("INOUT_STOP").toString());
             map.put("inout_stop", inOutStop);
@@ -381,21 +381,21 @@ public class GpsServiceImpl implements GpsService {
         	gpsNotValidList.get(gpsNotValidList.size() - 1).put("et", rs.get("TS"));
         	gpsEqualsZeroList.get(gpsEqualsZeroList.size() - 1).put("et", rs.get("TS"));
         }
-        
+
         for (int i = lineSwitch.size() - 1;i > -1;i--) {
         	Map<String, Object> ls = lineSwitch.get(i);
         	if ("normal".equals(ls.get("abnormalType")) || ls.get("et") == null) {
         		lineSwitch.remove(i);
         	}
         }
-        
+
         for (int i = gpsNotValidList.size() - 1;i > -1;i--) {
         	Map<String, Object> gnv = gpsNotValidList.get(i);
         	if ("normal".equals(gnv.get("abnormalType"))) {
         		gpsNotValidList.remove(i);
         	}
         }
-        
+
         for (int i = gpsEqualsZeroList.size() - 1;i > -1;i--) {
         	Map<String, Object> gez = gpsEqualsZeroList.get(i);
         	if ("normal".equals(gez.get("abnormalType"))) {
@@ -421,7 +421,7 @@ public class GpsServiceImpl implements GpsService {
                 		vm.put("endTime", vet);
                 		vm.put("stations", stations);
                 		//vm.put("sections", sections);
-                		
+
                 		Map<String, String> stationcode2name = new HashMap<String, String>();//sectioncode2name = new HashMap<String, String>();
                 		for (LsStationRoute lsr : stations) {
                 			stationcode2name.put(lsr.getStationCode(), lsr.getStationName());
@@ -432,14 +432,14 @@ public class GpsServiceImpl implements GpsService {
                 		lv2station.put(lineId + "_" + lv.getVersions(), stationcode2name);
                 		// 路段因为可能漂到其它线路路段 因此需要使用最新的全量路段
                 		//lv2section.put(lineId + "_" + lv.getVersions(), sectioncode2name);
-                		
+
                 		vlist.add(vm);
                 		vmap.put(lineId + "_" + lv.getVersions(), vm);
                 	}
                 }
             }
             rsMap.put("lineVerson",vlist);
-            
+
             for (Map<String, Object> gps : list) {
             	long ts = (long)gps.get("timestamp");
             	for (Map<String, Object> vm : vlist) {
@@ -1174,7 +1174,7 @@ public class GpsServiceImpl implements GpsService {
             }
             //过滤数据
             for (SafeDriv sd : list) {
-                if (isSpecialLines(sd, map) && fieldEquals(fs, sd, map))
+                if (isSpecialLines(sd, map) && fieldEqualstow(fs, sd, map))
                     rs.add(sd);
             }
@@ -1295,9 +1295,9 @@ public class GpsServiceImpl implements GpsService {
             }
         });
     }
-    
+
     /**
-     * 
+     *
      * @param sd
      * @param map
      * @return
@@ -1305,7 +1305,7 @@ public class GpsServiceImpl implements GpsService {
     public boolean isSpecialLines(SafeDriv sd, Map<String, Object> map) {
     	String lines = (String)map.get("lines");
     	if (lines == null) lines = "";
-    	
+
     	if (Arrays.asList(lines.split(",")).contains(sd.getXlbm())) return true;
     	return false;
     }
@@ -1333,6 +1333,32 @@ public class GpsServiceImpl implements GpsService {
         return true;
     }
+    public boolean fieldEqualstow(List<Field> fs, Object obj, Map<String, Object> map) {
+        try {
+            String fv, v;
+            for (Field f : fs) {
+                if (StringUtils.isEmpty(map.get(f.getName()).toString()))
+                    continue;
+
+                if(f.get(obj) == null)
+                    return false;
+
+                fv = f.get(obj).toString();
+                v = map.get(f.getName()).toString();
+                SafeDriv sd = (SafeDriv) obj;
+                if(v.equals(sd.getJctype()))
+                    return true;
+                else if(!fv.startsWith(v)/* && !fv.endsWith(v)*/)
+                    return false;
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            return false;
+        }
+        return true;
+    }
+
+
     @Override
     public List<GpsSpeed> findPosition(String deviceid, String startdate,
                                        String enddate) throws ParseException{
@@ -4,32 +4,35 @@
         <div class="uk-modal-header">
             <h2>安全驾驶图像信息（当日）</h2></div>
-            <div class="uk-panel uk-panel-box uk-panel-box-primary">
-                <form class="uk-form search-form">
-                    <fieldset data-uk-margin>
-                        <legend>
-                            数据检索
-                        </legend>
-                        <span class="horizontal-field">车辆</span>
-                        <div class="uk-autocomplete uk-form autocomplete-cars" >
-                            <input type="text" name="clzbh" placeholder="车辆自编号">
-                        </div>
-                        <span class="horizontal-field">异常类型</span>
-                        <select name="yczltype">
-                            <option value="">全部</option>
-                            <option value="A1">手部离开方向盘</option>
-                            <option value="A2">摄像头异常</option>
-                            <option value="A3">未戴安全带</option>
-                            <option value="A4">未戴袖章</option>
-                            <option value="A5">眨眼/疲劳驾驶</option>
-                            <option value="A6">打哈欠/打瞌睡</option>
-                            <option value="A7">行驶中与人交谈</option>
-                        </select>
-                        <button class="uk-button">检索</button>
-                        <!--<a id="showSSSpVedioModal" style="color: red;float: right;font-size: 12px;">查看实时视频</a>-->
-                    </fieldset>
-                </form>
-            </div>
+        <div class="uk-panel uk-panel-box uk-panel-box-primary">
+            <form class="uk-form search-form">
+                <fieldset data-uk-margin>
+                    <legend>
+                        数据检索
+                    </legend>
+                    <span class="horizontal-field">车辆</span>
+                    <div class="uk-autocomplete uk-form autocomplete-cars" >
+                        <input type="text" name="clzbh" placeholder="车辆自编号">
+                    </div>
+                    <span class="horizontal-field">异常类型</span>
+                    <select name="yczltype">
+                        <option value="">全部</option>
+                        <option value="A1">手部离开方向盘</option>
+                        <option value="A2">摄像头异常</option>
+                        <option value="A3">未戴安全带</option>
+                        <option value="A4">未戴袖章</option>
+                        <option value="A5">眨眼/疲劳驾驶</option>
+                        <option value="A6">打哈欠/打瞌睡</option>
+                        <option value="A7">行驶中与人交谈</option>
+                        <option value="A11">抽烟</option>
+                        <option value="A12">驾驶车辆期间打电话</option>
+                        <option value="B4">疫情期间未带口罩</option>
+                    </select>
+                    <button class="uk-button">检索</button>
+                    <!--<a id="showSSSpVedioModal" style="color: red;float: right;font-size: 12px;">查看实时视频</a>-->
+                </fieldset>
+            </form>
+        </div>
         <div style="height: 495px;margin:5px 0 -18px;">
             <table class="ct-fixed-table uk-table uk-table-hover">
                 <thead>
@@ -65,12 +68,15 @@
             <td style="width: 10%;">{{sd.timeStr}}</td>
             <td style="width: 10%;">
                 {{if sd.yczltype=='A1'}}
-                    {{if sd.jctype==0}}
-                        双脱手
-                    {{else if sd.jctype==1}}
-                        单脱手
-                    {{/if}}
+                {{if sd.jctype==0}}
+                双脱手
+                {{else if sd.jctype==1}}
+                单脱手
+                {{/if}}
+                {{else if sd.jctype == 'B4'}}
+                未戴口罩
                 {{/if}}
+
             </td>
             <td style="width: 10%;">
                 <a class="image_link" href="{{sd.url}}.jpg" data-uk-lightbox="{group:'jpg_group1'}" title="{{sd.title}}">JPG</a>
@@ -117,7 +123,6 @@
             var query = function() {
                 scanFlag = false;
                 var data = form.serializeJSON();
-                debugger;
                 var lines = new Array();
                 for (var i = 0;i < gb_data_basic.activeLines.length;i++) {
                 	lines.push(gb_data_basic.activeLines[i].lineCode);
@@ -136,17 +141,27 @@
                             this.xlmc='';
                         stm = moment(this.ts);
                         this.timeStr = stm.format('YYYY-MM-DD HH:mm:ss');
-                        this.yczlText= gb_safe_driv.safeCode[this.yczltype];
+                        if(this.jctype == 'B4')
+                            this.yczlText= gb_safe_driv.safeCode[this.jctype];
+                        else
+                            this.yczlText= gb_safe_driv.safeCode[this.yczltype];
                         //拼接图片地址
-                        p = (this.sbbh+'_'+this.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+                        if(this.jctype == 'B4')
+                            p = (this.sbbh+'_A'+this.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+                        else
+                            p = (this.sbbh+'_'+this.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+
                         url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
                         this.url = gb_safe_driv.urlPath + url;
                         //title
                         var call_btn_html = '<button class="uk-button uk-button-mini uk-button-primary" ' +
-                                'id="m_voip_call_btn_001" ' +
-                                'type="button" ' +
-                                'data-nbbm="'+this.clzbh+'">打电话</button>';
-                        this.title = this.clzbh+' '+stm.format('HH时mm分ss秒')+' '+this.yczlText + '&nbsp;' + call_btn_html;
+                            'id="m_voip_call_btn_001" ' +
+                            'type="button" ' +
+                            'data-nbbm="'+this.clzbh+'">打电话</button>';
+                        if(this.jctype == 'B4')
+                            this.title = this.clzbh+' '+stm.format('HH时mm分ss秒')+' '+'A'+this.yczltype + '&nbsp;' + call_btn_html;
+                        else
+                            this.title = this.clzbh+' '+stm.format('HH时mm分ss秒')+' '+this.yczltype + '&nbsp;' + call_btn_html;
                     });
                     var bodyHtml = template('all-safe_dring-table-temp', {
@@ -4,6 +4,7 @@
 var gb_safe_driv = (function () {
     var codes = {
+        'B4': '未带口罩',
         'A1': '手部违规',
         'A2': '摄像头偏离',
         'A3': '安全带',
@@ -11,7 +12,9 @@ var gb_safe_driv = (function () {
         'A5': '眨眼/疲劳驾驶',
         'A6': '打哈欠/打瞌睡',
         'A7': '与人交谈',
-        'A9': '玩手机'
+        'A9': '玩手机',
+        'A11': '抽烟',
+        'A12': '打电话'
     };
     var path = 'http://211.95.61.66:9005/CurrentSafeDriving/';
@@ -24,9 +27,17 @@ var gb_safe_driv = (function () {
         var stm = moment(sd.ts);
         sd.timeStr = stm.format('HH时mm分ss秒');
         //异常状态文本
-        sd.ycztText = codes[sd.yczltype];
+        if(sd.jctype == 'B4')
+            sd.ycztText = codes[sd.jctype];
+        else
+            sd.ycztText = codes[sd.yczltype];
+        var p;
         //图片地址
-        var p = (sd.sbbh+'_'+sd.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+        if(sd.jctype == 'B4')
+            p = (sd.sbbh+'_A'+sd.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+        else
+            p = (sd.sbbh+'_'+sd.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+
         var url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
         sd.url = path + url + '.gif';
@@ -68,43 +79,43 @@ var gb_safe_driv = (function () {
         'A6': 2,
         'A7': 2
     };
-/*    var showVedioModal = function (type) {
-        var channel = channelMap[type]?channelMap[type]:1;
-        open_modal_dom(vedioModal.replace('^^channel^^', channel) ,{}, {modal: false});
-        $('#ssspVedioModal #vedioIframe').on('load', function () {
-            var that = this;
-            setTimeout(function () {
-                $(that).show();
-                $('#ssspVedioModal p.loading').remove();
-            }, 500);
-        });
-    };*/
-
-/*    $(document).on('click', '#openVedioModalBtn', function () {
-        showVedioModal($(this).data('type'));
-    });*/
-
-
-/*    var showCallPhoneModal = function () {
-        open_modal_dom(phoneModal ,{}, {modal: false});
-        $('#callPhoneModal #phoneIframe').on('load', function () {
-            var that = this;
-            var iframe = this.contentWindow.document.body;
-            setTimeout(function () {
-                //修改css
-                $(iframe).find('.CallCenterToolBar').css('height', '200px').css('width', '100%').css('top', '10px').css('left', 'calc(50% - 148px)').css('box-shadow', 'none');
-                $(iframe).find('.CallCenterToolBar .top').css('display', 'none');
-
-                $('.toolBar td[data-action=call]', iframe).trigger('click');
-
-                //焦点
-                $('input#telNumber', iframe).focus();
-
-                $(that).show();
-                $('#callPhoneModal p.loading').remove();
-            }, 700);
-        });
-    };*/
+    /*    var showVedioModal = function (type) {
+            var channel = channelMap[type]?channelMap[type]:1;
+            open_modal_dom(vedioModal.replace('^^channel^^', channel) ,{}, {modal: false});
+            $('#ssspVedioModal #vedioIframe').on('load', function () {
+                var that = this;
+                setTimeout(function () {
+                    $(that).show();
+                    $('#ssspVedioModal p.loading').remove();
+                }, 500);
+            });
+        };*/
+
+    /*    $(document).on('click', '#openVedioModalBtn', function () {
+            showVedioModal($(this).data('type'));
+        });*/
+
+
+    /*    var showCallPhoneModal = function () {
+            open_modal_dom(phoneModal ,{}, {modal: false});
+            $('#callPhoneModal #phoneIframe').on('load', function () {
+                var that = this;
+                var iframe = this.contentWindow.document.body;
+                setTimeout(function () {
+                    //修改css
+                    $(iframe).find('.CallCenterToolBar').css('height', '200px').css('width', '100%').css('top', '10px').css('left', 'calc(50% - 148px)').css('box-shadow', 'none');
+                    $(iframe).find('.CallCenterToolBar .top').css('display', 'none');
+
+                    $('.toolBar td[data-action=call]', iframe).trigger('click');
+
+                    //焦点
+                    $('input#telNumber', iframe).focus();
+
+                    $(that).show();
+                    $('#callPhoneModal p.loading').remove();
+                }, 700);
+            });
+        };*/
     $(document).on('click', '#m_voip_call_btn_001', function () {
         //debugger