最新版本

jiangping

2024-10-10 29d76f8a034cb2bbeccee258e97f66f2e2d87451

最新版本

 admin/src/views/business/platformEvent.vue

@@ -63,7 +63,6 @@
                    <span v-if="row.stockStatus != 'rear' && row.stockStatus != 'front'">{{ row.stockStatus }}</span>
                  </template>
                </el-table-column>
                <el-table-column prop="stockStatus" label="车门状态" min-width="90px"></el-table-column>
                <el-table-column label="车门状态" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.vehicleDoorStatus == 'open'">开门</span>

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -126,6 +126,11 @@
    public static final String WMS_INBOUND_PLATFROM_URL ="WMS_INBOUND_PLATFROM_URL" ;
    public static final String WMS_GET_INVENTORYLIST_URL ="WMS_GET_INVENTORYLIST_URL" ;
    public static final String WMS_OUTBOUND_PLATFROM_URL ="WMS_OUTBOUND_PLATFROM_URL" ;
    public static final String TSM_PARAM ="TSM_PARAM" ;
    public static final String TMS_ORDER_LIST_URL ="TMS_ORDER_LIST_URL" ;
    public static final String TMS_ORDER_DETAIL_URL ="TMS_ORDER_DETAIL_URL" ;
    public static final String TMS_LOCK_STATUS_URL ="TMS_LOCK_STATUS_URL" ;
    public static final String TMS_INTERFACE_URL_PREFIX ="TMS_INTERFACE_URL_PREFIX" ;
    public static  boolean DEALING_HK_SYNCPRIVILEGE= false;
    public static  boolean DEALING_HK_SYNCDEVICE = false;
    public static  boolean DEALING_HK_SYNCPLATFORM = false;

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java

@@ -4,39 +4,21 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.request.EventSubRequest;
import com.doumee.core.haikang.model.param.request.ParkListRequest;
import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
import com.doumee.core.wms.model.request.WmsBaseRequest;
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.WmsService;
import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncPrivilegeServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * @author æ±Ÿè¹„蹄

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java

@@ -10,7 +10,7 @@
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.WmsService;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java

@@ -4,7 +4,7 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.WmsService;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsBaseRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms请求公共参数")
public class TmsBaseRequest  {


}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsLockStatusQueryRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms查询合同号上锁状态请求参数")
public class TmsLockStatusQueryRequest {


    private List<String> contractNumbers; //是    é›†åˆ    åˆåŒå·    å¿…填，至少传一个合同号

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderInfoRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms合同详情请求参数")
public class TmsOrderInfoRequest {

    private String contractNumber    ;//是 åˆåŒå·

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms合同列表请求参数")
public class TmsOrderListRequest {


    private List<String> permissionDomainIdList; //是    é›†åˆ    åŒºåŸŸID集合
    private List<String> contractNumbers; //    å¦    é›†åˆ    åˆåŒå·é›†åˆ
    private String fromRepertoty    ;//否    å­—符串    å‘货地
    private String   toRepertoty    ;//    å¦    å­—符串    åˆ°è´§åœ°
    private String  provinceName    ;//    å¦    å­—符串    åˆ°è´§åœ°çœä»½

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBaseResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms接口处理返回参数")
public class TmsBaseResponse<T> {
    public static final String CODE_SUCCESS = "0";
    @ApiModelProperty(value = "返回参数"  )
    private  T data;

    @ApiModelProperty(value = "响应码")
    private String code;

    @ApiModelProperty(value = "请求是否成功")
    private boolean success;

    @ApiModelProperty(value = "错误消息")
    private String message;

    @ApiModelProperty(value = "异常消息")
    private String exception;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsLockStatusQueryResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms查询合同号上锁状态返回参数")
public class TmsLockStatusQueryResponse {
   /**
    {
        "code": 0,
        "data": [
            {
                "outDate": "2024-04-25 14:50:20",
                "contractNumber": "112623190"
            },
            {
                "outDate": "2024-06-21 10:15:10",
                "contractNumber": "112722870"
            }
        ],
        "message": "操作成功"
    }
    */
   private String contractNumber;//    åˆåŒå·
   private String  outDate    ;//上锁时间 2024-04-29 14:50:20

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms合同详情返回参数")
public class TmsOrderInfoResponse {
    /**
     {
         "code": 0,
         "data": [
             {
                 "ncCreateDate": "2024-09-10 08:20:04",
                 "toRepertotyName": "芜湖市烟草公司仓库",
                 "contractNumber": "112895169",
                 "orderStatus": "到达卸货地",
                 "fromRepertotyName": "芜湖成品库",
                 "plateNumber": "皖B25010"
             }
         ],
         "message": "操作成功"
     }
     */
 
    private String   contratNumber    ; //合同号
    private String   fromRepertotyName    ; //发货地
    private String    toRepertoty    ; //到货地
    private String    plateNumber; //    è½¦ç‰Œå·    åˆåŒæœªé…è½½åˆ™æ— 
    private String   orderStatus    ; //当前运输单状态
    private String   ncCreateDate; //    åˆ¶å•æ—¶é—´

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms合同列表返回参数")
public class TmsOrderListResponse {
    /**
     {
         "code": 0,
         "data": [
             {
                 "fromRepertoty": "合肥成品库",
                 "ncCreateDate": "2023-12-04 10:36:15",
                 "toRepertoty": "天津市中心仓库",
                 "contractNumber": "112308335",
                 "orderStatus": "到达卸货地"
             }
         ],
         "message": "操作成功"
     }
     */
    private String    contractNumber; //    åˆåŒå·
    private String    fromRepertoty; //    å‘货地
    private String   toRepertoty    ; //到货地
    private String   plateNumber; //    è½¦ç‰Œå·    åˆåŒæœªé…è½½åˆ™æ— 
    private String    orderStatus; //    å½“前运输单状态
    private String  ncCreateDate; //    åˆ¶å•æ—¶é—´


}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java

@@ -149,7 +149,6 @@
    @Override
    public  void syncOrgUpdateData( Date start, Date end){
    }

