parent: 7756a8fd | patch | commit | ignore whitespace
jinpengyong
2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63 
Merge remote-tracking branch 'origin/master'
4 files modified
51 ■■■■■ changed files
src/main/java/com/moral/task/AQIDataInsertTask.java 17 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/task/AlarmTableInsertTask.java 12 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/task/HistoryMinutelySubTableTask.java 11 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/task/HistoryTableDeleteTask.java 11 ●●●●● patch | view | raw | blame | history 
 src/main/java/com/moral/task/AQIDataInsertTask.java


@@ -1,12 +1,22 @@


package com.moral.task;


import java.text.SimpleDateFormat;


import java.util.Calendar;


import java.util.Collection;


import java.util.Date;


import java.util.HashMap;


import java.util.List;


import java.util.Map;




import javax.annotation.Resource;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONObject;


import com.moral.service.AQIService;


import com.moral.util.HttpUtils;


import com.moral.util.WxMappingJackson2HttpMessageConverter;




import com.xxl.job.core.biz.model.ReturnT;


import com.xxl.job.core.handler.annotation.XxlJob;




import org.apache.commons.lang3.time.DateUtils;


import org.apache.http.HttpResponse;


import org.apache.http.util.EntityUtils;


@@ -14,9 +24,6 @@


import org.springframework.stereotype.Component;


import org.springframework.util.ObjectUtils;


import org.springframework.web.client.RestTemplate;


import javax.annotation.Resource;


import java.text.SimpleDateFormat;


import java.util.*;




@Component


public class AQIDataInsertTask {


@@ -25,7 +32,7 @@


    @Resource


    private RedisTemplate redisTemplate;


    @XxlJob("insertData")


    public ReturnT insertData(){


    public ReturnT insertData(String param){


        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


        RestTemplate restTemplate = new RestTemplate();


        restTemplate.getMessageConverters().add(new WxMappingJackson2HttpMessageConverter());




 src/main/java/com/moral/task/AlarmTableInsertTask.java


@@ -6,14 +6,14 @@




import javax.annotation.Resource;




import com.moral.service.AlarmService;


import com.xxl.job.core.biz.model.ReturnT;


import com.xxl.job.core.handler.annotation.XxlJob;




import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.stereotype.Component;


import org.springframework.util.CollectionUtils;




import com.moral.service.AlarmService;


import com.xxl.job.core.biz.model.ReturnT;


import com.xxl.job.core.handler.annotation.XxlJob;




@Component


public class AlarmTableInsertTask {


@@ -23,7 +23,7 @@


    private AlarmService alarmService;




    @XxlJob("alarmDaily")


    public ReturnT insertAlarmDailyTable() {


    public ReturnT insertAlarmDailyTable(String param) {


        List<Map<String, Object>> list = alarmService.getAlarmData();


        if (!CollectionUtils.isEmpty(list)) {


            alarmService.insertAlarmDaily(list);


@@ -33,7 +33,7 @@


    }




    @XxlJob("createAlarmSubTable")


    public ReturnT createAlarmSubTable() {


    public ReturnT createAlarmSubTable(String param) {


        LocalDateTime time = LocalDateTime.now().plusMonths(1);


        String year = time.getYear() + "";


        String month = time.getMonthValue() + "";




 src/main/java/com/moral/task/HistoryMinutelySubTableTask.java


@@ -1,20 +1,21 @@


package com.moral.task;




import java.time.LocalDateTime;




import javax.annotation.Resource;




import com.moral.service.HistoryMinutelyService;


import com.xxl.job.core.biz.model.ReturnT;


import com.xxl.job.core.handler.annotation.XxlJob;


import org.springframework.format.datetime.joda.LocalDateTimeParser;


import org.springframework.stereotype.Component;




import javax.annotation.Resource;


import java.time.LocalDateTime;


import org.springframework.stereotype.Component;




@Component


public class HistoryMinutelySubTableTask {


    @Resource


    private HistoryMinutelyService historyMinutelyService;


    @XxlJob("createHistoryMinutelyTb")


    public ReturnT createHistoryMinutelyTb(){


    public ReturnT createHistoryMinutelyTb(String param){


        LocalDateTime time=LocalDateTime.now();


        LocalDateTime time1 = time.plusMonths(1);


        String year = String.valueOf(time1.getYear());




 src/main/java/com/moral/task/HistoryTableDeleteTask.java


@@ -1,18 +1,15 @@


package com.moral.task;




import com.moral.service.HistoryService;


import javax.annotation.Resource;




import com.moral.service.HistoryService;


import com.moral.util.DateUtil;


import com.xxl.job.core.biz.model.ReturnT;


import com.xxl.job.core.handler.annotation.XxlJob;




import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.stereotype.Component;




import javax.annotation.Resource;


import java.text.SimpleDateFormat;




import java.util.Date;




@Component


public class HistoryTableDeleteTask {


@@ -21,7 +18,7 @@


    private HistoryService historyService;




    @XxlJob("deleteOldDate")


    public ReturnT deleteOldData() {


    public ReturnT deleteOldData(String param) {


        String p=DateUtil.getOldTime(8);


        String s=DateUtil.getOldTime(7);


        String[] ss=p.split("-");