Merge remote-tracking branch 'origin/master'

signal-control-service/pom.xml

@@ -53,9 +53,23 @@
                     <artifactId>swagger-annotations</artifactId>
                     <groupId>io.swagger</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>springfox-core</artifactId>
+                    <groupId>io.springfox</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- 鉴权包 end -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.22</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-core</artifactId>
+            <version>2.9.2</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/RunningPlanServiceImpl.java

@@ -257,6 +257,9 @@ public class RunningPlanServiceImpl implements RunningPlanService {
         String startTime = startEndTime[0];
         String endTime = startEndTime[1];
         String s = startTime + endTime;
+        if ("23:59".equals(endTime)) {
+            endTime = "24:00";
+        }
         String sectionNo = s.replaceAll(":", "");
         crossSectionPO.setSectionNo(sectionNo);
         crossSectionPO.setStartTime(startTime);