java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改日志打印的方式

training
pref_mail@163.com 1 year ago
parent
c23d546200
commit
ce5f8612b7
4 changed files with 43 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
  2. 26
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
  3. 33
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
  4. 23
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java

9
blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
Unescape View File

@ -433,7 +433,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity = new AdvanceEntity();
advanceEntity.setOrderSelfNum(StringUtil.isBlank(factoryOrderEntity.getSelfCode()) ? "" : factoryOrderEntity.getSelfCode()); //订单自编号
advanceEntity.setSiteName(receivingOrderEntity.getCurrentWarehouseName()); // 基地 TODO 需要映射
advanceEntity.setSiteName(receivingOrderEntity.getFromWarehouseName()); // 基地 TODO 需要映射
advanceEntity.setArea(""); // 区域
advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空
advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空
@ -444,8 +444,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity.setMctsTruckNo(receivingOrderEntity.getPlate());// 车牌//字段没有了
advanceEntity.setFirstPackName(""); //一级品类
advanceEntity.setFirstPackCode(""); //一级品类
advanceEntity.setDealerName(factoryOrderEntity.getShopReceiver()); //商场名称
advanceEntity.setDealerCode(""); //商场编码
advanceEntity.setDealerName(factoryOrderEntity.getShopName()); //商场名称
advanceEntity.setDealerCode(factoryOrderEntity.getShopCode()); //商场编码
advanceEntity.setDueDate(""); // 交期
advanceEntity.setIsOpai(0); //是否干仓配
advanceEntity.setOrderNum("");//MSCS订单号 可以为空
@ -455,7 +455,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity.setCustomerRoad(StringUtil.isBlank(factoryOrderEntity.getCustomerAddress()) ? "" : factoryOrderEntity.getCustomerAddress());//顾客地址
advanceEntity.setSystemType("线上"); //订单类型
advanceEntity.setStoreNo(StringUtil.isBlank(factoryOrderEntity.getStoreCode()) ? "" : factoryOrderEntity.getStoreCode()); //门店编码
advanceEntity.setStoreName(StringUtil.isBlank(factoryOrderEntity.getStoreName()) ? "" : factoryOrderEntity.getStoreCode()); //门店名称
advanceEntity.setStoreName(StringUtil.isBlank(factoryOrderEntity.getStoreName()) ? "" : factoryOrderEntity.getStoreName()); //门店名称
advanceEntity.setSerialKey(""); //序列号
advanceEntity.setServiceNum(StringUtil.isBlank(factoryOrderEntity.getServiceNumber()) ? "" : factoryOrderEntity.getServiceNumber()); //服务号
advanceEntity.setMatingCode("");//齐套模式 可以为空
@ -472,7 +472,6 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
// Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId());
// 获取基地对应的ID
advanceEntity.setWarehouseId(warehourseId); //导入人仓库id TODO 需要提供映射
advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态：1=未开单，2=已开单

