From baf2cc2ce3dfd1235c012a3750132769fcd9ad2f Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期四, 18 九月 2025 17:02:05 +0800 Subject: [PATCH] 2025.9.18 1. 联合前端调试数据产品接口(待完成) --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ItemevaluationServiceImpl.kt | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ItemevaluationServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ItemevaluationServiceImpl.kt index b3d99bc..37e8bab 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ItemevaluationServiceImpl.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ItemevaluationServiceImpl.kt @@ -88,7 +88,7 @@ } return true } catch (e: Exception) { - throw BizException("鍑虹幇绯荤粺鍐呴儴閿欒") + throw BizException(e.message, e.cause) } } @@ -107,7 +107,7 @@ } return true } catch (e: Exception) { - throw BizException("鍑虹幇绯荤粺鍐呴儴閿欒") + throw BizException(e.message, e.cause) } } @@ -117,17 +117,22 @@ val sceneType = evaVo.scensetypeid?.toInt() ?: throw BizException("鍦烘櫙绫诲瀷鏈缃紝鏃犳硶鏇存柊鍒嗘暟") val source = AopDataSource(aopDbMapper, aopSceneTypeCheck) source.setResource(taskId, sceneType, null, null) + try { source.loop() { _, evaluationScene -> - if (evaluationScene.noRecord()) throw BizException("宸℃煡浠诲姟涓嶅瓨鍦�") - // 灏嗗垎鏁拌祴鍊煎埌瀵瑰簲鐨勮瘎浼拌鍒欎笅锛屽苟涓旇嚜鍔ㄨ绠楀叾浣欒鍒欑殑寰楀垎 - ScoreUtil.scoreAssign(evaluationScene, itemList) - // 鑾峰彇鎬诲垎鍜屽瓙椤瑰緱鍒嗘暟鎹簱琛ㄧ粨鏋勪綋锛屽苟鍏ュ簱 - ScoreUtil.updateEvaRecord(evaluationScene)?.let { aopOutput.updateDbEvaluation(evaluationScene, it) } + if (evaluationScene.noRecord()) return@loop + evaVo.subTaskEvaList?.find { + it.subTaskId == evaluationScene.subTask.value?.stguid + }?.let {stEva -> + // 灏嗗垎鏁拌祴鍊煎埌瀵瑰簲鐨勮瘎浼拌鍒欎笅锛屽苟涓旇嚜鍔ㄨ绠楀叾浣欒鍒欑殑寰楀垎 + ScoreUtil.scoreAssignSelected(evaluationScene, stEva.subRule) + // 鑾峰彇鎬诲垎鍜屽瓙椤瑰緱鍒嗘暟鎹簱琛ㄧ粨鏋勪綋锛屽苟鍏ュ簱 + ScoreUtil.updateEvaRecord(evaluationScene)?.let { aopOutput.updateDbEvaluation(evaluationScene, it) } + } } return true } catch (e: Exception) { - throw BizException("鍑虹幇绯荤粺鍐呴儴閿欒") + throw BizException(e.message, e.cause) } } } \ No newline at end of file -- Gitblit v1.9.3