潘钊 / bsth_control · Commits

Commit 9bfed1f5d9cc35984662e3c8b9689007f22140ff

Authored by 王通
1 parent 55780ada
build: skipped

1.修复因为行车路单查询屏蔽烂班字段后造成烂班无法撤销的问题

Inline Side-by-side
Showing 4 changed files with 7 additions and 7 deletions
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
  View file @9bfed1f
@@ -829,8 +829,8 @@ public class ScheduleRealInfo { @@ -829,8 +829,8 @@ public class ScheduleRealInfo {
829 this.clearFcsjActual(); 829 this.clearFcsjActual();
830 } 830 }
831 831
832 - @JsonIgnore  
833 public boolean isDestroy(){ 832 public boolean isDestroy(){
  833 + if (status == null) status = 0;
834 return this.status == -1; 834 return this.status == -1;
835 } 835 }
836 836
src/main/resources/application-cloud.properties
  View file @9bfed1f
@@ -28,7 +28,7 @@ spring.datasource.control.max-lifetime= 1800000 @@ -28,7 +28,7 @@ spring.datasource.control.max-lifetime= 1800000
28 spring.datasource.control.connection-timeout= 3000 28 spring.datasource.control.connection-timeout= 3000
29 spring.datasource.control.connection-test-query= SELECT 1 29 spring.datasource.control.connection-test-query= SELECT 1
30 spring.datasource.control.validation-timeout= 3000 30 spring.datasource.control.validation-timeout= 3000
31 -spring.datasource.control.register-mbeans=true 31 +spring.datasource.control.register-mbeans=false
32 32
33 #DATABASE info-publish 33 #DATABASE info-publish
34 spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver 34 spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver
@@ -46,7 +46,7 @@ spring.datasource.info-publish.max-lifetime= 1800000 @@ -46,7 +46,7 @@ spring.datasource.info-publish.max-lifetime= 1800000
46 spring.datasource.info-publish.connection-timeout= 3000 46 spring.datasource.info-publish.connection-timeout= 3000
47 spring.datasource.info-publish.connection-test-query= SELECT 1 47 spring.datasource.info-publish.connection-test-query= SELECT 1
48 spring.datasource.info-publish.validation-timeout= 3000 48 spring.datasource.info-publish.validation-timeout= 3000
49 -spring.datasource.info-publish.register-mbeans=true 49 +spring.datasource.info-publish.register-mbeans=false
50 50
51 kafka.use= false 51 kafka.use= false
52 spring.kafka.consumer.bootstrap-servers= 127.0.0.1:9092 52 spring.kafka.consumer.bootstrap-servers= 127.0.0.1:9092
src/main/resources/application-dev.properties
  View file @9bfed1f
@@ -28,7 +28,7 @@ spring.datasource.control.max-lifetime= 1800000 @@ -28,7 +28,7 @@ spring.datasource.control.max-lifetime= 1800000
28 spring.datasource.control.connection-timeout= 3000 28 spring.datasource.control.connection-timeout= 3000
29 spring.datasource.control.connection-test-query= SELECT 1 29 spring.datasource.control.connection-test-query= SELECT 1
30 spring.datasource.control.validation-timeout= 3000 30 spring.datasource.control.validation-timeout= 3000
31 -spring.datasource.control.register-mbeans=true 31 +spring.datasource.control.register-mbeans=false
32 32
33 #DATABASE info-publish 33 #DATABASE info-publish
34 spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver 34 spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver
@@ -46,7 +46,7 @@ spring.datasource.info-publish.max-lifetime= 1800000 @@ -46,7 +46,7 @@ spring.datasource.info-publish.max-lifetime= 1800000
46 spring.datasource.info-publish.connection-timeout= 3000 46 spring.datasource.info-publish.connection-timeout= 3000
47 spring.datasource.info-publish.connection-test-query= SELECT 1 47 spring.datasource.info-publish.connection-test-query= SELECT 1
48 spring.datasource.info-publish.validation-timeout= 3000 48 spring.datasource.info-publish.validation-timeout= 3000
49 -spring.datasource.info-publish.register-mbeans=true 49 +spring.datasource.info-publish.register-mbeans=false
50 50
51 kafka.use= false 51 kafka.use= false
52 spring.kafka.consumer.bootstrap-servers= localhost:9092 52 spring.kafka.consumer.bootstrap-servers= localhost:9092
src/main/resources/application-test.properties
  View file @9bfed1f
@@ -28,7 +28,7 @@ spring.datasource.control.hikari.max-lifetime= 1800000 @@ -28,7 +28,7 @@ spring.datasource.control.hikari.max-lifetime= 1800000
28 spring.datasource.control.hikari.connection-timeout= 3000 28 spring.datasource.control.hikari.connection-timeout= 3000
29 spring.datasource.control.hikari.connection-test-query= SELECT 1 29 spring.datasource.control.hikari.connection-test-query= SELECT 1
30 spring.datasource.control.hikari.validation-timeout= 3000 30 spring.datasource.control.hikari.validation-timeout= 3000
31 -spring.datasource.control.hikari.register-mbeans=true 31 +spring.datasource.control.hikari.register-mbeans=false
32 32
33 #DATABASE info-publish 33 #DATABASE info-publish
34 spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver 34 spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver
@@ -46,7 +46,7 @@ spring.datasource.info-publish.hikari.max-lifetime= 1800000 @@ -46,7 +46,7 @@ spring.datasource.info-publish.hikari.max-lifetime= 1800000
46 spring.datasource.info-publish.hikari.connection-timeout= 3000 46 spring.datasource.info-publish.hikari.connection-timeout= 3000
47 spring.datasource.info-publish.hikari.connection-test-query= SELECT 1 47 spring.datasource.info-publish.hikari.connection-test-query= SELECT 1
48 spring.datasource.info-publish.hikari.validation-timeout= 3000 48 spring.datasource.info-publish.hikari.validation-timeout= 3000
49 -spring.datasource.info-publish.hikari.register-mbeans=true 49 +spring.datasource.info-publish.hikari.register-mbeans=false
50 50
51 kafka.use= false 51 kafka.use= false
52 spring.kafka.consumer.bootstrap-servers= 127.0.0.1:9092 52 spring.kafka.consumer.bootstrap-servers= 127.0.0.1:9092