26
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
Unescape View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.logpm.factory.comfac.constant.FactoryConstant;
import com.logpm.factory.comfac.dto.*;
import com.logpm.factory.mt.dto.*;
import com.logpm.factory.mt.entity.*;
@ -283,25 +284,24 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
@Override
public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException, JsonProcessingException, NoSuchAlgorithmException {
logger.info("#############handleStatusData: orderStatusDTO={}", orderStatusDTO);
logger.info("TAG {} #############handleStatusData: orderStatusDTO={}", FactoryConstant.MENGT,orderStatusDTO);
String status = orderStatusDTO.getStatus();
// if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status) || "8".equals(status) || "9".equals(status)) {
//
// }
R rd = null;
if("4".equals(status)){
rd = shouhuoruku(orderStatusDTO);
}else if("7".equals(status)){
rd = qianshouScan(orderStatusDTO);
}else{
logger.info("#############handleStatusData: 当前数据的状态不推送 status={}", status);
return Resp.fail(400, "当前数据的状态不推送");
try{
if("4".equals(status)){
rd = shouhuoruku(orderStatusDTO);
}else if("7".equals(status)){
rd = qianshouScan(orderStatusDTO);
}else{
return Resp.fail(400, "当前数据的状态不推送");
}
}catch (Exception e){
rd = Resp.fail(401,e.getMessage());
logger.error("TAG {} ############# error {}", FactoryConstant.MENGT, e.getMessage());
}
logger.info("##################orderStatusHandler: 异常tag={}", 0);
return rd;

33
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
Unescape View File

@ -318,7 +318,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
String unitNo = orderStatusDTO.getUnitNo();
String operationTime = orderStatusDTO.getOperationTime();
if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status) || "8".equals(status) || "9".equals(status)) {
log.warn(FactoryConstant.OUPAI,"#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status);
log.warn("#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status);
return Resp.fail(400, "当前数据的状态不推送");
}
@ -332,12 +332,12 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
}
String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id
if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {
log.warn(FactoryConstant.OUPAI,"##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
log.warn("##############oupai-handleStatusData: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
return Resp.fail(400, "仓库数据有误");
}
if (!currentWarehouseId.equals(destinationWarehouseId)) {
log.info(FactoryConstant.OUPAI,"##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
log.info("##############oupai-handleStatusData: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
return Resp.fail(400, "不是目的仓");
}
@ -350,7 +350,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
// 如何判断这个包间是非干仓配的数据
if (!"经销商".equals(factoryOrder.getBusinessModel())) {
log.info(FactoryConstant.OUPAI,"oupai- 该包条为干仓配的数据类型 不进行推送 >>> unitNo={} businessModel:{}", unitNo, factoryOrder.getBusinessModel());
log.info("oupai- 该包条为干仓配的数据类型 不进行推送 >>> unitNo={} businessModel:{}", unitNo, factoryOrder.getBusinessModel());
return Resp.fail(400, "包条为干仓配的数据类型");
}
@ -358,7 +358,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
ReceivingOrderEntity receivingOrderEntity = receivingOrderMapper.selectById(factoryOrder.getReceivingId());
if (Objects.isNull(receivingOrderEntity)) {
log.info(FactoryConstant.OUPAI,"oupai- 该订单为没有收货单 不进行推送 >>> receivingId={} ", factoryOrder.getReceivingId());
log.info(" 该订单为没有收货单 不进行推送 >>> receivingId={} ", factoryOrder.getReceivingId());
return Resp.fail(400, "未查询到该单据推送收货单信息");
}
@ -367,7 +367,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
detailObject.put("WarehouseBelong", "oppein");
detailObject.put("Creator", orderStatusDTO.getUsername());
detailObject.put("PackageCode", unitNo);
detailObject.put("Operate", "到货");
detailObject.put("Operate", "收货");
// 查询系统的包件对象
LambdaQueryWrapper<FactoryPackageEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@ -379,9 +379,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
OpPackagePushLogEntity opPackagePushLogEntity = sendPushOuPaiData(factoryPackageEntity.getId(), url, 1, detailObject);
// 需要盘点这个对象的
String resp = opPackagePushLogEntity.getResp();
// 转换为json
// JSONObject respJson = JSONObject.parseObject(resp);
log.info(FactoryConstant.OUPAI,">>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}", resp);
log.info(" >>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}",resp);
// TODO: 2023/10/25 不知道返回成功的状态是多少
// 需要修改包件对应的状态
@ -418,7 +419,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
try {
rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_SIGN_EXCHANGE, RabbitConstant.OUPAI_SIGN_ROUTING, map);
} catch (Exception e) {
log.error(FactoryConstant.OUPAI,"############handlePackageData: {}", e.getMessage());
log.error("############handlePackageData: {}", e.getMessage());
}
}
@ -521,11 +522,11 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
try {
JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getResponseBody());
JSONArray resultArray = jsonObject.getJSONArray("value");
log.info(FactoryConstant.OUPAI,"############handleData: 数据处理开始");
log.info("############handleData: 数据处理开始");
analyzeData(resultArray);
opOrderStatusLogEntity.setDataStatus(1);
} catch (Exception e) {
log.error(FactoryConstant.OUPAI,">>>> error {}", e.getMessage());
log.error(">>>> TAG {} error {}",FactoryConstant.OUPAI, e.getMessage());
opOrderStatusLogEntity.setDataStatus(2);
}
@ -542,7 +543,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
for (int i = 0; i < resultArray.size(); i++) {
JSONObject valueObject = resultArray.getJSONObject(i);
if (Objects.isNull(valueObject)) {
log.warn(FactoryConstant.OUPAI,"############handleData: value中没有数据");
log.warn("############handleData: value中没有数据");
throw new CustomerException(403, "value中没有数据");
}
JSONObject fromWarehouse = valueObject.getJSONObject("FromWarehouse");
@ -613,7 +614,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
JSONObject packageEntity = packages.getJSONObject(j);//包件信息
JSONObject orderEntity = packageEntity.getJSONObject("Order");//订单信息
if(orderEntity==null){
log.info(FactoryConstant.OUPAI,"包件数据没有订单信息 packageCode {}",packageEntity.getString("Code"));
log.info("包件数据没有订单信息 packageCode {}",packageEntity.getString("Code"));
continue;
}
String selfCode = orderEntity.getString("SelfCode");//订单自编码
@ -719,7 +720,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
factoryOrderEntity.setTurnStatus(0);
boolean save = factoryOrderService.save(factoryOrderEntity);
if (!save) {
log.warn(FactoryConstant.OUPAI,"############handleData: 保存订单失败 selfCode={}", selfCode);
log.warn("############handleData: 保存订单失败 selfCode={}", selfCode);
throw new CustomerException(403, "保存订单失败");
}
}
@ -824,19 +825,19 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
}
}
} else {
log.info(FactoryConstant.OUPAI,"############handleData: 包件码已存在 packageCode={}", packageCode);
log.info("############handleData: 包件码已存在 packageCode={}", packageCode);
throw new CustomerException(403, "包件码已存在");
}
}
} else {
log.error(FactoryConstant.OUPAI,"############handleData: 保存发货单数据失败 code={}", code);
log.error("############handleData: 保存发货单数据失败 code={}", code);
throw new CustomerException(403, "保存发货单数据失败");
}
Date end = new Date();
long startLong = start.getTime();
long endLong = end.getTime();
long l = endLong - startLong;
log.info(FactoryConstant.OUPAI,"############handleData: 数据处理完成 耗时 {} 毫秒", l);
log.info("############handleData: 数据处理完成 耗时 {} 毫秒", l);
}
}