    @Override
    public  void  syncVisitData() {
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,129 @@
package com.doumee.service.business.impl.thrid;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
import com.doumee.core.tms.model.request.TmsOrderListRequest;
import com.doumee.core.tms.model.response.TmsBaseResponse;
import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;

/**
 * TMS平台对接Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
@Service
@Slf4j
public class TmsServiceImpl implements TmsService {
    @Autowired
    private PlatformWmsJobMapper platformWmsJobMapper;
    @Autowired
    private PlatformGroupMapper platformGroupMapper;
    @Autowired
    private CarsMapper carsMapper;
    @Autowired
    private MemberMapper memberMapper;
    @Autowired
    private PlatformJobMapper platformJobMapper;
    @Autowired
    private PlatformWmsDetailMapper platformWmsDetailMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private WmsInterfaceLogMapper wmsInterfaceLogMapper;

    /**
     * ç”µå­é”ä¸Šé”æ—¶é—´æŽ¥å£
     * æ ¹æ®åˆåŒå·ï¼ŒæŸ¥è¯¢ç”µå­é”ä¸Šé”æƒ…况；存在批量查询的情况；
     * @param param å‚æ•°
     * @return WmsBaseResponse
     */
    @Override
    public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param){
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_LOCK_STATUS_URL).getCode();

        TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,"电子锁上锁时间接口",JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<List<TmsLockStatusQueryResponse>>>(){});
        return  new TmsBaseResponse<>();
    }

    /**
     * åˆåŒåˆ—表接口
     * æ ¹æ®åŒºåŸŸID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份，非需要），返回合同列表信息，按照时间倒序展示；
     * @param param å‚æ•°
     * @return WmsBaseResponse
     */
    @Override
    public  TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param){
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_LIST_URL).getCode();
        TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,"合同列表接口",JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){});
        return  new TmsBaseResponse<>();
    }

    /**
     * å‘èµ· tms接口请求
     * @param url
     * @param name
     * @param param
     * @param typeReference
     * @return
     * @param <T>
     */
    public  <T> TmsBaseResponse<T> sendHttpRequest(String url, String name, String param,TypeReference<TmsBaseResponse<T>> typeReference){
        log.info("【"+name+"】================开始===="+ JSONObject.toJSONString(param));
        if ( StringUtils.isNotBlank(url)) {
            String res = null;
            int success = 0;
            try {
                Map<String,String> headers = new HashMap<>();
                res = HttpsUtil.postJson(url,param);
                TmsBaseResponse result = JSONObject.parseObject(res, typeReference.getType());
                logResult(result,name);
                if(result!=null && result.getData() !=null ){

                }else{
                    success =1;
                }
                return  result;
            }catch (Exception e){
                success = 1;
                log.error("【"+name+"】================失败===="+ JSONObject.toJSONString(param));
            }finally {
            }
        }
        return  null;
    }
    private static void logResult(TmsBaseResponse res,String name) {
        if(StringUtils.equals(res.getCode(), TmsBaseResponse.CODE_SUCCESS)){
            log.info("【TMS接口："+name+"】================成功====\n"+res);
        }else{
            log.error("【TMS接口："+name+"】================失败====：\n"+ res);
        }
    }

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java

ÎļþÃû´Ó server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.service.business.impl.wms;
package com.doumee.service.business.impl.thrid;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
@@ -13,7 +13,7 @@
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.WmsService;
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
package com.doumee.service.business.third;

import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
import com.doumee.core.tms.model.request.TmsOrderListRequest;
import com.doumee.core.tms.model.response.TmsBaseResponse;
import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
import com.doumee.core.wms.model.request.WmsBaseRequest;
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.dao.business.model.PlatformJob;

import java.util.List;

/**
 * æœˆå°ä¿¡æ¯è¡¨Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface TmsService {



    /**
     * ç”µå­é”ä¸Šé”æ—¶é—´æŽ¥å£
     * æ ¹æ®åˆåŒå·ï¼ŒæŸ¥è¯¢ç”µå­é”ä¸Šé”æƒ…况；存在批量查询的情况；
     * @param param å‚æ•°
     * @return WmsBaseResponse
     */
    TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param);

    /**
     * åˆåŒåˆ—表接口
     * æ ¹æ®åŒºåŸŸID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份，非需要），返回合同列表信息，按照时间倒序展示；
     * @param param å‚æ•°
     * @return WmsBaseResponse
     */
    TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param);


}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java

ÎļþÃû´Ó server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsService.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.service.business;
package com.doumee.service.business.third;

import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
import com.doumee.core.wms.model.request.WmsBaseRequest;
@@ -10,7 +10,7 @@
import java.util.List;

/**
 * æœˆå°ä¿¡æ¯è¡¨Service定义
 * WMS系統Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */