From 867e3d0bd0760950ed0dc7a303106e47063d0928 Mon Sep 17 00:00:00 2001 From: liriming <1343021927@qq.com> Date: 星期四, 24 四月 2025 17:48:48 +0800 Subject: [PATCH] 定时任务修改 --- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java | 229 ++++++++++++++++++++------------------------------------ 1 files changed, 83 insertions(+), 146 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java index 8eddebf..4731a6a 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java @@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.*; @@ -31,7 +32,7 @@ * @createTime 2025年04月22日 */ @Component("runCokingTraceModelHCTask") -public class RunCokingTraceModelHCTask implements ITask{ +public class RunCokingTraceModelHCTask implements ITask { private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired @@ -50,19 +51,18 @@ private CokingTraceIndService cokingTraceIndService; @Autowired - private CokingTraceConfService cokingTraceConfService; - - @Autowired private CokingTraceChartService cokingTraceChartService; @Autowired private McsApi mcsApi; - @Autowired - private DataPointApi dataPointApi; + private final static String process = "化产工序"; - @Autowired - private IndItemApi indItemApi; + private final static String reportName = "化产工序异常溯源"; + + private final static String SugObj = "HC"; + + private final static String indType = "化产工序异常溯源"; private static final HashMap<String, Object> chemProdColoumMap = new HashMap<String, Object>() {{ put("chemProdFirstColoum0", "一级指标-偏差值"); @@ -77,20 +77,17 @@ put("F0000101006", "脱硫后H2S含量"); }}; - private static final String jsonStr="{\n" + - " \"result\":{\n" + - " \"chemProdSteam\":[[33836,33925]], \n" + - " \"chemProdIndex\":[[352,355],[68,66.3],[82.5,87.6],[50.7,56.5],[73.5,73.1]],\n" + - " \"chemProdTotal\":\"蒸汽消耗量异常,当前值1342,经模型计算,指标1异常,当前值1342,建议调整指标1至区间[90,110],指标2异常,当前值1342,建议调整指标2至区间[50,80]\",\n" + - " \"chemProdFirstColoum0\":[[0,42]],\n" + - " \"chemProdFirstColoum1\":[[5,1342],[7,1342],[9,1342]],\n" + - " \"chemProdFirstColoum2\":[[5,10,1342],[5,16,1342],[7,18,1342]],\n" + - " \"chemProdHomePage\":[[9,1342],[9,1342]],\n" + - " \"chemProdHomeIndex\":[[90.4,90.2],[80.3,78],[103,100],[280,270]],\n" + - " \"chemProdHomeIndexInfo\":\"2月18日甲班:化产蒸汽消耗量异常\",\n" + - " \"chemProdHomeErr\":\"2月18日化产蒸汽消耗量数据异常(无数据)\"\n" + - " }" + - "}"; + private static final String jsonStr = "{\n" + + "\"result\":{\n" + + "\"chemProdSteam\":[[33836,33925]], \n" + + "\"chemProdIndex\":[[352,355],[68,66.3],[82.5,87.6],[50.7,56.5],[73.5,73.1]],\n" + + "\"chemProdTotal\":\"蒸汽消耗量异常,当前值1342,经模型计算,指标1异常,当前值1342,建议调整指标1至区间[90,110],指标2异常,当前值1342,建议调整指标2至区间[50,80]\",\n" + + "\"chemProdFirstColoum0\":[[0,42]],\n" + " \"chemProdFirstColoum1\":[[5,1342],[7,1342],[9,1342]],\n" + + "\"chemProdFirstColoum2\":[[5,10,1342],[5,16,1342],[7,18,1342]],\n" + + "\"chemProdHomePage\":[[9,1342],[9,1342]],\n" + + "\"chemProdHomeIndex\":[[90.4,90.2],[80.3,78],[103,100],[280,270]],\n" + + "\"chemProdHomeIndexInfo\":\"2月18日甲班:化产蒸汽消耗量异常\",\n" + + "\"chemProdHomeErr\":\"2月18日化产蒸汽消耗量数据异常(无数据)\"\n" + " }" + "}"; @Override public void run(String params) { @@ -128,27 +125,36 @@ clock = DateUtils.format(startDate).concat("-").concat("B"); analyClass = "丙班"; } - Map<String, Object> tMap = new HashMap<>(); - tMap.put("relId", UUID.randomUUID().toString()); - tMap.put("process", "化产工序"); - tMap.put("reportName", "化产工序"); - tMap.put("analyDate", DateUtils.format(startDate)); - tMap.put("analyClass", analyClass); - tMap.put("clock", clock); - tMap.put("analyContent", "化产蒸汽消耗量异常"); - tMap.put("startDate", startDate); - tMap.put("endDate", endDate); - JSONObject jsonObject= JSONObject.parseObject(jsonStr); + // 调用模型 + JSONObject jsonObject = JSONObject.parseObject(jsonStr); JSONObject result = (JSONObject) JSON.toJSON(jsonObject.get("result")); - if(!Objects.isNull(result)){ - saveTraceReport(tMap,result); - saveTraceSuggest(tMap,result); - saveTraceDeviation(tMap,result); - saveAnalyInd(tMap,result); - saveTraceInd(tMap,result); - saveTraceChart(tMap,result,startDate,endDate); + + if (Objects.isNull(result)) { + logger.info("模型结果为空"); + return; } + + // 保存报告 + String analyDate = DateUtils.format(startDate); + String analyContent = result.getString("chemProdHomeIndexInfo"); + String relId = cokingTraceReportService.save(process, reportName, analyDate, analyClass, clock, analyContent); + + // 保存一级分析指标 + saveAnalyInd(relId, process, analyDate, analyClass, analyContent); + + // 保存优化建议 + saveTraceSuggest(relId, process, clock, result); + + // 保存偏差值 + saveTraceDeviation(relId, process, clock, result); + + // 保存溯源指标 + cokingTraceIndService.saveTraceInd(relId, indType, clock); + + // 保存溯源折线图 + cokingTraceChartService.save(relId, clock, indType, startDate, endDate); + } catch (Exception ex) { logger.error("RunCokingTraceModelHCTask运行异常"); ex.printStackTrace(); @@ -156,49 +162,39 @@ logger.info("RunCokingTraceModelHCTask运行完成"); } - public void saveTraceReport(Map<String, Object> tMap,JSONObject result) { - CokingTraceReportEntity reportEntity = new CokingTraceReportEntity(); - reportEntity.setId(tMap.get("relId").toString()); - reportEntity.setProcess(tMap.get("process").toString()); - reportEntity.setReportName(tMap.get("reportName").toString()); - reportEntity.setAnalyDate(tMap.get("analyDate").toString()); - reportEntity.setAnalyClass(tMap.get("analyClass").toString()); - reportEntity.setClock(tMap.get("clock").toString()); - reportEntity.setAnalyContent(tMap.get("analyContent").toString()); - reportEntity.setCreateDate(new Date()); - cokingTraceReportService.save(reportEntity); - } - - public void saveTraceSuggest(Map<String, Object> tMap,JSONObject result) { + public void saveTraceSuggest(String relId, String process, String clock, JSONObject result) { String chemProdTotal = result.get("chemProdTotal").toString(); - if(StringUtils.isNotBlank(chemProdTotal)){ - CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity(); - suggestEntity.setRelId(tMap.get("relId").toString()); - suggestEntity.setProcess(tMap.get("process").toString()); - suggestEntity.setSugObj("HC"); - suggestEntity.setClock(tMap.get("clock").toString()); - suggestEntity.setContent(chemProdTotal); - suggestEntity.setCreateDate(new Date()); - cokingTraceSuggestService.save(suggestEntity); + if (StringUtils.isBlank(chemProdTotal)) { + logger.info("coalPrepElecTotal1 is null"); + return; } + CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity(); + suggestEntity.setRelId(relId); + suggestEntity.setProcess(process); + suggestEntity.setSugObj(SugObj); + suggestEntity.setClock(clock); + suggestEntity.setContent(chemProdTotal); + suggestEntity.setCreateDate(new Date()); + cokingTraceSuggestService.save(suggestEntity); } - public void saveTraceDeviation(Map<String, Object> tMap,JSONObject result) { + @Transactional + public void saveTraceDeviation(String relId, String process, String clock, JSONObject result) { List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.CHEMPROD_INDEX_CHARTCODE); Map<String, String> steamIndexMaps = list.stream().collect(Collectors.toMap(ChartParamDTO::getParamCode, e -> e.getParamName())); - for(int i=0;i<=2;i++){ - String chemProdFirstColoum = result.get("chemProdFirstColoum"+i).toString(); - if(StringUtils.isNotBlank(chemProdFirstColoum)){ + for (int i = 0; i <= 2; i++) { + String chemProdFirstColoum = result.get("chemProdFirstColoum" + i).toString(); + if (StringUtils.isNotBlank(chemProdFirstColoum)) { JSONArray responseArr = JSON.parseArray(chemProdFirstColoum); List<CokingTraceDeviationEntity> cokingTraceDeviationEntities = new ArrayList<>(); for (int j = 0; j < responseArr.size(); j++) { JSONArray element = JSON.parseArray(responseArr.get(j).toString()); CokingTraceDeviationEntity deviationEntity = new CokingTraceDeviationEntity(); - deviationEntity.setRelId(tMap.get("relId").toString()); - deviationEntity.setProcess(tMap.get("process").toString()); - deviationEntity.setClock(tMap.get("clock").toString()); - deviationEntity.setSugObj("HC"); - deviationEntity.setGroupName(chemProdColoumMap.get("chemProdFirstColoum"+i).toString()); + deviationEntity.setRelId(relId); + deviationEntity.setProcess(process); + deviationEntity.setClock(clock); + deviationEntity.setSugObj(SugObj); + deviationEntity.setGroupName(chemProdColoumMap.get("chemProdFirstColoum" + i).toString()); deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString())); deviationEntity.setIndValue(element.get(1).toString()); deviationEntity.setCreateDate(new Date()); @@ -209,82 +205,23 @@ } } - public void saveAnalyInd(Map<String, Object> tMap,JSONObject result) { - String[] analyContent = tMap.get("analyContent").toString().split(";"); - List<CokingAnalyIndEntity> list = new ArrayList<>(); - for(int i=0;i<analyContent.length;i++){ - CokingAnalyIndEntity analyIndEntity = new CokingAnalyIndEntity(); - analyIndEntity.setRelId(tMap.get("relId").toString()); - analyIndEntity.setAnalyType(tMap.get("process").toString()); - analyIndEntity.setAnalyDate(tMap.get("analyDate").toString()); - analyIndEntity.setAnalyClass(tMap.get("analyClass").toString()); - analyIndEntity.setAnalyContent(analyContent[i]); - analyIndEntity.setSort(i+1); - list.add(analyIndEntity); - } - cokingAnalyIndService.save(list); - } - - public void saveTraceInd(Map<String, Object> tMap,JSONObject result) { - Map<String,Object> map = new HashMap<>(); - map.put("indType","化产工序异常溯源"); - List<CokingTraceConfEntity> list = cokingTraceConfService.list(map); - if (CollectionUtils.isEmpty(list)) { - logger.info("ConfLis is Empty"); + public void saveAnalyInd(String relId, String process, String analyDate, String analyClass, String analyContent) { + if (StringUtils.isBlank(analyContent)) { + logger.info("analyContent is null"); return; } - List<CokingTraceIndEntity> cokingTraceIndEntities = new ArrayList<>(); - for (CokingTraceConfEntity conf : list) { - if (StringUtils.isBlank(conf.getDataType())) { - logger.info("DataType is Empty"); - continue; - } - if (StringUtils.isBlank(conf.getPointNo())) { - logger.info("PointNo is Empty"); - continue; - } - String value = ""; - switch (ProcessConfDataTypeEnum.getEumByCode(conf.getDataType())) { - case DATAPOINT: - List<String> points = new ArrayList<>(); - points.add(conf.getPointNo()); - Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points); - value = pointsRealValue.get(conf.getPointNo()).toString(); - break; - case IND: - List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemDefaultValue(conf.getPointNo()); - if (!CollectionUtils.isEmpty(indValues)) { - value = indValues.get(indValues.size() - 1).getDataValue().toString(); - } - break; - default: - break; - } - CokingTraceIndEntity cokingTraceIndEntity = new CokingTraceIndEntity(); - cokingTraceIndEntity.setRelId(tMap.get("relId").toString()); - cokingTraceIndEntity.setTitle(conf.getIndType()); - cokingTraceIndEntity.setClock(tMap.get("clock").toString()); - cokingTraceIndEntity.setIndCode(conf.getIndCode()); - cokingTraceIndEntity.setIndName(conf.getIndName()); - cokingTraceIndEntity.setIndValue(value); - cokingTraceIndEntity.setIndUnit(conf.getIndUnit()); - cokingTraceIndEntities.add(cokingTraceIndEntity); + String[] analyContentArr = analyContent.split(";"); + List<CokingAnalyIndEntity> entityList = new ArrayList<>(); + for (int i = 0; i < analyContentArr.length; i++) { + CokingAnalyIndEntity analyIndEntity = new CokingAnalyIndEntity(); + analyIndEntity.setRelId(relId); + analyIndEntity.setAnalyType(process); + analyIndEntity.setAnalyDate(analyDate); + analyIndEntity.setAnalyClass(analyClass); + analyIndEntity.setAnalyContent(analyContentArr[i]); + analyIndEntity.setSort(i + 1); + entityList.add(analyIndEntity); } - cokingTraceIndService.save(cokingTraceIndEntities); - } - - public void saveTraceChart(Map<String, Object> tMap, JSONObject result,Date startDate,Date endDate) { - historyPointMap.forEach((key,value) ->{ - CokingTraceChartEntity cokingTraceChartEntity = new CokingTraceChartEntity(); - cokingTraceChartEntity.setRelId(tMap.get("relId").toString()); - cokingTraceChartEntity.setName(value.toString()); - cokingTraceChartEntity.setClock(tMap.get("clock").toString()); - cokingTraceChartEntity.setDataNo(key); - cokingTraceChartEntity.setDataType("DATAPOINT"); - cokingTraceChartEntity.setStartTime(startDate); - cokingTraceChartEntity.setEndTime(endDate); - cokingTraceChartEntity.setCreateDate(new Date()); - cokingTraceChartService.save(cokingTraceChartEntity); - }); + cokingAnalyIndService.save(entityList); } } \ No newline at end of file -- Gitblit v1.9.3