Skip to content

A
amos-boot-biz
Commit 6a32eb52 authored by wujiang's avatar wujiang
Browse files
Options

提交历史发电量问题

parent 18fb01a2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java
View file @ 6a32eb52
...@@ -274,7 +274,7 @@ public class LargeScreenImpl { ...@@ -274,7 +274,7 @@ public class LargeScreenImpl {
//全国发电趋势 //全国发电趋势
@Scheduled(cron = "0/10 * * * * ?") @Scheduled(cron = "0/1 * * * * ? ")
public SeriesData getSeriesDataqg(){ public SeriesData getSeriesDataqg(){
//获取今年当月 日发电趋势 //获取今年当月 日发电趋势
...@@ -289,8 +289,8 @@ public class LargeScreenImpl { ...@@ -289,8 +289,8 @@ public class LargeScreenImpl {
mapjn.put("data",listjn); mapjn.put("data",listjn);
mapjn.put("name","当前值"); mapjn.put("name","当前值");
Map<String,Object> mapqn=new HashMap<>(); Map<String,Object> mapqn=new HashMap<>();
mapjn.put("data",listqn); mapqn.put("data",listqn);
mapjn.put("name","同期值"); mapqn.put("name","同期值");
List<Map<String,Object>> list=new ArrayList<>(); List<Map<String,Object>> list=new ArrayList<>();
list.add(mapjn); list.add(mapjn);
...@@ -489,7 +489,7 @@ public class LargeScreenImpl { ...@@ -489,7 +489,7 @@ public class LargeScreenImpl {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setTime(month);//month 为指定月份任意日期 cal.setTime(month);//month 为指定月份任意日期
int year = cal.get(Calendar.YEAR); int year = cal.get(Calendar.YEAR);
int m = cal.get(Calendar.MONTH); int m = cal.get(Calendar.MONTH)+1;
int dayNumOfMonth = DateUtil.getDaysByYearMonth(year, m); int dayNumOfMonth = DateUtil.getDaysByYearMonth(year, m);
cal.set(Calendar.DAY_OF_MONTH, 1);// 从一号开始 cal.set(Calendar.DAY_OF_MONTH, 1);// 从一号开始
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment