潘钊 / bsth_control · Commits

Commit 7ac37d3222766a65957c984ab47fc7a4d8f690b7

Authored by YRF
1 parent 40ad0a49
build: skipped

Signed-off-by: YRF <YRF@DESKTOP-UNV37O6>

Inline Side-by-side
Showing 2 changed files with 11 additions and 11 deletions
src/main/java/com/bsth/service/excep/impl/NowSpeedingServiceImpl.java
  View file @7ac37d3
@@ -138,10 +138,10 @@ public class NowSpeedingServiceImpl implements NowSpeedingService { @@ -138,10 +138,10 @@ public class NowSpeedingServiceImpl implements NowSpeedingService {
138 if(line!=null && line != ""){ 138 if(line!=null && line != ""){
139 sql +=" and line like'%"+line.toString().trim()+"%'"; 139 sql +=" and line like'%"+line.toString().trim()+"%'";
140 } 140 }
141 - if(updown!=null && line != ""){ 141 + if(updown!=null && updown != ""){
142 sql +="and up_down like '%"+updown.toString()+"%'"; 142 sql +="and up_down like '%"+updown.toString()+"%'";
143 } 143 }
144 - if(startDate!=null && line != ""){ 144 + if(startDate!=null && startDate != ""){
145 if (startDate.toString().length()>0) { 145 if (startDate.toString().length()>0) {
146 try { 146 try {
147 Long t1 = sdf.parse(startDate.toString()+" 00:00:00").getTime(); 147 Long t1 = sdf.parse(startDate.toString()+" 00:00:00").getTime();
@@ -151,7 +151,7 @@ public class NowSpeedingServiceImpl implements NowSpeedingService { @@ -151,7 +151,7 @@ public class NowSpeedingServiceImpl implements NowSpeedingService {
151 } 151 }
152 } 152 }
153 } 153 }
154 - if(endDate!=null && line != ""){ 154 + if(endDate!=null && endDate != ""){
155 if (endDate.toString().length()>0) { 155 if (endDate.toString().length()>0) {
156 try { 156 try {
157 Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime(); 157 Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime();
@@ -162,7 +162,7 @@ public class NowSpeedingServiceImpl implements NowSpeedingService { @@ -162,7 +162,7 @@ public class NowSpeedingServiceImpl implements NowSpeedingService {
162 } 162 }
163 } 163 }
164 164
165 - if(times!=null && times.toString().length()>0 && line != ""){ 165 + if(times!=null && times.toString().length()>0 && times != ""){
166 sql +=" and (endTimestamp-startTimestamp) >="+Integer.valueOf(times.toString())*1000; 166 sql +=" and (endTimestamp-startTimestamp) >="+Integer.valueOf(times.toString())*1000;
167 } 167 }
168 168
src/main/resources/ms-jdbc.properties
  View file @7ac37d3
1 -#ms.mysql.driver= com.mysql.jdbc.Driver  
2 -#ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false  
3 -#ms.mysql.username= root  
4 -#ms.mysql.password= 123456  
5 -  
6 ms.mysql.driver= com.mysql.jdbc.Driver 1 ms.mysql.driver= com.mysql.jdbc.Driver
7 -ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8 2 +ms.mysql.url= jdbc:mysql://localhost:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
8 ms.mysql.username= root 3 ms.mysql.username= root
9 -ms.mysql.password= root2jsp  
10 \ No newline at end of file 4 \ No newline at end of file
  5 +ms.mysql.password=
  6 +
  7 +#ms.mysql.driver= com.mysql.jdbc.Driver
  8 +#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
  9 +#ms.mysql.username= root
  10 +#ms.mysql.password= root2jsp
11 \ No newline at end of file 11 \ No newline at end of file