update...

潘钊
1 parent 4b460f3d
Showing 6 changed files with 31 additions and 9 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html
@@ -529,8 +529,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value="/changeBcType/{id}", method=RequestMethod.POST)
-	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks){
-		return scheduleRealInfoService.changeBcType(id, bcType, remarks);
+	public Map<String, Object> changeBcType(@PathVariable("id") Long id, String bcType, String remarks, String majorStationName){
+		return scheduleRealInfoService.changeBcType(id, bcType, remarks, majorStationName);
 	}
 	@RequestMapping(value="/history", method=RequestMethod.POST)
@@ -108,6 +108,9 @@ public class ScheduleRealInfo {
 	 */
 	private String bcType;
+	//放站班次 站点名称
+	private String majorStationName;
+
 	/** 创建人 */
 	@JsonIgnore
 	@ManyToOne(fetch = FetchType.LAZY)
@@ -971,4 +974,12 @@ public class ScheduleRealInfo {
 	public void setCcService(boolean ccService) {
 		this.ccService = ccService;
 	}
+
+	public String getMajorStationName() {
+		return majorStationName;
+	}
+
+	public void setMajorStationName(String majorStationName) {
+		this.majorStationName = majorStationName;
+	}
 }
@@ -110,8 +110,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 logger.warn("烂班不允许发送调度指令....");
                 return -1;
             }
-            String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
-                    + sch.getQdzName() + "发往" + sch.getZdzName();
+            String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
+                    + sch.getQdzName() + "发往" + sch.getZdzName() ;
+
+            if(sch.getBcType().equals("venting")){
+                text += " (直放)";
+            }
+            else if(sch.getBcType().equals("major")){
+                text += " (放站到"+sch.getMajorStationName()+"带客)";
+            }
             //下发0x01指令  调度指令(闹钟有效)
             long t = System.currentTimeMillis() + 1000 * 30,
@@ -139,9 +139,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs);
-    Map<String,Object> changeBcType(Long id, String bcType, String remarks);
+	Map<String, Object> changeBcType(Long id, String bcType, String remarks, String majorStationName);
-    Map<String,Object> historySave(ScheduleRealInfo sch);
+	Map<String,Object> historySave(ScheduleRealInfo sch);
     Map<String, Object> MapById(Long id) ;
@@ -24,7 +24,6 @@ import com.bsth.data.utils.CustomStringUtils;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
-import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -3241,7 +3240,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      * @return
      */
     @Override
-    public Map<String, Object> changeBcType(Long id, String bcType, String remarks) {
+    public Map<String, Object> changeBcType(Long id, String bcType, String remarks, String majorStationName) {
         Map<String, Object> rs = new HashMap<>();
         try {
@@ -3251,6 +3250,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 sch.addRemarks(remarks);
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
+
+                if("major".equals(bcType)){
+                    sch.setMajorStationName(majorStationName);
+                }
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -178,7 +178,8 @@
                 //将班次类型调整为放站
                 gb_common.$post('/realSchedule/changeBcType/' + sch.id, {
                     bcType: 'major',
-                    remarks: remarks
+                    remarks: remarks,
+                    majorStationName: $('[name=endStation]').find("option:selected").text()
                 }, function (rs) {
                     UIkit.modal(modal).hide();
                     gb_schedule_table.updateSchedule(rs.t);