Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

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

@@ -1,9 +1,7 @@
package com.doumee.service.business.impl;

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformWarnEventMapper;
@@ -109,6 +107,7 @@
                        .selectAs(Platform::getName,PlatformWarnEvent::getPlatformName)
                        .selectAs(Platform::getHkId,PlatformWarnEvent::getPlatfromHkId)
                        .leftJoin(Platform.class,Platform::getId,PlatformWarnEvent::getPlatformId)
                        .orderByDesc(PlatformWarnEvent::getCreateDate)
                        .last(" limit 20 ")
        );
        List<PlatformWarnEventListResponse> list = new ArrayList<PlatformWarnEventListResponse>();
@@ -203,6 +202,7 @@
        platformWarnEvent.setIsdeleted(Constants.ZERO);
        platformWarnEvent.setPlatformId(savePlatformWarnEventDTO.getPlatformId());
        platformWarnEvent.setCarCode(savePlatformWarnEventDTO.getCarCode());
        platformWarnEvent.setPlatformId(savePlatformWarnEventDTO.getPlatformJobId());
        Constants.PlatformWarnEvent cPl = Constants.PlatformWarnEvent.STOP_TIMEOUT;
        if(Constants.equalsInteger(savePlatformWarnEventDTO.getEventType(),Constants.ZERO)){
            if(Objects.isNull(savePlatformWarnEventDTO.getPlatformJobId())){
@@ -216,7 +216,6 @@
        platformWarnEvent.setEventContent(cPl.getInfo().replace("${carCode}",savePlatformWarnEventDTO.getCarCode()));
        platformWarnEventMapper.insert(platformWarnEvent);
    }



}