From a3c6b8485a884b0d79c53484d7907736e031d1b2 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 14 Jan 2022 14:31:50 +0800
Subject: [PATCH] screen-api 更新返回属性大小写
---
screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java b/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java
index 69ae60a..77dae71 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java
@@ -35,16 +35,12 @@
/*
* ���������������������������������������������������
* */
- @DateTimeFormat(pattern = "yyyy")
- @JsonFormat(pattern = "yyyy", timezone = "GMT+8")
- Date year;
+ String dateType;
/*
* ���������������������������������������������������
* */
- @DateTimeFormat(pattern = "yyyy-MM")
- @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
- Date month;
+ String time;
/*
* ���������������������������������
@@ -66,8 +62,6 @@
return false;
if (!regionType.equals(Constants.TWENTY_EIGHT_CITIES) && regionCode == null)
return false;
- if (regionCode.toString().length() != 6)
- return false;
if (regionType.equals(Constants.CITY_TYPE)) {
String regionCodeStr = regionCode.toString();
if (!regionCodeStr.substring(regionCodeStr.length() - 2, regionCodeStr.length()).equals("00"))
@@ -75,28 +69,30 @@
}
if (regionType.equals(Constants.PROVINCE_TYPE)) {
String regionCodeStr = regionCode.toString();
- if (!regionCodeStr.substring(regionCodeStr.length() - 4, regionCodeStr.length()).equals("0000"))
- return false;
+ regionCode = Integer.parseInt(regionCodeStr.substring(0,regionCodeStr.length()-4)+"0000");
+ }
+ //������������
+ if(dateType.equals(Constants.MONTH)){
+ Date date = DateUtils.getDate(time, "yyyy-MM");
+ startDate = DateUtils.getFirstDayOfMonth(date);
+ endDate = DateUtils.getLastDayOfMonth(date);
+ return true;
}
- //������������
- if (year != null) {
- if(month!=null)
- return false;
- startDate = DateUtils.getFirstDayOfYear(year);
- endDate = DateUtils.getLastDayOfYear(year);
+ if(dateType.equals(Constants.YEAR)){
+ Date date = DateUtils.getDate(time, "yyyy");
+ startDate = DateUtils.getFirstDayOfYear(date);
+ endDate = DateUtils.getLastDayOfYear(date);
return true;
}
- if (month != null) {
- if(year!=null)
- return false;
- startDate = DateUtils.getFirstDayOfMonth(month);
- endDate = DateUtils.getLastDayOfMonth(month);
- return true;
- }
+
if(startDate!=null&&endDate!=null)
return true;
return false;
}
+
+ public static void main(String[] args) {
+
+ }
}
--
Gitblit v1.8.0