Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

娄高锋
2 parents 36b2db0d 0345dba6
Showing 8 changed files with 242 additions and 64 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/application-prod.properties
src/main/resources/application.properties
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/wxsb.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
 package com.bsth.controller.realcontrol;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
@@ -10,14 +33,11 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
+import com.bsth.util.ConfigUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
 @RestController
 @RequestMapping("/realSchedule")
@@ -691,4 +711,74 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> deleteToHistory(@PathVariable("id") Long id){
 		return scheduleRealInfoService.deleteToHistory(id);
 	}
+	
+	/**
+	 * 从历史库里删除临加班次
+	 * @param sch
+	 * @return
+	 */
+	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
+	public Map<String, Object> deleteToHistory(@RequestParam Map<String, Object> param){
+		SysUser user = SecurityUtils.getCurrentUser();
+		String uname = user.getUserName();
+		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url"));
+		url.append("?nbbm=").append(param.get("nbbm")).append("&bxy=").append(uname).append("&bxbm=").append(param.get("bxType"));
+		// 分公司保存格式 分公司编码_公司编码
+		String val = BasicData.nbbm2FgsCompanyCodeMap.get(param.get("nbbm"));
+		String[] arr = val.split("_");
+		if (!"22".equals(arr[1])) {
+			Map<String, Object> res = new HashMap<String, Object>();
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "除金高公司外暂未开通此功能");
+			
+			return res;
+		}
+		url.append("&fgs=").append(arr[0]);
+		
+		return request(url.toString());
+	}
+	
+	@SuppressWarnings("unchecked")
+	private static Map<String, Object> request(String url) {
+		Map<String, Object> res = new HashMap<String, Object>();
+		res.put("status", ResponseCode.SUCCESS);
+		InputStream in = null;
+		HttpURLConnection con = null;
+		try {
+			con = (HttpURLConnection)new URL(url).openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "application/json");
+			con.setRequestProperty("content-type", "application/json");
+			con.setDoInput(true);
+			con.setReadTimeout(2500);
+			con.setConnectTimeout(2500);
+			
+			con.connect();
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout); bout.close();
+				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				if (!"报修成功".equals(response.get("msg"))) {
+					res.put("status", ResponseCode.ERROR);
+					res.putAll(response);
+				}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "调用上报接口异常");
+		} finally {
+			try {
+				if (in != null) in.close();
+				if (con != null) con.disconnect();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return res;
+	}
 }
