update...

潘钊
1 parent 516f358a
Showing 5 changed files with 49 additions and 24 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/data/gpsdata/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -36,4 +36,14 @@ public class Constants {
  
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
+
+	/**
+	 * 解除调度指令和班次的外键约束
+	 */
+	public static final String REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch=?";
+
+	/**
+	 * 批量解除调度指令和班次的外键约束
+	 */
+	public static final String MULTI_REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch in ";
 }
+package com.bsth.data.gpsdata.late_adjust;
+
+/**
+ * 误点调整处理程序
+ * Created by panzhao on 2017/4/16.
+ */
+public class LateAdjustHandle {
+
+}
@@ -3,6 +3,7 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
@@ -27,6 +28,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
  
 import java.text.ParseException;
@@ -855,6 +858,9 @@ public class DayOfSchedule implements CommandLineRunner {
         return false;
     }
  
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
     /**
      * 删除实际排班
      * @param lineCode
@@ -866,20 +872,33 @@ public class DayOfSchedule implements CommandLineRunner {
         try {
             String rq = currSchDateMap.get(lineCode);
             if(StringUtils.isNotEmpty(rq)){
+                List<ScheduleRealInfo> all = findByLineCode(lineCode);
                 //解除gps 和班次之间的关联
-                List<ScheduleRealInfo> unions = calcUnion(findByLineCode(lineCode), carExecutePlanMap.values());
+                List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
                 for(ScheduleRealInfo sch : unions){
                     removeExecPlan(sch.getClZbh());
                 }
+                //解除调度指令和班次的外键约束
+                StringBuilder inStr = new StringBuilder("(");
+                for(ScheduleRealInfo sch : all){
+                    inStr.append(sch.getId() + ",");
+                }
+                inStr.deleteCharAt(inStr.length() - 1).append(")");
+                jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
  
                 //删除班次数据
                 removeRealSch(lineCode, rq);
                 //删除相关班次修正记录
+
             }
             rs.put("status", ResponseCode.SUCCESS);
         }catch (Exception e){
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
+            if(e instanceof DataIntegrityViolationException)
+                rs.put("msg", "失败，违反数据约束！！");
+            else
+                rs.put("msg", e.getMessage());
         }
  
         return rs;
@@ -3,6 +3,7 @@ package com.bsth.service.realcontrol.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
@@ -413,7 +414,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
  
             //解除和调度指令的外键约束
-            jdbcTemplate.update("update bsth_v_directive_60 set sch=NULL where sch=" + id);
+            jdbcTemplate.update(Constants.REMOVE_DIRECTIVE_SCH_FK, id);
  
             //数据库删除
             rs = super.delete(id);
@@ -181,27 +181,6 @@ var gb_schedule_table = (function () {
  
         //重新渲染表格
         reRenderTable(sch.xlBm);
-        /*//重新渲染表格
-         var data = gb_common.get_vals(line2Schedule[sch.xlBm]).sort(schedule_sort),
-         dirData = gb_common.groupBy(data, 'xlDir'),
-         tabCont = $('li.line_schedule[data-id=' + sch.xlBm + ']');
-
-         for (var upDown in dirData) {
-         htmlStr = temps['line-schedule-table-temp']({
-         dir: upDown,
-         line: gb_data_basic.codeToLine[sch.xlBm],
-         list: dirData[upDown]
-         });
-         $('.schedule-wrap .card-panel:eq(' + upDown + ')', tabCont).html(htmlStr);
-         }
-         //图例相关
-         gb_sch_legend.init(tabCont);
-         //标记末班
-         markerLastByLine(sch.xlBm);
-         //计算应发未发
-         calc_yfwf_num(sch.xlBm);
-         //重新固定表头
-         gb_ct_table.fixedHead($('.line_schedule .ct_table_wrap'));*/
         //定位到新添加的班次
         scroToDl(sch);
     };
@@ -234,7 +213,14 @@ var gb_schedule_table = (function () {
             //计算应发未发
             calc_yfwf_num(lineCode);
             //重新固定表头
-            gb_ct_table.fixedHead($('.line_schedule .ct_table_wrap'));
+            gb_ct_table.fixedHead($('.line_schedule .ct_table_wrap', tabCont));
+
+            //重新初始化排序
+            gb_ct_table.enableSort($('.ct_table', tabCont), reset_seq_no, gb_schedule_table_dbclick.init);
+            //重新初始化双击待发调整
+            gb_schedule_table_dbclick.init();
+            //重新初始化双击实发发车信息微调
+            gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell', tabCont));
         }
     };