Merge branch 'master' of http://dlindusit.com:53929/r/ansteel

# Conflicts:
#	doc/鞍钢数据接口文档_master.doc

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java

@@ -58,9 +58,9 @@
        return success(list);
    }

    @PostMapping("/schedule-suggest/update-status")
    @Operation(summary = "修改建议状态")
    public CommonResult<Boolean> updateSuggestStatus(@RequestBody StAlarmAndSuggestReqVO ReqVO) {
        return success(dataApi.updateSuggestStatus(ReqVO));
    @PostMapping("/schedule-suggest/use-suggest")
    @Operation(summary = "采纳建议")
    public CommonResult<Boolean> useSuggest(@RequestBody StAlarmAndSuggestReqVO ReqVO) {
        return success(dataApi.useSuggest(ReqVO));
    }
}

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

@@ -23,5 +23,5 @@

    List<MainProcessIndexDTO> getIndexList(Map<String, Object> params);

    Boolean updateSuggestStatus(StAlarmAndSuggestReqVO ReqVO);
    Boolean useSuggest(StAlarmAndSuggestReqVO ReqVO);
}

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

@@ -119,8 +119,8 @@
    }

    @Override
    public Boolean updateSuggestStatus(StAlarmAndSuggestReqVO ReqVO) {
        return mcsApi.updateSuggestStatus(ReqVO);
    public Boolean useSuggest(StAlarmAndSuggestReqVO ReqVO) {
        return mcsApi.useSuggest(ReqVO);
    }

    @Override
@@ -186,13 +186,6 @@
            });
            preDataView.setTrendsDataL(newList);
        }
        MmItemOutputDTO outputDTO = mcsApi.getItemOutputByItemid(predictItem.getId(), resultStr, resultIndex);

        PreItemResultReqVO preItemResultReqVO = new PreItemResultReqVO();
        preItemResultReqVO.setOutputid(outputDTO.getId());
        preItemResultReqVO.setStartTime(startTime);
        preItemResultReqVO.setEndTime(endTime);
        preItemResultReqVO.setTimeFormat(timeFormat);

        preDataView.setPreData(resultOld.getDataView().getPreDataL());


 doc/鞍钢数据接口文档_dev_li.doc

Binary files differ