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 56750772 d2dcc317
Showing 11 changed files with 248 additions and 26 deletions
pom.xml
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/entity/schedule/SchedulePlan.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.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
src/main/java/com/bsth/util/db/DBUtils_oldSystem.java
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
src/test/resources/testdata/test5.txt
@@ -259,11 +259,11 @@
 		</dependency>
-		<!--<dependency>-->
-			<!--<groupId>ojdbc</groupId>-->
-			<!--<artifactId>ojdbc</artifactId>-->
-			<!--<version>14</version>-->
-		<!--</dependency>-->
+		<dependency>
+			<groupId>ojdbc</groupId>
+			<artifactId>ojdbc</artifactId>
+			<version>14</version>
+		</dependency>
 	</dependencies>
 	<dependencyManagement>
@@ -30,7 +30,8 @@ public class OfflineSignalHandle extends SignalHandle{
         if(isNotEmpty(prevs)){
             GpsEntity prev = prevs.getTail();
-            int space = (int) (gps.getTimestamp() - prev.getTimestamp());
+            //间隔太大就丢弃，不管之前还是之后
+            int space = Math.abs((int) (gps.getTimestamp() - prev.getTimestamp()));
             if(space > OFFLINE_TIME)
                 gps.setSignalState("reconnection");
@@ -2,8 +2,11 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.commons.lang3.BooleanUtils;
 import javax.persistence.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -53,6 +56,30 @@ public class SchedulePlan extends BEntity {
     @OneToMany(mappedBy = "schedulePlan", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<SchedulePlanInfo> schedulePlanInfoList = new ArrayList<>();
+
+    public static String generateInsertSql() {
+        String sql = "insert into bsth_c_s_sp " +
+                " (xl, schedule_from_time, schedule_to_time, " +
+                "tt_info_names, tt_info_ids, is_history_plan_first, plan_result, " +
+                "create_by, update_by, create_date, update_date) " +
+                "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        return sql;
+    }
+
+    public void preparedStatementSet(PreparedStatement ps) throws SQLException {
+        ps.setInt(1, this.xl.getId());
+        ps.setDate(2, new java.sql.Date(this.scheduleFromTime.getTime()));
+        ps.setDate(3, new java.sql.Date(this.scheduleToTime.getTime()));
+        ps.setString(4, this.ttInfoNames);
+        ps.setString(5, this.ttInfoIds);
+        ps.setInt(6, BooleanUtils.isTrue(this.isHistoryPlanFirst) ? 1 : 0);
+        ps.setString(7, this.planResult);
+        ps.setInt(8, this.getCreateBy().getId());
+        ps.setInt(9, this.getUpdateBy().getId());
+        ps.setTimestamp(10, new java.sql.Timestamp(this.getCreateDate().getTime()));
+        ps.setTimestamp(11, new java.sql.Timestamp(this.getUpdateDate().getTime()));
+    }
+
     public Long getId() {
         return id;
     }
@@ -6,6 +6,9 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import org.apache.commons.lang3.StringUtils;
 import javax.persistence.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
 import java.util.Date;
 import java.util.List;
@@ -148,12 +151,15 @@ public class SchedulePlanInfo {
     private Date updateDate;
+//    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+//    @JoinTable(
+//            name = "bsth_c_s_sp_r_info",
+//            joinColumns = @JoinColumn(name = "sp_info_id"),
+//            inverseJoinColumns = @JoinColumn(name = "sp_id")
+//    )
+//    private SchedulePlan schedulePlan;
+
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    @JoinTable(
-            name = "bsth_c_s_sp_r_info",
-            joinColumns = @JoinColumn(name = "sp_info_id"),
-            inverseJoinColumns = @JoinColumn(name = "sp_id")
-    )
     private SchedulePlan schedulePlan;
     public SchedulePlanInfo() {}
@@ -302,6 +308,62 @@ public class SchedulePlanInfo {
     }
+    public static String generateInsertSql() {
+        String sql = "insert into bsth_c_s_sp_info " +
+                " (schedule_date, gs_name, gs_bm, fgs_name, fgs_bm, ccno, " +
+                "xl, xl_name, xl_bm, lp, lp_name, cl, cl_zbh, bd_time, cc_time, " +
+                "j, j_gh, j_name, s, s_gh, s_name, " +
+                "xl_dir, qdz_code, qdz_name, zdz_code, zdz_name, " +
+                "fcsj, fcno, bcs, jhlc, bcsj, bc_type, " +
+                "tt_info, tt_info_name, remark, schedule_plan, " +
+                "create_by, update_by, create_date, update_date) " +
+                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," +
+                "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+        return sql;
+    }
+
+    public void preparedStatementSet(PreparedStatement ps) throws SQLException {
+        if (this.scheduleDate != null) ps.setDate(1, new java.sql.Date(this.scheduleDate.getTime())); else ps.setNull(1, Types.DATE);
+        if (this.gsName != null) ps.setString(2, this.gsName); else ps.setNull(2, Types.VARCHAR);
+        if (this.gsBm != null) ps.setString(3, this.gsBm); else ps.setNull(3, Types.VARCHAR);
+        if (this.fgsName != null) ps.setString(4, this.fgsName); else ps.setNull(4, Types.VARCHAR);
+        if (this.fgsBm != null) ps.setString(5, this.fgsBm); else ps.setNull(5, Types.VARCHAR);
+        if (this.ccno != null) ps.setInt(6, this.ccno); else ps.setNull(6, Types.INTEGER);
+        if (this.xl != null) ps.setInt(7, this.xl); else ps.setNull(7, Types.INTEGER);
+        if (this.xlName != null) ps.setString(8, this.xlName); else ps.setNull(8, Types.VARCHAR);
+        if (this.xlBm != null) ps.setString(9, this.xlBm); else ps.setNull(9, Types.VARCHAR);
+        if (this.lp != null) ps.setLong(10, this.lp); else ps.setNull(10, Types.BIGINT);
+        if (this.lpName != null) ps.setString(11, this.lpName); else ps.setNull(11, Types.VARCHAR);
+        if (this.cl != null) ps.setInt(12, this.cl); else ps.setNull(12, Types.INTEGER);
+        if (this.clZbh != null) ps.setString(13, this.clZbh); else ps.setNull(13, Types.VARCHAR);
+        if (this.bdTime != null) ps.setString(14, this.bdTime); else ps.setNull(14, Types.VARCHAR);
+        if (this.ccTime != null) ps.setString(15, this.ccTime); else ps.setNull(15, Types.VARCHAR);
+        if (this.j != null) ps.setInt(16, this.j); else ps.setNull(16, Types.INTEGER);
+        if (this.jGh != null) ps.setString(17, this.jGh); else ps.setNull(17, Types.VARCHAR);
+        if (this.jName != null) ps.setString(18, this.jName); else ps.setNull(18, Types.VARCHAR);
+        if (this.s != null) ps.setInt(19, this.s); else ps.setNull(19, Types.INTEGER);
+        if (this.sGh != null) ps.setString(20, this.sGh); else ps.setNull(20, Types.VARCHAR);
+        if (this.sName != null) ps.setString(21, this.sName); else ps.setNull(21, Types.VARCHAR);
+        if (this.xlDir != null) ps.setString(22, this.xlDir); else ps.setNull(22, Types.VARCHAR);
+        if (this.qdzCode != null) ps.setString(23, this.qdzCode); else ps.setNull(23, Types.VARCHAR);
+        if (this.qdzName != null) ps.setString(24, this.qdzName); else ps.setNull(24, Types.VARCHAR);
+        if (this.zdzCode != null) ps.setString(25, this.zdzCode); else ps.setNull(25, Types.VARCHAR);
+        if (this.zdzName != null) ps.setString(26, this.zdzName); else ps.setNull(26, Types.VARCHAR);
+        if (this.fcsj != null) ps.setString(27, this.fcsj); else ps.setNull(27, Types.VARCHAR);
+        if (this.fcno != null) ps.setInt(28, this.fcno); else ps.setNull(28, Types.INTEGER);
+        if (this.bcs != null) ps.setInt(29, this.bcs); else ps.setNull(29, Types.INTEGER);
+        if (this.jhlc != null) ps.setDouble(30, this.jhlc); else ps.setNull(30, Types.DOUBLE);
+        if (this.bcsj != null) ps.setInt(31, this.bcsj); else ps.setNull(31, Types.INTEGER);
+        if (this.bcType != null) ps.setString(32, this.bcType); else ps.setNull(32, Types.VARCHAR);
+        if (this.ttInfo != null) ps.setLong(33, this.ttInfo); else ps.setNull(33, Types.BIGINT);
+        if (this.ttInfoName != null) ps.setString(34, this.ttInfoName); else ps.setNull(34, Types.VARCHAR);
+        if (this.remark != null) ps.setString(35, this.remark); else ps.setNull(35, Types.VARCHAR);
+        if (this.schedulePlan != null) ps.setLong(36, this.schedulePlan.getId()); else ps.setNull(36, Types.BIGINT);
+        if (this.createBy != null) ps.setInt(37, this.createBy.getId()); else ps.setNull(37, Types.INTEGER);
+        if (this.updateBy != null) ps.setInt(38, this.updateBy.getId()); else ps.setNull(38, Types.INTEGER);
+        if (this.createDate != null) ps.setTimestamp(39, new java.sql.Timestamp(this.createDate.getTime())); else ps.setNull(39, Types.TIMESTAMP);
+        if (this.updateDate != null) ps.setTimestamp(40, new java.sql.Timestamp(this.updateDate.getTime())); else ps.setNull(40, Types.TIMESTAMP);
+    }
     public Long getId() {
         return id;
@@ -24,8 +24,6 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
 	@Query(value = "select s from SchedulePlanInfo s where scheduleDate=?1")
 	List<SchedulePlanInfo> findByDate(Date date);
-    Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
-    
     @Query(value = " select " +
             "info.xl as xlId, " +
             "info.xl_name as xlName, " +
@@ -8,6 +8,7 @@ import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.*;
 import com.bsth.service.schedule.SchedulePlanRuleResultService;
 import com.bsth.service.schedule.SchedulePlanService;
+import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.rules.ScheduleRuleService;
 import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
 import com.bsth.service.schedule.rules.plan.PlanResult;
@@ -24,9 +25,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
@@ -216,32 +214,53 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     }
-    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     public SchedulePlan save(SchedulePlan schedulePlan) {
         // pre、如果排班的数据之前已经有了，删除之前的数据
-        schedulePlanInfoRepository.deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(
-                schedulePlan.getXl().getId(), schedulePlan.getScheduleFromTime(), schedulePlan.getScheduleToTime()
-        );
+        Date startpre = new Date();
+        scheduleRuleService.deelteSchedulePlanInfo(
+                schedulePlan.getXl().getId(),
+                schedulePlan.getScheduleFromTime(),
+                schedulePlan.getScheduleToTime());
+        Date endpre = new Date();
         // 1、时刻表数据及每日路牌数据计算
+        Date start1 = new Date();
         Object[] ttInfoRets = ttInfoOutput(schedulePlan);
         TTInfoResults_output ttInfoResults_output = (TTInfoResults_output) ttInfoRets[0];
         LpInfoResults_output lpInfoResults_output = (LpInfoResults_output) ttInfoRets[1];
+        Date end1 = new Date();
         // 2、循环规则计算输出
+        Date start2 = new Date();
         ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
+        Date end2 = new Date();
         // 3、计划输出
+        Date start3 = new Date();
         PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
+        Date end3 = new Date();
+
+        // 4、保存数据（jdbcTemplate 批量插入）
+        Date start4 = new Date();
+        scheduleRuleService.generateSchedulePlan(schedulePlan, planResult.getSchedulePlanInfos());
+        Date end4 = new Date();
+
-        // 4、保存数据（TODO：之后改成批量保存）
-        schedulePlan.getSchedulePlanInfoList().addAll(planResult.getSchedulePlanInfos());
-        super.save(schedulePlan);
+        logger.info("删除数据 {} ms，drool时刻表每日路牌计算 {} ms，drool循环规则计算 {} ms，drool计划数据 {} ms，插入数据 {} ms",
+                endpre.getTime() - startpre.getTime(),
+                end1.getTime() - start1.getTime(),
+                end2.getTime() - start2.getTime(),
+                end3.getTime() - start3.getTime(),
+                end4.getTime() - start4.getTime());
-        schedulePlanRuleResultService.bulkSave(scheduleResults_output.getSchedulePlanRuleResults());
         return new SchedulePlan();
     }
     @Override
+    public void delete(Long aLong) throws ScheduleException {
+        scheduleRuleService.deleteSchedulePlanAll(aLong);
+    }
+
+    @Override
     public SchedulePlan findSchedulePlanTommorw() {
         DateTime today = new DateTime(new Date());
         DateTime tommorw = new DateTime(today.getYear(), today.getMonthOfYear(), today.getDayOfMonth(), 0, 0).plusDays(1);
 package com.bsth.service.schedule.rules;
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
 import java.util.Date;
@@ -19,4 +21,26 @@ public interface ScheduleRuleService {
      * @return
      */
     List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from);
+
+    /**
+     * 生成排班计划。
+     * @param schedulePlan 计划主表
+     * @param schedulePlanInfos 计划明细表
+     */
+    void generateSchedulePlan(SchedulePlan schedulePlan, List<SchedulePlanInfo> schedulePlanInfos);
+
+    /**
+     * 删除排班计划。
+     * @param id 排班计划id
+     */
+    void deleteSchedulePlanAll(Long id);
+
+    /**
+     * 删除指定时间范围的排班明细。
+     * @param xlid 线路id
+     * @param datefrom 开始日期
+     * @param dateto 结束日期
+     */
+    void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto);
 }
+
 package com.bsth.service.schedule.rules;
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementCreator;
 import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -16,6 +30,8 @@ import java.util.List;
  */
 @Service
 public class ScheduleRuleServiceImpl implements ScheduleRuleService {
+    /** 日志记录器 */
+    private static final Logger logger = LoggerFactory.getLogger(ScheduleRuleServiceImpl.class);
     @Autowired
     private JdbcTemplate jdbcTemplate;
@@ -43,4 +59,70 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
             }
         });
     }
+
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+    public void deleteSchedulePlanAll(Long id) {
+        String sql1 = "delete from bsth_c_s_sp where id = ?";
+        String sql2 = "delete from bsth_c_s_sp_info where schedule_plan = ?";
+
+        jdbcTemplate.update(sql2, id);
+        jdbcTemplate.update(sql1, id);
+    }
+
+    @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);
+    }
+
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+    @Override
+    public void generateSchedulePlan(final SchedulePlan schedulePlan, final List<SchedulePlanInfo> schedulePlanInfos) {
+        // 1、插入排班计划主表，并获取主键id
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        jdbcTemplate.update(new PreparedStatementCreator() {
+            @Override
+            public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
+                PreparedStatement ps = connection.prepareStatement(
+                        SchedulePlan.generateInsertSql(), new String[] {"id"});
+                schedulePlan.preparedStatementSet(ps);
+
+                return ps;
+            }
+        }, keyHolder);
+
+        SchedulePlan master = new SchedulePlan();
+        master.setId(keyHolder.getKey().longValue());
+        for (SchedulePlanInfo schedulePlanInfo : schedulePlanInfos) {
+            schedulePlanInfo.setSchedulePlan(master);
+        }
+
+        // 2、批量插入排班计划从表
+        List<List<SchedulePlanInfo>> lists = new ArrayList<>();
+        int batchSize = 2000;
+        int loopCount = schedulePlanInfos.size() / batchSize;
+        int otherCount = schedulePlanInfos.size() % batchSize;
+        for (int i = 0; i < loopCount; i++) {
+            lists.add(schedulePlanInfos.subList(i * batchSize, i * batchSize + batchSize));
+        }
+        if (otherCount > 0) {
+            lists.add(schedulePlanInfos.subList(loopCount * batchSize, loopCount * batchSize + otherCount));
+        }
+
+        for (final List<SchedulePlanInfo> list : lists) {
+            jdbcTemplate.batchUpdate(SchedulePlanInfo.generateInsertSql(), new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
+                    SchedulePlanInfo schedulePlanInfo = list.get(i);
+                    schedulePlanInfo.preparedStatementSet(preparedStatement);
+                }
+                @Override
+                public int getBatchSize() {
+                    return list.size();
+                }
+            });
+        }
+
+    }
 }
+
@@ -50,8 +50,8 @@ public class DBUtils_oldSystem {
 			pool_conf.put("testConnectionOnCheckout", false);
 			//异步检测连接的有效性
 			pool_conf.put("testConnectionOnCheckin", true);
-			//10分钟检测一次
-			pool_conf.put("idleConnectionTestPeriod", 60 * 10);
+			//30秒检测一次
+			pool_conf.put("idleConnectionTestPeriod", 30);
 			ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
 		}  catch (ClassNotFoundException e) {
 			logger.error(e.toString());
@@ -858,6 +858,7 @@
                         upDown = roadUpdown;
                     map.clearOverlays();
+                    parkPolygons = {};//清除停车场对照
                     //路段
                     drawRoadPolyline(upDown);
                     //站点
+update bsth_c_s_sp_info a
+set a.schedule_plan = (
+select sp_id from bsth_c_s_sp_r_info b where a.id = b.sp_info_id
+)
+where a.schedule_plan is null
+
+select count(*) from bsth_c_s_sp_info
+where schedule_plan is null
 \ No newline at end of file