update...

潘钊
1 parent 848bdb4c
Showing 11 changed files with 239 additions and 20 deletions
src/main/java/com/bsth/controller/realcontrol/FrequentPhrasesController.java
src/main/java/com/bsth/entity/realcontrol/FrequentPhrases.java
src/main/java/com/bsth/repository/realcontrol/FrequentPhrasesRepository.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/FrequentPhrasesService.java
src/main/java/com/bsth/service/realcontrol/impl/FrequentPhrasesServiceImpl.java
src/main/resources/static/real_control_v2/alone_page/home/alone_data_basic.js
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/fragments/home/context_menu.html
src/main/resources/static/real_control_v2/js/home/context_menu.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
+package com.bsth.controller.realcontrol;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+@RestController
+@RequestMapping("frequent_phrases")
+public class FrequentPhrasesController extends BaseController<FrequentPhrases, Integer>{
+
+}
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 常用短语
+ * Created by panzhao on 2017/9/17.
+ */
+@Entity
+@Table(name = "bsth_c_s_frequent_phrases")
+public class FrequentPhrases {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 短语
+     */
+    private String text;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+@Repository
+public interface FrequentPhrasesRepository extends BaseRepository<FrequentPhrases, Integer> {
+}
@@ -994,7 +994,7 @@ public class GpsServiceImpl implements GpsService {
                 fv = f.get(obj).toString();
                 v = map.get(f.getName()).toString();
-                if(!fv.startsWith(v) && !fv.endsWith(v))
+                if(!fv.startsWith(v)/* && !fv.endsWith(v)*/)
                     return false;
             }
         } catch (Exception e) {
+package com.bsth.service.realcontrol;
+
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+public interface FrequentPhrasesService extends BaseService<FrequentPhrases, Integer> {
+}
+package com.bsth.service.realcontrol.impl;
+
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.realcontrol.FrequentPhrasesService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+@Service
+public class FrequentPhrasesServiceImpl extends BaseServiceImpl<FrequentPhrases, Integer> implements FrequentPhrasesService {
+
+    @Override
+    public Map<String, Object> save(FrequentPhrases fp) {
+        fp.setUserName(SecurityUtils.getCurrentUser().getUserName());
+        return super.save(fp);
+    }
+
+    @Override
+    public Iterable<FrequentPhrases> list(Map<String, Object> map) {
+        map.put("userName_eq", SecurityUtils.getCurrentUser().getUserName());
+        return super.list(map);
+    }
+}
@@ -43,17 +43,19 @@ var gb_data_basic = (function () {
     });
     //线路标准信息
-    gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
+    /*gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
         var informations = {};
         $.each(rs, function () {
             informations[this.line.lineCode] = this;
             delete this['line'];
         });
         ep.emit('lineInformations', informations);
-    });
+    });*/
+    ep.emit('lineInformations', {});
     //人员信息
-    loadAllPersonnel(function (data) {
+    ep.emit('all_personnel', {});
+    /*loadAllPersonnel(function (data) {
         ep.emit('all_personnel', data);
     });
     function loadAllPersonnel(cb) {
@@ -70,24 +72,24 @@ var gb_data_basic = (function () {
             }
             cb && cb(data);
         });
-    }
+    }*/
     var carparks = {};
     //停车场数据
-    gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+/*    gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
         rs.list.sort(function (a, b) {
            return a.parkName.localeCompare(b.parkName);
         });
         $.each(rs.list, function () {
             carparks[this.parkCode] = this;
         });
-    });
+    });*/
     //车辆数据
     var carsArray;
-    $.get('/basic/cars?t=' + Math.random(), function (rs) {
+    /*$.get('/basic/cars?t=' + Math.random(), function (rs) {
         carsArray = rs;
-    });
+    });*/
     var getCarparkByCode = function (code) {
         return carparks[code];
@@ -121,12 +123,12 @@ var gb_data_basic = (function () {
     //站点和停车场历时、公里对照数据
     var stat_park_data;
-    var load_stat_park_data = function () {
+    /*var load_stat_park_data = function () {
         $.get('/basic/station2ParkData?t='+Math.random(), {idx: line_idx}, function (rs) {
             stat_park_data = rs;
         });
     }
-    load_stat_park_data();
+    load_stat_park_data();*/
     function findLineByCodes(codeArr) {
         var rs = [];
@@ -313,4 +313,16 @@ span.signal-state-speed-limit{
 .home_alone_page{
     cursor: pointer;
+}
+
+#send-phrase-modal .tools,
+#send-phrase-multi-modal .tools{
+    display: inline-block;
+    margin-left: 5px;
+}
+
+#send-phrase-modal .tools>span,
+#send-phrase-multi-modal .tools>span{
+    cursor: pointer;
+    margin-left: 12px;
 }
 \ No newline at end of file
@@ -11,11 +11,15 @@
                     <input type="hidden" value="{{nbbm}}" name="nbbm" />
                     <div class="uk-form-row">
                         <select style="width: 170px;" class="common_phrase_sel">
-                            <option value="">------ 常用短语 -------</option>
-                            <option value="天气异常，请小心驾驶">天气异常，请小心驾驶</option>
-                            <option value="请适当减速慢行，保持最佳行车间距">请适当减速慢行，保持最佳行车间距</option>
-                            <option value="请准点执行班次任务">请准点执行班次任务</option>
                         </select>
+                        <div class="tools" >
+                            <span data-uk-tooltip title="添加到常用短语" class="add_frequent_phrases">
+                                <i class="uk-icon-plus"></i>
+                            </span>
+                            <span data-uk-tooltip title="删除这条常用短语" class="minus_frequent_phrases">
+                                <i class="uk-icon-minus"></i>
+                            </span>
+                        </div>
                     </div>
                     <div class="uk-form-row">
                         <textarea cols="30" rows="5" name="text" data-fv-notempty data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="输入短语，不要超过50 个字符" style="margin: 0px; width: 100%; height: 110px;"></textarea>
@@ -43,9 +47,16 @@
                     <div class="uk-width-4-6" style="border-left: 1px solid #dddddd;">
                         <form class="uk-form fixed-tool">
                             <div class="uk-form-row">
-                                <select>
-                                  <option value="">------ 常用短语 -------</option>
-                              </select>
+                                <select style="width: 170px;" class="common_phrase_sel">
+                                </select>
+                                <div class="tools" >
+                                    <span data-uk-tooltip title="添加到常用短语" class="add_frequent_phrases">
+                                        <i class="uk-icon-plus"></i>
+                                    </span>
+                                            <span data-uk-tooltip title="删除这条常用短语" class="minus_frequent_phrases">
+                                        <i class="uk-icon-minus"></i>
+                                    </span>
+                                </div>
                             </div>
                             <br />
                             <div class="uk-form-row">
@@ -53,6 +53,62 @@ var gb_home_context_menu = (function() {
         });
     };
+    /**
+     * 常用短语
+     * @type {{add, minus}}
+     */
+    var frequent_phrases = function () {
+
+        var init = function (wrap) {
+            add(wrap);
+            minus(wrap);
+            //查询常用短语
+            $.get('/frequent_phrases/all', function (list) {
+                var t = $('textarea[name=text]', wrap).val();
+                var opts = '<option value="">------ 常用短语 -------</option>';
+                for(var i=0,obj;obj=list[i++];){
+                    opts += '<option value="'+obj.text+'" data-id="'+obj.id+'" '+(obj.text==t?"selected":"")+'>'+obj.text+'</option>';
+                }
+                $('.common_phrase_sel', wrap).html(opts);
+            });
+        };
+
+        var add = function (wrap) {
+            $('.add_frequent_phrases', wrap).unbind('click').on('click', function () {
+                var text = $('textarea[name=text]', wrap).val();
+                if(!$.trim(text))
+                    return notify_err('请在下列文本框内输入文字');
+
+                gb_common.$post('/frequent_phrases', {text: text}, function () {
+                    notify_succ('添加成功！');
+                    init(wrap);
+                });
+            });
+        };
+
+        var minus = function (wrap) {
+            $('.minus_frequent_phrases', wrap).unbind('click').on('click', function () {
+                var text = $('.common_phrase_sel', wrap).val();
+                if(!$.trim(text))
+                    return notify_err('请选中常用短语后再删除');
+
+                var id = $('.common_phrase_sel', wrap).find("option:selected").data('id');
+                if(!id)
+                    return notify_err('无法获取到索引');
+
+                gb_common.$del('/frequent_phrases/' + id, function () {
+                    notify_succ('删除成功！');
+                    $('textarea[name=text]', wrap).val('');
+                    init(wrap);
+                });
+            });
+        };
+
+        return {
+            init: init
+        }
+    }();
+
     // send phrase
     var sendPhrase = function() {
         var dom = temps['home-send-phrase-temp']({
@@ -62,10 +118,11 @@ var gb_home_context_menu = (function() {
         // show modal
         var elem = show_modal(modal, dom);
+        frequent_phrases.init(modal);
         //form submit
         var f = $('form', modal).formValidation(gb_form_validation_opts);
         $('.common_phrase_sel', f).on('change', function () {
-            $('[name=text]', f).text($(this).val());
+            $('[name=text]', f).val($(this).val());
         });
         f.on('success.form.fv', function(e) {
             e.preventDefault();
@@ -92,8 +149,13 @@ var gb_home_context_menu = (function() {
             },
             'plugins': ['checkbox']
         });
+
+        frequent_phrases.init(modal);
         //form submit
         var f = $('form', modal).formValidation(gb_form_validation_opts);
+        $('.common_phrase_sel', f).on('change', function () {
+            $('[name=text]', f).val($(this).val());
+        });
         f.on('success.form.fv', function(e) {
             e.preventDefault();
             //tree checked node
@@ -12,7 +12,21 @@
                 未知站点
                 {{/if}}
             </h5>
-            <p>设备状态：正常</p>
+            <p>设备状态：
+                {{if valid==1}}
+                    invalid(-1
+                {{else if abnormalStatus=='outBounds'}}
+                    越界
+                {{else if abnormalStatus=='overspeed'}}
+                    超速
+                {{else if abnormalStatus=='gps-offline'}}
+                    GPS掉线
+                {{else if abnormalStatus=='offline'}}
+                    离线
+                {{else}}
+                    .
+                {{/if}}
+            </p>
             <p>设备号：{{deviceId}}</p>
             <p>速度：{{speed}}</p>
             <p>角度：{{direction}}</p>