update...

潘钊
1 parent 05bd9885
Showing 7 changed files with 78 additions and 6 deletions
src/main/java/com/bsth/service/geo_data/impl/GeoDataServiceImpl.java
src/main/resources/static/pages/base/geo_data_edit/css/mian.css
src/main/resources/static/pages/base/geo_data_edit/fragments/f_station_route.html
src/main/resources/static/pages/base/geo_data_edit/fragments/versions.html
src/main/resources/static/pages/base/geo_data_edit/js/map.js
src/main/resources/static/pages/base/geo_data_edit/js/station_route.js
src/main/resources/static/pages/base/geo_data_edit/js/submit.js
@@ -722,7 +722,7 @@ public class GeoDataServiceImpl implements GeoDataService {
             for (int i = 0, size = routes.size(); i < size; i++) {
                 routes.get(i).setStationMark("Z");
             }
-            if(routes.size() > 0)
+            if(routes.size() > 0 && prevRouteId!=-1)
                 routes.get(0).setStationMark("B");
             if(routes.size() > 1)
                 routes.get(routes.size() - 1).setStationMark("E");
@@ -808,15 +808,68 @@ public class GeoDataServiceImpl implements GeoDataService {
     public Map<String, Object> destroyStation(GeoStation station) {
         Map<String, Object> rs = new HashMap<>();
  
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
         try {
             String sql = "update bsth_c_ls_stationroute set destroy=1 where id=?";
             jdbcTemplate.update(sql, station.getId());
  
+            //重新排序路由，标记mark
+            sql = "select * from bsth_c_ls_stationroute where line_code='" + station.getLineCode() + "' and directions=" + station.getDirections() + " and destroy=0 and versions=" + station.getVersions();
+            List<SaveStationRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveStationRouteDTO.class));
+            Collections.sort(routes, new StationRouteComp());
+
+            for (int i = 0, size = routes.size(); i < size; i++) {
+                routes.get(i).setStationMark("Z");
+            }
+            if(routes.size() > 0)
+                routes.get(0).setStationMark("B");
+            if(routes.size() > 1)
+                routes.get(routes.size() - 1).setStationMark("E");
+
+            final List<SaveStationRouteDTO> saveList = routes;
+            // update 原路由
+            jdbcTemplate.batchUpdate("update bsth_c_ls_stationroute set line=?,station=?,station_name=?,station_route_code=?," +
+                            "line_code=?,station_code=?,station_mark=?,distances=?,to_time=?,destroy=?,versions=?,create_date=?,update_date=?,directions=?" +
+                            " where id=?"
+                    , new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            SaveStationRouteDTO sr = saveList.get(i);
+                            ps.setInt(1, sr.getLine());
+                            ps.setLong(2, sr.getStation());
+                            ps.setString(3, sr.getStationName());
+                            ps.setInt(4, sr.getStationRouteCode());
+                            ps.setString(5, sr.getLineCode());
+                            ps.setString(6, sr.getStationCode());
+                            ps.setString(7, sr.getStationMark());
+                            ps.setDouble(8, sr.getDistances());
+                            ps.setDouble(9, sr.getToTime());
+                            ps.setInt(10, sr.getDestroy());
+                            ps.setInt(11, sr.getVersions());
+                            ps.setTimestamp(12, new java.sql.Timestamp(sr.getCreateDate().getTime()));
+                            ps.setTimestamp(13, new java.sql.Timestamp(sr.getUpdateDate().getTime()));
+                            ps.setInt(14, sr.getDirections());
+                            ps.setInt(15, sr.getId());
+                        }
+
+                        @Override
+                        public int getBatchSize() {
+                            return saveList.size();
+                        }
+                    });
+
+            tran.commit(status);
+
             //返回更新之后的数据
             List<GeoStation> list = findByUpdown(station.getLineCode(), station.getDirections(), station.getVersions());
             rs.put("list", list);
             rs.put("status", ResponseCode.SUCCESS);
         } catch (Exception e) {
+            tran.rollback(status);
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
             rs.put("msg", "服务器出现异常");
@@ -132,6 +132,7 @@ a.clock_enable_version:focus{
 ._route_info_wrap{
     height: calc(100% - 90px);
     padding-top: 10px;
+    background: #fff;
 }
  
 ._route_info_wrap .uk-tab>li>a{
@@ -681,6 +682,7 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
  
 .s_future_version_info ._route_info_wrap{
     height: calc(100% - 105px);
+    background: #fff;
 }
  
 a.b_l_s_link{
@@ -63,7 +63,7 @@
                 半径：{{radius}}
                 {{/if}}
             </li>
-            <li>站序：{{index + 1}}</li>
+            <li>站序：{{index}}</li>
             <li>路由序号：{{stationRouteCode}}</li>
         </ul>
     </script>
@@ -35,6 +35,8 @@
                         <div class="uk-form-controls">
                             <select class="uk-select" name="remark">
                                 <option>线路改道</option>
+                                <option>增加中途站</option>
+                                <option>站名更变</option>
                                 <option>其他</option>
                             </select>
                         </div>
@@ -290,6 +290,8 @@ var gb_ct_map = function () {
         if (marker) {
             openStationInfoWin(marker);
         }
+        //居中
+        map.setCenter(marker.point);
     };
  
     var getStationMarker = function (code, updown) {
@@ -37,13 +37,24 @@ var gb_station_route = function () {
             //当前编辑的线路版本
             storage.setItem("geo_data_edit_line_version" , rs['editVersion']);
  
-            //序号
-            for(var i=0,len=rs.list.length;i<len;i++){
-                rs.list[i].index = i + 1;
-            }
             var data = {0:[],1:[]};
             if(rs.list.length > 0)
                 data = gb_common.groupBy(rs.list, 'directions');
+
+            //序号
+            if(data[0]){
+                for(var i=0,len=data[0].length;i<len;i++){
+                    data[0][i].index = i + 1;
+                }
+            }
+            if(data[1]){
+                for(var i=0,len=data[1].length;i<len;i++){
+                    data[1][i].index = i + 1;
+                }
+            }
+            /*for(var i=0,len=rs.list.length;i<len;i++){
+                rs.list[i].index = i + 1;
+            }*/
             ep.emit('data', data);
         });
  
@@ -190,6 +190,8 @@ var gb_data_submit = function () {
      */
     var destroyStation = function (station) {
  
+        station.bdCoords=null;
+        delete station.bdCoords;
         UIkit.modal.confirm('确定撤销站点【'+station.stationName+'】？').then(function() {
             show_run_text('正在撤销...');