From 0ff9348f038ff25758065e7239a3d5f544bb3385 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 27 九月 2024 13:53:50 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 331 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 317 insertions(+), 14 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 0fe1d44..a0aa589 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
@@ -1,19 +1,26 @@
package cn.lihu.jh.module.ecg.service.devrent;
+import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.JobRecordSaveReqVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
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.enums.DevRentStateEnum;
+import cn.lihu.jh.module.ecg.enums.DevStateEnum;
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;
@@ -38,15 +45,40 @@
@Resource
private JobRecordMapper jobRecordMapper;
+ @Resource
+ DeviceMapper deviceMapper;
+
+ @Override
+ public CommonResult<Long> registerOperation(DevRentSaveReqVO createReqVO) {
+ Long rent_id = createDevRent(createReqVO);
+ return CommonResult.success(rent_id);
+ }
+
@Override
@Transactional
- public Long installOperation(DevRentSaveReqVO createReqVO) {
+ public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ // 鏍囨敞璁惧 宸查鍙�
+ Integer ret = markDevRecieved(createReqVO.getDevId());
+ if (null == ret || 0 == ret) {
+ return CommonResult.error(DEVICE_NOT_FREE);
+ }
+
Long rent_id = createReqVO.getId();
if (null == rent_id) {
- rent_id = createDevRent(createReqVO);
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() == 0)
+ return CommonResult.error(DEV_INSTALL_NOT_APPOINTMENT);
+ else if (devRentDOList.size() != 1) {
+ return CommonResult.error(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);
@@ -56,17 +88,22 @@
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
- jobRecordSaveReqVO.setJobType(0);
+ 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 jobRecordDO = jobRecordMapper.selectByRentIdJobTypeDocId(rent_id, 0, userId);
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId);
if (null != jobRecordDO) {
+ jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -74,18 +111,82 @@
jobRecordMapper.updateById(jobRecordDO);
}
}
- return rent_id;
+ return CommonResult.success(rent_id);
+ }
+
+ @Override
+ @Transactional
+ public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ // 璁剧疆璁惧 浣跨敤涓�
+ Integer ret = markDevInUse(createReqVO.getDevId());
+ if (null == ret || 0 == ret) {
+ return CommonResult.error(DEVICE_NOT_RECEIVED);
+ }
+
+ Long rent_id = createReqVO.getId();
+ if (null == rent_id) {
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
+ if (devRentDOList.size() == 0)
+ return CommonResult.error(DEV_INSTALL_NOT_RECEIVED);
+ else if (devRentDOList.size() != 1) {
+ return CommonResult.error(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 jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId);
+ if (null != jobRecordDO) {
+ 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);
+ }
+ }
+ return CommonResult.success(rent_id);
}
@Override
@Transactional
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);
+ // 璁惧鎭㈠鍒扮┖闂�
+ resumeDevFree( updateReqVO.getDevId() );
+
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId);
if (jobRecordDO == null) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
@@ -95,12 +196,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 {
+ jobRecordDO.setJobType( DevRentStateEnum.DISMANTLED.getState() );
jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
jobRecordDO.setRemark( updateReqVO.getRemark() );
jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
@@ -108,7 +210,140 @@
jobRecordDO.setUpdateTime( LocalDateTime.now() );
jobRecordMapper.updateById(jobRecordDO);
}
- return 0L;
+ return updateReqVO.getId();
+ }
+
+ @Override
+ @Transactional
+ public Long dataEntryOperation(DevRentSaveReqVO updateReqVO) {
+ updateReqVO.setState( DevRentStateEnum.DATAENTERED.getState() );
+ updateDevRent( updateReqVO );
+
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId);
+ if (jobRecordDO == null) {
+ 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
+ public CommonResult<Long> cancelOperation(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.CANCELLED.getState() );
+
+ Long rent_id = createReqVO.getId();
+ if (null == rent_id) {
+
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() != 1)
+ return CommonResult.error(DEV_INSTALL_EXIST);
+
+ rent_id = devRentDOList.getFirst().getId();
+ createReqVO.setId( rent_id );
+ createReqVO.setState( DevRentStateEnum.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.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 jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId);
+ if (null != jobRecordDO) {
+ jobRecordDO.setDevId(null);
+ jobRecordDO.setJobType( DevRentStateEnum.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
+ public CommonResult<Long> loseOperation(DevRentSaveReqVO updateReqVO) {
+ // 璁惧閬楀け鏃�, 鏍囨敞閬楀け
+ markDevLost( updateReqVO.getDevId(), updateReqVO.getReturnTime().toLocalDate() );
+
+ updateReqVO.setState( DevRentStateEnum.LOST.getState() );
+ updateDevRent( updateReqVO );
+
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId);
+ if (jobRecordDO == null) {
+ 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.getReturnTime() );
+ 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.setJobType( DevRentStateEnum.LOST.getState() );
+ jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
+ jobRecordDO.setRemark( updateReqVO.getRemark() );
+ jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordDO.setUpdater( String.valueOf(userId) );
+ jobRecordDO.setUpdateTime( LocalDateTime.now() );
+ jobRecordMapper.updateById(jobRecordDO);
+ }
+
+ return CommonResult.success(updateReqVO.getId());
}
@Override
@@ -141,7 +376,7 @@
private void validateDevRentExists(Long id) {
if (devRentMapper.selectById(id) == null) {
- throw exception(DEV_RENT_NOT_EXISTS);
+ throw exception(DEV_INSTALL_NOT_EXISTS);
}
}
@@ -156,8 +391,76 @@
}
@Override
- public DevRentDO getLatestRent(String devId) {
- return devRentMapper.getLatestRent(devId);
+ public DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.INSTALLED.getState() );
+ stateList.add( DevRentStateEnum.CANCELLED.getState() );
+ searchReqVO.setStateList( stateList );
+ return devRentMapper.getRentByState(searchReqVO);
}
-}
\ No newline at end of file
+ @Override
+ public DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add( DevRentStateEnum.READY.getState() );
+ stateList.add( DevRentStateEnum.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() );
+ 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.setState( DevStateEnum.INUSE.getState() );
+ return deviceMapper.updateById(deviveDO);
+ }
+
+ return 0;
+ }
+
+ private Integer markDevLost(String devId, LocalDate localDate) {
+ // 璁惧鏍囨敞閬楀け
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
+ if (null != deviveDO) {
+ deviveDO.setState( DevStateEnum.LOST.getState() );
+ deviveDO.setLoseDate( localDate ); // createReqVO.getReturnTime().toLocalDate()
+ return deviceMapper.updateById(deviveDO);
+ }
+
+ return 0;
+ }
+
+ private Integer resumeDevFree(String devId) {
+ // 璁惧鏍囨敞閬楀け 鎭㈠涓虹┖闂�
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId );
+ if (null != deviveDO) {
+ deviveDO.setState( DevStateEnum.FREE.getState() );
+ deviveDO.setLoseDate( null );
+ return deviceMapper.updateById(deviveDO);
+ }
+
+ return 0;
+ }
+
+}
+
--
Gitblit v1.9.3