修改

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

@@ -141,6 +141,8 @@ public class OffSiteTransportationController extends BaseRESTfulController {
             mapValue.put("startTime",startTime1);
             mapValue.put("endTime",endTime1);
         }
+        //执行中
+        mapValue.put("orderStatus",5);
         List<Map<String,Object>> filter= offSiteTransportationService.getInTransitTransportation(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String,Object>> list= offSiteTransportationService.getInTransitTransportation(mapValue);
@@ -185,6 +187,26 @@ public class OffSiteTransportationController extends BaseRESTfulController {
             mapValue.put("startTime",startTime1);
             mapValue.put("endTime",endTime1);
         }
+        if (mapValue.containsKey("abnormalType")&&mapValue.get("abnormalType")!=null){
+            switch(mapValue.get("abnormalType").toString()){
+                case "其他":
+                    mapValue.put("abnormalType","0");
+                    break;
+                case "偏离":
+                    mapValue.put("abnormalType","1");
+                    break;
+                case "停车":
+                    mapValue.put("abnormalType","2");
+                    break;
+                case "离线":
+                    mapValue.put("abnormalType","3");
+                    break;
+                default:
+                    mapValue.remove("abnormalType");
+                    break;
+
+            }
+        }
         List<Map<String,Object>> filter= offSiteTransportationService.getHaveAbnormalTruckOrderInfo(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String,Object>> list= offSiteTransportationService.getHaveAbnormalTruckOrderInfo(mapValue);
@@ -399,8 +421,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
 
     @PostMapping("/abnormalLineWarn")
     public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        System.out.println("abnormalLineWarn");
-        System.out.println(data);
+
         ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
         Map<String, Object> map=  DataConversionTool.objectToMap(resultWarn);
         int i= offSiteTransportationService.addTransportationAlarm(map);
@@ -408,8 +429,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
     }
     @PostMapping("/parkWarn")
     public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception {
-        System.out.println("parkWarn");
-        System.out.println(data);
+
         ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
         Map<String, Object> map=  DataConversionTool.objectToMap(resultWarn);
         int i=offSiteTransportationService.addTransportationAlarm(map);
@@ -418,8 +438,7 @@ public class OffSiteTransportationController extends BaseRESTfulController {
     }
     @PostMapping("/offLineWarn")
     public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        System.out.println("offLineWarn");
-        System.out.println(data);
+
         ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
         Map<String, Object> map=  DataConversionTool.objectToMap(resultWarn);
         int i=offSiteTransportationService.addTransportationAlarm(map);
@@ -488,4 +507,40 @@ public class OffSiteTransportationController extends BaseRESTfulController {
         return success(currentLocationResult);
 
     }
+    //在途订单列表
+    @PostMapping("/transportationPerformance")
+    public RESTfulResult transportationPerformance(@RequestBody Map<String,Object> mapValue,
+                                                   @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
+                                                   @RequestParam(required = false,name = "pageNum")Integer pageNum,
+                                                   @RequestParam(required = false,name = "pageSize")Integer pageSize){
+        if(mapValue.containsKey("startTime")&&mapValue.containsKey("endTime")){
+            Date  startDate=new Date(Long.parseLong(mapValue.get("startTime").toString())) ;
+            Date  endDate=new Date(Long.parseLong(mapValue.get("endTime").toString())) ;
+            Calendar ca = Calendar.getInstance();
+            ca.setTime(endDate);
+            ca.add(Calendar.DATE,1);
+            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+            String startTime1=simpleDateFormat.format(startDate);
+            String endTime1=simpleDateFormat.format(ca.getTime());
+            mapValue.replace("startTime",startTime1);
+            mapValue.replace("endTime",endTime1);
+        }else {
+            Date  startDate=new Date() ;
+            Date  endDate=new Date() ;
+            Calendar ca = Calendar.getInstance();
+            ca.setTime(endDate);
+            ca.add(Calendar.DATE,1);
+            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+            String startTime1=simpleDateFormat.format(startDate);
+            String endTime1=simpleDateFormat.format(ca.getTime());
+            mapValue.put("startTime",startTime1);
+            mapValue.put("endTime",endTime1);
+        }
+        //执行中
+        List<Map<String,Object>> filter= offSiteTransportationService.transportationPerformance(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String,Object>> list= offSiteTransportationService.transportationPerformance(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, filter,list);
+        return success(pageList);
+    }
 }

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

@@ -38,4 +38,6 @@ public interface OffSiteTransportationMapper {
     List<Map<String, Object>> getHaveAbnormalTruckOrderInfo(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getTransportAbnormalInfo(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> transportationPerformance(Map<String, Object> mapValue);
 }

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

@@ -32,4 +32,5 @@ public interface OffSiteTransportationService {
 
     List<Map<String, Object>> getTransportAbnormalInfo(Map<String, Object> mapValue);
 
+    List<Map<String, Object>> transportationPerformance(Map<String, Object> mapValue);
 }

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

@@ -153,6 +153,11 @@ public class OffSiteTransportationServiceImpl implements OffSiteTransportationSe
         return offSiteTransportationMapper.getTransportAbnormalInfo(mapValue);
     }
 
+    @Override
+    public List<Map<String, Object>> transportationPerformance(Map<String, Object> mapValue) {
+        return offSiteTransportationMapper.transportationPerformance(mapValue);
+    }
+
 
     public synchronized int addTransportationAlarm(TmstruckAbnormalResult tmstruckAbnormalResult,String tripId) {
         long id;

src/main/java/com/steerinfo/route/service/impl/RouteServiceImpl.java

@@ -851,18 +851,14 @@ public class RouteServiceImpl implements RouteService {
     public CurrentLocationResult getCurrentLocation(String capcityNumber) throws Exception {
         String json = zhongJiaoXingLu.vLastLocationV3(capcityNumber);
         CurrentLocationResult currentLocationResult = (CurrentLocationResult) DataConversionTool.jsonToBean(json, CurrentLocationResult.class);
-<<<<<<< HEAD
-        if (currentLocationResult.equals(1006)){
+        if (currentLocationResult.equals(1006)) {
             return null;
-=======
+        }
         if(currentLocationResult.getResult().getLat()!=null&&currentLocationResult.getResult().getLon()!=null){
             Double[] lngLon = LngLonUtil.gps84_To_Gcj02((Double.valueOf(currentLocationResult.getResult().getLat()) / 600000), (Double.valueOf(currentLocationResult.getResult().getLon()) / 600000));
             currentLocationResult.getResult().setLat(lngLon[0].toString());
             currentLocationResult.getResult().setLon(lngLon[1].toString());
->>>>>>> 8f52edecbb90f4859e5e95585c3a90a1a6731cf2
         }
         return currentLocationResult;
     }
-
-
 }

src/main/java/com/steerinfo/route/threeRequest/ZhongJiaoXingLu.java

@@ -98,7 +98,7 @@ public class ZhongJiaoXingLu {
             map.put("token", token);
             map.put("cid", cid);
             map.put("srt", srt);
-            map.put("timeNearby", "0.1");
+            map.put("timeNearby", "10");
             map.put("vclN", capcityNumber);
             String url = "https://openapi.sinoiov.cn/save/apis/vLastLocationV3";
             DataExchangeService des = new DataExchangeService(5000, 8000);

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

@@ -380,11 +380,18 @@
         on ASM1.MATERIAL_ID=RM.MATERIAL_ID
         left join(
         select max(RESULT_TOTAL_ID) coun,RESULT_TOTAL_ID RESULT_TOTAL_ID from  TMSTRUCK_ABNORMAL_RESULT
+        
+        <if test="abnormalType!=null">
+            where
+            ABNORMAL_TYPE=#{abnormalType}
+        </if>
         group by RESULT_TOTAL_ID
         ) TAR
         on TTR.RESULT_TOTAL_ID=TAR.RESULT_TOTAL_ID
         where TAR.coun is not null and OO.ORDER_TYPE in (1) and TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
+        
         )
+        
         <where>
             <if test="orderStatus !=null">
                 and "orderStatus" ='${orderStatus}'
@@ -511,7 +518,11 @@
         select r_capacity.CAPACITY_NUMBER "capacityNumber",
         o_torder.ORDER_NUMBER "orderNumber",
         a_s_order.SALE_NUMBER "saleNumber",
-        t_abnormal.ABNORMAL_TYPE "abnormalType",
+        case t_abnormal.ABNORMAL_TYPE
+        when '1' then '偏离'
+        when '2' then '停车'
+        when '3' then '离线'
+        else '其他' end "abnormalType",
         t_abnormal.ABNORMAL_TIME "abnormalTime",
         t_abnormal.ABNORMAL_ADDRESS "abnormalAddress",
         t_abnormal.ABNORMAL_DURATION "abnormalDuration"
@@ -574,6 +585,218 @@
             <include refid="orderBy"></include>
         </where>
     </select>
+    <select id="transportationPerformance" resultType="java.util.Map">
+        select
+        *
+        from (
+        select  distinct
+        OO.ORDER_STATUS               "orderStatus",
+        OO.ORDER_NUMBER              "orderNumber", --运单订单号
+        RC.CAPACITY_NUMBER           "capacityNumber",--车牌号
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",--计毛时间
+        TWR.RESULT_NET_WEIGHT        "resultNetWeight",--净重
+    
+        RGOUT.GATEPOST_NAME          "outGatepostName",--出厂门禁
+        RCR.CARRIER_NAME             "carrierName" , --承运商名称
+        CONCAT( CONCAT( CONCAT(RRA.ADDRESS_PROVINCE,RRA.ADDRESS_DISTRICT),RRA.Address_Town),RRP.ADDRESS_DELIVERY_ADDRESS) "deliveryAddress",  --详细收货地址
+        RM.MATERIAL_NAME             "materialName" , --"物质名称"
+        RM.MATERIAL_SPECIFICATION    "materialSpecification", -- "物质规格"
+        RM.MATERIAL_MODEL            "materialModel", --"物质型号"
+        RCON.CONSIGNEE_COMPANY_NAME   "receiveName" ,--客户名称
+    
+        TAR.RESULT_ARRIVAL_ADDRESS "resultReceiveAddress",--签收收货点的地址
+    
+        TRR.ORDER_MILEAGE "orderMileage", --运输距离
+    
+        TAR.RESULT_ARRIVAL_ADDRESS "resultArrivalAddress",--抵达收货点的地址
+        TLFR.RESULT_OUT_GATE_TIME    "resultOutGateTime",--出厂时间
+        TAR.INSERT_TIME "arrivalTime",--抵达作业时间
+        TRR.INSERT_TIME "recepitTime"--签收作业时间
+    
+--         CEIL((TRR.INSERT_TIME-TAR.INSERT_TIME) * 24  ) "unloadingWaitingTime",
+--
+--         CEIL((TAR.INSERT_TIME  - TLFR.RESULT_OUT_GATE_TIME) * 24  ) "transportationTime"
+    
+        from OMSTRUCK_ORDER OO --运输订单
+        left join AMS_SALE_ORDER_MATERIAL ASOM --销售订单物质表
+        on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        left join AMS_SALE_ORDER ASO --销售订单
+        on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        left join RMS_CONSIGNEE RCON --收货客户
+        on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+        left join TMSTRUCK_TOTAL_RESULT TTR --运输总实绩
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join TMSTRUCK_LOAD_RESULT TLR --汽车运输实绩表
+        on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_WAREHOUSE RW --装卸货仓库
+        on RW.WAREHOUSE_ID = TLR.LOADING_ID
+    
+        left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR --离厂实绩
+        on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_GATEPOST RGOUT --门岗
+        on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
+        left join RMS_CAPACITY RC --运力
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+    
+    
+        left join AMS_DISPATCH_SALE_ORDER  ADSO
+        on ASOM.SALE_ORDER_MATERIAL_ID=ADSO.SALE_ORDER_MATERIAL_ID
+        left join RMS_CARRIER RCR --承运单位
+        on ADSO.CARRIER_ID=RCR.CARRIER_ID
+    
+    
+        left join RMS_RECEIVE_PLACE RRP  --收货地址
+        on ASOM.SALE_SHIPPING_ADDRESS_ID=RRP.PLACE_ID
+        left join RMS_RECEIVE_ADDRESS RRA
+        on RRP.ADDRESS_ID=RRA.ADDRESS_ID
+    
+        left join AMS_SALE_TRUCKNO_MATERIAL ASTM
+        on ASOM.SALE_ORDER_MATERIAL_ID=ASTM.SALE_ORDER_MATERIAL_ID
+    
+        left join AMS_SALE_MATERIAL ASM1
+        on ASTM.MATERIAL_ID =ASM1.SALE_MATERIAL_ID
+    
+        left join TMSTRUCK_WEIGHT_RESULT TWR --运输实绩计重
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID  and  ASM1.MATERIAL_ID =TWR.MATERIAL_ID
+    
+        left join RMS_MATERIAL RM
+        on ASM1.MATERIAL_ID=RM.MATERIAL_ID
+    
+        left join TMSTRUCK_RECEIPT_RESULT TRR
+        on TRR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+    
+        left join TMSTRUCK_ARRIVAL_RESULT TAR
+        on TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        
+        where OO.ORDER_TYPE in (1) and TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
+        )
+        <where>
+            <if test="orderStatus !=null">
+                and "orderStatus" ='${orderStatus}'
+            </if>
+            <if test="orderNumbers !=null and orderNumbers !=''">
+                and "orderNumber" like '%${orderNumbers}%'
+            </if>
+            <if test="capacityNumbers !=null and capacityNumbers !=''">
+                and "capacityNumber" like '%${capacityNumbers}%'
+            </if>
+            <if test="resultGrossWeightTimes !=null and resultGrossWeightTimes !=''">
+                and "resultGrossWeightTime" like '%${resultGrossWeightTimes}%'
+            </if>
+            <if test="resultGrossWeightTimes !=null and resultGrossWeightTimes !=''">
+                and "resultGrossWeightTime" like '%${resultGrossWeightTimes}%'
+            </if>
+            <if test="resultOutGateTimes !=null and resultOutGateTimes !=''">
+                and "resultOutGateTime" like '%${resultOutGateTimes}%'
+            </if>
+            <if test="resultNetWeights !=null and resultNetWeights !=''">
+                and "resultNetWeight" like '%${resultNetWeights}%'
+            </if>
+            <if test="resultOutGateTimes !=null and resultOutGateTimes !=''">
+                and "resultOutGateTime" like '%${resultOutGateTimes}%'
+            </if>
+            <if test="outGatepostNames !=null and outGatepostNames !=''">
+                and "outGatepostName" like '%${outGatepostNames}%'
+            </if>
+            <if test="carrierNames !=null and carrierNames !=''">
+                and "carrierName" like '%${carrierNames}%'
+            </if>
+            <if test="deliveryAddresss !=null and deliveryAddresss !=''">
+                and "deliveryAddress" like '%${deliveryAddresss}%'
+            </if>
+            <if test="materialNames !=null and materialNames !=''">
+                and "materialName" like '%${materialNames}%'
+            </if>
+            <if test="materialSpecifications !=null and materialSpecifications !=''">
+                and "materialSpecification" like '%${materialSpecifications}%'
+            </if>
+            <if test="materialModels !=null and materialModels !=''">
+                and "materialModel" like '%${materialModels}%'
+            </if>
+            <if test="receiveNames !=null and receiveNames!=''">
+                and "receiveName" like '%${receiveNames}%'
+            </if>
+            <if test="startTime != null">
+                and "resultOutGateTime" &gt;= to_date('${startTime}','yyyy-mm-dd')
+            </if>
+            <if test="endTime != null">
+                and "resultOutGateTime" &lt;= to_date('${endTime}','yyyy-mm-dd')
+            </if>
+            <if test="orderNumber !=null">
+                and  "orderNumber" in
+                <foreach collection="orderNumber" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="capacityNumber !=null">
+                and  "capacityNumber" in
+                <foreach collection="capacityNumber" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="resultGrossWeightTime !=null">
+                and  "resultGrossWeightTime" in
+                <foreach collection="resultGrossWeightTime" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="resultNetWeight !=null">
+                and  "resultNetWeight" in
+                <foreach collection="resultNetWeight" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="resultOutGateTime !=null">
+                and  "resultOutGateTime" in
+                <foreach collection="resultOutGateTime" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="outGatepostName !=null">
+                and  "outGatepostName" in
+                <foreach collection="outGatepostName" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="carrierName !=null">
+                and  "carrierName" in
+                <foreach collection="carrierName" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="deliveryAddress !=null">
+                and  "deliveryAddress" in
+                <foreach collection="deliveryAddress" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="materialSpecification !=null">
+                and  "materialSpecification" in
+                <foreach collection="materialSpecification" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="materialModel !=null">
+                and  "materialModel" in
+                <foreach collection="materialModel" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="receiveName !=null">
+                and  "receiveName" in
+                <foreach collection="receiveName" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+            <if test="orderMileage !=null">
+                and  "orderMileage" in
+                <foreach collection="orderMileage" separator="," open="(" close=")" item="item" >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
     <sql id="orderBy">
         <if test="orderField != null and orderField != ''">
             order by  "${orderField}"

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

@@ -860,46 +860,46 @@
     )
     <where>
       <if test="orderNumbers !=null">
-        and "orderNumber" like '${orderNumbers}'
+        and "orderNumber" like '%${orderNumbers}%'
       </if>
       <if test="capacityNumbers !=null">
-        and "capacityNumber" like '${capacityNumbers}'
+        and "capacityNumber" like '%${capacityNumbers}%'
       </if>
       <if test="resultGrossWeightTimes !=null">
-        and "resultGrossWeightTime" like '${resultGrossWeightTimes}'
+        and "resultGrossWeightTime" like '%${resultGrossWeightTimes}%'
       </if>
       <if test="resultGrossWeightTimes !=null">
-        and "resultGrossWeightTime" like '${resultGrossWeightTimes}'
+        and "resultGrossWeightTime" like '%${resultGrossWeightTimes}%'
       </if>
       <if test="resultOutGateTimes !=null">
-        and "resultOutGateTime" like '${resultOutGateTimes}'
+        and "resultOutGateTime" like '%${resultOutGateTimes}%'
       </if>
       <if test="resultNetWeights !=null">
-        and "resultNetWeight" like '${resultNetWeights}'
+        and "resultNetWeight" like '%${resultNetWeights}%'
       </if>
       <if test="resultOutGateTimes !=null">
-        and "resultOutGateTime" like '${resultOutGateTimes}'
+        and "resultOutGateTime" like '%${resultOutGateTimes}%'
       </if>
       <if test="outGatepostNames !=null">
-        and "outGatepostName" like '${outGatepostNames}'
+        and "outGatepostName" like '%${outGatepostNames}%'
       </if>
       <if test="carrierNames !=null">
-        and "carrierName" like '${carrierNames}'
+        and "carrierName" like '%${carrierNames}%'
       </if>
       <if test="deliveryAddresss !=null">
-        and "deliveryAddress" like '${deliveryAddresss}'
+        and "deliveryAddress" like '%${deliveryAddresss}%'
       </if>
       <if test="materialNames !=null">
-        and "materialName" like '${materialNames}'
+        and "materialName" like '%${materialNames}%'
       </if>
       <if test="materialSpecifications !=null">
-        and "materialSpecification" like '${materialSpecifications}'
+        and "materialSpecification" like '%${materialSpecifications}%'
       </if>
       <if test="materialModels !=null">
-        and "materialModel" like '${materialModels}'
+        and "materialModel" like '%${materialModels}%'
       </if>
       <if test="receiveNames !=null">
-        and "receiveName" like '${receiveNames}'
+        and "receiveName" like '%${receiveNames}%'
       </if>
       <if test="orderNumber !=null">
         and  "orderNumber" in