From b65c4cdd68b72771634fcfd52709edfd77d7abc6 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 07 八月 2026 17:47:43 +0800
Subject: [PATCH] 【景宁】发送方式改执行方式
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 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 73b9e8b..c933413 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
@@ -48,6 +48,8 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
+
/**
* 鍗曚竴浠诲姟锛堥殢璁匡級Controller
*
@@ -88,6 +90,12 @@
@Value("${spring.profiles.active}")
private String active;
+ @Value("${localIP}")
+ private String localIP;
+
+ @Value("${req_path}")
+ private String req_path;
+
@Value("${isAdmin}")
private List<Long> isAdmin;
@@ -105,6 +113,7 @@
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
serviceSubtaskVO.setOrgid(user.getOrgid());
+ serviceSubtaskVO.setCampusid(user.getCampusid());
ServiceSubtaskEntity serviceSubtaskEntity = null;
if (serviceSubtaskVO != null) {
serviceSubtaskEntity = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskEntity.class);
@@ -448,7 +457,8 @@
SysUser user = getLoginUser().getUser();
if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid());
if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setCampusid(user.getCampusid());
- return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
+ serviceSubtask.setCampusid(user.getCampusid());
+ return success(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
}
@ApiOperation("鎮ｈ�呭啀娆￠殢璁�")
@@ -575,7 +585,7 @@
sysUserWard.setOrgid(user.getOrgid());
sysUserWard.setDeptType("2");
List<SysUserDept> wardList = sysUserDeptService.selectSysUserDeptList(sysUserWard);
- if(CollectionUtils.isNotEmpty(wardList)) {
+ if (CollectionUtils.isNotEmpty(wardList)) {
leavehospitaldistrictcodes = wardList.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList());
}
serviceSubtaskCountReq.setLeavehospitaldistrictcodes(leavehospitaldistrictcodes);
@@ -589,7 +599,7 @@
sysUserDept.setOrgid(user.getOrgid());
sysUserDept.setDeptType("1");
List<SysUserDept> deptList = sysUserDeptService.selectSysUserDeptList(sysUserDept);
- if(CollectionUtils.isNotEmpty(deptList)){
+ if (CollectionUtils.isNotEmpty(deptList)) {
deptCodes = deptList.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList());
}
serviceSubtaskCountReq.setDeptcodes(deptCodes);
@@ -914,20 +924,33 @@
return serviceSubtaskService.smsSubTask(subid);
}
-
- @PostMapping("/test")
- public void test() {
- ryTask.dealOutHospInfo();
+ /**
+ * 璺宠浆涓棿椤�
+ *
+ * @param taskId
+ * @return
+ */
+ @PostMapping(value = "/goSfRelay")
+ public AjaxResult goSfRelay(@RequestParam("taskId") Long taskId, @RequestParam("deptcode") String deptcode, @RequestParam("leavehospitaldistrictcode") String leavehospitaldistrictcode) {
+ String url = localIP + ":" + req_path + "/SfRelay?taskid=" + taskId;
+ if (StringUtils.isNotEmpty(deptcode)) {
+ url = url + "&deptcode=" + deptcode;
+ }
+ if (StringUtils.isNotEmpty(leavehospitaldistrictcode)) {
+ url = url + "&leavehospitaldistrictcode=" + leavehospitaldistrictcode;
+ }
+ return AjaxResult.success(url);
}
- @PostMapping("/compensateTasktest")
- public void compensateTasktest(@RequestParam("subId") Long subId) {
- ryTask.compensateTaskTest(subId);
- }
-
- @PostMapping("/longTaskSendtest")
- public void longTaskSendtest(@RequestParam("subId") Long subId) {
- ryTask.longTaskSendTest(subId);
+ /**
+ * 鎵爜鐢熸垚瀛愪换鍔�
+ *
+ * @param serviceTask
+ * @return
+ */
+ @PostMapping(value = "/scanGenerateSubtask")
+ public AjaxResult scanGenerateSubtask(@RequestBody ServiceTask serviceTask) {
+ return AjaxResult.success(serviceSubtaskService.scanGenerateSubtask(serviceTask));
}
@PostMapping("/syncMedInhospForShiyi")
@@ -938,11 +961,5 @@
@PostMapping("/syncMedOperForShiyi")
public void syncMedOperForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
collectHISService.syncOper(startTime, endTime);
- }
-
- @PostMapping("/qwenLLMTest")
- public int qwenLLMTest(@RequestParam("voiceText") String questionText, @RequestParam("voiceText") String voiceText, @RequestParam("value") String value, @RequestParam("regexText") String regexText) {
- int result = ryTask.qwenLLMTest(questionText, voiceText, value, regexText);
- return result;
}
}
--
Gitblit v1.9.3