Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -690,7 +690,6 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 
 		logger.info("##############sendMtFactoryData 发送数据:  {}", data);
 
-
 		//先获取token
 		String token = getMtToken();
 		//处理逻辑
@@ -700,7 +699,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 			.header("USERID", mtFactoryProperties.getUserid())
 			.header("USERPWD", MD5Utils.md5Hex(mtFactoryProperties.getUserpwd().getBytes(StandardCharsets.UTF_8)))
 			.header("Content-Type", "application/json")
-			.body(data).timeout(5 * 1000)
+			.body(data).timeout(30 * 1000)
 			.execute().body();
 
 		logger.info("##############sendMtFactoryData 接受数据:  {}", result);
@@ -718,7 +717,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 		if (!Objects.isNull(jsonObject)) {
 			Integer code = jsonObject.getInteger("Result");
 			String message = jsonObject.getString("Message");
-			if (code.equals(0)) {
+			if (0==code) {
 				logger.info("##########sendMtFactoryData: 物流状态传递成功");
 				return Resp.success("物流状态传递成功");
 			} else {