project-zsy
/
gasWellWatch
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

redis, rtcp服务地址配置化

This commit is contained in:
wangshilong 2025-02-06 18:26:46 +08:00
parent c99e56c682
commit f9e1df0000
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/isu/gaswellwatch/modbus/data/Redis2DBPersistenceService.java
View File

@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ParameterizedTypeReference;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.data.redis.core.*; import org.springframework.data.redis.core.*;
@ -50,6 +51,8 @@ public class Redis2DBPersistenceService {
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@Resource(name = "stringRedisTemplate") @Resource(name = "stringRedisTemplate")
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
@Value("${app.modbus-rtcp-host:http://localhost:9999}")
private String modbusRtcpHost;
@Resource @Resource
private RabbitTemplate rabbitTemplate; private RabbitTemplate rabbitTemplate;
@Resource @Resource
@ -145,7 +148,7 @@ public class Redis2DBPersistenceService {
private void writeOnlineGateway() { private void writeOnlineGateway() {
try { try {
RequestEntity request = RequestEntity.get("http://localhost:9999/modbus-tcp/online").build(); RequestEntity request = RequestEntity.get(this.modbusRtcpHost + "/modbus-tcp/online").build();
ResponseEntity<Response<List<String>>> response = this.restTemplate.exchange(request, ResponseEntity<Response<List<String>>> response = this.restTemplate.exchange(request,
new ParameterizedTypeReference<Response<List<String>>>() { new ParameterizedTypeReference<Response<List<String>>>() {
}); });

5
src/main/resources/application-test.yaml
View File

@ -14,5 +14,8 @@ spring:
data: data:
redis: redis:
host: ${REDIS_HOST:172.17.0.1} host: ${REDIS_HOST:172.17.0.1}
port: ${REDIS_PORT:6379} port: ${REDIS_PORT:56379}
database: ${REDIS_DATABASE:1} database: ${REDIS_DATABASE:1}
app:
modbus-rtcp-host: http://172.17.0.1:9999