Commit ec5ed2c0bcf7e4789adc2998372fcab67ef3ad42

Authored by 潘钊
1 parent 3bd21912

update...

src/main/java/com/bsth/data/in_out/buffer/BerthDataBuffer.java
@@ -137,7 +137,7 @@ public class BerthDataBuffer { @@ -137,7 +137,7 @@ public class BerthDataBuffer {
137 } 137 }
138 else{ 138 else{
139 //修改数据库 139 //修改数据库
140 - jdbcTemplate.update("update bsth_p_berth set status=-1 where name=?", berthName); 140 + jdbcTemplate.update("update bsth_p_berth set status=-1,car=null where name=?", berthName);
141 findOne(berthName).setStatus(-1); 141 findOne(berthName).setStatus(-1);
142 lockList.add(berthName); 142 lockList.add(berthName);
143 143
src/main/resources/application.properties
1 spring.profiles: dev,prod 1 spring.profiles: dev,prod
2 -spring.profiles.active: dev 2 +spring.profiles.active: prod
3 3
4 spring.view.suffix=.html 4 spring.view.suffix=.html
5 server.session-timeout=-1 5 server.session-timeout=-1
src/main/resources/static/pages/b_p_manager/b_p_main.html
@@ -163,14 +163,18 @@ @@ -163,14 +163,18 @@
163 resetAll(); 163 resetAll();
164 var $berthReg, clazz, htmlStr, nbbm, soc; 164 var $berthReg, clazz, htmlStr, nbbm, soc;
165 for (var i = 0, obj; obj = list[i++];) { 165 for (var i = 0, obj; obj = list[i++];) {
166 - $berthReg = $('.berth_card_list .car_blank[name=berth_reg_' + obj['berth'] + ']', wrap);  
167 - if (!$berthReg)  
168 - return; 166 + try{
  167 + $berthReg = $('.berth_card_list .car_blank[name=berth_reg_' + obj['berth'] + ']', wrap);
  168 + if (!$berthReg)
  169 + return;
169 170
170 - nbbm = obj['bus'].nbbm;  
171 - var htmlStr = '<div class="car_name">' + nbbm + '<span class="elec_perc"></span> </div>'; 171 + nbbm = obj['bus'].nbbm;
  172 + var htmlStr = '<div class="car_name">' + nbbm + '<span class="elec_perc"></span> </div>';
172 173
173 - $berthReg.attr('data-nbbm', nbbm).html(htmlStr).addClass('no_elec').removeClass('free'); 174 + $berthReg.attr('data-nbbm', nbbm).html(htmlStr).addClass('no_elec').removeClass('free');
  175 + }catch (e){
  176 + console.log(e);
  177 + }
174 /*soc = obj['elec'] ? obj['elec']['soc'] : -1; 178 /*soc = obj['elec'] ? obj['elec']['soc'] : -1;
175 179
176 if (soc == -1) { 180 if (soc == -1) {