Merge remote-tracking branch 'origin/master'

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java

@@ -322,7 +322,11 @@
            if (!CollectionUtils.isEmpty(value)) {
                value.forEach(item -> {
                    String[] ri = new String[3];
                    ri[0] = DateUtils.format(DateUtils.parse(item.getStartTime(), DateUtils.DATE_TIME_PATTERN_STRING), "yyyy-MM-dd HH:mm:00");
                    if(DateUtils.parse(item.getStartTime(), DateUtils.DATE_TIME_PATTERN_STRING).getTime() < startTime.getTime()){
                        ri[0] = DateUtils.format(startTime, "yyyy-MM-dd HH:mm:00");
                    }else {
                        ri[0] = DateUtils.format(DateUtils.parse(item.getStartTime(), DateUtils.DATE_TIME_PATTERN_STRING), "yyyy-MM-dd HH:mm:00");
                    }
                    ri[1] = DateUtils.format(DateUtils.parse(item.getEndTime(), DateUtils.DATE_TIME_PATTERN_STRING), "yyyy-MM-dd HH:mm:00");
                    ri[2] = "2";
                    if (DateUtils.parse(item.getStartTime(), "yyyyMMddHHmmss").getTime() < predictTime.getTime()) {

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelBMTask.java

@@ -93,6 +93,8 @@
            calendar.add(Calendar.DAY_OF_YEAR, -1);
            Date startDate = calendar.getTime();
            String clock = DateUtils.format(startDate);
            calendar.add(Calendar.DAY_OF_YEAR, -3);
            Date chartStartDate = calendar.getTime();

            // 调用模型
     /*       MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
@@ -132,7 +134,7 @@
            cokingTraceIndService.saveTraceInd(relId, indType, clock);

            // 保存溯源折线图
            cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
            cokingTraceChartService.save(relId, clock, indType, chartStartDate, endDate);

        } catch (Exception ex) {
            logger.error("RunCokingTraceModelBMTask运行异常");

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java

@@ -92,6 +92,8 @@
            calendar.add(Calendar.DAY_OF_YEAR, -1);
            Date startDate = calendar.getTime();
            String clock = DateUtils.format(startDate);
            calendar.add(Calendar.DAY_OF_YEAR, -3);
            Date chartStartDate = calendar.getTime();

            // 调用模型
            JSONObject jsonObject = JSONObject.parseObject(jsonStr);
@@ -121,7 +123,7 @@
            cokingTraceIndService.saveTraceInd(relId, indType, clock);

            // 保存溯源折线图
            cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
            cokingTraceChartService.save(relId, clock, indType, chartStartDate, endDate);

        } catch (Exception ex) {
            logger.error("RunCokingTraceModelHCTask运行异常");

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java

@@ -92,6 +92,8 @@
            calendar.add(Calendar.DAY_OF_YEAR, -1);
            Date startDate = calendar.getTime();
            String clock = DateUtils.format(startDate);
            calendar.add(Calendar.DAY_OF_YEAR, -3);
            Date chartStartDate = calendar.getTime();

            // 调用模型
            JSONObject jsonObject = JSONObject.parseObject(jsonStr);
@@ -121,7 +123,7 @@
            cokingTraceIndService.saveTraceInd(relId, indType, clock);

            // 保存溯源折线图
            cokingTraceChartService.save(relId, clock, indType, startDate, endDate);
            cokingTraceChartService.save(relId, clock, indType, chartStartDate, endDate);

        } catch (Exception ex) {
            logger.error("RunCokingTraceModelLJTask运行异常");