add

pom.xml

@@ -109,8 +109,8 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_SUPPLIER</param>
-<!--                        <param>RMS_CONSIGNEE</param>-->
+<!--                        <param>Omstruck_Order</param>-->
+<!--                        <param>TMSTRAIN_WEIGHT_RESULT</param>-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -11,6 +11,7 @@ import com.steerinfo.dil.util.PageListAdd;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -312,6 +313,16 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return success(pageList);
 
     }
+    @ApiOperation(value="判断一车多单是否还有订单，如果还有就推送消息再给司机")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name ="mapValue",value = "orderId")
+    })
+    @PostMapping("/pushMessageToDriver")
+    public RESTfulResult pushMessageToDriver(@RequestBody Map<String,Object> mapValue){
+
+        omstruckOrderService.pushMessageToDriver(mapValue);
+        return null;
+    }
 
     @ApiOperation(value = "司机接收、拒绝接单")
     @ApiImplicitParams({

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -19,4 +19,9 @@ public interface AmsFeign {
     //更改计划子表重量
     @PostMapping("api/v1/ams/amstruckpurplanmaterial/updateMaterial")
     RESTfulResult updateMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+
+    //更改计划子表重量
+    @PostMapping("api/v1/ams/amstrucksporadicorders/addSporadicOrderTimes")
+    RESTfulResult addSporadicOrderTimes(@RequestBody(required = false) Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -257,13 +257,19 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     List<Map<String, Object>> getOrderMaterialList(BigDecimal orderId);
 
+    //通过订单查询趟次
+    Integer getSporadicOrderTimes(BigDecimal orderId);
+
     //查询订单是否确认
     Integer getDriverConfirmation(BigDecimal orderId);
 
     //查看当前订单最大路段顺序号 与当前订单路段顺序号
     Map<String, Object> getMaxLineSeqByOrderId(BigDecimal orderId);
 
-    //通过订单查询趟次
-    Integer getSporadicOrderTimes(BigDecimal orderId);
+    //通过订单id查询零星订单id，运力id
+    Map<String, Object> getSporadicOrdermapAddOrder(BigDecimal orderId);
+//
+//    //通过订单查询趟次
+//    Integer getSporadicOrderTimes(BigDecimal orderId);
 
 }

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.java

@@ -76,11 +76,16 @@ public interface OmstruckOrderSeparateMapper {
     // 查询销售订单的物资件数或重量
     List<Map<String, Object>> getWeightOrNumber(BigDecimal saleOrderMaterialId);
 
+
+    int updateTimes(@Param("orderPlanId") BigDecimal orderPlanId, @Param("times")int times);
+
     //查询当前车辆之前所有已完成的订单
     List<Map<String, Object>> getCapacityAllOrder(String capacityNumber);
 
     //查询订单发货日期（订单类型为2）
     Integer getDeliveryDate(Object orderId);
 
-    int updateTimes(@Param("orderPlanId") BigDecimal orderPlanId, @Param("times")int times);
+
+//    int updateTimes(@Param("orderPlanId") BigDecimal orderPlanId, @Param("times")int times);
+
 }

src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -182,4 +182,8 @@ public interface IOmstruckOrderService {
 
     // 新增采购进口矿订单
     int addInputOrder(Map<String, Object> mapValue);
+
+    void pushMesToWebsocket(Map<String, Object> map);
+
+    void pushMessageToDriver(Map<String, Object> mapValue);
 }

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

@@ -395,6 +395,10 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         return result;
     }
 
+    @Override
+    public int updateTimes(BigDecimal orderPlanId, int times) {
+        return omstruckOrderSeparateMapper.updateTimes(orderPlanId, times);
+    }
     /**
      * @Author TXF
      * @Date 2021/12/30 16:15
@@ -406,8 +410,8 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     }
 
 
-    @Override
-    public int updateTimes(BigDecimal orderPlanId, int times) {
-         return omstruckOrderSeparateMapper.updateTimes(orderPlanId,times);
-       }
+//    @Override
+//    public int updateTimes(BigDecimal orderPlanId, int times) {
+//         return omstruckOrderSeparateMapper.updateTimes(orderPlanId,times);
+//       }
 }

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

@@ -499,6 +499,27 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         System.out.println(s);
     }
 
+    @Override//判断一车多单是否还有订单，如果又就再推送消息给他
+    public void pushMessageToDriver(Map<String, Object> mapValue) {
+        Map<String,Object> mapAddOrder  =omstruckOrderMapper.getSporadicOrdermapAddOrder(new BigDecimal(mapValue.get("orderId").toString()));
+        BigDecimal sporadicOrderTimes = DataChange.dataToBigDecimal(mapAddOrder.get("sporadicOrderTimes"));
+        BigDecimal sporadicOrderId = DataChange.dataToBigDecimal(mapAddOrder.get("sporadicOrderId"));
+        BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
+        BigDecimal capacityId = DataChange.dataToBigDecimal(mapAddOrder.get("capacityId"));
+        Map<String, Object> addMapSporadicOrder = new HashMap<>();
+        addMapSporadicOrder.put("sporadicOrderId",sporadicOrderId);
+        addMapSporadicOrder.put("orderId",orderId);
+        List<Map<String,Object>> mapList = new ArrayList<>();
+        Map<String,Object> map=new HashMap<>();
+        map.put("capacityId",capacityId);
+        mapList.add(map);
+        addMapSporadicOrder.put("mapList",mapList);
+        if (sporadicOrderTimes.intValue()>0){
+            //mapvalue需要orderId,零星订单id，maplist放一个运力id
+            amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
+        }
+    }
+
     /**
      * 销售物流，下发订单
      *
@@ -545,7 +566,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      */
     @Override
     @Transactional
-    public  synchronized int driverReceiveOrRefuse(Map<String, Object> map) {
+    public synchronized int driverReceiveOrRefuse(Map<String, Object> map) {
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         if((Integer) map.get("orderReceiveStatus") == 1) {

src/main/resources/application-dev.yml

@@ -1,3 +1,4 @@
+#测试环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -7,3 +8,17 @@ spring:
   application:
     name: DAL-OMS-API-DEV
 
+#feign设置
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.166:8018}
+
+server:
+  port: 8016
+

src/main/resources/application-prod.yml

@@ -1,3 +1,4 @@
+#正式环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -5,4 +6,18 @@ spring:
     username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: DAL-OMS-API-PROD
+    name: DAL-OMS-API-PROD
+
+#feign设置
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:localhost:8079}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+server:
+  port: 8095

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -43,6 +43,7 @@ redis:
     time: 864000000
   database: 0
 
+
 #feign设置
 openfeign:
   #正式环境
@@ -74,9 +75,3 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-
-server:
-  #正式
-   port: 8095
-  #测试
-#  port: 8016

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -2953,6 +2953,14 @@
         WHERE OOM.ORDER_ID = #{orderId}
     </select>
 
+    <select id="getSporadicOrderTimes" resultType="java.lang.Integer">
+         select aso.sporadic_order_times from OMSTRUCK_ORDER oo
+            left join  AMSTRUCK_SPORADIC_ORDER  aso
+            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
+            where oo.order_id= #{orderId}
+    </select>
+
+
     <!--  查询订单是否确认  -->
     <select id="getDriverConfirmation" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
         select OO.DRIVER_CONFIRMATION
@@ -2972,12 +2980,13 @@
             on RL.LINE_ID = OO.LINE_ID
         where OO.ORDER_ID = #{orderId}
     </select>
-
-
-    <select id="getSporadicOrderTimes" resultType="java.lang.Integer">
-           select aso.sporadic_order_times from OMSTRUCK_ORDER oo
-           left join  AMSTRUCK_SPORADIC_ORDER  aso
-           on oo.ORDER_PLAN_ID=aso.sporadic_order_id
-           where oo.order_id= #{orderId}
+    <select id="getSporadicOrdermapAddOrder" resultType="java.util.Map">
+        select aso.sporadic_order_times "sporadicOrderTimes",
+               aso.SPORADIC_ORDER_ID "sporadicOrderId",
+               oo.CAPACITY_ID "capacityId"
+            from OMSTRUCK_ORDER oo
+            left join  AMSTRUCK_SPORADIC_ORDER  aso
+            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
+        where oo.order_id= #{orderId}
     </select>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -47,7 +47,12 @@
         set OO.ORDER_STATUS = #{orderStatus}
         where OO.ORDER_ID = #{orderId}
     </update>
-
+<!--    修改运输订单趟次-->
+    <update id="updateTimes">
+        update AMSTRUCK_SPORADIC_ORDER  set sporadic_order_times =#{times}
+        where sporadic_order_id= #{orderPlanId}
+    </update>
+    
     <!-- 得到运单id -->
     <select id="getOrderIdByTotalId" parameterType="DECIMAL" resultType="DECIMAL">
         SELECT TTR.ORDER_ID AS "orderId"
@@ -497,9 +502,9 @@
     </select>
 
  <!--    修改运输订单趟次-->
-     <update id="updateTimes">
-          update AMSTRUCK_SPORADIC_ORDER  set sporadic_order_times =#{times}
-          where sporadic_order_id= #{orderPlanId}
-      </update>
+<!--     <update id="updateTimes">-->
+<!--          update AMSTRUCK_SPORADIC_ORDER  set sporadic_order_times =#{times}-->
+<!--          where sporadic_order_id= #{orderPlanId}-->
+<!--      </update>-->
 
 </mapper>