From bc4cc7d8ffb5bb9afca7127847b4e203fde4c217 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Tue, 6 Aug 2024 09:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/bracelet/BraceletParamsDto.java | 5 +++ .../bracelet/vo/EquipmentReqDataVo.java | 9 ++-- .../controller/EquipmentReqController.java | 7 ++++ .../bracelet/mapper/EquipmentReqMapper.java | 18 ++++++++ .../service/IEquipmentReqService.java | 9 ++++ .../service/impl/EquipmentReqServiceImpl.java | 42 ++++++++++++++----- .../mapper/bracelet/EquipmentReqMapper.xml | 14 +++++-- 7 files changed, 86 insertions(+), 18 deletions(-) diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java index 25a2517..280bbd6 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java @@ -87,6 +87,8 @@ public class BraceletParamsDto { private Long updateUser = SecurityUtils.getUserId(); + /**设备ID*/ + private Long devId; /**工程名称*/ private String proName; /**杆塔编号*/ @@ -101,4 +103,7 @@ public class BraceletParamsDto { private String lyTime; /**归还时间*/ private String ghTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date backTime = new Date(); } diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EquipmentReqDataVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EquipmentReqDataVo.java index 52ba53b..37d60f2 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EquipmentReqDataVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EquipmentReqDataVo.java @@ -49,10 +49,6 @@ public class EquipmentReqDataVo { */ private String devType; - /** - * 领用时间 - */ - private Date lyTime = new Date(); } @Length(max = 255, message = "备注字符长度不能超过255") @@ -76,4 +72,9 @@ public class EquipmentReqDataVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private Date updateTime = new Date(); + + /** + * 领用时间 + */ + private Date lyTime = new Date(); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/EquipmentReqController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/EquipmentReqController.java index 8dad68a..6a02cf5 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/EquipmentReqController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/EquipmentReqController.java @@ -60,4 +60,11 @@ public class EquipmentReqController extends BaseController { public AjaxResult getUseDevices(BraceletParamsDto dto) { return service.getUseDevices(dto); } + + // @RequiresPermissions("basic:equipmentReq:returnDevice") + @PostMapping("returnDevice") + @SysLog(title = "施工管控", businessType = OperaType.INSERT,logType = 0,module = "施工管控->设备领用",details ="归还设备") + public AjaxResult returnDevice(@RequestBody BraceletParamsDto dto) { + return service.returnDevice(dto); + } } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java index 66ead66..3d6fedc 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java @@ -79,4 +79,22 @@ public interface EquipmentReqMapper { */ @MapKey("devId") List> getUseDevices(BraceletParamsDto dto); + + /** + * 更新手环箱状态 + * @param dto + * @return void + * @author cwchen + * @date 2024/8/6 9:16 + */ + void updateshBoxData(BraceletParamsDto dto); + + /** + * 更新设备归还状态 + * @param dto + * @return void + * @author cwchen + * @date 2024/8/6 9:19 + */ + void returnDevice(BraceletParamsDto dto); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IEquipmentReqService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IEquipmentReqService.java index 248c4fd..56709ac 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IEquipmentReqService.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IEquipmentReqService.java @@ -42,4 +42,13 @@ public interface IEquipmentReqService { * @date 2024/8/5 18:06 */ AjaxResult getUseDevices(BraceletParamsDto dto); + + /** + * 归还设备 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/8/6 9:14 + */ + AjaxResult returnDevice(BraceletParamsDto dto); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java index 6b525f9..75865ce 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java @@ -16,10 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * @className:EquipmentReqServiceImpl @@ -37,14 +34,14 @@ public class EquipmentReqServiceImpl implements IEquipmentReqService { @Override public List getEquipmentReqLists(BraceletParamsDto dto) { - List list= new ArrayList<>(); + List list = new ArrayList<>(); try { list = mapper.getEquipmentReqLists(dto); for (EquipmentReqVo vo : list) { vo.setLeaderPhone(Sm4Utils.decode(vo.getLeaderPhone())); } } catch (Exception e) { - log.error(e.toString(),e); + log.error(e.toString(), e); } return list; } @@ -53,16 +50,22 @@ public class EquipmentReqServiceImpl implements IEquipmentReqService { @Transactional(rollbackFor = Exception.class) public AjaxResult addData(EquipmentReqDataVo vo) { try { - if(CollectionUtils.isEmpty(vo.getList())){ + if (CollectionUtils.isEmpty(vo.getList())) { return AjaxResult.error("领用设备不能为空"); } + // 判断是否添加重复设备 + Set setList = new HashSet<>(vo.getList()); + if (setList.size() != vo.getList().size()) { + return AjaxResult.error("领用设备中有重复设备，请仔细检查"); + } for (EquipmentReqDataVo.Equipment equipment : vo.getList()) { // 判断设备是否已经归还 Integer result = result = mapper.isHasUseDevice(equipment); - if(result > 0){ + if (result > 0) { return AjaxResult.error("领用设备中包含未归还设备，请先归还后，方可再次领用"); } } + // 添加设备领用数据、设备领用详情数据 mapper.addDevUseData(vo); mapper.addDevUseDetailData(vo); @@ -74,7 +77,7 @@ public class EquipmentReqServiceImpl implements IEquipmentReqService { } return AjaxResult.success(); } catch (Exception e) { - log.error(e.toString(),e); + log.error(e.toString(), e); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error(); } @@ -82,12 +85,29 @@ public class EquipmentReqServiceImpl implements IEquipmentReqService { @Override public AjaxResult getUseDevices(BraceletParamsDto dto) { - List> list = new ArrayList<>(); + List> list = new ArrayList<>(); try { list = mapper.getUseDevices(dto); } catch (Exception e) { - log.error(e.toString(),e); + log.error(e.toString(), e); } return AjaxResult.success(list); } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult returnDevice(BraceletParamsDto dto) { + try { + if(Objects.equals(dto.getDevType(), BusinessConstants.SHX)){ + // 设备类型为手环箱更新手环箱状态 + mapper.updateshBoxData(dto); + } + mapper.returnDevice(dto); + return AjaxResult.success(); + } catch (Exception e) { + log.error(e.toString(),e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + } } diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml index 6310174..d63033a 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INSERT INTO tb_dev_use_bid(id,dev_id,dev_name,dev_code,dev_type,ly_time) VALUES ( - #{id},#{item.devId},#{item.devName},#{item.devCode},#{item.devType},#{item.lyTime} + #{id},#{item.devId},#{item.devName},#{item.devCode},#{item.devType},#{lyTime} ) @@ -44,6 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE tb_sh_box SET team_id = #{vo.teamId},pro_id = #{vo.proId},gt_id = #{vo.powerId} WHERE id = #{equipment.devId} + + + UPDATE tb_sh_box SET team_id = null,pro_id = null,gt_id = null WHERE id = #{devId} + + + + UPDATE tb_dev_use_bid SET gh_time = #{backTime} WHERE id = #{id} AND dev_id = #{devId} AND dev_type = #{devType} AND dev_code = #{devCode} +