From 003513b047fcae16e2125ff7a59e6d46ad048ce4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 16 十月 2025 18:03:36 +0800
Subject: [PATCH] 代码提交
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceServiceImpl.java
index 81da0b9..683b1e3 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceServiceImpl.java
@@ -1,6 +1,7 @@
package cn.lihu.jh.module.ecg.service.devmanage;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceStatisticDO;
+import cn.lihu.jh.module.infra.api.config.ConfigApi;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
@@ -17,6 +18,8 @@
import javax.annotation.Resource;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.lihu.jh.module.ecg.Constants.DEV_CODE_CHOICE;
+import static cn.lihu.jh.module.ecg.Constants.ECG_SCREEN_PANE_PASSED_KEY;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -27,12 +30,25 @@
@Service
@Validated
public class DeviceServiceImpl implements DeviceService {
+ @Resource
+ private ConfigApi configApi;
@Resource
private DeviceMapper deviceMapper;
@Override
public Integer createDevice(DeviceSaveReqVO createReqVO) {
+ // 璇诲彇 璁惧缂栧彿閫夋嫨 绯荤粺閰嶇疆
+ Integer devCodeChoice = Integer.valueOf(configApi.getConfigValueByKey(DEV_CODE_CHOICE));
+ if (0 == devCodeChoice)
+ createReqVO.setDevId( createReqVO.getDevCodeIntrinsic() );
+ else if (1 == devCodeChoice)
+ createReqVO.setDevId( createReqVO.getDevCodeHosp() );
+ else if (2 == devCodeChoice)
+ createReqVO.setDevId( createReqVO.getDevCodeDept() );
+ else
+ createReqVO.setDevId( createReqVO.getDevCodeDept() );
+
// 鎻掑叆
DeviceDO device = BeanUtils.toBean(createReqVO, DeviceDO.class);
deviceMapper.insert(device);
@@ -44,6 +60,18 @@
public void updateDevice(DeviceSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪
validateDeviceExists(updateReqVO.getId());
+
+ // 璇诲彇 璁惧缂栧彿閫夋嫨 绯荤粺閰嶇疆
+ Integer devCodeChoice = Integer.valueOf(configApi.getConfigValueByKey(DEV_CODE_CHOICE));
+ if (0 == devCodeChoice)
+ updateReqVO.setDevId( updateReqVO.getDevCodeIntrinsic() );
+ else if (1 == devCodeChoice)
+ updateReqVO.setDevId( updateReqVO.getDevCodeHosp() );
+ else if (2 == devCodeChoice)
+ updateReqVO.setDevId( updateReqVO.getDevCodeDept() );
+ else
+ updateReqVO.setDevId( updateReqVO.getDevCodeDept() );
+
// 鏇存柊
DeviceDO updateObj = BeanUtils.toBean(updateReqVO, DeviceDO.class);
deviceMapper.updateById(updateObj);
@@ -55,7 +83,7 @@
validateDeviceExists(updateReqVO.getId());
// 鏇存柊
DeviceDO updateObj = BeanUtils.toBean(updateReqVO, DeviceDO.class);
- return deviceMapper.updateDevState(updateObj.getDevId(), updateObj.getState(), updateObj.getStateDate());
+ return deviceMapper.updateDevState(updateObj.getDevId(), updateObj.getState(), updateObj.getStateDate(), updateObj.getComment());
}
@Override
--
Gitblit v1.9.3