Commit 781cca45 authored by xinglei's avatar xinglei

修改项目报错

parent 2b96e258
...@@ -41,11 +41,6 @@ ...@@ -41,11 +41,6 @@
<artifactId>amos-component-feign</artifactId> <artifactId>amos-component-feign</artifactId>
<version>1.1.0-SNAPSHOT</version> <version>1.1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-foundation</artifactId>
<version>1.1.13-Ty</version>
</dependency>
<!-- fegion客户端引用end --> <!-- fegion客户端引用end -->
<!-- 安全模块jar <!-- 安全模块jar
<dependency> <dependency>
......
...@@ -250,7 +250,6 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient { ...@@ -250,7 +250,6 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
ShiduAlarmWebSocketClient client = new ShiduAlarmWebSocketClient(monitorAlarmWebSocketClientUrl); ShiduAlarmWebSocketClient client = new ShiduAlarmWebSocketClient(monitorAlarmWebSocketClientUrl);
client.connect(); client.connect();
while (!client.getReadyState().equals(WebSocket.READYSTATE.OPEN)) { while (!client.getReadyState().equals(WebSocket.READYSTATE.OPEN)) {
System.out.println("connecting... shidu Dynamic ring alarm----" + client.getReadyState()); System.out.println("connecting... shidu Dynamic ring alarm----" + client.getReadyState());
} }
System.out.println("build " + monitorAlarmWebSocketClientUrl + "connected..."); System.out.println("build " + monitorAlarmWebSocketClientUrl + "connected...");
......
...@@ -30,7 +30,6 @@ import com.yeejoin.amos.bank.webSocket.ShiduAlarmWebSocketClient; ...@@ -30,7 +30,6 @@ import com.yeejoin.amos.bank.webSocket.ShiduAlarmWebSocketClient;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
/** /**
*
* <pre> * <pre>
* 服务启动类 * 服务启动类
* </pre> * </pre>
...@@ -52,53 +51,46 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; ...@@ -52,53 +51,46 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
// @EnableApolloConfig // @EnableApolloConfig
@EnableJpaAuditing @EnableJpaAuditing
@EnableScheduling @EnableScheduling
@MapperScan(basePackages = { "com.yeejoin.amos.spc.business.dao.mapper","com.yeejoin.amos.bank.dao.mapper" }) @MapperScan(basePackages = {"com.yeejoin.amos.spc.business.dao.mapper", "com.yeejoin.amos.bank.dao.mapper"})
@ComponentScan({"org.typroject","com.yeejoin.amos","com.yeejoin.amos.bank"}) @ComponentScan({"org.typroject", "com.yeejoin.amos", "com.yeejoin.amos.bank"})
public class AmosBankStart public class AmosBankStart {
{
private static final Logger log = Logger.getLogger(AmosBankStart.class); private static final Logger log = Logger.getLogger(AmosBankStart.class);
/** /**
* 启动amosop-server * 启动amosop-server
* *
* @param args * @param args
* @throws IOException * @throws IOException
* @throws URISyntaxException * @throws URISyntaxException
*/ */
public static void main(String[] args) public static void main(String[] args) {
{ log.info("start xian bank Service..........");
log.info("start xian bank Service.........."); try {
try SpringApplication application = new SpringApplication(AmosBankStart.class);
{ ConfigurableApplicationContext run = application.run(args);
SpringApplication application = new SpringApplication(AmosBankStart.class); //websocketClinet 设置application
ConfigurableApplicationContext run = application.run(args); AlarmWebSocketClient.setAllpicationContext(run);
//websocketClinet 设置application MonitorAlarmWebSocketClient.setAllpicationContext(run);
AlarmWebSocketClient.setAllpicationContext(run); ShiduAlarmWebSocketClient.setAllpicationContext(run);
MonitorAlarmWebSocketClient.setAllpicationContext(run); InspectionWebSocketClient.setAllpicationContext(run);
ShiduAlarmWebSocketClient.setAllpicationContext(run); FireDetectionWebSocketClient.setAllpicationContext(run);
InspectionWebSocketClient.setAllpicationContext(run); Environment environment = run.getEnvironment();
FireDetectionWebSocketClient.setAllpicationContext(run); log.info("SwaggerUI: http://localhost:"
Environment environment = run.getEnvironment(); + environment.getProperty("server.port") + "/swagger-ui.html");
log.info("SwaggerUI: http://localhost:"
+ environment.getProperty("server.port") + "/swagger-ui.html"); log.info("动环告警websocket监听");
MonitorAlarmWebSocketClient.synMonitorAlarmPoint();
log.info("动环告警websocket监听"); log.info("湿度告警websocket监听");
MonitorAlarmWebSocketClient.synMonitorAlarmPoint(); ShiduAlarmWebSocketClient.synMonitorAlarmPoint();
log.info("湿度告警websocket监听"); log.info("设备告警websocket监听");
ShiduAlarmWebSocketClient.synMonitorAlarmPoint(); AlarmWebSocketClient.synAlarmPoint();
log.info("设备告警websocket监听"); log.info("自动巡检websocket监听");
AlarmWebSocketClient.synAlarmPoint(); InspectionWebSocketClient.synInspectionAlarm();
log.info("自动巡检websocket监听"); log.info("火探websocket监听");
InspectionWebSocketClient.synInspectionAlarm(); FireDetectionWebSocketClient.synFireDetection();
log.info("火探websocket监听"); } catch (Exception e) {
FireDetectionWebSocketClient.synFireDetection(); System.out.println("error xian bank occur when run server! " + e);
} }
catch (Exception e) }
{
System.out.println("error xian bank occur when run server! " + e);
}
}
} }
\ No newline at end of file
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