From 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:05:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
index e80144f..20134ae 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
@@ -49,7 +49,7 @@
|| Objects.isNull(jkKeys.getCarId())
|| Objects.isNull(jkKeys.getRoleType())
|| StringUtils.isBlank(jkKeys.getCode())
- || StringUtils.isBlank(jkKeys.getRfidLable())
+ || StringUtils.isBlank(jkKeys.getRfidCode())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -65,10 +65,15 @@
if(Objects.nonNull(carsKeys)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠杞﹁締宸茶閽ュ寵["+carsKeys.getCode()+"]缁戝畾浣跨敤锛�");
}
- JkKeys rfidKeys = jkKeysMapper.selectOne(new QueryWrapper<JkKeys>().lambda().eq(JkKeys::getRfidLable,jkKeys.getRfidLable()).eq(JkKeys::getIsdeleted,Constants.ZERO).last("limit 1"));
+ JkKeys rfidKeys = jkKeysMapper.selectOne(new QueryWrapper<JkKeys>().lambda().eq(JkKeys::getRfidCode,jkKeys.getRfidCode()).eq(JkKeys::getIsdeleted,Constants.ZERO).last("limit 1"));
if(Objects.nonNull(rfidKeys)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠RFID鏍囩宸茶閽ュ寵["+rfidKeys.getCode()+"]浣跨敤锛�");
}
+ String lable = Constants.getRFIDNumber(jkKeys.getRfidCode());
+ if(StringUtils.isEmpty(lable)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"RFID鏍囩璁剧疆澶辫触銆愭牸寮忎笉姝ｇ‘銆�");
+ }
+ jkKeys.setRfidLable(lable);
LoginUserInfo loginUserInfo = jkKeys.getLoginUserInfo();
jkKeys.setCreateDate(new Date());
jkKeys.setEditDate(jkKeys.getCreateDate());
@@ -76,6 +81,7 @@
jkKeys.setEditor(loginUserInfo.getId());
jkKeys.setIsdeleted(Constants.ZERO);
jkKeys.setStatus(Constants.ZERO);
+ jkKeys.setCarCode(cars.getCode());
jkKeysMapper.insert(jkKeys);
return jkKeys.getId();
}
@@ -113,10 +119,15 @@
|| Objects.isNull(jkKeys.getCarId())
|| Objects.isNull(jkKeys.getRoleType())
|| StringUtils.isBlank(jkKeys.getCode())
- || StringUtils.isBlank(jkKeys.getRfidLable())
+ || StringUtils.isBlank(jkKeys.getRfidCode())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ String lable = Constants.getRFIDNumber(jkKeys.getRfidCode());
+ if(StringUtils.isEmpty(lable)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"RFID鏍囩璁剧疆澶辫触銆愭牸寮忎笉姝ｇ‘銆�");
+ }
+ jkKeys.setRfidLable(lable);
//鏌ヨ缂栧彿鏄惁閲嶅
if(jkKeysMapper.selectCount(new QueryWrapper<JkKeys>().lambda().ne(JkKeys::getId,jkKeys.getId()).eq(JkKeys::getCode,jkKeys.getCode()).eq(JkKeys::getIsdeleted,Constants.ZERO))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閽ュ寵缂栧彿宸插瓨鍦紒");
@@ -133,9 +144,11 @@
if(Objects.nonNull(rfidKeys)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠RFID鏍囩宸茶閽ュ寵["+rfidKeys.getCode()+"]浣跨敤锛�");
}
+
LoginUserInfo loginUserInfo = jkKeys.getLoginUserInfo();
jkKeys.setEditDate(new Date());
jkKeys.setEditor(loginUserInfo.getId());
+ jkKeys.setCarCode(cars.getCode());
jkKeysMapper.updateById(jkKeys);
}
@@ -162,8 +175,16 @@
@Override
public List<JkKeys> findList(JkKeys jkKeys) {
+
+
+
+
+ jkKeys.setIsdeleted(Constants.ZERO);
QueryWrapper<JkKeys> wrapper = new QueryWrapper<>(jkKeys);
- return jkKeysMapper.selectList(wrapper);
+ return jkKeysMapper.selectList(new QueryWrapper<JkKeys>()
+ .lambda().eq(JkKeys::getIsdeleted,Constants.ZERO)
+
+ );
}
@Override
@@ -174,12 +195,13 @@
JkKeys model = pageWrap.getModel();
MPJLambdaWrapper<JkKeys> wrapper = new MPJLambdaWrapper<JkKeys>()
.selectAll(JkKeys.class)
- .selectAs(JkCabinetGrid::getCode,JkKeys::getGridCode)
- .selectAs(JkCabinet::getName,JkKeys::getCabinetName)
+ .select("j.code",JkKeys::getGridCode)
+ .select("j1.name",JkKeys::getCabinetName)
.leftJoin(Cars.class,Cars::getId,JkKeys::getCarId)
- .leftJoin(JkCabinetGrid.class,JkCabinetGrid::getKeyId,JkKeys::getId)
- .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
+ .leftJoin(" jk_cabinet_grid j on j.key_id = t.id and j.isdeleted = 0 ")
+ .leftJoin(" jk_cabinet j1 on j.CABINET_ID = j1.id ")
.eq(JkKeys::getIsdeleted,Constants.ZERO)
+// .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
.like(StringUtils.isNotBlank(model.getCode()),JkKeys::getCode,model.getCode())
.like(StringUtils.isNotBlank(model.getCarCode()),JkKeys::getCarCode,model.getCode());
IPage<JkKeys> iPage = jkKeysMapper.selectJoinPage(page,JkKeys.class,wrapper);
--
Gitblit v1.9.3