Browse Source

修改零星

zx 3 years ago
parent
commit
8a0d88b8d5

+ 3 - 3
pom.xml

@@ -104,12 +104,12 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>DIL</user>
-                    <password>Dil123789</password>
+                    <user>DAGANG</user>
+                    <password>root123</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>Omstruck_Order</param>-->
+                        <table>AMSTRUCK_SPORADIC_ORDER</table>
 <!--                        <param>TMSTRAIN_WEIGHT_RESULT</param>-->
                     </tables>
                 </configuration>

+ 0 - 1
src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -319,7 +319,6 @@ public class OmstruckOrderController extends BaseRESTfulController {
     })
     @PostMapping("/pushMessageToDriver")
     public RESTfulResult pushMessageToDriver(@RequestBody Map<String,Object> mapValue){
-
         omstruckOrderService.pushMessageToDriver(mapValue);
         return null;
     }

+ 1 - 0
src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -185,5 +185,6 @@ public interface IOmstruckOrderService {
 
     void pushMesToWebsocket(Map<String, Object> map);
 
+    //判断车是否为一车多趟
     void pushMessageToDriver(Map<String, Object> mapValue);
 }

+ 2 - 1
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1681,8 +1681,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 12:
             case 13:
             case 15:
+            case 16:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
-                break;
+
 
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));

+ 1 - 7
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -44,12 +44,6 @@ redis:
   database: 0
 
 
-
-
-
-
-
-
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
   mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml