Skip to content

N
New MineTRS
Commit 1d2be9a9 authored by kiritoausna's avatar kiritoausna
Browse files
Options

重新拼接实时数据

parent ce929bfd
Hide whitespace changes
Inline Side-by-side
Showing with 321 additions and 319 deletions
eladmin-system/src/main/java/me/zhengjie/gemho/mapper/web/WebMonitorLinkMapper.java
View file @ 1d2be9a9
...@@ -18,7 +18,7 @@ import java.util.List; ...@@ -18,7 +18,7 @@ import java.util.List;
*/ */
@Mapper @Mapper
public interface WebMonitorLinkMapper extends BaseMapper<WebMonitorLink> { 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); 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})") @Select(value = "SELECT * FROM `web_monitor_link` where pointid = (select guid from web_monitor_points where guid = #{guid})")
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/web/impl/WebMonitorChartServiceImpl.java
View file @ 1d2be9a9
...@@ -38,331 +38,333 @@ import java.util.*; ...@@ -38,331 +38,333 @@ import java.util.*;
@Transactional @Transactional
@Service @Service
public class WebMonitorChartServiceImpl extends ServiceImpl<WebMonitorChartMapper, WebMonitorChart> implements IWebMonitorChartService { public class WebMonitorChartServiceImpl extends ServiceImpl<WebMonitorChartMapper, WebMonitorChart> implements IWebMonitorChartService {
@Autowired @Autowired
private WebMonitorChartMapper webMonitorChartMapper; private WebMonitorChartMapper webMonitorChartMapper;
@Autowired @Autowired
private WebMonitorIconMapper webMonitorIconMapper; private WebMonitorIconMapper webMonitorIconMapper;
@Autowired @Autowired
private WebMonitorPointsMapper webMonitorPointsMapper; private WebMonitorPointsMapper webMonitorPointsMapper;
@Autowired @Autowired
private WebMonitorLinkMapper webMonitorLinkMapper; private WebMonitorLinkMapper webMonitorLinkMapper;
@Autowired @Autowired
private DrybeachequipinforMapper drybeachequipinforMapper; private DrybeachequipinforMapper drybeachequipinforMapper;
@Autowired @Autowired
private OnlineUserService onlineUserService; private OnlineUserService onlineUserService;
@Autowired @Autowired
private TabAbnormalMapper tabAbnormalMapper; private TabAbnormalMapper tabAbnormalMapper;
@Autowired @Autowired
private RedisUtils redisUtils; private RedisUtils redisUtils;
@Autowired @Autowired
private DrybeachequipinforService drybeachequipinforService; private DrybeachequipinforService drybeachequipinforService;
@Autowired @Autowired
private RealDataController realDataController; private RealDataController realDataController;
@Override @Override
public boolean deal(WebMonitorChart webMonitorChart, HttpServletRequest request) { public boolean deal(WebMonitorChart webMonitorChart, HttpServletRequest request) {
boolean result = false; boolean result = false;
String currentUsername = SecurityUtils.getCurrentUsername(); String currentUsername = SecurityUtils.getCurrentUsername();
String tailno = onlineUserService.gettailno(currentUsername, request); String tailno = onlineUserService.gettailno(currentUsername, request);
if (tailno == null) { if (tailno == null) {
return false; return false;
} }
webMonitorChart.setTailingno(tailno); webMonitorChart.setTailingno(tailno);
//判断是否存在 //判断是否存在
QueryWrapper<WebMonitorChart> webMonitorChartQueryWrapper = new QueryWrapper<>(); QueryWrapper<WebMonitorChart> webMonitorChartQueryWrapper = new QueryWrapper<>();
webMonitorChartQueryWrapper.eq("tailingno", tailno); webMonitorChartQueryWrapper.eq("tailingno", tailno);
WebMonitorChart monitorChart = webMonitorChartMapper.selectOne(webMonitorChartQueryWrapper); WebMonitorChart monitorChart = webMonitorChartMapper.selectOne(webMonitorChartQueryWrapper);
if (monitorChart != null) { if (monitorChart != null) {
int update = webMonitorChartMapper.update(webMonitorChart, webMonitorChartQueryWrapper); int update = webMonitorChartMapper.update(webMonitorChart, webMonitorChartQueryWrapper);
if (update > 0) { if (update > 0) {
result = true; result = true;
} }
} else { } else {
int insert = webMonitorChartMapper.insert(webMonitorChart); int insert = webMonitorChartMapper.insert(webMonitorChart);
if (insert > 0) { if (insert > 0) {
result = true; result = true;
} }
} }
return result; return result;
} }
@Override @Override
public boolean depic(int id) { public boolean depic(int id) {
int delpic = webMonitorChartMapper.delpic(id); int delpic = webMonitorChartMapper.delpic(id);
if (delpic > 0) { if (delpic > 0) {
return true; return true;
} }
return false; return false;
} }
@Override @Override
public MonitorChartVo getmonbase(HttpServletRequest request) { public MonitorChartVo getmonbase(HttpServletRequest request) {
//获取当前尾矿库编码 //获取当前尾矿库编码
String currentUsername = SecurityUtils.getCurrentUsername(); String currentUsername = SecurityUtils.getCurrentUsername();
String tailno = onlineUserService.gettailno(currentUsername, request); String tailno = onlineUserService.gettailno(currentUsername, request);
//构建返回结构 //构建返回结构
MonitorChartVo monitorChartVo = new MonitorChartVo(); MonitorChartVo monitorChartVo = new MonitorChartVo();
//获取监测点图标 //获取监测点图标
List<WebMonitorIcon> webMonitorIcons = webMonitorIconMapper.selectList(null); List<WebMonitorIcon> webMonitorIcons = webMonitorIconMapper.selectList(null);
monitorChartVo.setIcons(webMonitorIcons); monitorChartVo.setIcons(webMonitorIcons);
//获取可配置的设备列表 //获取可配置的设备列表
List<HashMap<String, Object>> device = drybeachequipinforMapper.getDevice(tailno); List<HashMap<String, Object>> device = drybeachequipinforMapper.getDevice(tailno);
monitorChartVo.setDevices(device); monitorChartVo.setDevices(device);
//获取对应尾矿库的图片 //获取对应尾矿库的图片
WebMonitorChart webMonitorChart = webMonitorChartMapper.getpic(tailno); WebMonitorChart webMonitorChart = webMonitorChartMapper.getpic(tailno);
HashMap<String, Integer> id1 = webMonitorChartMapper.getId(tailno); HashMap<String, Integer> id1 = webMonitorChartMapper.getId(tailno);
if (id1 != null) { if (id1 != null) {
Integer cid = id1.get("id"); Integer cid = id1.get("id");
monitorChartVo.setChart(webMonitorChart); monitorChartVo.setChart(webMonitorChart);
//获取对应检测项配置的监测点信息 //获取对应检测项配置的监测点信息
List<WebMonitorPointsVo> webMonitorPointsVos = webMonitorPointsMapper.getbycid(cid); List<WebMonitorPointsVo> webMonitorPointsVos = webMonitorPointsMapper.getbycid(cid);
if (webMonitorPointsVos != null) { if (webMonitorPointsVos != null) {
List<HashMap<String, Object>> links = webMonitorLinkMapper.getByChartId(cid); List<HashMap<String, Object>> links = webMonitorLinkMapper.getByChartId(cid);
if (links != null) { if (links != null) {
//遍历监测信息 //遍历监测信息
for (WebMonitorPointsVo webMonitorPointsVo : webMonitorPointsVos) { for (WebMonitorPointsVo webMonitorPointsVo : webMonitorPointsVos) {
List<HashMap<String, Object>> hashMaps = new ArrayList<>(); List<HashMap<String, Object>> hashMaps = new ArrayList<>();
Integer id = webMonitorPointsVo.getId(); Integer id = webMonitorPointsVo.getId();
String guid = webMonitorPointsVo.getGuid(); String guid = webMonitorPointsVo.getGuid();
//遍历监测点和设备关系 //遍历监测点和设备关系
for (HashMap<String, Object> link : links) { for (HashMap<String, Object> link : links) {
String pointid = (String) link.get("pointid"); String pointid = (String) link.get("pointid");
if (pointid.equals(guid)) { if (pointid.equals(guid)) {
hashMaps.add(link); hashMaps.add(link);
} }
} }
webMonitorPointsVo.setItems(hashMaps); webMonitorPointsVo.setItems(hashMaps);
} }
} }
monitorChartVo.setPoints(webMonitorPointsVos); monitorChartVo.setPoints(webMonitorPointsVos);
} }
} }
return monitorChartVo; return monitorChartVo;
} }
public MonitorChartVo getsimplemonbase(HttpServletRequest request) { public MonitorChartVo getsimplemonbase(HttpServletRequest request) {
//获取当前尾矿库编码 //获取当前尾矿库编码
String currentUsername = SecurityUtils.getCurrentUsername(); String currentUsername = SecurityUtils.getCurrentUsername();
String tailno = onlineUserService.gettailno(currentUsername, request); String tailno = onlineUserService.gettailno(currentUsername, request);
//构建返回结构 //构建返回结构
MonitorChartVo monitorChartVo = new MonitorChartVo(); MonitorChartVo monitorChartVo = new MonitorChartVo();
//获取对应尾矿库的图片 //获取对应尾矿库的图片
WebMonitorChart webMonitorChart = webMonitorChartMapper.getpic(tailno); WebMonitorChart webMonitorChart = webMonitorChartMapper.getpic(tailno);
HashMap<String, Integer> id1 = webMonitorChartMapper.getId(tailno); HashMap<String, Integer> id1 = webMonitorChartMapper.getId(tailno);
if (id1 != null) { if (id1 != null) {
Integer cid = id1.get("id"); Integer cid = id1.get("id");
monitorChartVo.setChart(webMonitorChart); monitorChartVo.setChart(webMonitorChart);
//获取对应检测项配置的监测点信息 //获取对应检测项配置的监测点信息
List<WebMonitorPointsVo> webMonitorPointsVos = webMonitorPointsMapper.getbycid(cid); List<WebMonitorPointsVo> webMonitorPointsVos = webMonitorPointsMapper.getbycid(cid);
if (webMonitorPointsVos != null) { if (webMonitorPointsVos != null) {
List<HashMap<String, Object>> links = webMonitorLinkMapper.getByChartId(cid); List<HashMap<String, Object>> links = webMonitorLinkMapper.getByChartId(cid);
if (links != null) { if (links != null) {
//遍历监测信息 //遍历监测信息
for (WebMonitorPointsVo webMonitorPointsVo : webMonitorPointsVos) { for (WebMonitorPointsVo webMonitorPointsVo : webMonitorPointsVos) {
List<HashMap<String, Object>> hashMaps = new ArrayList<>(); List<HashMap<String, Object>> hashMaps = new ArrayList<>();
Integer id = webMonitorPointsVo.getId(); Integer id = webMonitorPointsVo.getId();
String guid = webMonitorPointsVo.getGuid(); String guid = webMonitorPointsVo.getGuid();
//遍历监测点和设备关系 //遍历监测点和设备关系
for (HashMap<String, Object> link : links) { for (HashMap<String, Object> link : links) {
String pointid = (String) link.get("pointid"); String pointid = (String) link.get("pointid");
if (pointid.equals(guid)) { if (pointid.equals(guid)) {
hashMaps.add(link); hashMaps.add(link);
} }
} }
webMonitorPointsVo.setItems(hashMaps); webMonitorPointsVo.setItems(hashMaps);
} }
} }
monitorChartVo.setPoints(webMonitorPointsVos); monitorChartVo.setPoints(webMonitorPointsVos);
} }
} }
return monitorChartVo; return monitorChartVo;
} }
@Override @Override
public MonitorChartVo getmonbasevisual(HttpServletRequest request) { public MonitorChartVo getmonbasevisual(HttpServletRequest request) {
//获取设备的状态 //获取设备的状态
List<HashMap<String, Object>> hashMaps = drybeachequipinforService.dryStateCount(request); List<HashMap<String, Object>> hashMaps = drybeachequipinforService.dryStateCount(request);
//获取所有设备的实时数据 //获取所有设备的实时数据
List<RealDataVo> realData = (List<RealDataVo>) redisUtils.get("realData"); List<RealDataVo> realData = (List<RealDataVo>) redisUtils.get("realData");
if (ObjectUtils.isEmpty(realData)) { if (ObjectUtils.isEmpty(realData)) {
realDataController.real(request); realDataController.real(request);
realData = (List<RealDataVo>) redisUtils.get("realData"); realData = (List<RealDataVo>) redisUtils.get("realData");
} }
//获取设备的实时报警状态 //获取设备的实时报警状态
List<HashMap<String, Object>> realalarm = tabAbnormalMapper.realalarm(); List<HashMap<String, Object>> realalarm = tabAbnormalMapper.realalarm();
MonitorChartVo monitorChartVo = getsimplemonbase(request); MonitorChartVo monitorChartVo = getsimplemonbase(request);
List<WebMonitorPointsVo> points = monitorChartVo.getPoints(); List<WebMonitorPointsVo> points = monitorChartVo.getPoints();
for (WebMonitorPointsVo point : points) { for (WebMonitorPointsVo point : points) {
List<HashMap<String, Object>> items = point.getItems(); List<HashMap<String, Object>> items = point.getItems();
for (HashMap<String, Object> item : items) { for (HashMap<String, Object> item : items) {
String id1 = (String) item.get("id"); StringBuffer stringBuffer1 = new StringBuffer();
for (HashMap<String, Object> hashMap : hashMaps) { stringBuffer1.append("( ");
String equipno = (String) hashMap.get("equipno"); String id1 = (String) item.get("id");
if (equipno.equals(id1)) { for (HashMap<String, Object> hashMap : hashMaps) {
Long state = (Long) hashMap.get("state"); String equipno = (String) hashMap.get("equipno");
item.put("state", state); if (equipno.equals(id1)) {
break; Long state = (Long) hashMap.get("state");
} item.put("state", state);
; break;
} }
String id = (String) item.get("id"); ;
for (HashMap<String, Object> map : realalarm) { }
String equipno = (String) map.get("equipno"); String id = (String) item.get("id");
if (equipno.equals(id)) { for (HashMap<String, Object> map : realalarm) {
item.put("alarmlevel", map.get("alarmlevel")); String equipno = (String) map.get("equipno");
break; if (equipno.equals(id)) {
} item.put("alarmlevel", map.get("alarmlevel"));
} break;
if (!ObjectUtils.isEmpty(realData)) { }
for (RealDataVo realDataVo : realData) { }
if (realDataVo.getEquipno().equals(id)) { if (!ObjectUtils.isEmpty(realData)) {
//获取键值 for (RealDataVo realDataVo : realData) {
List<Map> keys = (List<Map>) realDataVo.getKeys(); if (realDataVo.getEquipno().equals(id)) {
//获取数据 //获取键值
HashMap<String, Object> data = realDataVo.getData(); List<Map> keys = (List<Map>) realDataVo.getKeys();
//获取数据的keys //获取数据
Set<String> strings = data.keySet(); HashMap<String, Object> data = realDataVo.getData();
// //获取数据的keys
HashMap<String, Object> map = new HashMap<>(); Set<String> strings = data.keySet();
//遍历键值 //
for (Map key : keys) { HashMap<String, Object> map = new HashMap<>();
Set keyset1 = key.keySet(); //遍历键值
for (Object o : keyset1) { for (Map keyMap : keys) {
String s = (String) key.get(o.toString()); String name = keyMap.get("name").toString();
for (String string : strings) { String key = keyMap.get("key").toString();
if (s.equals(string)) { String value = data.get(key).toString();
map.put(o.toString(), data.get(string)); StringBuffer stringBuffer = new StringBuffer();
} stringBuffer.append(name).append(": ").append(value).append(" ").append(item.get("unit"));
} String string = stringBuffer.toString();
} data.put(key, string);
} stringBuffer.append(string).append(",");
item.put("realdata", map); }
} stringBuffer1.append(" )");
} item.put("realdata", data);
} }
} }
} }
return monitorChartVo; }
} }
return monitorChartVo;
}
@Override @Override
public MonitorChartVo getmonbasevisual(HttpServletRequest request, String tailno) { public MonitorChartVo getmonbasevisual(HttpServletRequest request, String tailno) {
//获取设备的状态 //获取设备的状态
List<HashMap<String, Object>> hashMaps = drybeachequipinforService.dryStateCount(request); List<HashMap<String, Object>> hashMaps = drybeachequipinforService.dryStateCount(request);
//获取所有设备的实时数据 //获取所有设备的实时数据
List<RealDataVo> realData = (List<RealDataVo>) redisUtils.get("realData"); List<RealDataVo> realData = (List<RealDataVo>) redisUtils.get("realData");
//获取设备的实时报警状态 //获取设备的实时报警状态
List<HashMap<String, Object>> realalarm = tabAbnormalMapper.realalarm(); List<HashMap<String, Object>> realalarm = tabAbnormalMapper.realalarm();
MonitorChartVo monitorChartVo = getsimplemonbase(request, tailno); MonitorChartVo monitorChartVo = getsimplemonbase(request, tailno);
List<WebMonitorPointsVo> points = monitorChartVo.getPoints(); List<WebMonitorPointsVo> points = monitorChartVo.getPoints();
if (!ObjectUtils.isEmpty(points)) { if (!ObjectUtils.isEmpty(points)) {
for (WebMonitorPointsVo point : points) { for (WebMonitorPointsVo point : points) {
List<HashMap<String, Object>> items = point.getItems(); List<HashMap<String, Object>> items = point.getItems();
if (!ObjectUtils.isEmpty(items)) { if (!ObjectUtils.isEmpty(items)) {
for (HashMap<String, Object> item : items) { for (HashMap<String, Object> item : items) {
String id1 = (String) item.get("id"); String id1 = (String) item.get("id");
for (HashMap<String, Object> hashMap : hashMaps) { for (HashMap<String, Object> hashMap : hashMaps) {
String equipno = (String) hashMap.get("equipno"); String equipno = (String) hashMap.get("equipno");
if (equipno.equals(id1)) { if (equipno.equals(id1)) {
Long state = (Long) hashMap.get("state"); Long state = (Long) hashMap.get("state");
item.put("state", state); item.put("state", state);
break; break;
} }
; ;
} }
String id = (String) item.get("id"); String id = (String) item.get("id");
for (HashMap<String, Object> map : realalarm) { for (HashMap<String, Object> map : realalarm) {
String equipno = (String) map.get("equipno"); String equipno = (String) map.get("equipno");
if (equipno.equals(id)) { if (equipno.equals(id)) {
item.put("alarmlevel", map.get("alarmlevel")); item.put("alarmlevel", map.get("alarmlevel"));
break; break;
} }
} }
for (RealDataVo realDataVo : realData) { for (RealDataVo realDataVo : realData) {
if (realDataVo.getEquipno().equals(id)) { if (realDataVo.getEquipno().equals(id)) {
//获取键说明的list //获取键说明的list
List<Map> keys = (List<Map>) realDataVo.getKeys(); List<Map> keys = (List<Map>) realDataVo.getKeys();
//获取数据 //获取数据
HashMap<String, Object> data = realDataVo.getData(); HashMap<String, Object> data = realDataVo.getData();
//获取数据的key集合 //获取数据的key集合
Set<String> strings = data.keySet(); Set<String> strings = data.keySet();
//创建储存键值的map //创建储存键值的map
HashMap<String, Object> realDataMap = new HashMap<>(); HashMap<String, Object> realDataMap = new HashMap<>();
//遍历键说明的list //遍历键说明的list
for (Map map : keys) { for (Map map : keys) {
//遍历键说明 //遍历键说明
Set keyset1 = map.keySet(); Set keyset1 = map.keySet();
for (Object o : keyset1) { for (Object o : keyset1) {
String s = (String) map.get(o.toString()); String s = (String) map.get(o.toString());
//遍历数据 //遍历数据
for (String string : strings) { for (String string : strings) {
//键和数据的键相同就存入 //键和数据的键相同就存入
if (s.equals(string)) { if (s.equals(string)) {
realDataMap.put(o.toString(), data.get(string)); realDataMap.put(o.toString(), data.get(string));
} }
} }
} }
} }
item.put("realdata", realDataMap); item.put("realdata", realDataMap);
} }
} }
} }
} }
} }
} }
return monitorChartVo; return monitorChartVo;
} }
public MonitorChartVo getsimplemonbase(HttpServletRequest request, String tailno) { public MonitorChartVo getsimplemonbase(HttpServletRequest request, String tailno) {
//构建返回结构 //构建返回结构
MonitorChartVo monitorChartVo = new MonitorChartVo(); MonitorChartVo monitorChartVo = new MonitorChartVo();
//获取对应尾矿库的图片 //获取对应尾矿库的图片
WebMonitorChart webMonitorChart = webMonitorChartMapper.getpic(tailno); WebMonitorChart webMonitorChart = webMonitorChartMapper.getpic(tailno);
HashMap<String, Integer> id1 = webMonitorChartMapper.getId(tailno); HashMap<String, Integer> id1 = webMonitorChartMapper.getId(tailno);
if (id1 != null) { if (id1 != null) {
Integer cid = id1.get("id"); Integer cid = id1.get("id");
monitorChartVo.setChart(webMonitorChart); monitorChartVo.setChart(webMonitorChart);
//获取对应检测项配置的监测点信息 //获取对应检测项配置的监测点信息
List<WebMonitorPointsVo> webMonitorPointsVos = webMonitorPointsMapper.getbycid(cid); List<WebMonitorPointsVo> webMonitorPointsVos = webMonitorPointsMapper.getbycid(cid);
if (webMonitorPointsVos != null) { if (webMonitorPointsVos != null) {
List<HashMap<String, Object>> links = webMonitorLinkMapper.getByChartId(cid); List<HashMap<String, Object>> links = webMonitorLinkMapper.getByChartId(cid);
if (links != null) { if (links != null) {
//遍历监测信息 //遍历监测信息
for (WebMonitorPointsVo webMonitorPointsVo : webMonitorPointsVos) { for (WebMonitorPointsVo webMonitorPointsVo : webMonitorPointsVos) {
List<HashMap<String, Object>> hashMaps = new ArrayList<>(); List<HashMap<String, Object>> hashMaps = new ArrayList<>();
Integer id = webMonitorPointsVo.getId(); Integer id = webMonitorPointsVo.getId();
String guid = webMonitorPointsVo.getGuid(); String guid = webMonitorPointsVo.getGuid();
//遍历监测点和设备关系 //遍历监测点和设备关系
for (HashMap<String, Object> link : links) { for (HashMap<String, Object> link : links) {
String pointid = (String) link.get("pointid"); String pointid = (String) link.get("pointid");
if (pointid.equals(guid)) { if (pointid.equals(guid)) {
hashMaps.add(link); hashMaps.add(link);
} }
} }
webMonitorPointsVo.setItems(hashMaps); webMonitorPointsVo.setItems(hashMaps);
} }
} }
monitorChartVo.setPoints(webMonitorPointsVos); monitorChartVo.setPoints(webMonitorPointsVos);
} }
} }
return monitorChartVo; return monitorChartVo;
} }
@Override @Override
public WebMonitorChart getbytailno(HttpServletRequest request) { public WebMonitorChart getbytailno(HttpServletRequest request) {
String currentUsername = SecurityUtils.getCurrentUsername(); String currentUsername = SecurityUtils.getCurrentUsername();
String gettailno = onlineUserService.gettailno(currentUsername, request); String gettailno = onlineUserService.gettailno(currentUsername, request);
QueryWrapper<WebMonitorChart> webMonitorChartQueryWrapper = new QueryWrapper<>(); QueryWrapper<WebMonitorChart> webMonitorChartQueryWrapper = new QueryWrapper<>();
webMonitorChartQueryWrapper.eq("tailingno", gettailno); webMonitorChartQueryWrapper.eq("tailingno", gettailno);
WebMonitorChart webMonitorChart = webMonitorChartMapper.selectOne(webMonitorChartQueryWrapper); WebMonitorChart webMonitorChart = webMonitorChartMapper.selectOne(webMonitorChartQueryWrapper);
return webMonitorChart; return webMonitorChart;
} }
@Override @Override
public void updatehw(int height, int width, int id) { public void updatehw(int height, int width, int id) {
} }
} }
eladmin-system/src/main/resources/config/application.yml
View file @ 1d2be9a9
...@@ -5,7 +5,7 @@ spring: ...@@ -5,7 +5,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: dev active: prod
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:
...@@ -28,9 +28,9 @@ spring: ...@@ -28,9 +28,9 @@ spring:
redis: redis:
#数据库索引 #数据库索引
database: ${REDIS_DB:0} database: ${REDIS_DB:0}
host: ${REDIS_HOST:127.0.0.1} host: ${REDIS_HOST:8.142.46.126}
port: ${REDIS_PORT:6399} port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:R#9Xz&2Lp$Wq8v!u} password: ${REDIS_PWD:}
#连接超时时间 #连接超时时间
timeout: 5000 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