数据字典添加分别字符key

liujun001
1 parent 84f2b7d5
Showing 5 changed files with 36 additions and 7 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/info/KeyInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/key/info/KeyInfoService.java
@@ -437,7 +437,7 @@ public class KeyBoxController extends BaseController {
         if (StringUtils.isNotEmpty(dto.getPlate())) {
             KeyInfo keyInfo = new KeyInfo();
             keyInfo.setPlateNum(dto.getPlate());
-            keyInfos = keyInfoService.list(keyInfo);
+            keyInfos = keyInfoService.listLikePlate(keyInfo);
             if (CollectionUtils.isNotEmpty(keyInfos)) {
                 keyInfoIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
             }
@@ -472,6 +472,7 @@ public class KeyBoxController extends BaseController {
         locationEq = new LinggangKeyWorkLocation();
         locationEq.setYardId(sourceEq.getYardId());
         locationEq.setStartScheduleDate(date);
+        locationEq.setKeyInfoIds(keyInfoIds);
         locationEq.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(locationEq.getStartScheduleDate(),1));
 //        Set<Integer> types = new HashSet<>();
@@ -119,6 +119,8 @@ public class LinggangKeyWorkLocation {
     @TableField(exist = false)
     private Long zdsjT;
+    @TableField(exist = false)
+    private Collection<Integer> keyInfoIds;
     public enum LinggangKeyWorkLocationEventTypeEnum {
@@ -58,6 +58,18 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
         return list(new LambdaQueryWrapper<>(entity));
     }
+    public List<KeyInfo> listLikePlate(KeyInfo entity) {
+        String plate = entity.getPlateNum();
+        if (StringUtils.isEmpty(plate)) {
+            return Collections.emptyList();
+        }
+        entity.setPlateNum(null);
+        LambdaQueryWrapper<KeyInfo> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.like(KeyInfo::getPlateNum, plate);
+
+        return list(wrapper);
+    }
+
     @Override
     public List<KeyInfo> list(Collection<String> codes) {
         if (CollectionUtils.isEmpty(codes)) {
@@ -70,7 +82,7 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
     @Override
     public List<KeyInfo> listPlateNums(Collection<String> plateNum) {
-        if(CollectionUtils.isEmpty(plateNum)){
+        if (CollectionUtils.isEmpty(plateNum)) {
             return Collections.emptyList();
         }
         LambdaQueryWrapper<KeyInfo> wrapper = new LambdaQueryWrapper<>();
@@ -81,14 +93,14 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
     @Override
     public List<KeyInfo> list(KeyInfo entity, Collection<String> plateNums) {
         LambdaQueryWrapper<KeyInfo> wrapper = null;
-        if(Objects.isNull(entity)){
+        if (Objects.isNull(entity)) {
             wrapper = new LambdaQueryWrapper<>();
-        }else{
+        } else {
             wrapper = new LambdaQueryWrapper<>(entity);
         }
-        if(CollectionUtils.isNotEmpty(plateNums)){
-            wrapper.in(KeyInfo::getPlateNum,plateNums);
+        if (CollectionUtils.isNotEmpty(plateNums)) {
+            wrapper.in(KeyInfo::getPlateNum, plateNums);
         }
         return list(wrapper);
     }
@@ -192,7 +204,7 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
                 wrapper.orderByDesc(KeyInfo::getUpdateTime);
             }
-           
+
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "plateNum")) {
                 wrapper.orderByDesc(KeyInfo::getPlateNum);
             }
@@ -78,6 +78,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         countWrapper.select(LinggangKeyWorkLocation::getId);
         switchTime(entity, countWrapper);
         switchTypes(entity, countWrapper);
+        switchKeyInfoIds(entity,countWrapper);
         int count = count(countWrapper);
         List<LinggangKeyWorkLocation> lists = Collections.emptyList();
@@ -86,6 +87,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             LambdaQueryWrapper<LinggangKeyWorkLocation> selectWrapper = new LambdaQueryWrapper<>(entity);
             switchTime(entity, selectWrapper);
             switchTypes(entity, selectWrapper);
+            switchKeyInfoIds(entity,selectWrapper);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }
@@ -123,6 +125,16 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         }
     }
+    private static void switchKeyInfoIds(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
+        if (Objects.isNull(entity) || Objects.isNull(wrapper)) {
+            return;
+        }
+
+        if (CollectionUtils.isNotEmpty(entity.getKeyInfoIds())) {
+            wrapper.in(LinggangKeyWorkLocation::getKeyInfoId, entity.getKeyInfoIds());
+        }
+    }
+
     @Override
     public List<LinggangKeyWorkLocation> list(LinggangKeyWorkLocation entity) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
@@ -20,6 +20,8 @@ public interface KeyInfoService extends IService&lt;KeyInfo&gt; {
      */
     List<KeyInfo> list(KeyInfo entity);
+    List<KeyInfo> listLikePlate(KeyInfo entity);
+
     List<KeyInfo> list(Collection<String> codes);
     List<KeyInfo> listPlateNums(Collection<String> plateNum);