From e3a243eb89856ffccad5c4d79a1134e04e34e76c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 16:54:58 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 553 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 462 insertions(+), 91 deletions(-)
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 441c3c4..30f77c7 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
@@ -7,16 +7,22 @@
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.module.ecg.dal.mysql.devmanage.DeviceMapper;
import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
+import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
+import cn.lihu.jh.module.ecg.enums.DevStateEnum;
+import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
@@ -44,28 +50,42 @@
@Resource
DeviceMapper deviceMapper;
+ @Resource
+ QueueMapper queueMapper;
+
@Override
- @Transactional
- public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
+ public CommonResult<Long> registerOperation(DevRentSaveReqVO createReqVO) {
+ Long rent_id = createDevRent(createReqVO);
+ return CommonResult.success(rent_id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> routineFinishOperation(RoutineFinishReqVO routineFinishReqVO) {
+ DevRentSaveReqVO createReqVO = BeanUtils.toBean(routineFinishReqVO, DevRentSaveReqVO.class);
+
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- // 妫�鏌ヨ澶囩紪鍙�
- DeviceDO deviceDO = deviceMapper.getDeviceByDevId( createReqVO.getDevId() );
- if (null == deviceDO ) {
- return CommonResult.error(DEVICE_NOT_EXISTS);
- }
-
+ // 鍚屾牱 鍦ㄩ绾︾‘瀹炴椂 灏辫繘鍏� [dev_rent] 琛ㄤ簡
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
- // 鍒ゆ柇鏄惁宸茬粡鏈夎鏈鸿褰�
- Integer recordNum = jobRecordMapper.getPatientJobNum(createReqVO.getPatId(), createReqVO.getRentTime(), 0);
- if (null != recordNum && recordNum > 0) {
- return CommonResult.error(DEV_INSTALL_EXIST);
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
+ jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() == 0)
+ throw exception(DEV_INSTALL_NOT_APPOINTMENT);
+ else if (devRentDOList.size() != 1) {
+ throw exception(DEV_INSTALL_EXCEPTION);
}
- rent_id = createDevRent(createReqVO);
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.ROUTINE_FINISH.getState() );
+ updateDevRent( createReqVO );
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
@@ -75,7 +95,7 @@
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
- jobRecordSaveReqVO.setJobType(0);
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
@@ -83,37 +103,178 @@
jobRecordMapper.insert(jobRecord);
} else {
// 鎾ら攢 鏀惧純鎿嶄綔
- createReqVO.setCancelled(0);
+ createReqVO.setState( DevRentStateEnum.ROUTINE_FINISH.getState() );
updateDevRent( createReqVO );
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(rent_id, 0, userId);
- if (null != jobRecordDO) {
- jobRecordDO.setCancelled( createReqVO.getCancelled() );
- jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobTime(createReqVO.getRentTime());
- jobRecordDO.setRemark(createReqVO.getRemark());
- jobRecordDO.setUpdater(String.valueOf(userId));
- jobRecordDO.setUpdateTime(LocalDateTime.now());
- jobRecordMapper.updateById(jobRecordDO);
- }
+ jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
}
+
+ // 鏇存柊..闃熷垪鐘舵��
+ queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
return CommonResult.success(rent_id);
}
@Override
- @Transactional
- public Long dismantleOperation(DevRentSaveReqVO updateReqVO) {
- // 鍙栨秷閬楀け鏍囪
- updateReqVO.setLost(0);
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ // 鏍囨敞璁惧 宸查鍙�
+ Integer ret = markDevRecieved(createReqVO.getDevId());
+ if (null == ret || 0 == ret) {
+ throw exception(DEVICE_NOT_FREE);
+ }
+
+ Long rent_id = createReqVO.getId();
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.READY.getState());
+ jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() == 0)
+ throw exception(DEV_INSTALL_NOT_APPOINTMENT);
+ else if (devRentDOList.size() != 1) {
+ throw exception(DEV_INSTALL_EXCEPTION);
+ }
+
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.READY.getState() );
+ updateDevRent( createReqVO );
+
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId(rent_id);
+ jobRecordSaveReqVO.setDevId(createReqVO.getDevId());
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY.getState() );
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ // 鎾ら攢 鏀惧純鎿嶄綔
+ createReqVO.setState( DevRentStateEnum.READY.getState() );
+
+ updateDevRent( createReqVO );
+
+ jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+
+ // 鏇存柊..闃熷垪鐘舵��
+ queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
+
+ return CommonResult.success(rent_id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ // 璁剧疆璁惧 浣跨敤涓�
+ Integer ret = markDevInUse(createReqVO.getDevId());
+ if (null == ret || 0 == ret) {
+ throw exception(DEVICE_NOT_RECEIVED);
+ }
+
+ Long rent_id = createReqVO.getId();
+
+ // 妫�鏌� job_record 鐢ㄤ簬纭鏄惁鏄涓�娆″畨瑁呮搷浣�
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.INSTALLED.getState());
+ jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+
+ // 绗竴娆� 瀹夎鎿嶄綔
+ if (null == jobRecordDO) {
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
+ if (devRentDOList.size() == 0)
+ throw exception(DEV_INSTALL_NOT_RECEIVED);
+ else if (devRentDOList.size() != 1) {
+ throw exception(DEV_INSTALL_EXCEPTION);
+ }
+
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.INSTALLED.getState() );
+ updateDevRent( createReqVO );
+
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId(rent_id);
+ jobRecordSaveReqVO.setDevId(createReqVO.getDevId());
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.INSTALLED.getState() );
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ // 鎾ら攢 鏀惧純鎿嶄綔
+ createReqVO.setState( DevRentStateEnum.INSTALLED.getState() );
+ updateDevRent( createReqVO );
+
+ jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobType( DevRentStateEnum.INSTALLED.getState() );
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+
+ // 鏇存柊..闃熷垪鐘舵��
+ queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+ return CommonResult.success(rent_id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long dismantleOperation(DevRentSaveReqVO updateReqVO) {
+ updateReqVO.setState( DevRentStateEnum.DISMANTLED.getState() );
updateDevRent( updateReqVO );
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(updateReqVO.getId(), 1, userId);
- if (jobRecordDO == null) {
+ // 璁惧鎭㈠鍒扮┖闂�
+ resumeDevFree( updateReqVO.getDevId() );
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.DISMANTLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -122,18 +283,13 @@
jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
- jobRecordSaveReqVO.setJobType( 1 );
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.DISMANTLED.getState() );
jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- // 璁惧閬楀け鏃�, 闇�鎭㈠鍒版甯�
- resumeDevLost( updateReqVO );
-
- // 鍙栨秷閬楀け鏍囪
- jobRecordDO.setLost(0);
-
+ jobRecordDO.setJobType( DevRentStateEnum.DISMANTLED.getState() );
jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
jobRecordDO.setRemark( updateReqVO.getRemark() );
jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
@@ -145,35 +301,78 @@
}
@Override
- @Transactional
- public CommonResult<Long> cancelOperation(DevCancelReqVO cancelReqVO) {
- DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
+ @Transactional(rollbackFor = Exception.class)
+ public Long dataEntryOperation(DevRentSaveReqVO updateReqVO) {
+ updateReqVO.setState( DevRentStateEnum.DATAENTERED.getState() );
+ updateDevRent( updateReqVO );
+
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- createReqVO.setCancelled(1);
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.DATAENTERED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
+ if (null == jobRecordDO) {
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
+ jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
+ jobRecordSaveReqVO.setDocId( userId );
+ jobRecordSaveReqVO.setDocName( userNickname );
+ jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
+ jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
+ jobRecordSaveReqVO.setJobTime( updateReqVO.getEntryTime() );
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
+ jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
+ jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ jobRecordDO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
+ jobRecordDO.setJobTime( updateReqVO.getEntryTime() );
+ jobRecordDO.setRemark( updateReqVO.getRemark() );
+ jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordDO.setUpdater( String.valueOf(userId) );
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+ return updateReqVO.getId();
+ }
+
+ // 甯歌妫�鏌� 鍙栨秷
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> cancelRoutineOperation(DevCancelReqVO cancelReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
+ createReqVO.setDevId(null);
+ createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState());
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
- // 鍒ゆ柇鏄惁宸茬粡鏈夋媶鏈鸿褰�
- Integer recordNum = jobRecordMapper.getPatientJobNum(createReqVO.getPatId(), createReqVO.getRentTime(), 0);
- if (null != recordNum && recordNum > 0) {
- return CommonResult.error(DEV_INSTALL_EXIST);
- }
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
+ jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() != 1)
+ throw exception(ROUTINE_CHECK_EXIST);
- rent_id = createDevRent(createReqVO);
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState() );
+ updateDevRent( createReqVO );
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
- //jobRecordSaveReqVO.setDevId(createReqVO.getDevId());
+ jobRecordSaveReqVO.setDevId(null);
jobRecordSaveReqVO.setDocId(userId);
jobRecordSaveReqVO.setDocName(userNickname);
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_CANCELLED.getState() );
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
- jobRecordSaveReqVO.setJobType(0);
- jobRecordSaveReqVO.setCancelled(1);
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
@@ -182,31 +381,151 @@
} else {
updateDevRent( createReqVO );
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(rent_id, 0, userId);
- if (null != jobRecordDO) {
- //jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobTime(createReqVO.getRentTime());
- jobRecordDO.setCancelled(1);
- jobRecordDO.setRemark(createReqVO.getRemark());
- jobRecordDO.setUpdater(String.valueOf(userId));
- jobRecordDO.setUpdateTime(LocalDateTime.now());
- jobRecordMapper.updateById(jobRecordDO);
- }
+ jobRecordDO.setDevId(null);
+ jobRecordDO.setJobType(DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
}
return CommonResult.success(rent_id);
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> cancelReadyOperation(DevCancelReqVO cancelReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ // 鑻ヤ粠 瑁呮満 鏀逛负 鍙栨秷瑁呮満锛屾仮澶嶈澶囩姸鎬�
+ if (null != cancelReqVO.getDevId()) {
+ resumeDevFree( cancelReqVO.getDevId() );
+ }
+
+ DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
+ createReqVO.setDevId(null);
+ createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState());
+
+ Long rent_id = createReqVO.getId();
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.READY.getState());
+ jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() != 1)
+ throw exception(DEV_INSTALL_EXIST);
+
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState() );
+ updateDevRent( createReqVO );
+
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId(rent_id);
+ jobRecordSaveReqVO.setDevId(null);
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY_CANCELLED.getState() );
+ jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ updateDevRent( createReqVO );
+
+ jobRecordDO.setDevId(null);
+ jobRecordDO.setJobType(DevRentStateEnum.READY_CANCELLED.getState());
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+ return CommonResult.success(rent_id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> cancelInstallOperation(DevCancelReqVO cancelReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ // 鑻ヤ粠 瑁呮満 鏀逛负 鍙栨秷瑁呮満锛屾仮澶嶈澶囩姸鎬�
+ if (null != cancelReqVO.getDevId()) {
+ resumeDevFree( cancelReqVO.getDevId() );
+ }
+
+ DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
+ createReqVO.setDevId(null);
+ createReqVO.setState( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+
+ Long rent_id = createReqVO.getId();
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.INSTALLED.getState());
+ jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
+ if (null == jobRecordDO) {
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
+ if (devRentDOList.size() != 1)
+ throw exception(DEV_INSTALL_EXIST);
+
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+ updateDevRent( createReqVO );
+
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId(rent_id);
+ jobRecordSaveReqVO.setDevId(null);
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+ jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ } else {
+ updateDevRent( createReqVO );
+
+ jobRecordDO.setDevId(null);
+ jobRecordDO.setJobType( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+ return CommonResult.success(rent_id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> loseOperation(DevRentSaveReqVO updateReqVO) {
- updateReqVO.setLost(1);
+ // 璁惧閬楀け鏃�, 鏍囨敞閬楀け
+ markDevLost( updateReqVO.getDevId(), updateReqVO.getReturnTime().toLocalDate() );
+
+ updateReqVO.setState( DevRentStateEnum.LOST.getState() );
updateDevRent( updateReqVO );
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(updateReqVO.getId(), 1, userId);
- if (jobRecordDO == null) {
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.LOST.getState());
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -215,14 +534,13 @@
jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
- jobRecordSaveReqVO.setJobType( 1 );
- jobRecordSaveReqVO.setLost( updateReqVO.getLost() );
+ jobRecordSaveReqVO.setJobType( DevRentStateEnum.LOST.getState() );
jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- jobRecordDO.setLost( updateReqVO.getLost() );
+ jobRecordDO.setJobType( DevRentStateEnum.LOST.getState() );
jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
jobRecordDO.setRemark( updateReqVO.getRemark() );
jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
@@ -231,16 +549,11 @@
jobRecordMapper.updateById(jobRecordDO);
}
- // 璁惧閬楀け鏃�, 鏍囨敞閬楀け
- markDevLost( updateReqVO );
-
return CommonResult.success(updateReqVO.getId());
}
@Override
public Long createDevRent(DevRentSaveReqVO createReqVO) {
- //
-
// 鎻掑叆
DevRentDO devRent = BeanUtils.toBean(createReqVO, DevRentDO.class);
devRentMapper.insert(devRent);
@@ -267,7 +580,7 @@
private void validateDevRentExists(Long id) {
if (devRentMapper.selectById(id) == null) {
- throw exception(DEV_RENT_NOT_EXISTS);
+ throw exception(DEV_INSTALL_NOT_EXISTS);
}
}
@@ -282,28 +595,86 @@
}
@Override
- public DevRentDO getLatestRent(DevRentSearchReqVO searchReqVO) {
- return devRentMapper.getLatestRent(searchReqVO);
+ public DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.INSTALLED.getState() );
+ stateList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
+ searchReqVO.setStateList( stateList );
+ return devRentMapper.getRentByState(searchReqVO);
}
- private void markDevLost(DevRentSaveReqVO createReqVO) {
+ @Override
+ public DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.FREE.getState() );
+ searchReqVO.setStateList( stateList );
+ return devRentMapper.getRentByState(searchReqVO);
+ }
+
+ @Override
+ public DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.READY.getState() );
+ stateList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ searchReqVO.setStateList( stateList );
+ return devRentMapper.getRentByState(searchReqVO);
+ }
+
+ @Override
+ public DevRentDO getDismantledRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.DISMANTLED.getState() );
+ searchReqVO.setStateList( stateList );
+ return devRentMapper.getRentByState(searchReqVO);
+ }
+
+ private Integer markDevRecieved(String devId) {
+ // 璁惧鏍囨敞 宸查鍙�
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
+ if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
+ deviveDO.setState( DevStateEnum.RECEIVED.getState() );
+ deviveDO.setStateDate( LocalDate.now() );
+ return deviceMapper.updateById(deviveDO);
+ }
+
+ return 0;
+ }
+
+ private Integer markDevInUse(String devId) {
+ // 璁惧鏍囨敞 鍦ㄤ娇鐢�
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
+ if (null != deviveDO && (deviveDO.getState() == DevStateEnum.RECEIVED.getState() || deviveDO.getState() == DevStateEnum.FREE.getState())) {
+ deviveDO.setState( DevStateEnum.INUSE.getState() );
+ deviveDO.setStateDate( LocalDate.now() );
+ return deviceMapper.updateById(deviveDO);
+ }
+
+ return 0;
+ }
+
+ private Integer markDevLost(String devId, LocalDate localDate) {
// 璁惧鏍囨敞閬楀け
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(createReqVO.getDevId());
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
if (null != deviveDO) {
- deviveDO.setLost(1);
- deviveDO.setLoseDate( createReqVO.getReturnTime().toLocalDate() );
- deviceMapper.updateById(deviveDO);
+ deviveDO.setState( DevStateEnum.LOST.getState() );
+ deviveDO.setStateDate( localDate );
+ return deviceMapper.updateById(deviveDO);
}
+
+ return 0;
}
- private void resumeDevLost(DevRentSaveReqVO createReqVO) {
- // 璁惧鏍囨敞閬楀け 鎭㈠涓烘甯�
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(createReqVO.getDevId());
+ private Integer resumeDevFree(String devId) {
+ // 璁惧鏍囨敞閬楀け 鎭㈠涓虹┖闂�
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId );
if (null != deviveDO) {
- deviveDO.setLost(0);
- deviveDO.setLoseDate( null );
- deviceMapper.updateById(deviveDO);
+ deviveDO.setState( DevStateEnum.FREE.getState() );
+ deviveDO.setStateDate( LocalDate.now() );
+ return deviceMapper.updateById(deviveDO);
}
+
+ return 0;
}
}
+
--
Gitblit v1.9.3