元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Administrator
2024-06-14 16158b89f0223db6a4501e5263f6d2817b562b09 
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java


@@ -3,13 +3,13 @@


import com.dy.common.mw.protocol.Data;


import lombok.extern.slf4j.Slf4j;


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


@@ -29,11 +29,13 @@


    }




    public void deal(Data data) {


        if (data.rtuResultSendWebUrl != null && data.rtuResultSendWebUrl.trim().equals("")) {


        if (data.rtuResultSendWebUrl != null && !data.rtuResultSendWebUrl.trim().equals("")) {


            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 +44,7 @@


            } catch (Exception e) {


                e.printStackTrace();


            }


            assert response != null;


            //assert response != null;


        } else {


            log.error("严重错误，在com.dy.aceMw.web.comResult.CommandResultDeal里，处理的是RTU命令结果Node，但数据中rtuResultSendWebUrl为空");


        }