From 5454cba66e3f64e004c96af4cb717bb2edfb6e9c Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Fri, 27 Dec 2024 17:24:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=83=E7=94=B5=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E7=A7=91=E5=AE=A4=20=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E7=94=9F=E4=BA=A7PDF=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/common/util/http/HttpUtils.java | 10 ++++++---- .../EcganalysisparasController.java | 14 +++++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java index d09e100cd..f139cbbec 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java @@ -182,14 +182,16 @@ public class HttpUtils { * @throws IOException 如果发生I/O错误 */ public static String sendPost(String url, String json) throws IOException { - URL obj = new URL(url); + URL obj = new URL(url); HttpURLConnection con = (HttpURLConnection) obj.openConnection(); // 默认设置POST方法 con.setRequestMethod("POST"); con.setRequestProperty("Content-Type","application/json"); - - + con.setConnectTimeout(10000); // 连接超时时间，单位为毫秒 + con.setReadTimeout(10000); // 读取超时时间，单位为毫秒 + con.setRequestProperty("User-Agent", "Mozilla/5.0 (compatible; MyClient/1.0)"); + con.setRequestProperty("Connection", "keep-alive"); // 发送POST请求必须设置如下两行 con.setDoOutput(true); @@ -209,7 +211,7 @@ public class HttpUtils { response.append(responseLine.trim()); } } - + int responseCode = con.getResponseCode(); // 断开连接 con.disconnect(); diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java index f2d3c9e41..e986485c8 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java @@ -6,8 +6,10 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; import cn.iocoder.yudao.module.infra.service.config.ConfigService; import cn.iocoder.yudao.module.system.dal.dataobject.doctor.DoctorDO; import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgUnitDO; +import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.doctor.DoctorService; import cn.iocoder.yudao.module.system.service.org.OrgUnitService; +import cn.iocoder.yudao.module.system.service.user.AdminUserService; import cn.iocoder.yudao.module.tblist.dal.dataobject.patientexamlist.PatientexamlistDO; import cn.iocoder.yudao.module.tblist.dal.mysql.ecganalysisparas.EcganalysisparasMapper; import cn.iocoder.yudao.module.tblist.dal.mysql.patientexamlist.PatientexamlistMapper; @@ -38,6 +40,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import cn.iocoder.yudao.module.tblist.controller.admin.ecganalysisparas.vo.*; import cn.iocoder.yudao.module.tblist.dal.dataobject.ecganalysisparas.EcganalysisparasDO; @@ -54,6 +57,8 @@ import java.net.URLEncoder; @Validated public class EcganalysisparasController { + @Resource + private AdminUserService userService; @Resource private ConfigService configService; @Resource @@ -93,9 +98,16 @@ public class EcganalysisparasController { @PutMapping("/save") @Operation(summary = "保存心电分析数据") public CommonResult SaveEcganalysisparas(@Valid @RequestBody EcganalysisparasSaveReqVO updateReqVO) { + //获取当前登陆用户 + AdminUserDO user = userService.getUser(getLoginUserId()); + DoctorDO doctorDO = Service.getBydoctorID(user.getDoctorID()); LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); updateReqVO.setDoctorDiagTime(dateTime); + if(!doctorDO.getDepartmentName().isEmpty()) + { + updateReqVO.setDepartName(doctorDO.getDepartmentName()); + } ecganalysisparasService.updateEcganalysisparas(updateReqVO); return success(true); } @@ -145,7 +157,7 @@ public class EcganalysisparasController { if(!re.isEmpty()) { //获取配置项地址 - ConfigDO config = configService.getConfigByKey("url.ftpurl"); + ConfigDO config = configService.getConfigByKey("url.ecgpdf"); UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("examId",updateReqVO.getExamId()); updateWrapper.eq("regId",updateReqVO.getRegId());