1.维修上报调整N

王通
1 parent b509e67c
Showing 14 changed files with 266 additions and 76 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/entity/report/RepairReport.java
src/main/java/com/bsth/listener/SessionListener.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/repairReport.xls
src/main/resources/static/pages/forms/statement/repairReport.html
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/right.html
@@ -134,9 +134,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @throws
 	 */
 	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
-	public Map<String, Object> realOutAdjust(@RequestParam Long id, @RequestParam String fcsjActual,
-											 @RequestParam String remarks) {
-		return scheduleRealInfoService.realOutAdjust(id, fcsjActual, remarks);
+	public Map<String, Object> realOutAdjust(Map<String, String> map) {
+		return scheduleRealInfoService.realOutAdjust(map);
 	}
 	/**
@@ -118,6 +118,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             captchaMap.remove(userName);
             rs.put("status", ResponseCode.SUCCESS);
+            logger.error("用户:" + user.getUserName() + "登录");
         } catch (Exception e) {
             logger.error("", e);
             rs.put("msg", "服务器出现异常，请联系管理员");
@@ -36,6 +36,8 @@ public class RepairReport {
 	private String departureTime;
 	// 报修类型
 	private String repairType;
+	// 业务类型
+	private String reportType;
 	// 报修时间
 	private Date reportDate;
 	// 格式化的时间字符串
@@ -121,6 +123,14 @@ public class RepairReport {
 		this.repairType = repairType;
 	}
+	public String getReportType() {
+		return reportType;
+	}
+
+	public void setReportType(String reportType) {
+		this.reportType = reportType;
+	}
+
 	public Date getReportDate() {
 		return reportDate;
 	}
+package com.bsth.listener;
+
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.bsth.common.Constants;
+
+@Component
+public class SessionListener implements HttpSessionListener {
+
+	private final static Logger log = LoggerFactory.getLogger(SessionListener.class);
+	
+	@Override
+	public void sessionCreated(HttpSessionEvent se) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void sessionDestroyed(HttpSessionEvent se) {
+		// TODO Auto-generated method stub
+		log.error("用户:" + se.getSession().getAttribute(Constants.SESSION_USERNAME) + "登出");
+	}
+}
+
@@ -78,7 +78,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<Integer, Integer> trustStatus(String lineCodes);
-	Map<String, Object> realOutAdjust(Long id, String fcsjActual, String remarks);
+	Map<String, Object> realOutAdjust(Map<String, String> map);
 	Map<String, Object> revokeDestroy(Long id);
 package com.bsth.service.realcontrol.impl;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -66,7 +114,16 @@ import com.bsth.service.report.ReportService;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.service.sys.DictionaryService;
 import com.bsth.service.sys.DutyEmployeeService;
-import com.bsth.util.*;
+import com.bsth.util.Arith;
+import com.bsth.util.ComparableChild;
+import com.bsth.util.ComparableLp;
+import com.bsth.util.ComparableReal;
+import com.bsth.util.ConfigUtil;
+import com.bsth.util.DateUtils;
+import com.bsth.util.ReportRelatedUtils;
+import com.bsth.util.ReportUtils;
+import com.bsth.util.TimeUtils;
+import com.bsth.util.TransGPS;
 import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.stuxuhai.jpinyin.PinyinException;
@@ -75,37 +132,9 @@ import com.github.stuxuhai.jpinyin.PinyinHelper;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Pattern;
-
 @Service
 public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Long>
-        implements ScheduleRealInfoService {
+        implements ScheduleRealInfoService, InitializingBean, DisposableBean {
     @Autowired
     JdbcTemplate jdbcTemplate;
     @Autowired
@@ -186,6 +215,30 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
             sdfSimple = new SimpleDateFormat("yyyyMMdd");
+    
+    private Queue<RepairReport> queue = new ConcurrentLinkedQueue<>();
+    
+    private ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+		
+		@Override
+		public Thread newThread(Runnable r) {
+			// TODO Auto-generated method stub
+			Thread t = new Thread(r);
+			t.setName("RepairReportReissuer");
+			
+			return t;
+		}
+	});
+    
+    private static Map<String, String> report2repair = new HashMap<String, String>();
+    
+    static {
+    	report2repair.put("9101", "9109");
+    	report2repair.put("9102", "9102");
+    	report2repair.put("9103", "9103");
+    	report2repair.put("9104", "9104");
+    	report2repair.put("9109", "9109");
+    }
     /**
@@ -1379,10 +1432,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
     @Override
-    public Map<String, Object> realOutAdjust(Long id, String fcsjActual, String remarks) {
+    public Map<String, Object> realOutAdjust(Map<String, String> map) {
         Map<String, Object> rs = new HashMap<>();
         List<ScheduleRealInfo> ts = new ArrayList<>();
         try {
+        	// 维修上报
+        	if (StringUtils.isNotBlank(map.get("reportTypes"))) {
+        		Map<String, Object> param = new HashMap<String, Object>();
+        		param.putAll(map);
+        		rs = repairReport(param, false);
+        	}
+        	
+        	Long id = Long.parseLong(map.get("id"));
+            String remarks = map.get("remarks"), fcsjActual = map.get("fcsjActual");
+        	
             ScheduleRealInfo sch = dayOfSchedule.get(id);
             LineConfig config = lineConfigData.get(sch.getXlBm());
@@ -1541,7 +1604,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> ts = new ArrayList<>();
         try {
         	// 维修上报
-        	if (StringUtils.isNotBlank(map.get("repairTypes"))) {
+        	if (StringUtils.isNotBlank(map.get("reportTypes"))) {
         		Map<String, Object> param = new HashMap<String, Object>();
         		param.putAll(map);
         		rs = repairReport(param, false);
@@ -6113,14 +6176,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         int reportState = -1;
     	SysUser user = SecurityUtils.getCurrentUser();
-		String reportUser = user.getUserName(), reportName = user.getName(), incode = (String)param.get("clZbh"), repairTypes = (String)param.get("repairTypes");
+		String reportUser = user.getUserName(), reportName = user.getName(), incode = (String)param.get("clZbh"), reportTypes = (String)param.get("reportTypes"), repairTypes = reportType2RepairType(reportTypes);
 		// 分公司保存格式 分公司编码_公司编码
 		String val = BasicData.nbbm2FgsCompanyCodeMap.get(incode);
 		String[] arr = val.split("_");
 		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url." + arr[1]));
 		url.append("?nbbm=").append(incode).append("&bxy=").append(reportUser).append("&bxbm=").append(repairTypes).append("&fgs=").append(arr[0]);
-		int count = repairReportRepository.repairReportBySch(id, 0);
+		int count = repairReportRepository.repairReportBySch(id, isActive ? 1 : 0);
 		if (count > 0) return res;
 		RepairReport lrr = dayOfSchedule.getLastestRepairReport(incode);
 		// 非主动上报并且无上报记录或上次已上报 则不用上报
@@ -6140,15 +6203,47 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		rr.setIncode(incode);
 		rr.setDepartureTime(sch.getFcsj());
 		rr.setRepairType(repairTypes);
+		rr.setReportType(reportTypes);
 		rr.setReportDate(new Date());
 		rr.setReportState(reportState);
 		rr.setReportMode(isActive ? 1 : 0);
-		repairReportRepository.save(rr);
+		rr = repairReportRepository.save(rr);
 		dayOfSchedule.setLastestRepairReport(rr);
+		// 如果上报失败，放到重传队列
+		if (rr.getReportState() == -1) queue.add(rr);
 		return res;
     }
+    private void repairReport(RepairReport rr) {
+    	int reportState = -1;
+    	// 分公司保存格式 分公司编码_公司编码
+		String val = BasicData.nbbm2FgsCompanyCodeMap.get(rr.getIncode());
+		String[] arr = val.split("_");
+		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url." + arr[1]));
+		url.append("?nbbm=").append(rr.getIncode()).append("&bxy=").append(rr.getReportUser()).append("&bxbm=").append(rr.getRepairType()).append("&fgs=").append(arr[0]);
+		
+		Map<String, Object> res = request(url.toString());
+		if (ResponseCode.SUCCESS.equals(res.get("status"))) reportState = 1;
+		if (reportState == 1) {
+			rr.setReportState(1);
+			repairReportRepository.save(rr);
+		}
+    }
+    
+    /**
+     ** 业务类型转报修类型
+     */
+    private String reportType2RepairType(String reportType) {
+    	String[] reportTypes = reportType.split(";");
+    	List<String> repairTypes = new ArrayList<>();
+    	for (String rt : reportTypes) {
+    		repairTypes.add(report2repair.get(rt));
+    	}
+    	
+    	return StringUtils.join(repairTypes, ";");
+    }
+    
     @Override
     public List<RepairReport> repairReportList(String lineId, String date, String incode, String type) {
     	List<RepairReport> result = new ArrayList<RepairReport>();
@@ -6168,14 +6263,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         result = repairReportRepository.repairReportList(lineId, start, end, incode);
         Map<String, Object> dMap=new HashMap<>();
-		dMap.put("dGroup", "repairtype");
+		dMap.put("dGroup_eq", "repairtype");
 		Map<String, String> code2name = new HashMap<String, String>();
 		for (Dictionary dic : dictionaryService.list(dMap)) {
 			code2name.put(dic.getdCode(), dic.getdName());
 		}
 		for (RepairReport rr : result) {
-			String repairType = rr.getRepairType();
-			String[] types = repairType.split(";");
+			String reportType = rr.getReportType();
+			String[] types = reportType.split(";");
 			StringBuilder sb = new StringBuilder();
 			for (String t : types) {
@@ -6234,6 +6329,37 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return result;
     }
+
+
+	@Override
+	public void destroy() throws Exception {
+		// TODO Auto-generated method stub
+		exec.shutdown();
+	}
+
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		// TODO Auto-generated method stub
+		// 维修上报重发调度
+		exec.scheduleAtFixedRate(new Runnable() {
+			
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				try {
+					Iterator<RepairReport> it = queue.iterator();
+					while (it.hasNext()) {
+						RepairReport rr = it.next();
+						repairReport(rr);
+						if (rr.getReportState() == 1) queue.remove(rr);
+					}
+				} catch (Exception e) {
+					logger.error("维修上报重发错误", e);
+				}
+			}
+		}, 30, 30, TimeUnit.MINUTES);
+	}
 }
 class AccountMap implements Comparator<Map<String, Object>> {
@@ -56,7 +56,7 @@
 								<th>计划发车时间</th>
 								<th>上报人</th>
 								<th>上报时间</th>
-								<th>故障类型</th>
+								<th>上报类型</th>
 								<th>上报状态</th>
 							</tr>
 						</thead>
@@ -86,7 +86,6 @@
 		$.get('/report/lineList',function(xlList){
 			var data = [];
 			$.get('/user/companyData', function(result){
-				debugger;
 				for(var i = 0; i < result.length; i++){
 					var companyCode = result[i].companyCode;
 					var children = result[i].children;
@@ -370,15 +370,15 @@ span.fcsj-diff {
     padding-left: 12px;
 }
-.repair-type-checkbox-list {
-    height: 130px;
+.report-type-checkbox-list {
+    height: 150px;
     overflow: auto;
     border: 1px solid #c4c4c4;
     border-radius: 4px;
     padding: 9px 0;
 }
-.repair-type-checkbox-list label {
+.report-type-checkbox-list label {
     display: block;
     font-size: 14px;
     border-bottom: 1px dashed #e6e3e3;
@@ -128,12 +128,12 @@
 		<div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row">
-                    <label class="uk-form-label" >故障类型</label>
-					<div class="uk-form-controls repair-type-checkbox-list">
-                        {{each repairTypes as repair i}}
+                    <label class="uk-form-label" >上报类型</label>
+					<div class="uk-form-controls report-type-checkbox-list">
+                        {{each reportTypes as report i}}
                         <label>
-                            <input class="i-cbox" name="repairTypes[]" value="{{repair.code}}" type="checkbox" title="{{repair.name}}">
-                            {{repair.name}}
+                            <input class="i-cbox" name="reportTypes[]" value="{{report.code}}" type="checkbox" title="{{report.name}}">
+                            {{report.name}}
                           </label>
                         {{/each}}
                     </div>
@@ -181,13 +181,13 @@
     <script>
         (function() {
             var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
-            var repairTypes = [{name:"掉线", code:"9102"}, {name:"指令故障", code:"9103"}, {name:"车辆漂移", code:"9104"}, {name:"无到无出", code:"9109"}];
+            var reportTypes = [{name:"无到", code:"9101"}, {name:"无出", code:"9109"}, {name:"掉线", code:"9102"}, {name:"指令故障", code:"9103"}, {name:"车辆漂移", code:"9104"}];
             var modal = '#schedule-fcxxwt-modal'
               ,sch;
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 sch=data.sch;
-                var formHtml = template('schedule-fcxxwt-form-temp', {sch: sch, adjustExps:adjustExps, repairTypes:repairTypes});
+                var formHtml = template('schedule-fcxxwt-form-temp', {sch: sch, adjustExps:adjustExps, reportTypes:reportTypes});
                 $('form', modal).html(formHtml);
                 $('input:checkbox').click(function(){
 	                var remark = $('[name=remarks]').val(), title = $(this).prop("title");
@@ -210,19 +210,17 @@
                 //售票员
                 gb_common.personAutocomplete($('.spy-autocom', modal));
                 // 维修类型选中
-                var initRepair = function() {
+                var initReport = function() {
                 	var remark = $('[name=remarks]').val(), items = remark.split(';');
                 	for (var i = 0;i < items.length;i++) {
-                		if (items[i].length > 2) {
-                			for (var j = 0;j < repairTypes.length;j++) {
-                				if (items[i] == repairTypes[j].name) {
-                					$('input:checkbox[value=' + repairTypes[j].code + ']').prop('checked', true);
-                				}
-                			}
-                		}
+               			for (var j = 0;j < reportTypes.length;j++) {
+               				if (items[i] == reportTypes[j].name) {
+               					$('input:checkbox[value=' + reportTypes[j].code + ']').prop('checked', true);
+               				}
+               			}
                 	}
                 }
-                initRepair();
+                initReport();
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -241,7 +239,7 @@
                     //修改里程
                     var editJhlc = data.jhlc != sch.jhlc && data.jhlc != 0;
                     // 修改报修类型为字符串
-                    if (data.repairTypes) data.repairTypes = data.repairTypes.join(";");
+                    if (data.reportTypes) data.reportTypes = data.reportTypes.join(";");
                     if(!data.adjustExps && (data.status==-1 || normalDestory || editJhlc)){
                         notify_err("当前操作需要选择调整原因！");
                         return;
@@ -8,13 +8,13 @@
     </div>
     <script id="schedule-sftz-form-temp" type="text/html">
-        <input type="hidden" name="id" value="{{id}}" />
+        <input type="hidden" name="id" value="{{sch.id}}" />
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row">
                     <label class="uk-form-label" >车辆</label>
                     <div class="uk-form-controls">
-                        <input type="text" value="{{clZbh}}" disabled>
+                        <input type="text" value="{{sch.clZbh}}" disabled>
                     </div>
                 </div>
             </div>
@@ -24,7 +24,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >路牌</label>
                     <div class="uk-form-controls">
-                        <input type="text" value="{{lpName}}" disabled>
+                        <input type="text" value="{{sch.lpName}}" disabled>
                     </div>
                 </div>
             </div>
@@ -34,7 +34,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >计发时刻</label>
                     <div class="uk-form-controls">
-                        <input type="text" value="{{fcsj}}" disabled>
+                        <input type="text" value="{{sch.fcsj}}" disabled>
                     </div>
                 </div>
             </div>
@@ -44,7 +44,22 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >实发时刻</label>
                     <div class="uk-form-controls">
-                        <input type="time" name="fcsjActual" value="{{fcsjActual}}" required autofocus>
+                        <input type="time" name="fcsjActual" value="{{sch.fcsjActual}}" required autofocus>
+                    </div>
+                </div>
+            </div>
+        </div>
+		<div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label" >上报类型</label>
+					<div class="uk-form-controls report-type-checkbox-list">
+                        {{each reportTypes as report i}}
+                        <label>
+                            <input class="i-cbox" name="reportTypes[]" value="{{report.code}}" type="checkbox" title="{{report.name}}">
+                            {{report.name}}
+                          </label>
+                        {{/each}}
                     </div>
                 </div>
             </div>
@@ -54,7 +69,7 @@
                 <div class="uk-form-row ct-stacked">
                     <label class="uk-form-label" for="form-s-t">调整说明<small class="font-danger">（不超过20个字符）</small></label>
                     <div class="uk-form-controls">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" required data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="不超过20个字符。必填">{{remarks}}</textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" required data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="不超过20个字符。必填">{{sch.remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -70,10 +85,11 @@
         (function() {
             var modal = '#schedule-sftz-modal',
                 sch;
+            var reportTypes = [{name:"无到", code:"9101"}, {name:"无出", code:"9109"}, {name:"掉线", code:"9102"}, {name:"指令故障", code:"9103"}, {name:"车辆漂移", code:"9104"}];
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 sch = data.sch;
-                var formHtml = template('schedule-sftz-form-temp', sch);
+                var formHtml = template('schedule-sftz-form-temp', {sch: sch, reportTypes:reportTypes});
                 $('form', modal).html(formHtml);
                 //submit
@@ -82,6 +98,8 @@
                     e.preventDefault();
                     var data = $(this).serializeJSON();
+                 	// 修改报修类型为字符串
+                    if (data.reportTypes) data.reportTypes = data.reportTypes.join(";");
                     gb_common.$post('/realSchedule/realOutAdjust', data, function(rs) {
                         if (rs.ts) {
                             //更新前端数据
@@ -94,6 +112,19 @@
                         }
                     });
                 });
+                
+             	// 维修类型选中
+                var initReport = function() {
+                	var remark = $('[name=remarks]').val(), items = remark.split(';');
+                	for (var i = 0;i < items.length;i++) {
+               			for (var j = 0;j < reportTypes.length;j++) {
+               				if (items[i] == reportTypes[j].name) {
+               					$('input:checkbox[value=' + reportTypes[j].code + ']').prop('checked', true);
+               				}
+               			}
+                	}
+                }
+                initReport();
             });
         })();
     </script>
@@ -91,7 +91,7 @@ var gb_schedule_context_menu = (function () {
             }, '确认撤销');
         },
         sftz: function (sch) {
-            open_modal(folder + '/sftz.html', {
+            open_modal(folder + '/sftz.html?r=' + Math.random(), {
                 sch: sch
             }, modal_opts);
         },
@@ -114,7 +114,7 @@ var gb_schedule_context_menu = (function () {
             }, '确认撤销实发');
         },
         fcxxwt: function (sch) {
-            open_modal(folder + '/fcxxwt.html', {
+            open_modal(folder + '/fcxxwt.html?r=' + Math.random(), {
                 sch: sch
             }, modal_opts);
         },
@@ -11,7 +11,6 @@ var gb_northToolbar = (function () {
         });
         $.get('/real_control_v2/js/data/json/north_toolbar.json', function (data) {
-        	debugger;
             ep.emit("data", data);
         });
@@ -304,7 +304,6 @@
             circleLine = circleLine && circlePrevStop != circleFirstStop ? true : false;
             circlePrevStop = gps.stopNo;
             if (autoChange && (gps.lineId != xlPolyline.lineId || gps.upDown != xlPolyline.upDown || circleLine) || xlPolyline.lineVersion != lineVersion) {
-            	debugger;
                 drawXlPolyline(gps.lineId, gps.upDown, lineVersion);
             }
         }
@@ -344,7 +343,6 @@
         function drawRoadPolyline(lineCode, upDown, lineVersion) {
             //从localStorage获取路段
-            //debugger;
             if (lineVersion==0)
                 routes = JSON.parse(storage.getItem(lineCode + '_route'));
             else