Commit 1d2be9a9 authored by kiritoausna's avatar kiritoausna

重新拼接实时数据

parent ce929bfd
......@@ -18,7 +18,7 @@ import java.util.List;
*/
@Mapper
public interface WebMonitorLinkMapper extends BaseMapper<WebMonitorLink> {
@Select(value = "SELECT b.pointid,c.equipno as id,c.equipname as name FROM web_monitor_link b join tb_drybeachequipinfor c on c.equipno = b .deviceid where b.pointid in (select guid from web_monitor_points where chartid = #{chartid} )")
@Select(value = "SELECT b.pointid,c.equipno as id,c.equipname as name ,c.eqdanwei as unit FROM web_monitor_link b join tb_drybeachequipinfor c on c.equipno = b .deviceid where b.pointid in (select guid from web_monitor_points where chartid = #{chartid} )")
List<HashMap<String, Object>> getByChartId(int chartid);
@Select(value = "SELECT * FROM `web_monitor_link` where pointid = (select guid from web_monitor_points where guid = #{guid})")
......
......@@ -5,7 +5,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: dev
active: prod
jackson:
time-zone: GMT+8
data:
......@@ -28,9 +28,9 @@ spring:
redis:
#数据库索引
database: ${REDIS_DB:0}
host: ${REDIS_HOST:127.0.0.1}
port: ${REDIS_PORT:6399}
password: ${REDIS_PWD:R#9Xz&2Lp$Wq8v!u}
host: ${REDIS_HOST:8.142.46.126}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:}
#连接超时时间
timeout: 5000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment