Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -111,7 +112,7 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 	public boolean saveOrUpdateBasicdataStoreContact(BasicdataStoreContactEntity basicdataStoreContact) {
 		//进行客户列表的联系人修改
 		Long shopId = basicdataStoreContact.getShopId();
-		if (basicdataStoreContact.getDefaultType()){
+		if (!Objects.isNull(basicdataStoreContact.getDefaultType()) &&basicdataStoreContact.getDefaultType()){
 			BasicdataClientEntity basicdataClientEntity = new BasicdataClientEntity();
 			basicdataClientEntity.setId(shopId);
 			basicdataClientEntity.setLinkman(basicdataStoreContact.getLinkman());

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

@@ -312,22 +312,29 @@ public class NodeDataPushListener {
 	}
 
 	private void sendFactory(String body, String operationCode, String url, FactoryNodePushEntity entity) {
+
 		log.info("推送工厂：{}", body);
 		HttpRequest post = HttpUtil.createPost(mengTianProperties.getHost() + url);
 		post.header("ClientId", "mt.ht");
 		post.header("OperationCode", operationCode);
+		post.timeout(5000);
 		post.body(body);
+		// 存入日志表
+		entity.setContent(body);
+		entity.setOperationCode(operationCode);
+		entity.setSendUrl(mengTianProperties.getHost() + url);
+		try {
 			HttpResponse execute = post.execute();
 			String resBody = execute.body();
 			log.info("推送工厂结果：{}", resBody);
 			JSONObject entries = JSONUtil.parseObj(resBody);
 			String resultCode = entries.getStr("Result");
-		// 存入日志表
-		entity.setContent(body);
-		entity.setOperationCode(operationCode);
-		entity.setSendUrl(mengTianProperties.getHost() + url);
 			entity.setResultContent(resBody);
 			entity.setSendStatus(StrUtil.isEmpty(resultCode) ? "0" : resultCode);
+		} catch (Exception e) {
+			entity.setResultContent(e.getMessage());
+			entity.setSendStatus("0");
+		}
 		factoryNodePushService.save(entity);
 	}