Commit 633ce784452e142ff892540d0c36e3fdaf83b2f8

Authored by 王通
1 parent be749ce8

1.合并临港分支,添加系统安全相关内容

src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
@@ -150,23 +150,6 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, @@ -150,23 +150,6 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
150 return scheduleRealInfoService.realOutAdjust(map); 150 return scheduleRealInfoService.realOutAdjust(map);
151 } 151 }
152 152
153 -  
154 -  
155 - /**  
156 - *  
157 - * @Title: realOutAdjust  
158 - * @Description: TODO(实发未发)智能调度  
159 - * @param @param id 班次ID  
160 - * @param @param fcsjActual 实际发车时间 HH:mm  
161 - * @param @param remarks 备注  
162 - * @throws  
163 - */  
164 - @RequestMapping(value = "/realOutAdjust_zndd", method = RequestMethod.POST)  
165 - public Map<String, Object> realOutAdjust_zndd(@RequestParam Map<String, String> map) {  
166 - return scheduleRealInfoService.realOutAdjust_zndd(map);  
167 - }  
168 -  
169 -  
170 /** 153 /**
171 * 154 *
172 * @Title: revokeDestroy 155 * @Title: revokeDestroy
@@ -191,19 +174,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -191,19 +174,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
191 return scheduleRealInfoService.revokeRealOutgo(id); 174 return scheduleRealInfoService.revokeRealOutgo(id);
192 } 175 }
193 176
194 -  
195 - /**  
196 - *  
197 - * @Title: revokeRealOutgo  
198 - * @Description: TODO(撤销实发) 智能调度  
199 - * @param @param id  
200 - * @throws  
201 - */  
202 - @RequestMapping(value = "/revokeRealOutgo_zndd", method = RequestMethod.POST)  
203 - public Map<String, Object> revokeRealOutgo_zndd(@RequestParam Long id, @RequestParam String remarks){  
204 - return scheduleRealInfoService.revokeRealOutgo_zndd(id,remarks);  
205 - }  
206 -  
207 /** 177 /**
208 * 撤销执行 178 * 撤销执行
209 * @param id 179 * @param id