From 0a9319f5d192666d6e8f210c223b01206e9645d2 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 十月 2024 17:13:37 +0800
Subject: [PATCH] 设备三个编号
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java | 1
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java | 12 ++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceServiceImpl.java | 28 ++++++++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java | 12 ++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceService.java | 3 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DevicePageReqVO.java | 10 +++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceSaveReqVO.java | 14 ++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceStatisticVO.java | 13 ++++++
8 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
index 19cf433..77c973f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
@@ -6,4 +6,5 @@
static final String ECG_ROOM_RESET_TIME_KEY = "ecg.room.reset.time";
static final String ECG_SCREEN_PANE_WAITING_KEY = "ecg.screen.pane.waiting";
static final String ECG_SCREEN_PANE_PASSED_KEY = "ecg.screen.pane.passed";
+ static final String DEV_CODE_CHOICE = "dev.code.choice";
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DevicePageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DevicePageReqVO.java
index 5f22afd..4216f4e 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DevicePageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DevicePageReqVO.java
@@ -1,5 +1,6 @@
package cn.lihu.jh.module.ecg.controller.admin.devmanage.vo;
+import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
import java.time.LocalDate;
@@ -20,6 +21,15 @@
@Schema(description = "璁惧缂栧彿", example = "5317")
private String devId;
+ @Schema(description = "璁惧鍥烘湁缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ private String devCodeIntrinsic;
+
+ @Schema(description = "璁惧鍖婚櫌缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ private String devCodeHosp;
+
+ @Schema(description = "璁惧绉戝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ private String devCodeDept;
+
@Schema(description = "鍒嗙被鍚�")
private String category;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java
index 8c72b3a..ec8c24d 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java
@@ -22,6 +22,18 @@
@ExcelProperty("璁惧缂栧彿")
private String devId;
+ @Schema(description = "璁惧鍥烘湁缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ @ExcelProperty("璁惧鍥烘湁缂栧彿")
+ private String devCodeIntrinsic;
+
+ @Schema(description = "璁惧鍖婚櫌缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ @ExcelProperty("璁惧鍖婚櫌缂栧彿")
+ private String devCodeHosp;
+
+ @Schema(description = "璁惧绉戝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ @ExcelProperty("璁惧绉戝缂栧彿")
+ private String devCodeDept;
+
@Schema(description = "鍒嗙被鍚�", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒嗙被鍚�")
private String category;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceSaveReqVO.java
index ffd62fa..8be66fa 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceSaveReqVO.java
@@ -16,9 +16,21 @@
private Integer id;
@Schema(description = "璁惧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
- @NotEmpty(message = "璁惧缂栧彿涓嶈兘涓虹┖")
+ //@NotEmpty(message = "璁惧缂栧彿涓嶈兘涓虹┖")
private String devId;
+ @Schema(description = "璁惧鍥烘湁缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ @NotEmpty(message = "璁惧鍥烘湁缂栧彿涓嶈兘涓虹┖")
+ private String devCodeIntrinsic;
+
+ @Schema(description = "璁惧鍖婚櫌缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ @NotEmpty(message = "璁惧鍖婚櫌缂栧彿涓嶈兘涓虹┖")
+ private String devCodeHosp;
+
+ @Schema(description = "璁惧绉戝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ @NotEmpty(message = "璁惧绉戝缂栧彿涓嶈兘涓虹┖")
+ private String devCodeDept;
+
@Schema(description = "鍒嗙被鍚�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "鍒嗙被鍚嶄笉鑳戒负绌�")
private String category;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceStatisticVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceStatisticVO.java
index 9f7315f..e20aaeb 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceStatisticVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceStatisticVO.java
@@ -1,6 +1,7 @@
package cn.lihu.jh.module.ecg.controller.admin.devmanage.vo;
import cn.lihu.jh.framework.common.pojo.PageParam;
+import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,6 +21,18 @@
@Schema(description = "璁惧缂栧彿", example = "5317")
private String devId;
+ @Schema(description = "璁惧鍥烘湁缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ @ExcelProperty("璁惧鍥烘湁缂栧彿")
+ private String devCodeIntrinsic;
+
+ @Schema(description = "璁惧鍖婚櫌缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ @ExcelProperty("璁惧鍖婚櫌缂栧彿")
+ private String devCodeHosp;
+
+ @Schema(description = "璁惧绉戝缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "5317")
+ @ExcelProperty("璁惧绉戝缂栧彿")
+ private String devCodeDept;
+
@Schema(description = "鍒嗙被鍚�")
private String category;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java
index 3ed1f5b..7a7a1b4 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java
@@ -34,6 +34,18 @@
*/
private String devId;
/**
+ * 璁惧缂栧彿
+ */
+ private String devCodeIntrinsic;
+ /**
+ * 璁惧缂栧彿
+ */
+ private String devCodeHosp;
+ /**
+ * 璁惧缂栧彿
+ */
+ private String devCodeDept;
+ /**
* 鍒嗙被鍚�
*/
private String category;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceService.java
index eafa19f..258b4d4 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceService.java
@@ -76,4 +76,5 @@
* @return
*/
List<DeviceStatisticDO> getDeviceStatistic(DevicePageReqVO pageReqVO);
-}
\ No newline at end of file
+}
+
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..8174a3b 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);
--
Gitblit v1.9.3