Merge branch 'dev' into pre-production

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

@@ -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/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;
-
 /**
  * 梦天数据 控制器
  *