update...

潘钊
1 parent 9485a38e
Showing 7 changed files with 46 additions and 12 deletions
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/h_add_temp_sch.html
@@ -38,7 +38,7 @@ public class GpsCacheData {
      * @param nbbm
      */
     public static void remove(String nbbm){
-        logger.info("清除车辆到离站轨迹, " + nbbm);
+        //logger.info("清除车辆到离站轨迹, " + nbbm);
         trailListMultimap.removeAll(nbbm);
     }
  
@@ -71,6 +71,8 @@ public class DayOfSchedule {
     // 排序器
     private static ScheduleComparator.FCSJ schFCSJComparator;
  
+    private static Long sch_max_id=-1L;
+
     @Autowired
     LineConfigData lineConfigData;
  
@@ -330,11 +332,13 @@ public class DayOfSchedule {
             // 转换为实际排班
             realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
  
+            Date d = new Date();
             SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
             String fcsj;
             for (ScheduleRealInfo sch : realList) {
                 sch.setScheduleDateStr(fmtyyyyMMdd.print(sch.getScheduleDate().getTime()));
                 sch.setRealExecDate(sch.getScheduleDateStr());
+                sch.setCreateDate(d);
  
                 if (StringUtils.isEmpty(sch.getFcsj()))
                     sch.setFcsj("00:00");
@@ -383,21 +387,28 @@ public class DayOfSchedule {
         return realList;
     }
  
+
+    public synchronized long getId(){
+        if(sch_max_id==-1){
+            sch_max_id = schRepository.getMaxId();
+            if(null == sch_max_id)
+                sch_max_id = 3000L;//留一点空间补数据用
+            sch_max_id += 5;
+        }
+        else
+            sch_max_id ++;
+        return sch_max_id;
+    }
+
     /**
      * @Title: batchSave
      * @Description: TODO(批量入库)
      */
     private void batchSave(List<ScheduleRealInfo> list) {
-        // 查询数据库最大ID
-        Long id = schRepository.getMaxId();
-        if (null == id)
-            id = 0L;
-        id++;
-
         SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
         for (ScheduleRealInfo item : list) {
             item.setSpId(item.getId());// 保留原始的计划ID
-            item.setId(id++);// 设置ID
+            item.setId(getId());// 设置ID
             item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
         }
  
@@ -1107,4 +1118,16 @@ public class DayOfSchedule {
             schAttrCalculator.calcQdzTimePlan(new ArrayList<ScheduleRealInfo>(map.get(k)));
         }
     }
+
+    public int dbCount(String lineCode, String currSchDate) {
+        int count = -1;
+
+        try{
+            count = jdbcTemplate.queryForObject("select count(*) from bsth_c_s_sp_info_real where schedule_date='"+currSchDate+"' and xl_bm='"+lineCode+"'", java.lang.Integer.class);
+
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return count;
+    }
 }
 \ No newline at end of file
@@ -56,7 +56,7 @@ public class ScheduleRefreshThread extends Thread{
  
 					if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
  
-						logger.info(lineCode + "开始翻班， " + currSchDate);
+						//logger.info(lineCode + "开始翻班， " + currSchDate);
  
 						try{
 							//清除指令数据
@@ -74,6 +74,14 @@ public class ScheduleRefreshThread extends Thread{
 						//重载排班数据
 						dayOfSchedule.reloadSch(lineCode, currSchDate, false);
 						logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
+
+
+						//校验一下数据库和缓存的数据
+						int dbCount = dayOfSchedule.dbCount(lineCode, currSchDate);
+						logger.info(lineCode + " 数据库数量：" + dbCount);
+						if(dbCount != dayOfSchedule.findByLineCode(lineCode).size()){
+							logger.error("异常异常异常，，数据库和缓存数量不一致，" + lineCode);
+						}
 					}
 				}catch (Exception e){
 					logger.error("班次更新失败！！ -" + lineCode, e);
@@ -24,7 +24,6 @@ import java.util.Set;
 public class ScheduleRealInfo {
 	/** 主键Id */
 	@Id
-	@GeneratedValue
 	private Long id;
  
 	/** 计划ID */
@@ -18,6 +18,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
  
 import javax.transaction.Transactional;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
  
@@ -78,7 +79,7 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
                 ccServiceSch.setScheduleDateStr(sch.getScheduleDateStr());
                 ccServiceSch.setRealExecDate(sch.getRealExecDate());
  
-                ccServiceSch.setId(null);
+                ccServiceSch.setId(dayOfSchedule.getId());
                 ccServiceSch.setSpId(null);
                 ccServiceSch.setClZbh(t.getNbbm());
                 ccServiceSch.setCcService(true);
@@ -96,6 +97,7 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
                 ccServiceSch.setZdsjActual(ccServiceSch.getZdsj());
                 ccServiceSch.setRemarks(t.getRemarks());
                 ccServiceSch.setStatus(2);
+                ccServiceSch.setCreateDate(new Date());
                 if("1".equals(t.getType2())){
                     ccServiceSch.setBcType("normal");
                 }
@@ -503,6 +503,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 return rs;
             }
  
+            t.setId(dayOfSchedule.getId());
             //实时入库
             rs = super.save(t);
         } catch (Exception e) {
@@ -603,6 +604,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 return rs;
             }
  
+            t.setId(dayOfSchedule.getId());
             //实时入库
             super.save(t);
  
@@ -30,7 +30,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                        <select class="form-control nt-dictionary" required name="bcType" data-code="{{bcType}}"
                                 data-group=ScheduleType></select>
                     </div>
                 </div>