From 4dc585d5bf2fd0a01602aba0d9fa25adbaf4a7fb Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 18 九月 2023 18:45:03 +0800
Subject: [PATCH] 提交仓内抓拍和后台配置
---
igds-basic/src/main/java/com/ld/igds/timer/WeatherTimerService.java | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/timer/WeatherScheduled.java b/igds-basic/src/main/java/com/ld/igds/timer/WeatherTimerService.java
similarity index 87%
rename from igds-basic/src/main/java/com/ld/igds/timer/WeatherScheduled.java
rename to igds-basic/src/main/java/com/ld/igds/timer/WeatherTimerService.java
index 64d944c..44b2ce3 100644
--- a/igds-basic/src/main/java/com/ld/igds/timer/WeatherScheduled.java
+++ b/igds-basic/src/main/java/com/ld/igds/timer/WeatherTimerService.java
@@ -24,9 +24,9 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
+
import javax.annotation.Resource;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -46,7 +46,7 @@
*/
@Slf4j
@Component
-public class WeatherScheduled {
+public class WeatherTimerService {
@Resource(name = NotifyWeatherService.BEAN_ID)
private NotifyWeatherService notifyService;
@@ -74,8 +74,7 @@
/**
* 瀹氭椂鑾峰彇姘旇薄淇℃伅锛岃娉ㄦ剰锛岀敱浜庢皵璞℃敮鎸佸缃戝拰鑷畾涔夋皵璞＄珯锛岀郴缁熼粯璁ゅ彧鎵ц鍏朵腑涓�绉嶆柟寮�
*/
- @Scheduled(cron = "0 0/30 * * * ?")
- public void scheduled() {
+ public void doExe() {
log.info("===========================绯荤粺瀹氭椂鑾疯幏鍙栨皵璞′俊鎭�======================");
@@ -179,9 +178,9 @@
private void getWeatherByRkV30(Date date, WeatherConf conf) {
//鑻ョ敤鎴枫�佸瘑鐮併�両P鍦板潃鏈変竴涓虹┖鍒欒繑鍥�
- if(StringUtils.isEmpty(conf.getAccount())
+ if (StringUtils.isEmpty(conf.getAccount())
|| StringUtils.isEmpty(conf.getPassword())
- || StringUtils.isEmpty(conf.getIp())){
+ || StringUtils.isEmpty(conf.getIp())) {
return;
}
@@ -199,15 +198,15 @@
String body = ans.getBody();
log.debug("-----褰撳墠寤哄ぇ浠佺骞冲彴鑾峰彇姘旇薄淇℃伅-----锛岃繑鍥炴暟鎹�={}", body);
RkResult response = JSONObject.parseObject(body, RkResult.class);
- if(StringUtils.isEmpty(response.getCode()) || !"1000".equals(response.getCode())){
+ if (StringUtils.isEmpty(response.getCode()) || !"1000".equals(response.getCode())) {
log.error("褰撳墠寤哄ぇ浠佺骞冲彴鑾峰彇姘旇薄淇℃伅澶辫触......");
return;
}
List<JSONObject> result = JSON.parseArray(JSONObject.toJSONString(response.getData()), JSONObject.class);
- JSONArray lists = (JSONArray)result.get(0).get("dataItem");
+ JSONArray lists = (JSONArray) result.get(0).get("dataItem");
List<RkDto> list = JSON.parseArray(JSONObject.toJSONString(lists), RkDto.class);
- if(null == list || list.isEmpty()){
+ if (null == list || list.isEmpty()) {
return;
}
WeatherInfo info = new WeatherInfo();
@@ -221,55 +220,55 @@
//鏍规嵁鍦板潃鍒ゆ柇閫夐」
for (RkDto rkDto : list) {
//娓╂箍搴�
- if("11".equals(rkDto.getNodeId())){
+ if ("11".equals(rkDto.getNodeId())) {
dataList = rkDto.getRegisterItem();
for (RkData rkData : dataList) {
//娓╁害
- if("1".equals(rkData.getRegisterId())){
+ if ("1".equals(rkData.getRegisterId())) {
info.setTemp(rkData.getData());
}
//婀垮害
- if("2".equals(rkData.getRegisterId())){
+ if ("2".equals(rkData.getRegisterId())) {
info.setHumidity(rkData.getData());
}
}
}
//椋庡姏椋庨��
- if("1".equals(rkDto.getNodeId())){
+ if ("1".equals(rkDto.getNodeId())) {
dataList = rkDto.getRegisterItem();
for (RkData rkData : dataList) {
//椋庡姏
- if("1".equals(rkData.getRegisterId())){
+ if ("1".equals(rkData.getRegisterId())) {
info.setWindSpeed(rkData.getData() + "绾�");
}
//椋庨��
- if("2".equals(rkData.getRegisterId())){
+ if ("2".equals(rkData.getRegisterId())) {
info.setWindMeter(rkData.getData());
}
}
}
//椋庡悜
- if("2".equals(rkDto.getNodeId())){
+ if ("2".equals(rkDto.getNodeId())) {
dataList = rkDto.getRegisterItem();
for (RkData rkData : dataList) {
//椋庡悜
- if("1".equals(rkData.getRegisterId())){
+ if ("1".equals(rkData.getRegisterId())) {
info.setWindDirection(rkData.getData());
}
}
}
//澶ф皵鍘�
- if("14".equals(rkDto.getNodeId())){
+ if ("14".equals(rkDto.getNodeId())) {
dataList = rkDto.getRegisterItem();
for (RkData rkData : dataList) {
//澶ф皵鍘�
- if("2".equals(rkData.getRegisterId())){
+ if ("2".equals(rkData.getRegisterId())) {
info.setPressure(rkData.getData());
}
}
}
//闆ㄩ噺
- if("21".equals(rkDto.getNodeId())){
+ if ("21".equals(rkDto.getNodeId())) {
dataList = rkDto.getRegisterItem();
for (RkData rkData : dataList) {
// //鐬椂闆ㄩ噺
@@ -277,33 +276,33 @@
// info.setRainfall(rkData.getData());
// }
//褰撳墠闆ㄩ噺
- if("2".equals(rkData.getRegisterId())){
+ if ("2".equals(rkData.getRegisterId())) {
info.setRainfall(rkData.getData());
}
}
}
//鏈夋棤闆ㄩ洩
- if("16".equals(rkDto.getNodeId())){
+ if ("16".equals(rkDto.getNodeId())) {
weatherList = rkDto.getRegisterItem();
}
}
for (RkData rkData : weatherList) {
//澶╂皵
- if("1".equals(rkData.getRegisterId())){
+ if ("1".equals(rkData.getRegisterId())) {
info.setWeather(rkData.getData());
//鏈夐洦闆椂鍒ゆ柇褰撳墠闆ㄩ噺
- if("鏈夐洦闆�".equals(rkData.getData())){
+ if ("鏈夐洦闆�".equals(rkData.getData())) {
Double rainfall = Double.valueOf(info.getRainfall());
- if(rainfall <= 10){
+ if (rainfall <= 10) {
info.setWeather("灏忛洦");
}
- if(rainfall > 10 && rainfall <= 25){
+ if (rainfall > 10 && rainfall <= 25) {
info.setWeather("涓洦");
}
- if(rainfall > 25 && rainfall <= 50){
+ if (rainfall > 25 && rainfall <= 50) {
info.setWeather("澶ч洦");
}
- if(rainfall > 50){
+ if (rainfall > 50) {
info.setWeather("鏆撮洦");
}
}
@@ -316,6 +315,7 @@
/**
* 鑾峰彇韬唤璁よ瘉鐨勬巿鏉僡ccessToken
+ *
* @param conf
* @return
*/
@@ -334,7 +334,7 @@
}
log.info("鑾峰彇鐨勮韩浠借璇佷俊鎭�={}", response);
- if(StringUtils.isEmpty(response.getCode()) || !"1000".equals(response.getCode())){
+ if (StringUtils.isEmpty(response.getCode()) || !"1000".equals(response.getCode())) {
log.error("褰撳墠寤哄ぇ浠佺骞冲彴鑾峰彇韬唤璁よ瘉淇℃伅澶辫触......");
return null;
}
@@ -345,9 +345,10 @@
token = (String) result.get("token");
//灏唗oken瀛樺叆缂撳瓨,
- redisUtil.set(key, token, 2*60*60);
+ redisUtil.set(key, token, 2 * 60 * 60);
}
return token;
}
+
}
--
Gitblit v1.9.3