From 0d10bc99eec75672b049339399e4f762fbd9746e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
index f384ec7..04fb42d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -108,21 +109,29 @@
//@PreAuthorize("@ss.hasPermi('system:answer:remove')")
@Log(title = "浠诲姟闂嵎闂閫夐」", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎浠诲姟闂嵎闂閫夐」")
- @DeleteMapping("/remove/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
log.info("銆恠aveQuestionCache-----remove銆戠殑鍏ュ弬涓猴細{}", ids);
return toAjax(serviceSubtaskAnswerService.deleteServiceSubtaskAnswerByIds(ids));
}
- @ApiOperation("鎮ｈ�呴棶棰樼粨鏋滆褰�(澶栭摼)")
+ /**
+ * 鎮ｈ�呴棶棰樼粨鏋滆褰� (澶栭摼) - 寮傛澶勭悊
+ */
+ @ApiOperation("鎮ｈ�呴棶棰樼粨鏋滆褰� (澶栭摼)")
@PostMapping("/saveQuestionAnswer")
public AjaxResult saveQuestionAnswer(@RequestBody ServiceSubTaskAnswerReq serviceSubTaskAnswerReq) {
- log.info("銆恠aveQuestionCache-----saveQuestionAnswer銆戠殑鍏ュ弬涓簆rarm1锛歿},prarm2锛歿},type锛歿},isabnormal:{}", serviceSubTaskAnswerReq.getParam1(), serviceSubTaskAnswerReq.getParam2(), serviceSubTaskAnswerReq.getType(), serviceSubTaskAnswerReq.getIsabnormal());
- return toAjax(serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 0L));
+ log.info("銆恠aveQuestionAnswer銆戠殑鍏ュ弬涓� param1:{},param2:{},type:{},isabnormal:{}",
+ serviceSubTaskAnswerReq.getParam1(), serviceSubTaskAnswerReq.getParam2(),
+ serviceSubTaskAnswerReq.getType(), serviceSubTaskAnswerReq.getIsabnormal());
+ // 寮傛澶勭悊淇濆瓨閫昏緫锛岀珛鍗宠繑鍥炴垚鍔熸秷鎭�
+ serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 0L);
+ return success("鎻愪氦鎴愬姛锛屾鍦ㄥ鐞嗕腑...");
}
@ApiOperation("鎮ｈ�呴棶棰樼粨鏋滆褰曠紦瀛�(灏忕▼搴忓閾�)")
+ @RepeatSubmit
@PostMapping("/saveQuestionCacheXCH")
public AjaxResult saveQuestionCacheXCH(@RequestBody ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
log.info("銆恠aveQuestionCache-----saveQuestionCacheXCH銆戠殑鍏ュ弬涓猴細{}", serviceSubTaskCacheReq);
@@ -130,6 +139,7 @@
}
@ApiOperation("鎮ｈ�呴棶棰樼粨鏋滀繚瀛�")
+ @RepeatSubmit
@PostMapping("/savequestiondetail")
public AjaxResult saveQuestionDetail(@RequestBody ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
log.info("銆恠aveQuestionDetail-----saveQuestionCache銆戠殑prarm1锛歿},prarm2锛歿},type锛歿},prarm6:{}", serviceSubTaskCacheReq.getParam1(), serviceSubTaskCacheReq.getParam2(), serviceSubTaskCacheReq.getType(), serviceSubTaskCacheReq.getParam6());
@@ -137,11 +147,16 @@
}
- @ApiOperation("鎮ｈ�呴棶棰樼粨鏋滆褰�(灏忕▼鍏呭閾�)")
+ /**
+ * 鎮ｈ�呴棶棰樼粨鏋滆褰� (灏忕▼搴忓閾�) - 寮傛澶勭悊
+ */
+ @ApiOperation("鎮ｈ�呴棶棰樼粨鏋滆褰� (灏忕▼鍏呭閾�)")
@PostMapping("/saveQuestionAnswerXCH")
public AjaxResult saveQuestionAnswerXCH(@RequestBody ServiceSubTaskAnswerReq serviceSubTaskAnswerReq) {
- log.info("銆恠aveQuestionCache-----saveQuestionAnswerXCH銆戠殑鍏ュ弬涓猴細{}", serviceSubTaskAnswerReq);
- return toAjax(serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 1L));
+ log.info("銆恠aveQuestionAnswerXCH銆戠殑鍏ュ弬涓猴細{}", serviceSubTaskAnswerReq);
+ // 寮傛澶勭悊淇濆瓨閫昏緫锛岀珛鍗宠繑鍥炴垚鍔熸秷鎭�
+ serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 1L);
+ return success("鎻愪氦鎴愬姛锛屾鍦ㄥ鐞嗕腑...");
}
@ApiOperation("鑾峰彇鎮ｈ�呴棶棰樼粨鏋滆褰曠紦瀛�(灏忕▼搴忓閾�)")
@@ -179,6 +194,7 @@
@ApiOperation("鎮ｈ�呮弧鎰忓害缁撴灉璁板綍(澶栭摼)")
+ @RepeatSubmit
@PostMapping("/saveMYDQuestionAnswer")
public AjaxResult saveMYDQuestionAnswer(@RequestBody ServiceSubTaskMYDAnswerReq serviceSubTaskAnswerReq) {
log.info("銆恠aveQuestionCache-----saveMYDQuestionAnswer銆戠殑鍏ュ弬涓猴細{}", serviceSubTaskAnswerReq);
--
Gitblit v1.9.3