1、优化代码；2、修改长级测试中发现的bug；3、通信中间件配置文件配置项修改

liurunyu

2024-11-20 14d7f0df63340ede75458c0e91b902376ef4dd64

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

@@ -1,7 +1,11 @@
package com.dy.rtuMw.web.comResult;

import com.dy.common.contant.Constant;
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.Data;
import lombok.extern.slf4j.Slf4j;
import com.dy.rtuMw.server.ServerProperties;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.http.converter.StringHttpMessageConverter;
@@ -15,11 +19,12 @@
 * @Author liurunyu
 * @Date 2023/12/21 20:28
 * @LastEditTime 2023/12/21 20:28
 * @Description
 * @Description 通信中间件对外进行web调用，把命令结果发送出去
 */
@Slf4j
@Component()
public class CommandResultDeal {

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

    private RestTemplate restTemplate;

@@ -29,19 +34,23 @@
    }

    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"));
            headers.set(Constant.UserTokenKeyInHeader, ServerProperties.orgTag);
            HttpEntity<?> httpEntity = new HttpEntity<>(data, headers);
            ResponseEntity<WebResponseVo> response = null;
            try {
                // 通过Post方式调用接口
                response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, WebResponseVo.class);
            } catch (Exception e) {
                log.error("命令结果回调发生异常", e);
                e.printStackTrace();
            }
            //assert response != null;