server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -797,7 +797,7 @@ * 5、超时停靠：1号月台 皖A12345 当前车辆超时停靠，请尽快驶离 */ public enum PlatformLedContent { IDEL_CONTNET(1, "空闲中","{param}" ), IDEL_CONTNET(1, "空闲中","安泰物流有限责任公司" ), CALLING(2, "叫号中","${param} ${param2} 叫号中"), WORKING(3, "作业中","${param} ${param2} 作业中" ), WRONG_IN(4, "错误停靠","${param} ${param2} 当前车辆错误停靠，请尽快驶离" ), server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
@@ -85,7 +85,6 @@ @LoginNoRequired @PostMapping("/tms/lockStatusQuery") public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request ) { return tmsService.lockStatusQuery(request); } @ApiOperation("【TMS】合同列表接口") server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsLockStatusQueryRequest.java
@@ -14,6 +14,6 @@ public class TmsLockStatusQueryRequest { private List<String> contractNumbers; //是 集合 合同号 必填，至少传一个合同号 private List<String> contractNumbers; //是集合 合同号 必填，至少传一个合同号 } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -313,6 +313,9 @@ @ApiModelProperty(value = "作业月台名称") @TableField(exist = false) private String platformName ; @ApiModelProperty(value = "月台空闲文案") @TableField(exist = false) private String ledContent ; @ApiModelProperty(value = "是否超时：0=是；1=否", example = "1") @TableField(exist = false) server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
@@ -84,5 +84,7 @@ @ApiModelProperty(value = "物料转换率") @ExcelColumn(name="物料转换率") private String rate; @ApiModelProperty(value = "上锁时间") @ExcelColumn(name="上锁时间") private String lockDate; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -13,6 +13,9 @@ import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest; import com.doumee.core.tms.model.response.TmsBaseResponse; import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse; import com.doumee.core.utils.*; import com.doumee.dao.business.*; import com.doumee.dao.business.join.PlatformJobJoinMapper; @@ -34,6 +37,7 @@ import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl; import com.doumee.service.business.impl.thrid.WmsServiceImpl; import com.doumee.service.business.third.EmayService; 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; @@ -63,6 +67,8 @@ @Autowired private PlatformJobMapper platformJobMapper; @Autowired private TmsService tmsService; @Autowired private PlatformDeviceMapper platformDeviceMapper; @@ -1347,14 +1353,42 @@ savePlatformLog(Constants.PlatformJobLogType.DONE.getKey(),oldPlatformJob,platformJob , Constants.PlatformJobLogType.DONE.getInfo()); if(Constants.equalsInteger(platformJob.getType(),Constants.TWO)){ //TODO 外协车装货 查询TMS 电子锁情况 if(Constants.equalsInteger(platformJob.getType(),Constants.THREE)){ // 外协车装货 查询TMS 电子锁情况 List<PlatformWmsDetail> details = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda() .eq(PlatformWmsDetail::getJobId,platformJob.getId()) .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO) ); if(details!=null && details.size()>0){ Date date = new Date(); List<String> codeList =new ArrayList<>(); for(PlatformWmsDetail d : details){ codeList.add(d.getIocode()); } TmsLockStatusQueryRequest tmsLock = new TmsLockStatusQueryRequest(); tmsLock.setContractNumbers(codeList); TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockResult = tmsService.lockStatusQuery(tmsLock); if(lockResult!=null && lockResult.isSuccess()&& lockResult.getData()!=null ){ for(TmsLockStatusQueryResponse s : lockResult.getData()){ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda() .eq(PlatformWmsDetail::getIocode,s.getContractNumber()) .set(PlatformWmsDetail::getEditDate,date) .set(PlatformWmsDetail::getLockDate,s.getOutDate()) .set(PlatformWmsDetail::getLockStatus,Constants.ONE) .eq(PlatformWmsDetail::getJobId,platformJob.getId()) .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)); } } } }else if(Constants.equalsInteger(platformJob.getType(),Constants.ONE) || Constants.equalsInteger(platformJob.getType(),Constants.FOUR)){ //TODO 外协车卸货 或者 市公司车卸货 则根据任务情况 } //发送短信信息 SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz, emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(), server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -27,6 +27,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -1023,6 +1024,7 @@ PlatformJob job = platformJobMapper.selectJoinOne(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>() .selectAll(PlatformJob.class) .selectAs(Platform::getName,PlatformJob::getPlatformName) .selectAs(Platform::getLedContent,PlatformJob::getLedContent) .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) // .eq(StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeFront,status.getPlateNo() )//前车牌号 // .eq(!StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeBack,status.getPlateNo() )//后车牌号 @@ -1054,15 +1056,21 @@ update.setStatus(Constants.PlatformJobStatus.DONE.getKey());//作业已完成 update.setDoneDate(update.getEditDate());*/ if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey()) || Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey()) || Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey()) || Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){ if(((StringUtils.equals(status.getStockStatus(),"front") && StringUtils.equals(job.getCarCodeFront(),status.getPlateNo())) ||(!StringUtils.equals(status.getStockStatus(),"front") && StringUtils.equals(job.getCarCodeBack(),status.getPlateNo())) )){ //说明车辆进错月台 或者还未叫号状态，发起警告 // dealCarsInErrorPlatformBiz(job,status); update.setInOut(Constants.ZERO);//车辆已经离开 platformJobMapper.updateById(update); } if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey()) || Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){ update.setInOut(Constants.ZERO);//车辆已经离开 platformJobMapper.updateById(update); } dealPlatformContentForLeave(job); } } }else if(StringUtils.equals(status.getMotionStatus(),"enter")){ //如果是车辆进入 @@ -1078,7 +1086,8 @@ platformJobMapper.updateById(update); } } /*if(job.getStartDate() == null){ /* if(job.getStartDate() == null){ update.setStartDate(update.getEditDate()); } update.setStatus(Constants.PlatformJobStatus.WORKING.getKey());//开始作业 @@ -1104,6 +1113,37 @@ return null; } /** * 月台车辆离开 设置月台文案为“空闲中 文案” * @param model */ private void dealPlatformContentForLeave(PlatformJob model) { List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda() .eq(PlatformDevice::getType, Constants.ZERO) .eq(PlatformDevice::getPlatformId,model.getPlatformId()) .eq(PlatformDevice::getIsdeleted,Constants.ZERO)); if(deviceList ==null || deviceList.size() == 0){ return; } int speed = 13; try { speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode()); }catch (Exception e){ } String content = StringUtils.defaultString(model.getLedContent(), Constants.PlatformLedContent.IDEL_CONTNET.getInfo()); List<PlatformBroadcastLog> logList = new ArrayList<>(); for(PlatformDevice device : deviceList){ if(StringUtils.isBlank(device.getHkId())){ continue; } PlatformBroadcastLog log = dealLedContentBiz(model.getId(),device.getHkNo(),device.getName(),content,speed,1); logList.add(log); } if(logList.size()>0){ platformBroadcastLogMapper.insert(logList); } } private PlatformEvent initPlatformEventModel(EventPlatformCarsInfoRequest request, EventPlatformCarsDataRequest data, EventPlatformCarsStatusInfoRequest status) { PlatformEvent model = new PlatformEvent(); model.setCreateDate(new Date()); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -67,7 +67,7 @@ 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) TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,"【TMS】电子锁上锁时间接口",JSONObject.toJSONString(param) ,new TypeReference< TmsBaseResponse<List<TmsLockStatusQueryResponse>>>(){}); return response; }
