From f5982398a509ecfa15fc210f50040511fd1d382b Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期三, 23 四月 2025 17:30:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java index 74fadb1..40f6ccb 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java @@ -160,19 +160,21 @@ } public void saveTraceSuggest(Map<String, Object> tMap,JSONObject result) { + List<CokingTraceSuggestEntity> entityList = new ArrayList<>(); for(int i=1;i<=2;i++){ String steamTotal = result.get("steamTotal"+i).toString(); if(StringUtils.isNotBlank(steamTotal)){ CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity(); suggestEntity.setRelId(tMap.get("relId").toString()); suggestEntity.setProcess(tMap.get("process").toString()); - suggestEntity.setSugObj("GXJ"); + suggestEntity.setSugObj(i+"#"); suggestEntity.setClock(tMap.get("clock").toString()); suggestEntity.setContent(steamTotal); suggestEntity.setCreateDate(new Date()); - cokingTraceSuggestService.save(suggestEntity); + entityList.add(suggestEntity); } } + cokingTraceSuggestService.insert(entityList); } public void saveTraceDeviation(Map<String, Object> tMap,JSONObject result) { @@ -182,39 +184,42 @@ String steamFirstColoum = result.get("steamFirstColoum"+i).toString(); if(StringUtils.isNotBlank(steamFirstColoum)){ JSONArray responseArr = JSON.parseArray(steamFirstColoum); + List<CokingTraceDeviationEntity> entityList = 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("GXJ"); + deviationEntity.setSugObj("1#"); deviationEntity.setGroupName(steamFirstColoumMap.get("steamFirstColoum"+i).toString()); deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString())); deviationEntity.setIndValue(element.get(1).toString()); deviationEntity.setCreateDate(new Date()); - cokingTraceDeviationService.save(deviationEntity); + entityList.add(deviationEntity); } + cokingTraceDeviationService.save(entityList); } } for(int i=0;i<=5;i++){ String steamSecondColoum = result.get("steamSecondColoum"+i).toString(); if(StringUtils.isNotBlank(steamSecondColoum)){ JSONArray responseArr = JSON.parseArray(steamSecondColoum); - + List<CokingTraceDeviationEntity> entityList = 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("GXJ"); + deviationEntity.setSugObj("2#"); deviationEntity.setGroupName(steamSecondColoumMap.get("steamSecondColoum" + i).toString()); deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString())); deviationEntity.setIndValue(element.get(1).toString()); deviationEntity.setCreateDate(new Date()); - cokingTraceDeviationService.save(deviationEntity); + entityList.add(deviationEntity); } + cokingTraceDeviationService.save(entityList); } } @@ -222,6 +227,7 @@ public void saveAnalyInd(Map<String, Object> tMap,JSONObject result) { String[] analyContent = tMap.get("analyContent").toString().split(";"); + List<CokingAnalyIndEntity> entityList = new ArrayList<>(); for(int i=0;i<analyContent.length;i++){ CokingAnalyIndEntity analyIndEntity = new CokingAnalyIndEntity(); analyIndEntity.setRelId(tMap.get("relId").toString()); @@ -230,8 +236,9 @@ analyIndEntity.setAnalyClass(tMap.get("analyClass").toString()); analyIndEntity.setAnalyContent(analyContent[i]); analyIndEntity.setSort(i+1); - cokingAnalyIndService.save(analyIndEntity); + entityList.add(analyIndEntity); } + cokingAnalyIndService.save(entityList); } public void saveTraceInd(Map<String, Object> tMap,JSONObject result) { @@ -242,6 +249,7 @@ logger.info("ConfLis is Empty"); return; } + List<CokingTraceIndEntity> entityList = new ArrayList<>(); for (CokingTraceConfEntity conf : list) { if (StringUtils.isBlank(conf.getDataType())) { logger.info("DataType is Empty"); @@ -277,8 +285,8 @@ cokingTraceIndEntity.setIndName(conf.getIndName()); cokingTraceIndEntity.setIndValue(value); cokingTraceIndEntity.setIndUnit(conf.getIndUnit()); - cokingTraceIndService.save(cokingTraceIndEntity); - + entityList.add(cokingTraceIndEntity); } + cokingTraceIndService.save(entityList); } } \ No newline at end of file -- Gitblit v1.9.3