From 9dfed23b330b14600ecb17ee3f8189dbef7d58cd Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 20 四月 2026 16:51:33 +0800
Subject: [PATCH] 【丽水】(临时接口)修改补偿机制
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index a8e2f3c..e56e2f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -37,6 +37,7 @@
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -56,6 +57,11 @@
@RestController
@RequestMapping("/smartor/serviceSubtask")
public class ServiceSubtaskController extends BaseController {
+ @InitBinder
+ public void initBinder(WebDataBinder binder) {
+ binder.setAutoGrowCollectionLimit(1024); // 鎴� 2048銆�4096 绛�
+ }
+
@Autowired
private IServiceSubtaskService serviceSubtaskService;
@@ -113,16 +119,6 @@
// 鐩存帴浠庡凡鏈夎仛鍚堢粨鏋滄帹绠梩otal锛岄伩鍏嶅幓鎺夊垎椤靛悗鍐嶅叏閲忔煡涓�閬嶅ぇ琛�
long total = 0L;
try {
-// * wzx: 鏈墽琛屾暟閲�
-// * ysf: 宸查殢璁挎暟閲�
-// * fssb: 鍙戦�佸け璐ユ暟閲�
-// * yfs: 宸插彂閫佹暟閲�
-// * dsf: 寰呴殢璁挎暟閲�
-
-// long wzx = map.get("wzx") != null ? ((Number) map.get("wzx")).longValue() : 0L;
-// long ysf = map.get("ysf") != null ? ((Number) map.get("ysf")).longValue() : 0L;
-// long dsf = map.get("dsf") != null ? ((Number) map.get("dsf")).longValue() : 0L;
-// long fssb = map.get("fssb") != null ? ((Number) map.get("fssb")).longValue() : 0L;
total = map.get("total") != null ? ((Number) map.get("total")).longValue() : 0L;
} catch (Exception e) {
@@ -179,7 +175,7 @@
if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
redisFlag = true;
map = redisMap;
- redisCache.setCacheObject(userId + "patItemCount", map, 120, TimeUnit.MINUTES);
+ redisCache.setCacheObject(userId + "patItemCount", map, 60, TimeUnit.MINUTES);
}
}
if (!redisFlag) {
@@ -211,7 +207,7 @@
//@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT)
@PostMapping("/patItemExport")
- public void patItemExport(HttpServletResponse response, @RequestBody ServiceSubtaskEntity serviceSubtaskVO) {
+ public void patItemExport(HttpServletResponse response, ServiceSubtaskEntity serviceSubtaskVO) {
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
serviceSubtaskVO.setOrgid(user.getOrgid());
@@ -441,6 +437,37 @@
}
/**
+ * 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟(涓存椂鎺ュ彛)
+ */
+ @ApiOperation("鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟(涓存椂鎺ュ彛)")
+ //@PreAuthorize("@ss.hasPermi('system:task:add')")
+ @Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/insertOrUpdateTaskByTaskId")
+ public AjaxResult insertOrUpdateTaskByTaskId(@RequestBody ServiceTaskVO ivrTaskVO) {
+ log.info("insertOrUpdateTaskByTaskId鐨勫叆鍙備负锛歿}", ivrTaskVO);
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ ivrTaskVO.setCreateBy(user.getNickName());
+ ivrTaskVO.setUpdateBy(user.getNickName());
+ ivrTaskVO.setOrgid(user.getOrgid());
+ //鏍规嵁鍏ュ弬鏌ヨ淇℃伅-鐢ㄦ埛鍏崇郴
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ if(ObjectUtils.isNotEmpty(ivrTaskVO.getTaskid())){
+ serviceSubtask.setTaskid(ivrTaskVO.getTaskid());
+ serviceSubtask.setOrgid(user.getOrgid());
+ serviceSubtask.setCampusid(user.getCampusid());
+ ServiceTaskVO ivrTaskVO1 = serviceSubtaskService.queryTaskByCondition(serviceSubtask);
+ ivrTaskVO.setPatTaskRelevances(ivrTaskVO1.getPatTaskRelevances());
+
+ return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
+ }else {
+ return error("insertOrUpdateTaskByTaskId taskid涓嶅彲涓虹┖");
+ }
+
+ }
+
+ /**
* 鐢佃瘽鍥炶皟浠诲姟(涓婃捣)
*/
@ApiOperation("鐢佃瘽鍥炶皟浠诲姟")
--
Gitblit v1.9.3