10 changed files with 451 additions and 26 deletions
@ -0,0 +1,74 @@
|
||||
package com.logpm.factorydata.linsy.config; |
||||
|
||||
import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; |
||||
import org.slf4j.Logger; |
||||
import org.slf4j.LoggerFactory; |
||||
import org.springframework.beans.factory.annotation.Value; |
||||
import org.springframework.context.annotation.Bean; |
||||
import org.springframework.context.annotation.Configuration; |
||||
|
||||
/** |
||||
* xxl-job config |
||||
* |
||||
* @author xuxueli 2017-04-28 |
||||
*/ |
||||
@Configuration(proxyBeanMethods = false) |
||||
public class XxlJobConfig { |
||||
private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class); |
||||
|
||||
@Value("${xxl.job.admin.addresses}") |
||||
private String adminAddresses; |
||||
|
||||
@Value("${xxl.job.executor.appname}") |
||||
private String appName; |
||||
|
||||
@Value("${xxl.job.executor.ip}") |
||||
private String ip; |
||||
|
||||
@Value("${xxl.job.executor.port}") |
||||
private int port; |
||||
|
||||
@Value("${xxl.job.accessToken}") |
||||
private String accessToken; |
||||
|
||||
@Value("${xxl.job.executor.logpath}") |
||||
private String logPath; |
||||
|
||||
@Value("${xxl.job.executor.logretentiondays}") |
||||
private int logRetentionDays; |
||||
|
||||
|
||||
@Bean |
||||
public XxlJobSpringExecutor xxlJobExecutor() { |
||||
logger.info(">>>>>>>>>>> xxl-job config init."); |
||||
XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); |
||||
xxlJobSpringExecutor.setAdminAddresses(adminAddresses); |
||||
xxlJobSpringExecutor.setAppName(appName); |
||||
xxlJobSpringExecutor.setIp(ip); |
||||
xxlJobSpringExecutor.setPort(port); |
||||
xxlJobSpringExecutor.setAccessToken(accessToken); |
||||
xxlJobSpringExecutor.setLogPath(logPath); |
||||
xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); |
||||
|
||||
return xxlJobSpringExecutor; |
||||
} |
||||
|
||||
/** |
||||
* 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP； |
||||
* |
||||
* 1、引入依赖： |
||||
* <dependency> |
||||
* <groupId>org.springframework.cloud</groupId> |
||||
* <artifactId>spring-cloud-commons</artifactId> |
||||
* <version>${version}</version> |
||||
* </dependency> |
||||
* |
||||
* 2、配置文件，或者容器启动变量 |
||||
* spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.' |
||||
* |
||||
* 3、获取IP |
||||
* String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); |
||||
*/ |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,51 @@
|
||||
package com.logpm.factorydata.linsy.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.mp.base.BaseEntity; |
||||
|
||||
/** |
||||
* 林氏自定义回传 实体类 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-26 |
||||
*/ |
||||
@Data |
||||
@TableName("linsy_custom_push") |
||||
@ApiModel(value = "林氏自定义回传", description = "林氏自定义回传") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class CustomPushEntity extends BaseEntity { |
||||
|
||||
@ApiModelProperty(name = "订单号", notes = "") |
||||
private String orderCode; |
||||
|
||||
@ApiModelProperty(name = "仓库", notes = "") |
||||
private String departureWarehouseName; |
||||
|
||||
@ApiModelProperty(name = "包件码", notes = "") |
||||
private String destinationWarehouseName; |
||||
|
||||
@ApiModelProperty(name = "返回内容", notes = "") |
||||
private String result; |
||||
|
||||
@ApiModelProperty(name = "返回码", notes = "") |
||||
private String resultCode; |
||||
|
||||
@ApiModelProperty(name = "状态 1已发送 0未发送", notes = "") |
||||
private Integer sendStatus; |
||||
|
||||
@ApiModelProperty(name = "预留1", notes = "") |
||||
private String reserve1; |
||||
@ApiModelProperty(name = "预留2", notes = "") |
||||
private String reserve2; |
||||
@ApiModelProperty(name = "预留3", notes = "") |
||||
private String reserve3; |
||||
@ApiModelProperty(name = "预留4", notes = "") |
||||
private String reserve4; |
||||
@ApiModelProperty(name = "预留5", notes = "") |
||||
private String reserve5; |
||||
|
||||
} |
||||
@ -0,0 +1,173 @@
|
||||
package com.logpm.factorydata.linsy.job; |
||||
|
||||
import cn.hutool.core.collection.CollUtil; |
||||
import cn.hutool.http.HttpUtil; |
||||
import cn.hutool.json.JSONObject; |
||||
import cn.hutool.json.JSONUtil; |
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
||||
import com.logpm.factorydata.linsy.entity.CustomPushEntity; |
||||
import com.logpm.factorydata.linsy.entity.FactoryNodePushEntity; |
||||
import com.logpm.factorydata.linsy.entity.PackageInfoEntity; |
||||
import com.logpm.factorydata.linsy.enums.FactoryNodeEnums; |
||||
import com.logpm.factorydata.linsy.pros.LinsyProperties; |
||||
import com.logpm.factorydata.linsy.service.CustomPushService; |
||||
import com.logpm.factorydata.linsy.service.FactoryNodePushService; |
||||
import com.logpm.factorydata.linsy.service.PackageInfoService; |
||||
import com.xxl.job.core.biz.model.ReturnT; |
||||
import com.xxl.job.core.handler.annotation.XxlJob; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springframework.stereotype.Component; |
||||
|
||||
import java.util.List; |
||||
import java.util.stream.Collectors; |
||||
|
||||
/** |
||||
* 自动回传工厂 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-02 |
||||
*/ |
||||
@AllArgsConstructor |
||||
@Component |
||||
@Slf4j |
||||
public class CustomPushJob { |
||||
|
||||
private final CustomPushService customPushService; |
||||
private final PackageInfoService packageInfoService; |
||||
private final LinsyProperties linsyProperties; |
||||
private final FactoryNodePushService factoryNodePushService; |
||||
|
||||
/** |
||||
* 自定义回传交接 |
||||
* |
||||
* @param param |
||||
* @return |
||||
* @throws Exception |
||||
*/ |
||||
@XxlJob("customPushFactoryDataOne") |
||||
public ReturnT<String> customPushFactoryDataOne(String param) throws Exception { |
||||
List<CustomPushEntity> list = customPushService.list(Wrappers.<CustomPushEntity>lambdaQuery() |
||||
.lt(CustomPushEntity::getSendStatus, 10) |
||||
.last(" limit 1 ") |
||||
); |
||||
if (CollUtil.isNotEmpty(list)) { |
||||
CustomPushEntity customPushEntity = list.get(0); |
||||
String orderCode = customPushEntity.getOrderCode(); |
||||
List<PackageInfoEntity> list1 = packageInfoService.list(Wrappers.<PackageInfoEntity>lambdaQuery() |
||||
.eq(PackageInfoEntity::getOrderCode, orderCode) |
||||
); |
||||
if (CollUtil.isNotEmpty(list1)) { |
||||
PackageInfoEntity infoEntity = list1.get(0); |
||||
JSONObject sendObj = new JSONObject(); |
||||
sendObj.set("billCode", infoEntity.getBillCode()); |
||||
sendObj.set("status", FactoryNodeEnums.INITIAL_WAREHOUSE_ENTRY.getText()); |
||||
sendObj.set("packages", list1.stream().map(packageInfoEntity -> { |
||||
JSONObject jsonObject = new JSONObject(); |
||||
jsonObject.set("barcode", packageInfoEntity.getBarcode()); |
||||
return jsonObject; |
||||
}).collect(Collectors.toList())); |
||||
log.info("推送工厂：{}", JSONUtil.toJsonStr(sendObj)); |
||||
String url = linsyProperties.getHost() + linsyProperties.getPushNodeUrl(); |
||||
try { |
||||
if (linsyProperties.getEnable()) { |
||||
String result = HttpUtil.post(url, JSONUtil.toJsonStr(sendObj)); |
||||
log.info("推送工厂结果：{}", result); |
||||
// 保存推送记录
|
||||
factoryNodePushService.save(FactoryNodePushEntity.builder() |
||||
.billCode(orderCode) |
||||
.node(FactoryNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode().toString()) |
||||
.content(JSONUtil.toJsonStr(sendObj)) |
||||
.resultContent(result) |
||||
.build()); |
||||
customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate() |
||||
.set(CustomPushEntity::getSendStatus, 10) |
||||
.set(CustomPushEntity::getResult, result) |
||||
.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) |
||||
); |
||||
// 封装需要修改作业节点状态的数据
|
||||
packageInfoService.update(Wrappers.<PackageInfoEntity>lambdaUpdate() |
||||
.set(PackageInfoEntity::getWorkedNodeCode, FactoryNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode().toString()) |
||||
.eq(PackageInfoEntity::getOrderCode, orderCode)); |
||||
} |
||||
} catch (Exception e) { |
||||
log.error("推送工厂失败：{}", e); |
||||
} |
||||
}else{ |
||||
customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate() |
||||
.set(CustomPushEntity::getSendStatus, 10) |
||||
.set(CustomPushEntity::getResult, "未查询到订单包件") |
||||
.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) |
||||
); |
||||
} |
||||
} |
||||
return ReturnT.SUCCESS; |
||||
} |
||||
|
||||
/** |
||||
* 自定义回传收货 |
||||
* |
||||
* @param param |
||||
* @return |
||||
* @throws Exception |
||||
*/ |
||||
@XxlJob("customPushFactoryDataTwo") |
||||
public ReturnT<String> customPushFactoryDataTwo(String param) throws Exception { |
||||
List<CustomPushEntity> list = customPushService.list(Wrappers.<CustomPushEntity>lambdaQuery() |
||||
.lt(CustomPushEntity::getSendStatus, 20) |
||||
.last(" limit 1 ") |
||||
); |
||||
if (CollUtil.isNotEmpty(list)) { |
||||
CustomPushEntity customPushEntity = list.get(0); |
||||
String orderCode = customPushEntity.getOrderCode(); |
||||
List<PackageInfoEntity> list1 = packageInfoService.list(Wrappers.<PackageInfoEntity>lambdaQuery() |
||||
.eq(PackageInfoEntity::getOrderCode, orderCode) |
||||
); |
||||
if (CollUtil.isNotEmpty(list1)) { |
||||
PackageInfoEntity infoEntity = list1.get(0); |
||||
JSONObject sendObj = new JSONObject(); |
||||
sendObj.set("billCode", infoEntity.getBillCode()); |
||||
sendObj.set("status", FactoryNodeEnums.END_WAREHOUSE_UNLOADING.getText()); |
||||
sendObj.set("packages", list1.stream().map(packageInfoEntity -> { |
||||
JSONObject jsonObject = new JSONObject(); |
||||
jsonObject.set("barcode", packageInfoEntity.getBarcode()); |
||||
return jsonObject; |
||||
}).collect(Collectors.toList())); |
||||
log.info("推送工厂：{}", JSONUtil.toJsonStr(sendObj)); |
||||
String url = linsyProperties.getHost() + linsyProperties.getPushNodeUrl(); |
||||
try { |
||||
if (linsyProperties.getEnable()) { |
||||
String result = HttpUtil.post(url, JSONUtil.toJsonStr(sendObj)); |
||||
log.info("推送工厂结果：{}", result); |
||||
// 保存推送记录
|
||||
factoryNodePushService.save(FactoryNodePushEntity.builder() |
||||
.billCode(orderCode) |
||||
.node(FactoryNodeEnums.END_WAREHOUSE_UNLOADING.getCode().toString()) |
||||
.content(JSONUtil.toJsonStr(sendObj)) |
||||
.resultContent(result) |
||||
.build()); |
||||
customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate() |
||||
.set(CustomPushEntity::getSendStatus, 20) |
||||
.set(CustomPushEntity::getResult, result) |
||||
.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) |
||||
); |
||||
// 封装需要修改作业节点状态的数据
|
||||
packageInfoService.update(Wrappers.<PackageInfoEntity>lambdaUpdate() |
||||
.set(PackageInfoEntity::getWorkedNodeCode, FactoryNodeEnums.END_WAREHOUSE_UNLOADING.getCode().toString()) |
||||
.eq(PackageInfoEntity::getOrderCode, orderCode)); |
||||
} |
||||
} catch (Exception e) { |
||||
log.error("推送工厂失败：{}", e); |
||||
} |
||||
}else{ |
||||
customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate() |
||||
.set(CustomPushEntity::getSendStatus, 20) |
||||
.set(CustomPushEntity::getResult, "未查询到订单包件") |
||||
.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode()) |
||||
); |
||||
} |
||||
} |
||||
return ReturnT.SUCCESS; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,16 @@
|
||||
package com.logpm.factorydata.linsy.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.logpm.factorydata.linsy.entity.CustomPushEntity; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
|
||||
/** |
||||
* 自定义回传 mapper |
||||
* |
||||
* @author zqb |
||||
* @since 2024-03-26 |
||||
*/ |
||||
@Mapper |
||||
public interface CustomPushMapper extends BaseMapper<CustomPushEntity> { |
||||
|
||||
} |
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.factorydata.linsy.mapper.CustomPushMapper"> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.factorydata.linsy.service; |
||||
|
||||
import com.logpm.factorydata.linsy.entity.CustomPushEntity; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
|
||||
/** |
||||
* 自定义回传 服务类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
public interface CustomPushService extends BaseService<CustomPushEntity> { |
||||
|
||||
} |
||||
@ -0,0 +1,22 @@
|
||||
package com.logpm.factorydata.linsy.service.impl; |
||||
|
||||
import com.logpm.factorydata.linsy.entity.CustomPushEntity; |
||||
import com.logpm.factorydata.linsy.mapper.CustomPushMapper; |
||||
import com.logpm.factorydata.linsy.service.CustomPushService; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
/** |
||||
* 自定义回传 业务实现类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
@Slf4j |
||||
@Service |
||||
@AllArgsConstructor |
||||
public class CustomPushServiceImpl extends BaseServiceImpl<CustomPushMapper, CustomPushEntity> implements CustomPushService { |
||||
|
||||
} |
||||
Loading…
Reference in new issue