diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/request/RequestOrderPackageInfoVo.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/request/RequestOrderPackageInfoVo.java index 6578982f9..9ff75facc 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/request/RequestOrderPackageInfoVo.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/request/RequestOrderPackageInfoVo.java @@ -23,4 +23,9 @@ public class RequestOrderPackageInfoVo extends RequestSecBaseVo { private String merge_number; + /** + * 派车单号 + */ + private String send_car_number; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/CommonController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/CommonController.java new file mode 100644 index 000000000..d5bd74852 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/CommonController.java @@ -0,0 +1,31 @@ +package com.logpm.basicdata.controller; + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.oss.MinioTemplate; +import org.springblade.core.oss.model.BladeFile; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +@RestController +@AllArgsConstructor +@Api(value = "公共",tags = "公共") +@RequestMapping("/common") +@Slf4j +public class CommonController { + + private MinioTemplate minioTemplate; + @SneakyThrows + @PostMapping("/uploadFile") + public R uploadFile(@RequestParam MultipartFile file){ + log.info("传入>>>>>>>>>>{}",file); + BladeFile bladeFile = minioTemplate.putFile(file); + return R.data(bladeFile); + } +} diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java index 402fc98a3..5cf9ea295 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java @@ -1,6 +1,7 @@ package com.logpm.factory.jobhandler; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.factory.snm.entity.OrderLogEntity; import com.logpm.factory.snm.entity.StaorderPackagesEntity; @@ -20,13 +21,17 @@ import com.logpm.oldproject.feign.IServiceNumClient; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.log.XxlJobLogger; +import io.jsonwebtoken.lang.Strings; import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springblade.common.constant.LogpmDataStatusEnum; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; + +import java.awt.datatransfer.StringSelection; import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -56,8 +61,6 @@ public class FactoryXxlJob { private IStationOrderService stationOrderService; private IStaorderPackagesService staorderPackagesService; - - private IAdvanceClient iAdvanceClient; private IAdvanceDetailClient advanceDetailClient; private IDetailProductClient detailProductClient; @@ -69,11 +72,16 @@ public class FactoryXxlJob { */ @XxlJob("factoryJobHandler") public ReturnT factoryJobHandler(String param) throws Exception { - - List ls = stationlinenumService.lambdaQuery().eq(StationlinenumEntity::getIsDeleted, 0).eq(StationlinenumEntity::getStatus, 1).list(); + // 获取当前时间 + LocalDate date ; + List ls = stationlinenumService.lambdaQuery().eq(StationlinenumEntity::getIsDeleted, 0).eq(StationlinenumEntity::getStatus, LogpmDataStatusEnum.OPEN.getValue()).list(); if (!ObjectUtils.isEmpty(ls)) { - // 获取当前时间 - LocalDate date = LocalDate.now(); + + if(StringUtils.isNotBlank(param)){ + date = LocalDate.parse(param); + }else{ + date = LocalDate.now(); + } //查询配置站点 ls.forEach(stationlinenumEntity -> { // 根据站点id和当前时间调用service 请求对方接口获取数据插入到我们的数据库 @@ -218,7 +226,7 @@ public class FactoryXxlJob { advanceEntity.setSenderName(""); //发货工厂名称 可以为空 advanceEntity.setAdministratorsId(0);// 导入人 advanceEntity.setCreateTime(LocalDate.now()); //添加时间 - advanceEntity.setCarsNum(""); //派车单--snm 可以为空 + advanceEntity.setCarsNum(v.getTcWla001()); //派车单--snm 可以为空 advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setWaybillNo("");//运单号 可以为空 advanceEntity.setWarehouseId(0); //导入人仓库id @@ -229,17 +237,14 @@ public class FactoryXxlJob { advanceEntity.setDeleteAdministratorsId(0);//删除用户 Integer integer = iAdvanceClient.addAdvanceClient(advanceEntity); if (integer > 0){ - //订单id longIntegerMap.put(k,integer); // longIntegerMap.put(k,advanceEntity.getId()); } }); //TODO 插入到老系统的的数据库 - map.forEach((k,v) ->{ Integer aLong = longIntegerMap.get(k);//订单ID - StationOrderEntity stationOrderEntity = collect.get(k); // 订单 //添加订单明细 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java index 3b3bf5130..da1312ef9 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java @@ -66,7 +66,7 @@ public class OrderServiceImpl implements IOrderService { requestLineNumberVo.setLogistics_line_number(lineNum); requestLineNumberVo.setDispatch_time_start(dayDate); - requestLineNumberVo.setDispatch_time_end("2023-05-10"); + requestLineNumberVo.setDispatch_time_end(dayDate); SystemSign systemSign = new SystemSign(); systemSign.setTimestamp(now.getTime()); systemSign.setPublicKey(factorySnmdataProperties.getPublicKey()); @@ -241,7 +241,14 @@ public class OrderServiceImpl implements IOrderService { } - private ResponseStaorderPackagesVo orderPackageInfo (String statinLineNum, String packageNum, String mergeNumber) + /** + * + * @param statinLineNum 线路编号 + * @param packageNum 包件号 + * @param tc_wla001 派车单号 + * @return + */ + private ResponseStaorderPackagesVo orderPackageInfo (String statinLineNum, String packageNum, String tc_wla001) { RequestVo requestVo = new RequestVo(); requestVo.setMethod("snimay.crm.externalinterface.package.order.get"); @@ -249,7 +256,8 @@ public class OrderServiceImpl implements IOrderService { RequestOrderPackageInfoVo requestOrderPackageInfoVo = new RequestOrderPackageInfoVo(); requestOrderPackageInfoVo.setLogistics_line_number(statinLineNum); requestOrderPackageInfoVo.setPackage_num(packageNum); - requestOrderPackageInfoVo.setMerge_number(mergeNumber); +// requestOrderPackageInfoVo.setMerge_number(mergeNumber); + requestOrderPackageInfoVo.setSend_car_number(tc_wla001); Date date = new Date(); SystemSign systemSign = new SystemSign(); systemSign.setTimestamp(date.getTime()); @@ -283,7 +291,7 @@ public class OrderServiceImpl implements IOrderService { */ private void staorderPackageInfo (ResponseStationOrderVo responseStationOrderVo){ responseStationOrderVo.getData().forEach(responseStationOrderInfoVo -> { - ResponseStaorderPackagesVo responseStaorderPackagesVo = orderPackageInfo(responseStationOrderInfoVo.getTC_WLB005(), null, responseStationOrderInfoVo.getTC_WLB008()); + ResponseStaorderPackagesVo responseStaorderPackagesVo = orderPackageInfo(responseStationOrderInfoVo.getTC_WLB005(), null, responseStationOrderInfoVo.getTC_WLA001()); if (responseStaorderPackagesVo.getCode() == 0) { responseStationOrderInfoVo.setPACKAGE_LIST(responseStaorderPackagesVo.getData()); }