23
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java
Unescape View File

@ -74,24 +74,14 @@ public class OrderStatusHandler {
r = panFactoryDataService.handleStatusData(orderStatusDTO);
int code = r.getCode();
if (code == 400 || code == 200) {
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.PIANO, orderSelfNum);
// channel.basicAck(deliveryTag,true);
} else {
throw new CustomerException(code, r.getMsg());
}
break;
case FactoryConstant.MENGT:
try {
r = mtFactoryDataService.handleStatusData(orderStatusDTO);
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
} catch (CustomerException rc) {
rc.printStackTrace();
if (200 != rc.code || 400 != rc.code) {
throw new CustomerException("程序异常，需要重试");
}
}
r = mtFactoryDataService.handleStatusData(orderStatusDTO);
code = r.getCode();
if (code == 400 || code == 200) {
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
@ -104,7 +94,7 @@ public class OrderStatusHandler {
r = zbFactoryDataService.handleStatusData(orderStatusDTO);
int resultCode = r.getCode();
if (resultCode == 400 || resultCode == 200) {
log.info("##################orderStatusHandler: 该条数据不用处理 orderNo={}", orderSelfNum);
log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.ZHIBANG, orderSelfNum);
// channel.basicAck(deliveryTag,true);
} else {
throw new CustomerException(resultCode, r.getMsg());
@ -113,7 +103,12 @@ public class OrderStatusHandler {
case FactoryConstant.OUPAI:
r = ouPaiFactoryService.handleStatusData(orderStatusDTO);
if (r.getCode() == 400 || r.getCode() == 200) {
log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.OUPAI, orderSelfNum);
// channel.basicAck(deliveryTag,true);
} else {
throw new CustomerException(r.getCode(), r.getMsg());
}
default:

Write Preview
Loading…
Cancel
Save