修改计时车辆类型

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -544,7 +544,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                     Integer pageSize,
                                                     String startTime,
                                                     String endTime,
-                                                   String con
+                                                    String con
     ){
         if (con != null && !"undefined".equals(con)) {
             mapValue.put("con",con);

src/main/java/com/steerinfo/dil/service/impl/TmstruckTimeTaskResultServiceImpl.java

@@ -51,7 +51,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     private BmsTruckFeign bmsTruckFeign;
     @Autowired
     private AmsFeign amsFeign;
-    private static final String TwoHour="16吨吊车,12吨吊车,35吨吊车,25吨吊车,70吨吊车,80吨吊车";
+    private static final String TwoHour="16吨吊车,12吨吊车,35吨吊车,25吨吊车,70吨吊车,80吨吊车,50吨吊车";
     private static final String FourHour="220吨吊车,130吨吊车,120吨吊车,150吨吊车,100吨吊车";
 
 

src/main/resources/application-prod.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-tms-truck-dev
@@ -33,17 +33,17 @@ openfeign:
   WmshBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OmsFeign:
-    url: ${OMSFEIGN_URL:localhost:8095}
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
   JoinFeign:
-    url: ${JOINFEIGN_URL:localhost:8066}
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.166:8047}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.33.166:8038}
 server: