From 77ab08e5fc74c1756841b4c535b28f46d95b16f3 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 13 九月 2024 16:28:44 +0800
Subject: [PATCH] 装机先检查设备是否存在
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java | 5 +++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 12 +++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
index f26353d..b7434bd 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
@@ -8,6 +8,8 @@
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import org.apache.ibatis.annotations.Mapper;
import cn.lihu.jh.module.ecg.controller.admin.devmanage.vo.*;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
/**
* 璁惧 Mapper
@@ -28,4 +30,7 @@
.orderByDesc(DeviceDO::getId));
}
+ @Select("select * from lihu.device where dev_id=#{devId}")
+ DeviceDO getDeviceByDevId(@Param("devId") String devId);
+
}
\ 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/devrent/DevRentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
index f3bf2aa..441c3c4 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -50,6 +50,12 @@
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ // 妫�鏌ヨ澶囩紪鍙�
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId( createReqVO.getDevId() );
+ if (null == deviceDO ) {
+ return CommonResult.error(DEVICE_NOT_EXISTS);
+ }
+
Long rent_id = createReqVO.getId();
if (null == rent_id) {
@@ -282,7 +288,7 @@
private void markDevLost(DevRentSaveReqVO createReqVO) {
// 璁惧鏍囨敞閬楀け
- DeviceDO deviveDO = deviceMapper.selectById(createReqVO.getDevId());
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(createReqVO.getDevId());
if (null != deviveDO) {
deviveDO.setLost(1);
deviveDO.setLoseDate( createReqVO.getReturnTime().toLocalDate() );
@@ -292,7 +298,7 @@
private void resumeDevLost(DevRentSaveReqVO createReqVO) {
// 璁惧鏍囨敞閬楀け 鎭㈠涓烘甯�
- DeviceDO deviveDO = deviceMapper.selectById(createReqVO.getDevId());
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(createReqVO.getDevId());
if (null != deviveDO) {
deviveDO.setLost(0);
deviveDO.setLoseDate( null );
@@ -300,4 +306,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3