diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 563cb28..9b636ac 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -37,6 +37,11 @@ // 8647080626696530AAAA01030200093985 4 // 8647080626890730AAAA01030200093985 5 // 8647080626269190AAAA01030200093985 6 -// 8647080626269190AAAA01030200093985 + +// 8653280684199430AAAA01030200023985 1 +// 8647080627176270AAAA01030200023985 3 +// 8647080626696530AAAA01030200023985 4 +// 8647080626890730AAAA01030200023985 5 +// 8647080626269190AAAA01030200023985 6 } diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 563cb28..9b636ac 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -37,6 +37,11 @@ // 8647080626696530AAAA01030200093985 4 // 8647080626890730AAAA01030200093985 5 // 8647080626269190AAAA01030200093985 6 -// 8647080626269190AAAA01030200093985 + +// 8653280684199430AAAA01030200023985 1 +// 8647080627176270AAAA01030200023985 3 +// 8647080626696530AAAA01030200023985 4 +// 8647080626890730AAAA01030200023985 5 +// 8647080626269190AAAA01030200023985 6 } diff --git a/src/main/java/com/casic/util/SendVoice.java b/src/main/java/com/casic/util/SendVoice.java index b88456f..b94087a 100644 --- a/src/main/java/com/casic/util/SendVoice.java +++ b/src/main/java/com/casic/util/SendVoice.java @@ -2,6 +2,7 @@ import java.io.IOException; +import com.alibaba.druid.util.StringUtils; import com.casic.config.ServerPort; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpException; @@ -25,6 +26,9 @@ public static void send(String deviceType, String passage) { HttpClient client = new HttpClient(); ServerPort serverPort = SpringContextUtil.getBean(ServerPort.class); + if (StringUtils.isEmpty(serverPort.getPhone())) { + return; + } PostMethod method = new PostMethod(serverPort.getUrl()); //client.getParams().setContentCharset("GBK"); client.getParams().setContentCharset("UTF-8"); diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 563cb28..9b636ac 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -37,6 +37,11 @@ // 8647080626696530AAAA01030200093985 4 // 8647080626890730AAAA01030200093985 5 // 8647080626269190AAAA01030200093985 6 -// 8647080626269190AAAA01030200093985 + +// 8653280684199430AAAA01030200023985 1 +// 8647080627176270AAAA01030200023985 3 +// 8647080626696530AAAA01030200023985 4 +// 8647080626890730AAAA01030200023985 5 +// 8647080626269190AAAA01030200023985 6 } diff --git a/src/main/java/com/casic/util/SendVoice.java b/src/main/java/com/casic/util/SendVoice.java index b88456f..b94087a 100644 --- a/src/main/java/com/casic/util/SendVoice.java +++ b/src/main/java/com/casic/util/SendVoice.java @@ -2,6 +2,7 @@ import java.io.IOException; +import com.alibaba.druid.util.StringUtils; import com.casic.config.ServerPort; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpException; @@ -25,6 +26,9 @@ public static void send(String deviceType, String passage) { HttpClient client = new HttpClient(); ServerPort serverPort = SpringContextUtil.getBean(ServerPort.class); + if (StringUtils.isEmpty(serverPort.getPhone())) { + return; + } PostMethod method = new PostMethod(serverPort.getUrl()); //client.getParams().setContentCharset("GBK"); client.getParams().setContentCharset("UTF-8"); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 03e581a..35b91b0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -29,7 +29,7 @@ pressure: 15 flow: 5 task: - cron-time: 0 0 */1 * * ? + cron-time: 0 */1 * * * ? server: port: 9393 appId: VM00452288 diff --git a/src/main/java/com/casic/enums/DevcodeEnums.java b/src/main/java/com/casic/enums/DevcodeEnums.java index 563cb28..9b636ac 100644 --- a/src/main/java/com/casic/enums/DevcodeEnums.java +++ b/src/main/java/com/casic/enums/DevcodeEnums.java @@ -37,6 +37,11 @@ // 8647080626696530AAAA01030200093985 4 // 8647080626890730AAAA01030200093985 5 // 8647080626269190AAAA01030200093985 6 -// 8647080626269190AAAA01030200093985 + +// 8653280684199430AAAA01030200023985 1 +// 8647080627176270AAAA01030200023985 3 +// 8647080626696530AAAA01030200023985 4 +// 8647080626890730AAAA01030200023985 5 +// 8647080626269190AAAA01030200023985 6 } diff --git a/src/main/java/com/casic/util/SendVoice.java b/src/main/java/com/casic/util/SendVoice.java index b88456f..b94087a 100644 --- a/src/main/java/com/casic/util/SendVoice.java +++ b/src/main/java/com/casic/util/SendVoice.java @@ -2,6 +2,7 @@ import java.io.IOException; +import com.alibaba.druid.util.StringUtils; import com.casic.config.ServerPort; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpException; @@ -25,6 +26,9 @@ public static void send(String deviceType, String passage) { HttpClient client = new HttpClient(); ServerPort serverPort = SpringContextUtil.getBean(ServerPort.class); + if (StringUtils.isEmpty(serverPort.getPhone())) { + return; + } PostMethod method = new PostMethod(serverPort.getUrl()); //client.getParams().setContentCharset("GBK"); client.getParams().setContentCharset("UTF-8"); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 03e581a..35b91b0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -29,7 +29,7 @@ pressure: 15 flow: 5 task: - cron-time: 0 0 */1 * * ? + cron-time: 0 */1 * * * ? server: port: 9393 appId: VM00452288 diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml index c292b5b..0ba2854 100644 --- a/src/main/resources/mapper/DeviceMapper.xml +++ b/src/main/resources/mapper/DeviceMapper.xml @@ -4,9 +4,13 @@ \ No newline at end of file