Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents d75cd7cd 244d55e9
Showing 8 changed files with 38 additions and 11 deletions
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/service/LineService.java
src/main/java/com/bsth/service/impl/LineServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleService.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
@@ -47,6 +47,16 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	}
 	/**
+	 * 验证线路编码是否存在
+	 * 
+	 * @return Map < {valid: true }：是否通过验证>
+	 */
+	@RequestMapping(value = "lineCodeVerification", method = RequestMethod.GET)
+	public String lineCodeVerification(@RequestParam(defaultValue = "lineCode") String lineCode) {
+		return service.lineCodeVerification(lineCode);
+	}
+	
+	/**
 	 * 
 	 * 保存
 	 * 
@@ -59,7 +69,7 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 			t.setId(Integer.valueOf(t.getLineCode()));
 		}
-		if( (t.getId().toString().length()) > 6) {
+		if( (t.getId().toString().length()) > 6 || service.lineCodeVerification(t.getLineCode()).equals("false") ) {
 			map.put("status", ResponseCode.ERROR); 
 			return map;
@@ -156,7 +156,7 @@ public class DayOfDirectives {
 		Collection<D60> d60s = d60Map.values();
 		List<D60> rem60List = new ArrayList<>();
 		for(D60 d60 : d60s){
-			if(d60.getDeviceId().equals(device))
+			if(device.equals(d60.getDeviceId()))
 				rem60List.add(d60);
 		}
 		//清除60数据
@@ -173,7 +173,7 @@ public class DayOfDirectives {
 		Collection<D64> d64s = d64Map.values();
 		List<D64> rem64List = new ArrayList<>();
 		for(D64 d64 : d64s){
-			if(d64.getDeviceId().equals(device))
+			if(device.equals(d64.getDeviceId()))
 				rem64List.add(d64);
 		}
 package com.bsth.service;
+import java.util.Map;
+
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -32,4 +34,6 @@ public interface LineService extends BaseService&lt;Line, Integer&gt; {
 	Line findByLineCode(String lineCode);
 	Line findById(Integer id);
+
+	String lineCodeVerification(String lineCode);
 }
 package com.bsth.service.impl;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,4 +53,14 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 		return repository.findOne(id);
 	}
+	@Override
+	public String lineCodeVerification(String lineCode) {
+		String state = "true";
+		Line line = repository.findByLineCode(lineCode);
+		if(line != null){
+			state = "false";
+		}
+		return state;
+	}
+
 }
@@ -246,7 +246,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             schedule.setDfsjAll(dfsj);
             schedule.setDfAuto(false);
-            schedule.addRemarks(remarks);
+            schedule.setRemarks(remarks);
             List<ScheduleRealInfo> ts = new ArrayList<>();
             ts.add(schedule);
@@ -426,8 +426,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     public SchedulePlan save(SchedulePlan schedulePlan) {
         // pre、如果排班的数据之前已经有了，删除之前的数据
         Date startpre = new Date();
-        scheduleRuleService.deelteSchedulePlanInfo(
-                schedulePlan.getXl().getId(),
+        scheduleRuleService.deleteSchedulePlanInfo(
+                schedulePlan.getXl().getLineCode(),
                 schedulePlan.getScheduleFromTime(),
                 schedulePlan.getScheduleToTime());
         Date endpre = new Date();
@@ -44,11 +44,11 @@ public interface ScheduleRuleService {
     /**
      * 删除指定时间范围的排班明细。
-     * @param xlid 线路id
+     * @param xlbm 线路编码
      * @param datefrom 开始日期
      * @param dateto 结束日期
      */
-    void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto);
+    void deleteSchedulePlanInfo(String xlbm, Date datefrom, Date dateto);
     /**
      * 查找线路的套跑规则，并封装成规则输入对象。
@@ -137,9 +137,9 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
     }
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    public void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto) {
-        String sql = "delete from bsth_c_s_sp_info where xl = ? and schedule_date >= ? and schedule_date <= ?";
-        jdbcTemplate.update(sql, xlid, datefrom, dateto);
+    public void deleteSchedulePlanInfo(String xlbm, Date datefrom, Date dateto) {
+        String sql = "delete from bsth_c_s_sp_info where xl_bm = ? and schedule_date >= ? and schedule_date <= ?";
+        jdbcTemplate.update(sql, xlbm, datefrom, dateto);
     }
     @Override