ZhuDongming
2020-04-28 8aa815dd9fca6dc914c0cba72ada9af5c795a44c
src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -24,6 +24,7 @@
import com.moral.service.HistoryDailyService;
import com.moral.service.HistoryHourlyService;
import com.moral.service.HistoryMinutelyService;
import com.moral.service.HistoryService;
import com.moral.service.SensorService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
@@ -40,6 +41,9 @@
    private DeviceService deviceService;
    @Resource
    private HistoryService historyService;
    @Resource
    private HistoryMinutelyService historyMinutelyService;
    @Resource
@@ -53,6 +57,15 @@
        LocalDateTime time = LocalDateTime.now();
        int year = time.getYear();
        int month = time.getMonthValue();
        int day = time.getDayOfMonth();
        if (day == 1) {
            if (month == 1) {
                month = 12;
                year = year - 1;
            } else {
                month = month - 1;
            }
        }
        String monthStr = month < 10 ? ("0" + month) : month + "";
        String yearAndMonth = year + monthStr;
        LocalDateTime endTime = time.truncatedTo(ChronoUnit.MINUTES);
@@ -492,6 +505,15 @@
        LocalDateTime time = LocalDateTime.now();
        int year = time.getYear();
        int month = time.getMonthValue();
        int day = time.getDayOfMonth();
        if (day == 1) {
            if (month == 1) {
                month = 12;
                year = year - 1;
            } else {
                month = month - 1;
            }
        }
        String monthStr = month < 10 ? ("0" + month) : month + "";
        String yearAndMonth = year + monthStr;
        LocalDateTime endTime = time.truncatedTo(ChronoUnit.HOURS);
@@ -519,8 +541,13 @@
                        if (!key.equals("mac") && !key.startsWith("M")) {
                            List<Object> date = new ArrayList<>();
                            date.add(deviceData.get(key));
                            date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
                            date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
                            if (deviceData.get("MIN" + key) instanceof String) {
                                date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
                                date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
                            } else if (deviceData.get("MIN" + key) instanceof byte[]) {
                                date.add(new BigDecimal(new String((byte[]) (deviceData.get("MIN" + key)))));
                                date.add(new BigDecimal(new String((byte[]) (deviceData.get("MAX" + key)))));
                            }
                            jo.put(key, date);
                        }
                    }
@@ -584,8 +611,13 @@
                        if (!key.equals("mac") && !key.startsWith("M")) {
                            List<Object> date = new ArrayList<>();
                            date.add(deviceData.get(key));
                            date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
                            date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
                            if (deviceData.get("MIN" + key) instanceof String) {
                                date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
                                date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
                            } else if (deviceData.get("MIN" + key) instanceof byte[]) {
                                date.add(new BigDecimal(new String((byte[]) (deviceData.get("MIN" + key)))));
                                date.add(new BigDecimal(new String((byte[]) (deviceData.get("MAX" + key)))));
                            }
                            jo.put(key, date);
                        }
                    }
@@ -643,8 +675,13 @@
                            if (!key.equals("mac") && !key.startsWith("M")) {
                                List<Object> date = new ArrayList<>();
                                date.add(deviceData.get(key));
                                date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
                                date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
                                if (deviceData.get("MIN" + key) instanceof String) {
                                    date.add(new BigDecimal(deviceData.get("MIN" + key).toString()));
                                    date.add(new BigDecimal(deviceData.get("MAX" + key).toString()));
                                } else if (deviceData.get("MIN" + key) instanceof byte[]) {
                                    date.add(new BigDecimal(new String((byte[]) (deviceData.get("MIN" + key)))));
                                    date.add(new BigDecimal(new String((byte[]) (deviceData.get("MAX" + key)))));
                                }
                                jo.put(key, date);
                            }
                        }
@@ -848,4 +885,28 @@
        return returnT;
    }
    @XxlJob("historySpecial")
    public ReturnT insertHistorySpecialTable(String params) {
        Map macMap = JSON.parseObject(params);
        List<String> macList = (List<String>) macMap.get("mac");
        LocalDateTime value = LocalDateTime.now();
        Map<String, Object> devices = new HashMap<>();
        devices.put("macList", macList);
        devices.put("time", value);
        try {
            int count = historyService.insertHistorySpecialTable(devices);
            XxlJobLogger.log("insertHistorySpecialTable:" + count);
            if (count > 0) {
                ReturnT returnT = new ReturnT(200, "插入historySpecial表成功");
                return returnT;
            }
        } catch (Exception e) {
            XxlJobLogger.log("insertHistorySpecialTableException:" + e.getMessage());
            logger.error(e.getMessage());
            e.printStackTrace();
        }
        ReturnT returnT = new ReturnT(500, "插入historySpecial表失败");
        return returnT;
    }
}