fix：雷达调整

cjl

10 hours ago bcc076d63c5c2ff473adb5ac15ea242559086000

 screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java

@@ -626,9 +626,9 @@
        }
        //从数据库获取数据参数
        Map<String, Object> params = new HashMap<>();
        Date startTime=null;
        Date endTime=null;
        if (!ObjectUtils.isEmpty(start) || !ObjectUtils.isEmpty(end)){
        Date startTime;
        Date endTime;
        if (!ObjectUtils.isEmpty(start) && !ObjectUtils.isEmpty(end)){
            startTime = DateUtils.getDate(start, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            endTime = DateUtils.getDate(end, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        }else {
@@ -665,7 +665,7 @@
        data.forEach((key, value) -> {
            Map<String, Object> historyHourly = new HashMap<>();
            historyHourly.put("mac", key);
            historyHourly.put("time",start);
            historyHourly.put("time",startTime);

            Map<String, Object> jsonMap = new HashMap<>();
            Map<String, Object> map = new HashMap<>();
@@ -807,8 +807,8 @@
    }

    public static void main(String[] args) {
        String result = "QN=20231019000100001;ST=31;CN=2051;PW=123456;MN=P5DND7A0392082;Flag=4;CP=&&DataTime=20231019000100;a01001-Avg=25.0,a01001-Flag=N;a01002-Avg=61.0,a01002-Flag=N;a34004-Avg=19.3,a34004-Flag=N;a34002-Avg=38.5,a34002-Flag=N;a34001-Avg=41.2,a34001-Flag=N;a01007-Avg=0.00,a01007-Flag=N;a01008-Avg=137.53,a01008-Flag=N;a01006-Avg=4255.774,a01006-Flag=T;a00e13-Avg=39.2,a00e13-Flag=N&&";

        //String result = "QN=20231019000100001;ST=31;CN=2051;PW=123456;MN=P5DND7A0392082;Flag=4;CP=&&DataTime=20231019000100;a01001-Avg=25.0,a01001-Flag=N;a01002-Avg=61.0,a01002-Flag=N;a34004-Avg=19.3,a34004-Flag=N;a34002-Avg=38.5,a34002-Flag=N;a34001-Avg=41.2,a34001-Flag=N;a01007-Avg=0.00,a01007-Flag=N;a01008-Avg=137.53,a01008-Flag=N;a01006-Avg=4255.774,a01006-Flag=T;a00e13-Avg=39.2,a00e13-Flag=N&&";
        String result = "QN=20190708102334000;ST=91;CN=9014;PW=3546D0E65659D92744234D6D;MN=1100000120001;Flag=4;CP=&&ExeRtn=1&&";
        String s = Crc16Utils.padLeftTest(String.valueOf(result.length()),4,null);
        String s1 = Crc16Utils.crc16_2017(result, result.length());
        System.out.println("##"+s+result+s1+"\r\n");