Merge branch 'pre-production'

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java

@@ -141,7 +141,7 @@ public class NodeDataPushListener {
 							.packageCode(centralStkInVO.getPackageCode())
 							.type("收货")
 							.build();
-						sendFactory(s, "mt.poc.ht_yc_noms.CentralStkIn", mengTianProperties.getCentralStkInUrl(), entity);
+						sendFactory(s, mengTianProperties.getCentralStkInCode(), mengTianProperties.getCentralStkInUrl(), entity);
 					}
 				}
 			}
@@ -207,7 +207,7 @@ public class NodeDataPushListener {
 						.packageCode(packageCodes)
 						.type("确认收货")
 						.build();
-					sendFactory(s, "mt.poc.ht_yc_noms.CentralStkInConfirm", mengTianProperties.getCentralStkInConfirmUrl(), entity);
+					sendFactory(s, mengTianProperties.getCentralStkInConfirmCode(), mengTianProperties.getCentralStkInConfirmUrl(), entity);
 				}
 			}
 		}
@@ -260,7 +260,7 @@ public class NodeDataPushListener {
 						.type("签收")
 						.sendTaskId(signForVO.getSendTaskId())
 						.build();
-					sendFactory(s, "mt.poc.ht_yc_noms.SignFor", mengTianProperties.getSignForUrl(), entity);
+					sendFactory(s, mengTianProperties.getSignForCode(), mengTianProperties.getSignForUrl(), entity);
 				}
 			}
 		}
@@ -320,7 +320,7 @@ public class NodeDataPushListener {
 				.type("确认签收")
 				.sendTaskId(confirmVO.getSendTaskId())
 				.build();
-			sendFactory(s, "mt.poc.ht_yc_noms.SignForConfirm", mengTianProperties.getSignForConfirmUrl(), entity);
+			sendFactory(s, mengTianProperties.getSignForConfirmCode(), mengTianProperties.getSignForConfirmUrl(), entity);
 		}
 	}
 
@@ -351,7 +351,7 @@ public class NodeDataPushListener {
 			entity.setResultContent(resBody);
 			entity.setSendStatus(StrUtil.isEmpty(resultCode) ? "-1" : resultCode);
 		} catch (Exception e) {
-			entity.setResultContent(resBody);
+			entity.setResultContent(e.getMessage());
 			entity.setSendStatus("-1");
 		}
 		factoryNodePushService.save(entity);

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java

@@ -18,12 +18,16 @@ public class MengTianProperties {
 	 * 收货 url
 	 */
 	private String centralStkInUrl;
+	private String centralStkInCode;
 	/** 确认收货 url */
 	private String centralStkInConfirmUrl;
+	private String centralStkInConfirmCode;
 	/** 签收扫描 url */
 	private String signForUrl;
+	private String signForCode;
 	/** 确认签收 url */
 	private String signForConfirmUrl;
+	private String signForConfirmCode;
 	/**
 	 * 是否推送工厂
 	 */

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java

@@ -22,7 +22,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.google.gson.Gson;
 import com.logpm.factory.comfac.service.IAsyncDataService;
 import com.logpm.factory.comfac.service.IOrderStatusLogService;
 import com.logpm.factory.mt.dto.MtFactoryDataDTO;
@@ -42,7 +41,6 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -57,8 +55,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import static com.alibaba.druid.util.FnvHash.Constants.GSON;
-
 /**
  * 梦天数据 控制器
  *