From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/controller/PubController.java b/screen-job/src/main/java/com/moral/api/controller/PubController.java
index 16805cd..190f76f 100644
--- a/screen-job/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -1,22 +1,22 @@
package com.moral.api.controller;
-import com.moral.api.service.HistoryAqiService;
-import com.moral.api.service.HistoryDailyService;
-import com.moral.api.service.HistoryFiveMinutelyService;
-import com.moral.api.service.HistoryHourlyService;
+import com.moral.api.service.*;
+import com.moral.api.util.HttpUtils;
import com.moral.constant.ResultMessage;
import com.moral.util.DateUtils;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* @ClassName UserController
@@ -36,6 +36,11 @@
private HistoryFiveMinutelyService historyFiveMinutelyService;
@Autowired
+ private CityWeatherService cityWeatherService;
+ @Autowired
+ private ForecastService forecastService;
+
+ @Autowired
private HistoryAqiService historyAqiService;
@Autowired
private HistoryHourlyService historyHourlyService;
@@ -52,7 +57,12 @@
@GetMapping("insertHistoryFiveMinutely")
@ApiOperation(value = "5������������", notes = "5������������")
public ResultMessage insertHistoryFiveMinutely() {
+ String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
historyFiveMinutelyService.insertHistoryFiveMinutely();
+ String s ="2023-10-13 03:35";
+ String s1 ="2023-10-13 03:40";
+ Date start = DateUtils.getDate(s,format);
+ Date end = DateUtils.getDate(s1,format);
return new ResultMessage();
}
@@ -65,11 +75,17 @@
@GetMapping("insertHistoryAqi")
@ApiOperation(value = "������������������", notes = "������������������")
- public ResultMessage insertHistoryAqi() {
- historyAqiService.insertHistoryAqi();
+ public ResultMessage insertHistoryAqi(String time) {
+ historyAqiService.insertHistoryAqi(time);
return new ResultMessage();
}
+ @GetMapping("insertHCHistoryAqi")
+ @ApiOperation(value = "������������", notes = "������������")
+ public ResultMessage insertHCHistoryAqi() {
+ historyAqiService.insertHCHistoryAqi();
+ return new ResultMessage();
+ }
@GetMapping("dateToChangShu")
@ApiOperation(value = "������������������", notes = "������������������")
public ResultMessage dateToChangShu() {
@@ -77,15 +93,50 @@
return new ResultMessage();
}
+ @GetMapping("forecastO3")
+ @ApiOperation(value = "O3������������������", notes = "O3")
+ public ResultMessage forecastO3() {
+ forecastService.forecastO3();
+ return new ResultMessage();
+ }
+ @GetMapping("insertCityWeather")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ public ResultMessage insertCityWeather() {
+ cityWeatherService.insertCityWeather();
+ return new ResultMessage();
+ }
+
public static void main(String[] args) {
- String s = "2023-9-01";
- Date d = DateUtils.getDate(s,"yyyy-MM-dd");
- System.out.println(DateUtils.dateToDateFullString(d));
- //System.out.println( DateUtils.dateToDateFullString(DateUtils.getDateOfDay(d, -1), "yyyy-MM-dd"));
+ String host = "https://pair.market.alicloudapi.com";
+ String path = "/api/v1/pair/station_list";
+ String method = "GET";
+ String appcode = "31b6ea8f804a4472be3b633cfee44849";
+ Map<String, String> headers = new HashMap<String, String>();
+ //���������header������������(���������������������)���Authorization:APPCODE 83359fd73fe94948385f570e3c139105
+ headers.put("Authorization", "APPCODE " + appcode);
+ Map<String, String> querys = new HashMap<String, String>();
+ querys.put("province", "���������");
-
+ try {
+ /**
+ * ������������������:
+ * HttpUtils������
+ * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java
+ * ������
+ *
+ * ������������������������
+ * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
+ */
+ HttpResponse response = HttpUtils.doGet(host, path, method, headers, querys);
+ System.out.println(response.toString());
+ //������response���body
+ System.out.println(EntityUtils.toString(response.getEntity()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
+
}
--
Gitblit v1.8.0