Merge remote-tracking branch 'origin/master'

k94314517

2024-12-11 23ac7615c09cd6a1f9e6e91875f0b8448a749191

Merge remote-tracking branch 'origin/master'

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

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

@@ -1177,7 +1177,7 @@
        ;
        // æˆå‘˜å˜é‡
        private int key;
        private int type;//用户类型 0司机 1访客  2员工
        private int type;//用户类型 0员工 1司机
        private String yw;//业务类型
        private String info;//说明


 server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.doumee.dao.business.model.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * çŸ­ä¿¡é‚®ä»¶ä¿¡æ¯è¡¨
 * @author æ±Ÿè¹„蹄
 * @date 2024/01/16 10:03
 */
@Data
@ApiModel("验证手机号和验证码入参")
public class ValidPhoneCodeVO {


    @ApiModelProperty(value = "验证码")
    private String code;

    @ApiModelProperty(value = "手机号", example = "1")
    private String phone;

}

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

@@ -9,6 +9,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import io.swagger.annotations.Api;
@@ -46,6 +47,15 @@
        return ApiResponse.success(smsEmailService.sendSms(smsEmail));
    }

    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("根据手机号和验证码校验")
    @PostMapping("/validPhoneCaptcha")
    public ApiResponse validPhoneCaptcha(@RequestBody ValidPhoneCodeVO param) {
        smsEmailService.validPhoneCaptcha(param);
        return ApiResponse.success("请求成功");
    }


    @LoginNoRequired
    @PreventRepeat
@@ -55,6 +65,5 @@
        emayService.sendSmsByHk(smsEmail.getPhone(),smsEmail.getContent());
        return ApiResponse.success("操作成功");
    }


}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,65 @@
package com.doumee.cloud.admin;

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;
import lombok.extern.slf4j.Slf4j;
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 æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
@Api(tags = "TMS平台数据接口")
@RestController
@Slf4j
@LoginNoRequired
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/tms")
public class TmsCloudController extends BaseController {

    @Autowired
    private TmsService tmsService;
    @ApiOperation("【TMS】电子锁上锁时间接口")
    @LoginNoRequired
    @PostMapping("/lockStatusQuery")
    public TmsBaseResponse<List<TmsLockStatusQueryResponse>>  lockStatusQuery(@RequestBody  TmsLockStatusQueryRequest request )   {
        return  tmsService.lockStatusQuery(request);
    }
    @ApiOperation("【TMS】合同列表接口")
    @LoginNoRequired
    @PostMapping("/orderList")
    public TmsBaseResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request )   {

        return  tmsService.orderList(request);
    }
    @ApiOperation("【TMS】合同详情接口")
    @LoginNoRequired
    @PostMapping("/orderInfo")
    public TmsBaseResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request )   {
        return  tmsService.orderInfo(request);
    }


}

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

@@ -19,5 +19,7 @@
    private String fromRepertoty    ;//否    å­—符串    å‘货地
    private String   toRepertoty    ;//    å¦    å­—符串    åˆ°è´§åœ°
    private String  provinceName    ;//    å¦    å­—符串    åˆ°è´§åœ°çœä»½

    private String    phoneNumber    ;//否    å­—符串    æ‰‹æœºå·

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
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 TmsContractListResponse {
   /**
    {
        "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/core/tms/model/response/TmsOrderListResponse.java

@@ -35,4 +35,5 @@
    private String  ncCreateDate; //    åˆ¶å•æ—¶é—´



}

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

@@ -3,6 +3,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;

import java.util.List;

@@ -98,4 +99,6 @@
    long count(SmsEmail smsEmail);

    void sendWaitingSmsNotice();

    void validPhoneCaptcha(ValidPhoneCodeVO param);
}

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

@@ -15,6 +15,7 @@
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import org.apache.commons.lang3.StringUtils;
@@ -76,6 +77,10 @@


    @Override
    public     void validPhoneCaptcha(ValidPhoneCodeVO param){
       isCaptcheValide(smsEmailMapper,param.getPhone(),param.getCode());
    }
    @Override
    public Integer create(SmsEmail smsEmail) {
        smsEmailMapper.insert(smsEmail);
        return smsEmail.getId();

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

@@ -19,13 +19,16 @@
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.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.impl.SmsEmailServiceImpl;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -39,6 +42,9 @@
@Service
@Slf4j
public class TmsServiceImpl implements TmsService {

    @Autowired
    private SmsEmailMapper smsEmailMapper;
    @Autowired
    private PlatformWmsJobMapper platformWmsJobMapper;
    @Autowired
@@ -55,7 +61,8 @@
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private WmsInterfaceLogMapper wmsInterfaceLogMapper;

    @Value("${debug_model}")
    private Boolean isDebug;
    /**
     * ç”µå­é”ä¸Šé”æ—¶é—´æŽ¥å£
     * æ ¹æ®åˆåŒå·ï¼ŒæŸ¥è¯¢ç”µå­é”ä¸Šé”æƒ…况；存在批量查询的情况；
@@ -80,6 +87,9 @@
     */
    @Override
    public  TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param){
       if(StringUtils.isBlank(param.getPhoneNumber())){
           param.setPhoneNumber("00000000000");//手机号必填
       }
        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)

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

@@ -35,7 +35,7 @@

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