From d5e01405a50c89966ae06363b09fd385b47f99f0 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 24 十月 2025 16:47:55 +0800
Subject: [PATCH] 问题修改
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
index cd2a697..22f4d87 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
@@ -371,7 +371,7 @@
List<JkCabinet> jkCabinetList = jkCabinetMapper.selectList(new QueryWrapper<JkCabinet>()
.lambda()
.eq(JkCabinet::getIsdeleted,Constants.ZERO)
- .apply(" FIND_IN_SET("+loginUserInfo.getId()+",MANAGER_ID) ")
+ .apply(" FIND_IN_SET("+loginUserInfo.getMemberId()+",MANAGER_ID) ")
.orderByAsc(JkCabinet::getCreateDate)
);
if(CollectionUtils.isNotEmpty(jkCabinetList)){
@@ -391,7 +391,7 @@
JkCabinet cabinet = jkCabinetMapper.selectOne(new QueryWrapper<JkCabinet>()
.lambda()
.eq(JkCabinet::getIsdeleted,Constants.ZERO)
- .apply(" FIND_IN_SET("+loginUserInfo.getId()+",MANAGER_ID) ")
+ .apply(" FIND_IN_SET("+loginUserInfo.getMemberId()+",MANAGER_ID) ")
.eq(JkCabinet::getId,cabinetId)
.last(" limit 1")
);
@@ -405,17 +405,19 @@
cabinetDetailVO.setServiceKeyNum(Constants.ZERO);
cabinetDetailVO.setOutKeyNum(Constants.ZERO);
cabinetDetailVO.setUnBindGridNum(Constants.ZERO);
+ cabinetDetailVO.setMemberId(loginUserInfo.getMemberId());
//鎵�鏈夋煖鏍间俊鎭�
List<JkCabinetGrid> jkCabinetGridList =
jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class, new MPJLambdaWrapper<JkCabinetGrid>()
.selectAll(JkCabinetGrid.class)
.selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
+ .selectAs(JkKeys::getCode,JkCabinetGrid::getKeyCode)
.selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
.leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
.eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
.eq(JkCabinetGrid::getCabinetId,cabinet.getId())
- .orderByDesc(JkCabinetGrid::getCode)
+ .orderByAsc(JkCabinetGrid::getCode)
);
List<CabinetGridInfoVO> cabinetGridInfoVOList = new ArrayList<>();
@@ -425,8 +427,10 @@
CabinetGridInfoVO cabinetGridInfoVO = new CabinetGridInfoVO();
BeanUtil.copyProperties(jkCabinetGrid,cabinetGridInfoVO);
cabinetGridInfoVO.setBindStatus(Objects.isNull(jkCabinetGrid.getKeyId())?Constants.ZERO:Constants.ONE);
+ cabinetGridInfoVO.setKeyStatus(Objects.isNull(cabinetGridInfoVO.getKeyStatus())?Constants.ZERO:cabinetGridInfoVO.getKeyStatus());
cabinetGridInfoVOList.add(cabinetGridInfoVO);
}
+ cabinetDetailVO.setCabinetGridInfoVOList(cabinetGridInfoVOList);
cabinetDetailVO.setErrGridNum(
cabinetGridInfoVOList.stream().filter(i->Constants.equalsInteger(i.getWorkingStatus(),Constants.ONE)).collect(Collectors.toList()).size()
);
@@ -530,7 +534,40 @@
CabinetInfoVO cabinetInfoVO = new CabinetInfoVO();
if(Objects.nonNull(jkCabinet)){
BeanUtil.copyProperties(jkCabinet,cabinetInfoVO);
+ //鎵�鏈夋煖鏍间俊鎭�
+ List<JkCabinetGrid> jkCabinetGridList =
+ jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class, new MPJLambdaWrapper<JkCabinetGrid>()
+ .selectAll(JkCabinetGrid.class)
+ .selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
+ .selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
+ .selectAs(JkKeys::getCode,JkCabinetGrid::getKeyCode)
+ .leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
+ .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
+ .eq(JkCabinetGrid::getCabinetId,jkCabinet.getId())
+ .orderByAsc(JkCabinetGrid::getCode)
+ );
+
+ List<CabinetGridInfoVO> cabinetGridInfoVOList = new ArrayList<>();
+ if(CollectionUtils.isNotEmpty(jkCabinetGridList)) {
+ for (JkCabinetGrid jkCabinetGrid : jkCabinetGridList) {
+ CabinetGridInfoVO cabinetGridInfoVO = new CabinetGridInfoVO();
+ BeanUtil.copyProperties(jkCabinetGrid, cabinetGridInfoVO);
+ cabinetGridInfoVO.setBindStatus(Objects.isNull(jkCabinetGrid.getKeyId()) ? Constants.ZERO : Constants.ONE);
+ cabinetGridInfoVO.setKeyStatus(Objects.isNull(cabinetGridInfoVO.getKeyStatus())?Constants.ZERO:cabinetGridInfoVO.getKeyStatus());
+ cabinetGridInfoVOList.add(cabinetGridInfoVO);
+ }
+ cabinetInfoVO.setCabinetGridInfoVOList(cabinetGridInfoVOList);
+ }
+
+ CabinetConfigDataVO cabinetConfigDataVO = new CabinetConfigDataVO();
+ cabinetConfigDataVO.setConcentration(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.CONCENTRATION).getCode());
+ cabinetConfigDataVO.setPressure(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.PRESSURE).getCode());
+ cabinetConfigDataVO.setBlowTime(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.BLOW_TIME).getCode());
+ cabinetConfigDataVO.setThreshold(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.THRESHOLD).getCode());
+ cabinetInfoVO.setCabinetConfigDataVO(cabinetConfigDataVO);
+
}
+ cabinetInfoVO.setLinkPhone("18156091665");
List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
.eq(Category::getIsdeleted,Constants.ZERO)
.eq(Category::getStatus,Constants.ZERO)
--
Gitblit v1.9.3