server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -672,105 +672,6 @@ } public enum NoticeType { ZERO(0, "待审核","","","待审核","待处理","处理中"), ONE(1, "企业待签署","","","工种待审核","","已结案"), TWO(2, "待出单","待审核","待审核","","",""), THREE(3, "申请退回","申请退回","申请退回","","",""), FOUR(4, "已退回","已退回","已退回","","","已撤销"), FIVE(5, "申请驳回","申请驳回","申请驳回","","",""), //续保通知 SIX(6, "","","","","",""), //商户端 委托保 - 投保待审核 加减保 换厂 待审核 SEVEN(7, "待审核","待审核","待审核","","",""), EIGHT(8, "","","","","",""), NINE(9, "","","","","",""), ; // 成员变量 private int status; private String insuranceApplyDetail; private String applyChangeDetail; private String changeFactoryDetail; private String dispatchUnitDetail; private String taxesDetail; private String settleClaimsDetail; // 构造方法 NoticeType(int status, String insuranceApplyDetail,String applyChangeDetail , String changeFactoryDetail,String dispatchUnitDetail , String taxesDetail,String settleClaimsDetail) { this.status = status; this.insuranceApplyDetail = insuranceApplyDetail; this.applyChangeDetail = applyChangeDetail; this.changeFactoryDetail = changeFactoryDetail; this.dispatchUnitDetail = dispatchUnitDetail; this.taxesDetail = taxesDetail; this.settleClaimsDetail = settleClaimsDetail; } // get set 方法 public int getStatus() { return status; } public void setStatus(int status) { this.status = status; } public String getInsuranceApplyDetail() { return insuranceApplyDetail; } public void setInsuranceApplyDetail(String name) { this.insuranceApplyDetail = insuranceApplyDetail; } public String getApplyChangeDetail() { return applyChangeDetail; } public void setApplyChangeDetail(String info) { this.applyChangeDetail = applyChangeDetail; } public String getChangeFactoryDetail() { return changeFactoryDetail; } public void setChangeFactoryDetail(String info) { this.changeFactoryDetail = changeFactoryDetail; } public String getDispatchUnitDetail() { return dispatchUnitDetail; } public void setDispatchUnitDetail(String info) { this.dispatchUnitDetail = dispatchUnitDetail; } public String getTaxesDetail() { return taxesDetail; } public void setTaxesDetail(String info) { this.taxesDetail = taxesDetail; } public String getSettleClaimsDetail() { return settleClaimsDetail; } public void setSettleClaimsDetail(String info) { this.settleClaimsDetail = settleClaimsDetail; } } public enum PlatformWarnEvent { STOP_TIMEOUT(0, "停靠超时","${carCode}月台停靠超时" ), STOP_ERROR(1, "停靠错误","${carCode}月台停靠错误" ), server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
@@ -2,8 +2,16 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest; import com.doumee.core.tms.model.request.TmsOrderInfoRequest; 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.TmsOrderInfoResponse; import com.doumee.core.tms.model.response.TmsOrderListResponse; import com.doumee.core.utils.Constants; import com.doumee.core.wms.model.response.WmsBaseResponse; import com.doumee.service.business.third.TmsService; import com.doumee.service.business.third.WmsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -11,12 +19,14 @@ import org.apache.commons.lang3.StringUtils; 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.io.BufferedReader; import java.util.List; /** * @author 江蹄蹄 @@ -31,6 +41,8 @@ @Autowired private WmsService wmsService; @Autowired private TmsService tmsService; @ApiOperation("【WMS】推送入库单通知任务") @PostMapping("/push/inboundNotice") @@ -69,6 +81,27 @@ doPringParam(request,"【WMS】推送出入库作业完成通知任务"); return new WmsBaseResponse(); } @ApiOperation("【TMS】电子锁上锁时间接口") @LoginNoRequired @PostMapping("/tms/lockStatusQuery") public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request ) { return tmsService.lockStatusQuery(request); } @ApiOperation("【TMS】合同列表接口") @LoginNoRequired @PostMapping("/tms/orderList") public TmsBaseResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) { return tmsService.orderList(request); } @ApiOperation("【TMS】合同详情接口") @LoginNoRequired @PostMapping("/tms/orderInfo") public TmsBaseResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) { return tmsService.orderInfo(request); } public static void doPringParam(HttpServletRequest request,String name) { try { server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
@@ -27,7 +27,7 @@ } */ private String contratNumber ; //合同号 private String contractNumber ; //合同号 private String fromRepertotyName ; //发货地 private String toRepertoty ; //到货地 private String plateNumber; // 车牌号 合同未配载则无 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -6,9 +6,11 @@ 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.TmsOrderInfoRequest; 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.TmsOrderInfoResponse; import com.doumee.core.tms.model.response.TmsOrderListResponse; import com.doumee.core.utils.Constants; import com.doumee.core.utils.HttpsUtil; @@ -58,7 +60,7 @@ * 电子锁上锁时间接口 * 根据合同号，查询电子锁上锁情况；存在批量查询的情况； * @param param 参数 * @return WmsBaseResponse * @return TmsBaseResponse */ @Override public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param){ @@ -67,14 +69,14 @@ TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,"电子锁上锁时间接口",JSONObject.toJSONString(param) ,new TypeReference< TmsBaseResponse<List<TmsLockStatusQueryResponse>>>(){}); return new TmsBaseResponse<>(); return response; } /** * 合同列表接口 * 根据区域ID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份，非需要），返回合同列表信息，按照时间倒序展示； * @param param 参数 * @return WmsBaseResponse * @return TmsBaseResponse */ @Override public TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param){ @@ -82,7 +84,20 @@ +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<>(); return response; } /** * 合同详情接口 * @param param 参数 * @return TmsBaseResponse */ @Override public TmsBaseResponse<TmsOrderInfoResponse> orderInfo(TmsOrderInfoRequest param){ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode() +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_DETAIL_URL).getCode(); TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,"合同详情接口",JSONObject.toJSONString(param) ,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){}); return response; } /** server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -1,9 +1,11 @@ package com.doumee.service.business.third; import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest; import com.doumee.core.tms.model.request.TmsOrderInfoRequest; 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.TmsOrderInfoResponse; import com.doumee.core.tms.model.response.TmsOrderListResponse; import com.doumee.core.wms.model.request.WmsActionNoticeRequest; import com.doumee.core.wms.model.request.WmsBaseRequest; @@ -27,7 +29,7 @@ * 电子锁上锁时间接口 * 根据合同号，查询电子锁上锁情况；存在批量查询的情况； * @param param 参数 * @return WmsBaseResponse * @return TmsBaseResponse */ TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param); @@ -35,9 +37,16 @@ * 合同列表接口 * 根据区域ID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份，非需要），返回合同列表信息，按照时间倒序展示； * @param param 参数 * @return WmsBaseResponse * @return TmsBaseResponse */ TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param); /** * 合同详情接口 * @param param 参数 * @return TmsBaseResponse */ TmsBaseResponse<TmsOrderInfoResponse> orderInfo(TmsOrderInfoRequest param); }
