上传RTU升级文件接收端改为json试

liurunyu

2024-11-08 65d05c6542ad066eafcbaaa6b078b0e917bf13a9

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java

@@ -1,15 +1,17 @@
package com.dy.rtuMw.web.comResult;

import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.http.*;
import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;

import java.nio.charset.StandardCharsets;

/**
 * @Author liurunyu
@@ -17,9 +19,10 @@
 * @LastEditTime 2023/12/21 20:28
 * @Description
 */
@Slf4j
@Component()
public class CommandResultDeal {

    private static final Logger log = LogManager.getLogger(CommandResultDeal.class.getName());

    private RestTemplate restTemplate;

@@ -29,11 +32,15 @@
    }

    public void deal(Data data) {
        if (data.rtuResultSendWebUrl != null && data.rtuResultSendWebUrl.trim().equals("")) {
        if (data.rtuResultSendWebUrl != null
                && !data.rtuResultSendWebUrl.trim().equals("")
                && !data.rtuResultSendWebUrl.trim().equals(Command.ignoreRtuResultSendWebUrl)) {
            String url = UriComponentsBuilder.fromUriString(data.rtuResultSendWebUrl)
                    .build()
                    .toUriString();
            restTemplate.getMessageConverters().set(1,new StringHttpMessageConverter(StandardCharsets.UTF_8));
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
            HttpEntity<?> httpEntity = new HttpEntity<>(data, headers);
            ResponseEntity<WebResponseVo> response = null;
            try {
@@ -42,7 +49,7 @@
            } catch (Exception e) {
                e.printStackTrace();
            }
            assert response != null;
            //assert response != null;
        } else {
            log.error("严重错误，在com.dy.aceMw.web.comResult.CommandResultDeal里，处理的是RTU命令结果Node，但数据中rtuResultSendWebUrl为空");
        }