Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 665c7783 authored by maoying's avatar maoying
Browse files
Options

删除配置文件webstock地址引用

parent 5a519749
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 85 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java
View file @ 665c7783
......@@ -760,12 +760,6 @@ public class ContingencyAction implements CustomerAction {
ContingencyPlanInstance contingencyPlanInstance = iContingencyInstance.createInstanceRecord(contingencyRo.getBatchNo(), actionName, "DEFAULT", "", "OPERATE", "");
Toke toke = remoteSecurityService.getServerToken();
// Toke toke = cacheMap.getValue(TOKE);
// if (toke == null) {
// toke = remoteSecurityService.come();
// Long times = (long) (20 * 24 * 60 * 60);
// cacheMap.setex(TOKE, toke, times);
// }
RequestContext.setToken(toke.getToke());
RequestContext.setProduct(toke.getProduct());
try {
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteWebSocketServer.java
View file @ 665c7783
package com.yeejoin.amos.fas.business.feign;
import java.util.HashMap;
import java.util.Map;
import org.codehaus.jackson.map.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import com.yeejoin.amos.fas.business.util.Constants;
@Service("remoteWebSocketServer")
public class RemoteWebSocketServer {
/*@Autowired
private ApplicationConfig applicationConfig;*/
@Value("${params.remoteWebsocketUrl}")
private String remoteWebsocketUrl;
private final RestTemplate restTemplate;
private ObjectMapper objectMapper = new ObjectMapper();
public RemoteWebSocketServer()
{
this.restTemplate = new RestTemplate();
}
public Object sendMessage(String path, String message) throws Exception
{
Map<String, String> map = new HashMap<String, String>();
map.put("filter", null);
map.put("message", message);
map.put("path", path);
String url =remoteWebsocketUrl;
HttpHeaders headers = new HttpHeaders();
MediaType type = MediaType
.parseMediaType("application/json; charset=UTF-8");
headers.setContentType(type);
headers.add("Accept", MediaType.APPLICATION_JSON.toString());
HttpEntity<Map<String, String>> formEntity = new HttpEntity<Map<String, String>>(map, headers);
ResponseEntity responseEntity = restTemplate.exchange(url + "/generic/sendMessage",
HttpMethod.POST, formEntity, String.class);
responseEntity.getBody();
Map commonResponse = objectMapper.readValue(responseEntity.getBody().toString(),Map.class);
if (commonResponse != null && commonResponse.get("result").equals(Constants.RESULT_SUCCESS) )
{
return commonResponse.get("dataList");
}
return null;
}
}
//package com.yeejoin.amos.fas.business.feign;
//
//import java.util.HashMap;
//import java.util.Map;
//
//import org.codehaus.jackson.map.ObjectMapper;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.http.HttpEntity;
//import org.springframework.http.HttpHeaders;
//import org.springframework.http.HttpMethod;
//import org.springframework.http.MediaType;
//import org.springframework.http.ResponseEntity;
//import org.springframework.stereotype.Service;
//import org.springframework.web.client.RestTemplate;
//
//import com.yeejoin.amos.fas.business.util.Constants;
//
//
//
//@Service("remoteWebSocketServer")
//public class RemoteWebSocketServer {
// /*@Autowired
// private ApplicationConfig applicationConfig;*/
//
// @Value("${params.remoteWebsocketUrl}")
// private String remoteWebsocketUrl;
//
// private final RestTemplate restTemplate;
//
// private ObjectMapper objectMapper = new ObjectMapper();
// public RemoteWebSocketServer()
// {
// this.restTemplate = new RestTemplate();
// }
//
//
// public Object sendMessage(String path, String message) throws Exception
// {
// Map<String, String> map = new HashMap<String, String>();
// map.put("filter", null);
// map.put("message", message);
// map.put("path", path);
// String url =remoteWebsocketUrl;
// HttpHeaders headers = new HttpHeaders();
// MediaType type = MediaType
// .parseMediaType("application/json; charset=UTF-8");
// headers.setContentType(type);
// headers.add("Accept", MediaType.APPLICATION_JSON.toString());
// HttpEntity<Map<String, String>> formEntity = new HttpEntity<Map<String, String>>(map, headers);
// ResponseEntity responseEntity = restTemplate.exchange(url + "/generic/sendMessage",
// HttpMethod.POST, formEntity, String.class);
//
// responseEntity.getBody();
// Map commonResponse = objectMapper.readValue(responseEntity.getBody().toString(),Map.class);
// if (commonResponse != null && commonResponse.get("result").equals(Constants.RESULT_SUCCESS) )
// {
// return commonResponse.get("dataList");
// }
// return null;
// }
//}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/DataRefreshServiceImpl.java
View file @ 665c7783
package com.yeejoin.amos.fas.business.service.impl;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.fas.business.feign.RemoteWebSocketServer;
import com.yeejoin.amos.fas.business.service.intfc.IDataRefreshService;
import com.yeejoin.amos.fas.common.enums.View3dRefreshAreaEum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
......@@ -21,8 +19,8 @@ public class DataRefreshServiceImpl implements IDataRefreshService {
private final Logger log = LoggerFactory.getLogger(DataRefreshServiceImpl.class);
@Autowired
private RemoteWebSocketServer remoteWebSocketServer;
// @Autowired
// private RemoteWebSocketServer remoteWebSocketServer;
@Override
public void refreshViewData(String dataType) {
......@@ -51,7 +49,7 @@ public class DataRefreshServiceImpl implements IDataRefreshService {
private void notifyDataRefresh(Map<String, Object> param) {
try {
remoteWebSocketServer.sendMessage("3dViewMessage", JSON.toJSONString(param));
// remoteWebSocketServer.sendMessage("3dViewMessage", JSON.toJSONString(param));
} catch (Exception e) {
log.error("通知前端数据刷新失败-->"+JSON.toJSONString(param));
log.error("通知前端数据刷新失败-->"+e.getMessage());
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
View file @ 665c7783
......@@ -83,7 +83,6 @@ import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
import com.yeejoin.amos.fas.business.dao.repository.IRpnChangeLogDao;
import com.yeejoin.amos.fas.business.feign.IEquipManageFeign;
import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
import com.yeejoin.amos.fas.business.feign.RemoteWebSocketServer;
import com.yeejoin.amos.fas.business.jpush.AppMessagePushService;
import com.yeejoin.amos.fas.business.jpush.JPushTypeEnum;
import com.yeejoin.amos.fas.business.jpush.PushMsgParam;
......@@ -187,8 +186,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
// @Autowired
// IFireEquipmentDataDao iFireEquipmentDataDao;
@Autowired
private RemoteWebSocketServer remoteWebSocketServer;
// @Autowired
// private RemoteWebSocketServer remoteWebSocketServer;
@Autowired
private IEquipmentService equipmentService;
......@@ -1056,8 +1055,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
map.put("id", param.getPointCode());
Map<String, Map<String, Object>> riskSourceMap = new HashMap();
riskSourceMap.put("equipments", map);//这个需要确认下
remoteWebSocketServer.sendMessage("equipmentMode", JSON.toJSONString(riskSourceMap));
// remoteWebSocketServer.sendMessage("equipmentMode", JSON.toJSONString(riskSourceMap));
// // 推送设备状态信息
// Alarm alarm = iAlarmDao.findByStatusTrueAndFireEquipmentPointCode(param.getPointCode());
// String topic = String.format("/%s/%s/%s", serviceName, stationName, "data/refresh/monitorData");
......
YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties
View file @ 665c7783
......@@ -19,8 +19,6 @@ spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
#ws
params.remoteWebsocketUrl=http://172.16.11.36:10600/
#redis
spring.redis.database=0
spring.redis.host=172.16.3.100
......
YeeAmosFireAutoSysStart/src/main/resources/application-docker.properties
View file @ 665c7783
......@@ -19,9 +19,7 @@ spring.datasource.hikari.maximum-pool-size = 10
spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
#rule
params.remoteWebsocketUrl=http://station-websocket:10600/
#redis
spring.redis.database=1
spring.redis.host=amos-redis
spring.redis.port=6379
......
YeeAmosFireAutoSysStart/src/main/resources/application-test.properties
View file @ 665c7783
......@@ -17,8 +17,7 @@ spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10
spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1
#ws
params.remoteWebsocketUrl=http://172.16.10.91:10600/
#redis
spring.redis.database=1
spring.redis.host=127.0.0.1
......
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