线调客流显示

yiming
1 parent 6c3e08a4
Showing 21 changed files with 345 additions and 18 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
src/main/java/com/bsth/data/kl/KlData.java
src/main/java/com/bsth/entity/Kl.java
src/main/java/com/bsth/service/Kl/KlService.java
src/main/java/com/bsth/service/Kl/impl/KlServiceImpl.java
src/main/resources/static/assets/img/ss.jpg
src/main/resources/static/assets/img/ss.png
src/main/resources/static/assets/img/yb.jpg
src/main/resources/static/assets/img/yb.png
src/main/resources/static/assets/img/yj.jpg
src/main/resources/static/assets/img/yj.png
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
src/main/resources/static/real_control_v2/fragments/north/nav/kl_config.html
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
@@ -5,6 +5,7 @@ import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.GpsOverspeed;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.data.kl.KlData;
 import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
 import com.bsth.data.schedule.e_state_check.entity.SCodeInfo;
 import com.bsth.service.gps.GpsService;
@@ -62,6 +63,9 @@ public class GpsController {
         //班次站点检查信息
         List<SCodeInfo> scis = ScheduleStationCodeChecker.findByLineIdx(lineArray);
+        for (GpsEntity gpsEntity : gpsList) {
+            gpsEntity.setKl(KlData.getKl(gpsEntity.getDeviceId()));
+        }
         rs.put("gpsList", gpsList);
         rs.put("overspeedList", overspeedList);
         rs.put("scis", scis);
 package com.bsth.data.gpsdata_v2.entity;
+import com.bsth.entity.Kl;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
@@ -113,6 +114,8 @@ public class GpsEntity implements Cloneable{
 	private String dvrcode;
+	private Kl kl;
+
 	/**
 	 * 电量 单位:%
 	 */
@@ -418,4 +421,12 @@ public class GpsEntity implements Cloneable{
 	public void setEnergy(int energy) {
 		this.energy = energy;
 	}
+
+	public Kl getKl() {
+		return kl;
+	}
+
+	public void setKl(Kl kl) {
+		this.kl = kl;
+	}
 }
+package com.bsth.data.kl;
+
+import com.bsth.entity.Kl;
+import com.bsth.service.Kl.KlService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import java.util.*;
+
+/**
+ * @author ym
+ * @ClassName: KlData
+ * @Description: TODO(客流数据加载定时器)
+ * @date 2024年7月18日09:59:40
+ */
+@Component
+public class KlData {
+
+    static Logger logger = LoggerFactory.getLogger(KlData.class);
+
+    //客流数据
+    private static Map<String, Kl> KlData = new HashMap<>();
+
+    @Autowired
+    private KlService klService;
+
+    @Value("${passengerFlow.url}")
+    private String url;
+
+    @Scheduled(cron = "0/10 * * * * ?")
+    public void loadKl() {
+        Map<String,Kl> map= new HashMap<>();
+        List<Kl> list = klService.loadKl();
+        for (Kl kl : list) {
+            String photo=kl.getPhoto();
+            kl.setPhoto(url+photo);
+            map.put(kl.getDeviceId(),kl);
+        }
+        KlData =map;
+    }
+
+    public static Kl getKl(String deviceId){
+        //return KlData.get( KlData.keySet().toArray()[0]);
+        return KlData.get(deviceId);
+    }
+
+
+}
 \ No newline at end of file
+package com.bsth.entity;
+
+public class Kl {
+
+    private String lineCode;
+    private String lineName;
+    private String deviceId;
+    private String stopNo;
+    private String stationName;
+    private String upDown;
+    private String photo;
+    private String num;
+    private String createDate;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getStopNo() {
+        return stopNo;
+    }
+
+    public void setStopNo(String stopNo) {
+        this.stopNo = stopNo;
+    }
+
+    public String getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(String upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getPhoto() {
+        return photo;
+    }
+
+    public void setPhoto(String photo) {
+        this.photo = photo;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+}
 package com.bsth.service.Kl;
+import com.bsth.entity.Kl;
 import com.bsth.entity.logger.Logger_MileModify;
 import com.bsth.service.BaseService;
+import java.util.List;
 import java.util.Map;
 public interface KlService {
     Map<String, Object> query(Map<String, Object> map);
+
+    List<Kl> loadKl();
 }
@@ -2,14 +2,17 @@ package com.bsth.service.Kl.impl;
+import com.bsth.entity.Kl;
 import com.bsth.service.Kl.KlService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -26,6 +29,8 @@ public class KlServiceImpl implements KlService {
     @Value("${passengerFlow.url}")
     private String url;
+    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
     @Override
     public Map<String, Object> query(Map<String, Object> map) {
         Map<String, Object> modelMap = new HashMap<>();
@@ -62,5 +67,20 @@ public class KlServiceImpl implements KlService {
         }
     }
+    @Override
+    public List<Kl> loadKl() {
+        List<Kl> list = new ArrayList<>();
+        try {
+            LocalDateTime localDateTime = LocalDateTime.now().minusMinutes(3);
+            String time = localDateTime.format(dateTimeFormatter);
+            StringBuffer sql=new StringBuffer("select * from bsth_c_kl where createDate>='" +time+
+                    "' and id in(SELECT max(id) from bsth_c_kl GROUP BY deviceId)");
+            list = jdbcTemplate.query(sql.toString(), BeanPropertyRowMapper.newInstance(Kl.class));
+        } catch (Exception e) {
+            logger.error("客流信息加载异常", e);
+        }
+        return list;
+    }
+
 }
@@ -77,6 +77,7 @@
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="fbzdzx_config"> 翻班与自动执行</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="tts_config"> TTS</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="signal_state"> 信号标记</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="kl_config"> 客流信息</label></li>
             </ul>
         </div>
         <div>
@@ -189,7 +190,9 @@
                 '24_1': '一车队',
                 '24_2': '二车队',
                 '24_3': '三车队',
-                '77_1': '临港公交'
+                '77_1': '临港公交',
+                '05_12': '二分公司',
+                '05_11': '一分公司'
             };
             var defauleConfig;
@@ -213,6 +213,15 @@ svg.line-chart g.gps-wrap &gt; rect {
     cursor: pointer;
 }
+svg.line-chart g.gps-wrap > image[updown="0"] {
+    width:17px;
+    height:15px;
+    z-index: 0;
+}
+svg.line-chart g.gps-wrap > image[updown="1"] {
+    width:17px;
+    height:15px;
+}
 svg.line-chart g.gps-wrap > rect[updown="0"] {
     stroke: rgb(62, 80, 179);
     fill: rgb(62, 80, 179);
@@ -57,6 +57,18 @@
                 <div>
                     预计 {{expectStopTime}} 分钟到达终点</div>
                 {{/if}}
+                {{if kl !=null}}
+                <div><span class="field">人数：</span>{{kl.num}}</div>
+                {{/if}}
+                {{if kl !=null && kl.num <= 5}}
+                <div><span class="field">状态：</span><a href="javascript:;" style="color:green" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">舒适</a></div>
+                {{/if}}
+                {{if kl !=null && kl.num > 5 && kl.num <= 10}}
+                <div><span class="field">状态：</span><a href="javascript:;" style="color:chocolate" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">一般</a></div>
+                {{/if}}
+                {{if kl !=null && kl.num > 10}}
+                <div><span class="field">状态：</span><a href="javascript:;" style="color:red" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">拥挤</a></div>
+                {{/if}}
             </div>
             <div class="tip_map_wrap"></div>
+<div class="uk-modal ct-form-modal" id="kl_config-modal">
+    <div class="uk-modal-dialog" style="width: 530px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>客流显示设置</h2></div>
+
+        <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
+            <small>
+                <i class="uk-icon-question-circle"> </i>
+                设置项将会保存在本地客户端，清理缓存和更换电脑会重置.</small>
+        </p>
+        <form class="uk-form uk-form-horizontal">
+            <div class="uk-grid">
+                <div class="uk-width-2-3 uk-container-center">
+                    <div class="uk-form-row">
+                        <label class="uk-form-label">是否启用</label>
+                        <div class="uk-form-controls">
+                            <select name="enable">
+                                <option value="1">启用</option>
+                                <option value="0">禁用</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+                <button type="button" class="uk-button uk-modal-close">取消</button>
+                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+            </div>
+        </form>
+    </div>
+
+    <script>
+        var storage = window.localStorage;
+        (function() {
+            var modal = '#kl_config-modal';
+            var f = $('form', modal);
+
+            $(modal).on('init', function(e, data) {
+                e.stopPropagation();
+                var locStatus=0;
+                if( storage.getItem("kl_state_enable")==1){
+                    locStatus=1;
+                }
+                $('[name=enable]', f).val(locStatus);
+            });
+
+            f.formValidation(gb_form_validation_opts);
+            f.on('success.form.fv', function(e) {
+                e.preventDefault();
+                var data = $(this).serializeJSON();
+                storage.setItem("kl_state_enable", data.enable);
+                UIkit.modal(modal).hide();
+            });
+
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -185,6 +185,11 @@
         "id": 4.4,
         "text": "翻班与自动执行",
         "event": "fbzdzx_config"
+      },
+      {
+        "id": 4.5,
+        "text": "客流信息",
+        "event": "kl_config"
       }
     ]
@@ -122,6 +122,9 @@ var gb_northToolbar = (function () {
         line_config: function () {
             open_modal('/real_control_v2/fragments/north/nav/line_config/line_config.html', {}, modal_opts);
         },
+        kl_config: function () {
+            open_modal('/real_control_v2/fragments/north/nav/kl_config.html', {}, modal_opts);
+        },
         // bcgxsj_config: function () {
         //     open_modal('/real_control_v2/fragments/north/nav/line_config/bcgxsj_config.html', {}, modal_opts);
         // },
@@ -220,6 +220,23 @@ var gb_svg_chart = (function () {
             return gps.upDown == 0 ? cy - 22 - (index * 17) : cy + 6 + (index * 19);
         },
+        gx2 = function (gps, svg, wrapId) {
+            var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
+            if (!circle) return -100;
+
+            var x = circle.attr('cx') - 16.5,
+                s = circle_spaces[wrapId] / 2;
+            // console.log('ss', gps.lineId + '=' + s);
+            //s = 5;
+            if(gps['instation']==0)
+                x = (gps['upDown']==0?x+s:x-s);
+            if(gps['abnormalClaszz']==false){//为越速掉设置偏移
+                x+=30;
+            }else {
+                x+=41;
+            }
+            return x;
+        },
         ups_gps = function (d) {
             return d.gpsUps;
         },
@@ -276,11 +293,54 @@ var gb_svg_chart = (function () {
             //update tip position
             gb_svg_tooltip.update(e);
         },
+        gps_update_point2 = function (e, svg, wrapId,state) {
+            var x,e1;
+            e1 = e;
+            if(animation)
+                e1 = e.transition();
+            e1.attr('x', function (d) {
+                x = gx2(d, svg, wrapId);
+                if(x == -100)
+                    $(this).css('transition-duration', 0).hide();
+                else
+                    $(this).show();//找不到停靠点，直接隐藏
+                if(state==0)
+                    $(this).css('transition-duration', 0).hide();
+                return x;
+            })
+                .attr('y', function (d) {
+                    return gy(d, svg);
+                })
+                .attr('updown', function (d) {
+                    return d.upDown;
+                })
+                .attr('xlink:href', function (d) {
+                    var img ='';
+                    if(d['kl'] != undefined && d['kl']['num']<=5){
+                        img ='/assets/img/ss.png';
+                    }else if(d['kl'] != undefined && d['kl']['num']>5 && d['kl']['num']<=10){
+                        img ='/assets/img/yb.png';
+                    }else if(d['kl'] != undefined && d['kl']['num']>10){
+                        img ='/assets/img/yj.png';
+                    }
+                return img;
+            });
+            e.classed({'abnormal': function (d) {
+                    return d.abnormalClaszz;
+                }, 'offline': function (d) {
+                    return d['abnormalStatus']=='offline';
+                }});
+            //update tip position
+            gb_svg_tooltip.update(e);
+        },
         rct_id = function (d) {
             return 'rct_' + d.deviceId;
         },
         tx_id = function (d) {
             return 'tx_' + d.deviceId;
+        },
+        img_id = function (d) {
+            return 'img_' + d.deviceId;
         };
     var setGps = function (lineCode) {
@@ -347,6 +407,14 @@ var gb_svg_chart = (function () {
         ts.enter().append('text').attr('_id', tx_id);
         ts.text(g_text)
         gps_update_point(ts, svg, wrapId);
+
+        var imageState=0;
+        if(window.localStorage.getItem("kl_state_enable") == 1){
+            imageState=1;
+        }
+        var imgs = gps_cont.selectAll('image').data(data, gps_key);
+        imgs.enter().append('image').attr('_id', img_id);
+        gps_update_point2(imgs, svg, wrapId,imageState);
     };
     var marker_clusterer = function (svg, lineCode) {
@@ -375,7 +443,7 @@ var gb_svg_chart = (function () {
         var svg = d3.select(svg);
         //hide old element
         $.each(gpsArr, function (i, d) {
-            $('rect[_id=rct_' + d + '],text[_id=tx_' + d + ']').attr('class', 'merge_hide');
+            $('rect[_id=rct_' + d + '],text[_id=tx_' + d + '],image[_id=img_' + d + ']').attr('class', 'merge_hide');
         });
         var mergerG = svg.selectAll('g.marker-clusterer').append('g').attr('_id', 'merger_' + stopNo)
@@ -32,17 +32,17 @@
             <p>角度：{{direction}}</p>
             <p>经度：{{lon}}</p>
             <p>纬度：{{lat}}</p>
-            {{if num !=null}}
-            <p>人数：{{num}}</p>
+            {{if kl !=null}}
+            <p>人数：{{kl.num}}</p>
             {{/if}}
-            {{if num !=null && num <= 5}}
-            <p>状态：<a href="javascript:;" style="color:green" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">舒适</a></p>
+            {{if kl !=null && kl.num <= 5}}
+            <p>状态：<a href="javascript:;" style="color:green" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">舒适</a></p>
             {{/if}}
-            {{if num > 5 && num <= 10}}
-            <p>状态：<a href="javascript:;" style="color:chocolate" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">一般</a></p>
+            {{if kl !=null && kl.num > 5 && kl.num <= 10}}
+            <p>状态：<a href="javascript:;" style="color:chocolate" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">一般</a></p>
             {{/if}}
-            {{if num > 10}}
-            <p>状态：<a href="javascript:;" style="color:red" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">拥挤</a></p>
+            {{if kl !=null && kl.num > 10}}
+            <p>状态：<a href="javascript:;" style="color:red" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">拥挤</a></p>
             {{/if}}
             {{if energy == 0}}
             <div><span class="field">电量：</span><span style="color: red;">{{energy}}%&nbsp;(异常)</span></div>
@@ -257,14 +257,6 @@ var gb_map_overlay_mge = (function () {
         _focus_station: _focus_station,
         _focus_carpark: _focus_carpark,
         map_gps_win_temp: function (data) {
-            var url='http://58.247.254.118:9999/pf/getPassengerFlow?deviceId='+data.deviceId;
-            console.log(url);
-            $.ajax({async:false,url:url, success:function(res) {
-                console.log(res);
-                data.num=res.num;
-                data.photo=res.photo;
-            }})
-            console.log("数据回显");
             return temps['map-win-gps-detail-temp'](data);
         },
         map_station_win_temp: function (data) {