@@ -121,7 +121,7 @@ public class InStationProcess {
     private void inEndStation(ScheduleRealInfo sch, GpsEntity gps) {
         String nbbm = sch.getClZbh();
         //校验进站前置约束
-        if (!validInPremise(gps))
+        if (!validInPremise(gps) && isNormalSch(sch))
             return;
         //实达时间不覆盖
@@ -74,7 +74,7 @@ public class OutStationProcess {
      * @param gps
      */
     private void outStation(GpsEntity gps, GpsEntity prev) {
-    	logger.info("进站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
+    	logger.info("出站记录(到达时间:" + gps.getArrTime() + " 进出站状态:" + gps.getInstation() + " 站点编号:" + gps.getStopNo() + " deviceId:" + gps.getDeviceId() + " nbbm:" + gps.getNbbm() + ")");
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         //起点发车
@@ -611,111 +611,119 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      * 临加班次
      */
     @Override
-    public Map<String, Object> save(ScheduleRealInfo t) {
+    public Map<String, Object> save(ScheduleRealInfo sch) {
         Map<String, Object> rs = new HashMap<>();
         try {
-            if (!carExist(t.getGsBm(), t.getClZbh())) {
-                rs.put("msg", "车辆 " + t.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
-                rs.put("status", ResponseCode.ERROR);
-                return rs;
+        	String clZbh = sch.getClZbh();
+            if (StringUtils.isNotEmpty(clZbh)) {
+                //检测
+                if (!carExist(sch.getGsBm(), clZbh)) {
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "车辆 " + clZbh + " 不存在！");
+                    return rs;
+                } else if (!sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(clZbh))) {
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", sch.getXlName() + "所属的公司编码下找不到自编号为【" + clZbh + "】的车辆");
+                    return rs;
+                }
             }
             SysUser user = SecurityUtils.getCurrentUser();
-            String schDate = DayOfSchedule.currSchDateMap.get(t.getXlBm());
+            String schDate = DayOfSchedule.currSchDateMap.get(sch.getXlBm());
             SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd"), sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
-            if (StringUtils.isEmpty(t.getjGh())) {
+            if (StringUtils.isEmpty(sch.getjGh())) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "驾驶员工号不能为空！");
                 return rs;
             }
             //截取驾驶员工号
-            if (t.getjGh().indexOf("-") != -1) {
-                t.setjGh(t.getjGh().split("-")[1]);
+            if (sch.getjGh().indexOf("-") != -1) {
+                sch.setjGh(sch.getjGh().split("-")[1]);
             }
             //检查驾驶员工号
-            String jName = getPersonName(t.getGsBm(), t.getjGh());
+            String jName = getPersonName(sch.getGsBm(), sch.getjGh());
             if (StringUtils.isEmpty(jName)) {
-                rs.put("msg", t.getXlName() + "所属的公司编码下找不到工号为【" + t.getjGh() + "】的驾驶员");
+                rs.put("msg", sch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getjGh() + "】的驾驶员");
                 rs.put("status", ResponseCode.ERROR);
                 return rs;
-            } else if (StringUtils.isEmpty(t.getjName())) {
-                t.setjName(jName);//补上驾驶员名称
+            } else if (StringUtils.isEmpty(sch.getjName())) {
+                sch.setjName(jName);//补上驾驶员名称
             }
             //有售票员
-            if (StringUtils.isNotEmpty(t.getsGh())) {
-                String sName = getPersonName(t.getGsBm(), t.getsGh());
+            if (StringUtils.isNotEmpty(sch.getsGh())) {
+                String sName = getPersonName(sch.getGsBm(), sch.getsGh());
                 if (StringUtils.isEmpty(sName)) {
-                    rs.put("msg", t.getXlName() + "所属的公司编码下找不到工号为【" + t.getjGh() + "】的售票员");
+                    rs.put("msg", sch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getjGh() + "】的售票员");
                     rs.put("status", ResponseCode.ERROR);
                     return rs;
-                } else if (StringUtils.isEmpty(t.getsName())) {
-                    t.setsName(sName);//补上售票员名称
+                } else if (StringUtils.isEmpty(sch.getsName())) {
+                    sch.setsName(sName);//补上售票员名称
                 }
             } else {
-                t.setsGh("");
-                t.setsName("");
+                sch.setsGh("");
+                sch.setsName("");
             }
             //公司 和 分公司名称
-            t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
-            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm() + "_" + t.getGsBm()));
-            t.setCreateDate(new Date());
-            t.setScheduleDateStr(schDate);
-            t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
-            t.setRealExecDate(schDate);
-
-            t.setCreateBy(user);
-            t.setSflj(true);
-            t.setLate(false);
-            t.setDfsj(t.getFcsj());
-            t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
-            t.setJhlcOrig(t.getJhlc());
-            t.setCreateDate(new Date());
-            t.setUpdateDate(new Date());
-            t.setSpId(-1L);
+            sch.setGsName(BasicData.businessCodeNameMap.get(sch.getGsBm()));
+            sch.setFgsName(BasicData.businessFgsCodeNameMap.get(sch.getFgsBm() + "_" + sch.getGsBm()));
+            sch.setCreateDate(new Date());
+            sch.setScheduleDateStr(schDate);
+            sch.setScheduleDate(sdfyyyyMMdd.parse(schDate));
+            sch.setRealExecDate(schDate);
+
+            sch.setCreateBy(user);
+            sch.setSflj(true);
+            sch.setLate(false);
+            sch.setDfsj(sch.getFcsj());
+            sch.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + sch.getZdsj()).getTime());
+            sch.setJhlcOrig(sch.getJhlc());
+            sch.setCreateDate(new Date());
+            sch.setUpdateDate(new Date());
+            sch.setSpId(-1L);
             //起终点名称
-            String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
-            t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
-            t.setZdzName(BasicData.getStationNameByCode(t.getZdzCode(), prefix));
+            String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+            sch.setQdzName(BasicData.getStationNameByCode(sch.getQdzCode(), prefix));
+            sch.setZdzName(BasicData.getStationNameByCode(sch.getZdzCode(), prefix));
             //计算班次实际执行时间
-            schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
+            schAttrCalculator.calcRealDate(sch).calcAllTimeByFcsj(sch);
             //处理计达跨24点
-            LineConfig conf = lineConfigData.get(t.getXlBm());
-            if (t.getZdsj().compareTo(conf.getStartOpt()) < 0) {
-                t.setZdsjT(sdfyyyyMMddHHmm.parse(t.getScheduleDateStr() + t.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
+            LineConfig conf = lineConfigData.get(sch.getXlBm());
+            if (sch.getZdsj().compareTo(conf.getStartOpt()) < 0) {
+                sch.setZdsjT(sdfyyyyMMddHHmm.parse(sch.getScheduleDateStr() + sch.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
             }
             //班次历时
-            t.setBcsj((int) ((t.getZdsjT() - t.getDfsjT()) / 1000 / 60));
-            if (t.getZdsjT() < t.getFcsjT()) {
+            sch.setBcsj((int) ((sch.getZdsjT() - sch.getDfsjT()) / 1000 / 60));
+            if (sch.getZdsjT() < sch.getFcsjT()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "起终点时间异常！");
                 return rs;
             }
-            t.setId(dayOfSchedule.getId());
+            sch.setId(dayOfSchedule.getId());
             //实时入库
-            super.save(t);
+            super.save(sch);
             // 加入缓存
-            dayOfSchedule.put(t);
+            dayOfSchedule.put(sch);
             //更新起点应到时间
-            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(t);
+            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch);
             //重新计算车辆当前执行班次
-            dayOfSchedule.reCalcExecPlan(t.getClZbh());
+            dayOfSchedule.reCalcExecPlan(sch.getClZbh());
             //记录站到场历时数据
-            Station2ParkBuffer.put(t);
+            Station2ParkBuffer.put(sch);
             rs.put("ts", ts);
-            rs.put("t", t);
+            rs.put("t", sch);
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -28,4 +28,6 @@ http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
 http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://10.10.200.79:8080/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://10.10.200.79:8080/transport_server/message/
+## maintenance report
+http.report.url = http://116.247.73.122:9098/jgjwsystem_j2ee/
 \ No newline at end of file
 spring.profiles: dev,prod
-spring.profiles.active: dev
+spring.profiles.active: prod
 spring.view.suffix=.html
 server.session-timeout=-1
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-wxsb-modal">
+    <div class="uk-modal-dialog">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>维修上报</h2></div>
+        <form class="uk-form uk-form-horizontal">
+        </form>
+    </div>
+
+    <script id="schedule-wxsb-form-temp" type="text/html">
+        <input type="hidden" name="id" value="{{id}}"/>
+        <div class="uk-grid">
+			<div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label" >车辆编码</label>
+                    <div class="uk-form-controls">
+                        <input type="text" name="nbbm" value="{{clZbh}}" readonly>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-label" >报修类型</label>
+                    <div class="uk-form-controls">
+                        <select name="bxType"></select>
+                    </div>
+                </div>
+            </div>
+        </div>
+		<div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+            <button type="button" class="uk-button uk-modal-close">取消</button>
+            <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+        </div>
+    </script>
+
+    <script>
+        (function() {
+            var modal = '#schedule-wxsb-modal'
+                    ,sch;
+
+            $(modal).on('init', function(e, data) {
+                e.stopPropagation();
+                sch=data.sch;
+                var formHtml = template('schedule-wxsb-form-temp', sch);
+                $('form', modal).html(formHtml);
+
+                //班次类型字典
+                var bxtypes=[{code:"9101", des:"轨迹不连续"}, {code:"9102", des:"无轨迹"}, {code:"9103", des:"收不到调度指令"}, {code:"9104", des:"漂移"}, {code:"9109", des:"其它"}],opts='';
+                for(var i = 0;i < bxtypes.length;i++){
+                    opts+='<option value="'+bxtypes[i].code+'">'+bxtypes[i].des+'</option>';
+                }
+                $('[name=bxType]', modal).html(opts);
+
+                //submit
+                var f = $('form', modal).formValidation(gb_form_validation_opts);
+                f.on('success.form.fv', function(e) {
+                    e.preventDefault();
+                    $('[type=submit]', f).attr('disabled', 'disabled');
+                    var data = $(this).serializeJSON();
+                    gb_common.$post('/realSchedule/wxsb', data, function(rs){
+                        //更新班次信息
+                        notify_succ('操作成功!');
+                        UIkit.modal(modal).hide();
+                    });
+                });
+            });
+        })();
+    </script>
+</div>
@@ -281,6 +281,11 @@ var gb_schedule_context_menu = (function () {
             open_modal(folder + '/sub_task_v2/main.html', {
                 sch: sch
             }, modal_opts);
+        },
+        wxsb: function (sch) {
+        	open_modal(folder + '/wxsb.html', {
+                sch: sch
+            }, modal_opts);
         }
     };
@@ -339,9 +344,13 @@ var gb_schedule_context_menu = (function () {
             'wdtz': {
                 name: '误点调整'
             },
-            'sep4': '---------',
+            'sep5': '---------',
             'lp_change': {
                 name: '路牌对调'
+            },
+            'sep6': '---------',
+            'wxsb': {
+                name: '维修上报'
             }
         }
     });