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"; } 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;
@@ -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; 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; 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;
@@ -34,6 +34,18 @@ */ private String devId; /** * 设备编号 */ private String devCodeIntrinsic; /** * 设备编号 */ private String devCodeHosp; /** * 设备编号 */ private String devCodeDept; /** * 分类名 */ private String category; 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); } }
@@ -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);
