diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
index 96e4031..963be9a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
@@ -4,6 +4,8 @@
import com.casic.missiles.modular.system.model.BizDayData;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
/**
*
* 日平均数据表 服务类
@@ -15,4 +17,6 @@
public interface IBizDayDataService extends IService {
void saveDate(Hjt212DTO hjt212DTO);
+ List getSns();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
index 96e4031..963be9a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
@@ -4,6 +4,8 @@
import com.casic.missiles.modular.system.model.BizDayData;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
/**
*
* 日平均数据表 服务类
@@ -15,4 +17,6 @@
public interface IBizDayDataService extends IService {
void saveDate(Hjt212DTO hjt212DTO);
+ List getSns();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java
index aa03654..82f4528 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java
@@ -7,6 +7,8 @@
import com.casic.missiles.modular.system.model.BizDayData;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
* 日平均数据表 服务实现类
@@ -22,4 +24,9 @@
public void saveDate(Hjt212DTO hjt212DTO) {
this.insert(new BizDayData(hjt212DTO));
}
+
+ @Override
+ public List getSns() {
+ return this.baseMapper.getSns();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
index 96e4031..963be9a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
@@ -4,6 +4,8 @@
import com.casic.missiles.modular.system.model.BizDayData;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
/**
*
* 日平均数据表 服务类
@@ -15,4 +17,6 @@
public interface IBizDayDataService extends IService {
void saveDate(Hjt212DTO hjt212DTO);
+ List getSns();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java
index aa03654..82f4528 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java
@@ -7,6 +7,8 @@
import com.casic.missiles.modular.system.model.BizDayData;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
* 日平均数据表 服务实现类
@@ -22,4 +24,9 @@
public void saveDate(Hjt212DTO hjt212DTO) {
this.insert(new BizDayData(hjt212DTO));
}
+
+ @Override
+ public List getSns() {
+ return this.baseMapper.getSns();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/task/ScheduledTask.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/task/ScheduledTask.java
index 320dbb7..4976894 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/biz/task/ScheduledTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/task/ScheduledTask.java
@@ -15,7 +15,10 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
@Component
@@ -32,68 +35,81 @@
private static String failCode = "1002";
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+ private static List snList = new ArrayList<>();
+
+ @PostConstruct
+ public void initDeviceSns() {
+ snList = iBizDayDataService.getSns();
+ }
@Scheduled(initialDelay = 1000 * 20, fixedDelay = 1000 * 60 * 60)
public void scheduledTask1() {
- System.out.println("小时获取监测数据:" + System.currentTimeMillis());
- try {
- //api url地址
- String url = environmentUrl+"hour";
- String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
- String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
- logger.info("=====收到小时数据======" + responseMsg);
- if (ToolUtil.isNotEmpty(responseMsg)) {
- JSONObject json = JSONObject.fromObject(responseMsg);
- if (successCode.equals(json.getString("code"))) {
- iBizHourDataService.saveDate(convertDTO(json));
+
+ for (String sn : snList) {
+ try {
+ //api url地址
+ String url = environmentUrl + "hour";
+// String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
+ String SN = sn;
+ String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
+ logger.info("=====收到小时数据======" + responseMsg);
+ if (ToolUtil.isNotEmpty(responseMsg)) {
+ JSONObject json = JSONObject.fromObject(responseMsg);
+ if (successCode.equals(json.getString("code"))) {
+ iBizHourDataService.saveDate(convertDTO(json));
+ }
}
+ } catch (Exception e) {
+ e.printStackTrace();
}
- } catch (Exception e) {
- e.printStackTrace();
}
+
}
@Scheduled(initialDelay = 1000 * 10, fixedDelay = 1000 * 60 * 10)
public void scheduledTask3() {
- System.out.println("分钟获取监测数据:" + System.currentTimeMillis());
- try {
- //api url地址
- String url = environmentUrl+"minute";
- String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
- String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
- logger.info("=====收到分钟数据======" + responseMsg);
- if (ToolUtil.isNotEmpty(responseMsg)) {
- JSONObject json = JSONObject.fromObject(responseMsg);
- if (successCode.equals(json.getString("code"))) {
- iBizMiniteDataService.saveDate(convertDTO(json));
+ for (String sn : snList) {
+ try {
+ //api url地址
+ String url = environmentUrl + "minute";
+// String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
+ String SN = sn;
+ String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
+ logger.info("=====收到分钟数据======" + responseMsg);
+ if (ToolUtil.isNotEmpty(responseMsg)) {
+ JSONObject json = JSONObject.fromObject(responseMsg);
+ if (successCode.equals(json.getString("code"))) {
+ iBizMiniteDataService.saveDate(convertDTO(json));
+ }
}
- }
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
@Scheduled(cron = "0 0 1 * * ?")
public void scheduledTask() {
- System.out.println("每天获取监测数据:" + System.currentTimeMillis());
- try {
+ for (String sn : snList) {
+ try {
- //api url地址
- String url = environmentUrl+"day";
- String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
- String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
- logger.info("=====收到每天数据======" + responseMsg);
- if (ToolUtil.isNotEmpty(responseMsg)) {
- JSONObject json = JSONObject.fromObject(responseMsg);
- if (successCode.equals(json.getString("code"))) {
- iBizDayDataService.saveDate(convertDTO(json));
+ //api url地址
+ String url = environmentUrl + "day";
+ String SN =sn;
+ String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
+ logger.info("=====收到每天数据======" + responseMsg);
+ if (ToolUtil.isNotEmpty(responseMsg)) {
+ JSONObject json = JSONObject.fromObject(responseMsg);
+ if (successCode.equals(json.getString("code"))) {
+ iBizDayDataService.saveDate(convertDTO(json));
+ }
+
}
-
+ } catch (Exception e) {
+ e.printStackTrace();
}
- } catch (Exception e) {
- e.printStackTrace();
}
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
index 96e4031..963be9a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/IBizDayDataService.java
@@ -4,6 +4,8 @@
import com.casic.missiles.modular.system.model.BizDayData;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
/**
*
* 日平均数据表 服务类
@@ -15,4 +17,6 @@
public interface IBizDayDataService extends IService {
void saveDate(Hjt212DTO hjt212DTO);
+ List getSns();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java
index aa03654..82f4528 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/service/impl/BizDayDataServiceImpl.java
@@ -7,6 +7,8 @@
import com.casic.missiles.modular.system.model.BizDayData;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
* 日平均数据表 服务实现类
@@ -22,4 +24,9 @@
public void saveDate(Hjt212DTO hjt212DTO) {
this.insert(new BizDayData(hjt212DTO));
}
+
+ @Override
+ public List getSns() {
+ return this.baseMapper.getSns();
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/biz/task/ScheduledTask.java b/casic-server/src/main/java/com/casic/missiles/modular/biz/task/ScheduledTask.java
index 320dbb7..4976894 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/biz/task/ScheduledTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/biz/task/ScheduledTask.java
@@ -15,7 +15,10 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
@Component
@@ -32,68 +35,81 @@
private static String failCode = "1002";
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+ private static List snList = new ArrayList<>();
+
+ @PostConstruct
+ public void initDeviceSns() {
+ snList = iBizDayDataService.getSns();
+ }
@Scheduled(initialDelay = 1000 * 20, fixedDelay = 1000 * 60 * 60)
public void scheduledTask1() {
- System.out.println("小时获取监测数据:" + System.currentTimeMillis());
- try {
- //api url地址
- String url = environmentUrl+"hour";
- String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
- String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
- logger.info("=====收到小时数据======" + responseMsg);
- if (ToolUtil.isNotEmpty(responseMsg)) {
- JSONObject json = JSONObject.fromObject(responseMsg);
- if (successCode.equals(json.getString("code"))) {
- iBizHourDataService.saveDate(convertDTO(json));
+
+ for (String sn : snList) {
+ try {
+ //api url地址
+ String url = environmentUrl + "hour";
+// String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
+ String SN = sn;
+ String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
+ logger.info("=====收到小时数据======" + responseMsg);
+ if (ToolUtil.isNotEmpty(responseMsg)) {
+ JSONObject json = JSONObject.fromObject(responseMsg);
+ if (successCode.equals(json.getString("code"))) {
+ iBizHourDataService.saveDate(convertDTO(json));
+ }
}
+ } catch (Exception e) {
+ e.printStackTrace();
}
- } catch (Exception e) {
- e.printStackTrace();
}
+
}
@Scheduled(initialDelay = 1000 * 10, fixedDelay = 1000 * 60 * 10)
public void scheduledTask3() {
- System.out.println("分钟获取监测数据:" + System.currentTimeMillis());
- try {
- //api url地址
- String url = environmentUrl+"minute";
- String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
- String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
- logger.info("=====收到分钟数据======" + responseMsg);
- if (ToolUtil.isNotEmpty(responseMsg)) {
- JSONObject json = JSONObject.fromObject(responseMsg);
- if (successCode.equals(json.getString("code"))) {
- iBizMiniteDataService.saveDate(convertDTO(json));
+ for (String sn : snList) {
+ try {
+ //api url地址
+ String url = environmentUrl + "minute";
+// String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
+ String SN = sn;
+ String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
+ logger.info("=====收到分钟数据======" + responseMsg);
+ if (ToolUtil.isNotEmpty(responseMsg)) {
+ JSONObject json = JSONObject.fromObject(responseMsg);
+ if (successCode.equals(json.getString("code"))) {
+ iBizMiniteDataService.saveDate(convertDTO(json));
+ }
}
- }
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
@Scheduled(cron = "0 0 1 * * ?")
public void scheduledTask() {
- System.out.println("每天获取监测数据:" + System.currentTimeMillis());
- try {
+ for (String sn : snList) {
+ try {
- //api url地址
- String url = environmentUrl+"day";
- String SN = "MjAyMTAxMjAwMzEwMDAxMg==";
- String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
- logger.info("=====收到每天数据======" + responseMsg);
- if (ToolUtil.isNotEmpty(responseMsg)) {
- JSONObject json = JSONObject.fromObject(responseMsg);
- if (successCode.equals(json.getString("code"))) {
- iBizDayDataService.saveDate(convertDTO(json));
+ //api url地址
+ String url = environmentUrl + "day";
+ String SN =sn;
+ String responseMsg = HttpClientUtils.post(url + "?SN=" + SN, "");
+ logger.info("=====收到每天数据======" + responseMsg);
+ if (ToolUtil.isNotEmpty(responseMsg)) {
+ JSONObject json = JSONObject.fromObject(responseMsg);
+ if (successCode.equals(json.getString("code"))) {
+ iBizDayDataService.saveDate(convertDTO(json));
+ }
+
}
-
+ } catch (Exception e) {
+ e.printStackTrace();
}
- } catch (Exception e) {
- e.printStackTrace();
}
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizDayDataMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizDayDataMapper.java
index df0885c..6dd0c74 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizDayDataMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BizDayDataMapper.java
@@ -2,6 +2,9 @@
import com.casic.missiles.modular.system.model.BizDayData;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
@@ -13,4 +16,8 @@
*/
public interface BizDayDataMapper extends BaseMapper {
+
+ @Select(" SELECT sn FROM `biz_device` where del_flag =0 and sn is not null ")
+ List getSns();
+
}