From 2867cf7076a584a34e63174cec0a8b89cdd03e4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:42:55 +0800
Subject: [PATCH] Merge branch 'master' into smartor_ls_261103
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
index 2b6c7cf..c137721 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
@@ -11,13 +11,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.BaseOrganization;
-import com.smartor.domain.PatArchive;
-import com.smartor.domain.ServiceOutPath;
-import com.smartor.domain.ServiceTask;
import com.smartor.service.IBaseOrganizationService;
-import com.smartor.service.IPatArchiveService;
-import com.smartor.service.IServiceOutPathService;
-import com.smartor.service.IServiceTaskService;
+import com.ruoyi.patarchive.service.IPatArchiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
@@ -29,6 +24,10 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import com.ruoyi.common.core.domain.entity.PatArchive;
+import com.ruoyi.task.domain.ServiceOutPath;
+import com.ruoyi.task.service.IServiceOutPathService;
+import com.ruoyi.task.service.IServiceTaskService;
/**
* 涓婚敭Controller
@@ -95,15 +94,14 @@
serviceOutPath1.setOrgname(orgname);
}
}
- if(StringUtils.isNotEmpty(serviceOutPath1.getParam2())){
- RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- Long patId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceOutPath1.getParam2(), pri_key));
- if(patId != null){
- PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(patId);
- serviceOutPath1.setPatArchive(patArchive);
- }
- }
-
+// if(StringUtils.isNotEmpty(serviceOutPath1.getParam2())){
+// RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+// Long patId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceOutPath1.getParam2(), pri_key));
+// if(patId != null){
+// PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(patId);
+// serviceOutPath1.setPatArchive(patArchive);
+// }
+// }
return success(serviceOutPath1);
}
return success(null);
@@ -142,6 +140,17 @@
return toAjax(serviceOutPathService.insertServiceOutPath(serviceOutPath));
}
+
+ /**
+ * 鏂板涓婚敭
+ */
+ @ApiOperation("鏂板涓婚敭")
+ @Log(title = "涓婚敭", businessType = BusinessType.INSERT)
+ @PostMapping("/addOutPath")
+ public AjaxResult addOutPath(@RequestBody ServiceOutPath serviceOutPath) {
+ return success(serviceOutPathService.addOutPath(serviceOutPath));
+ }
+
/**
* 淇敼涓婚敭
*/
--
Gitblit v1.9.3