jiangping
2024-12-12 6e2e6d490b2ff38e098bb708bf4ee459631934f2
最新版本541200007
已修改6个文件
61 ■■■■■ 文件已修改
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
@@ -19,7 +19,8 @@
    private String fromRepertoty    ;//否    字符串    发货地
    private String   toRepertoty    ;//    否    字符串    到货地
    private String  provinceName    ;//    否    字符串    到货地省份
    private String ncCreateDateTimeEnd;//截止时间
    private String ncCreateDateTimeStart;//    开始时间
    private String    phoneNumber    ;//否    字符串    手机号
}
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
@@ -13,21 +13,19 @@
    /**
     {
         "code": 0,
         "data": [
             {
     "contractNumber": "112718591",
     "ncCreateDate": "2024-06-20 09:08:01",
     "deliveryEnterprise": "蚌埠成品库",
     "receiveEnterprise": "宿州市卷烟配送中心",
     "transportCode": "39828",
     "transportDate": "2024-06-20 09:04:46.0",
     "driverName": "王付兰",
     "driverTel": "19955211695",
     "plateName": "皖CC2585",
     "orderStatus": "5",
     "orderStatusDesc": "到达卸货地-电子锁汽运"
             }
         ],
         "data": {
             "contractNumber": "112718591",
             "ncCreateDate": "2024-06-20 09:08:01",
             "deliveryEnterprise": "蚌埠成品库",
             "receiveEnterprise": "宿州市卷烟配送中心",
             "transportCode": "39828",
             "transportDate": "2024-06-20 09:04:46.0",
             "driverName": "王付兰",
             "driverTel": "19955211695",
             "plateName": "皖CC2585",
             "orderStatus": "5",
             "orderStatusDesc": "到达卸货地-电子锁汽运"
         },
         "message": "操作成功"
     }
     */
@@ -38,11 +36,11 @@
    private String    plateNumber; //    车牌号    合同未配载则无
    private String   orderStatus    ; //当前运输单状态
    private String   ncCreateDate; //    制单时间
    private String      transportDate; //
    private String      transportCode; //
    private String     driverName; //
    private String           driverTel; //
    private String            orderStatusDesc; //
    private String   transportDate; //
    private String   transportCode; //
    private String   driverName; //
    private String   driverTel; //
    private String   orderStatusDesc; //
    private String    plateName; //": "皖CC2585",
}
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
@@ -33,7 +33,12 @@
    private String   plateNumber; //    车牌号    合同未配载则无
    private String    orderStatus; //    当前运输单状态
    private String  ncCreateDate; //    制单时间
    private String   deliveryEnterprise; //    发货地    发货仓库名称
    private String   receiveEnterprise; //        到货地    卸货仓库名称
    private String    deliveryLon    ; //    发货仓库经度
    private String    deliveryLat    ; //    发货仓库纬度
    private String    receiveLon    ; //    卸货仓库经度
    private String   receiveLat; //        卸货仓库纬度
    private String    transportCode; //        运输单号    可能为空(无运输单的情况)
}
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java
@@ -19,6 +19,8 @@
    @ApiModelProperty(value = "空闲月台数量")
    private int freePlatform;
    @ApiModelProperty(value = "监控视频播放插件地址")
    private String  videoPluginUrl;
    @ApiModelProperty(value = "预约车辆")
    private int reservationCar;
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
@@ -52,6 +52,8 @@
    @ApiModelProperty(value = "当前报警总数")
    private int errTotal;
    @ApiModelProperty(value = "监控视频播放插件地址")
    private String  videoPluginUrl;
    @ApiModelProperty(value = "内运车(安泰自有车)")
    private int internalJobCarTotal;
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1445,9 +1445,14 @@
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count()
        );
        data.setVideoPluginUrl(getVideoUrl());
        return data;
    }
    private String getVideoUrl() {
        return  systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()+"plugin/VideoWebPlugin.exe";
    }
    private void getParkingCarsNum(SecurityBoardVO data) {
        try {
            BaseResponse<ParkingStatisticResponse> response = HKService.getParkingStatistics();