功能优化

rk

12 小时以前 89e890d195b6728c81afae6f64857f1bd08bbde5

功能优化

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncCabinetDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.doumee.dao.business.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2026/1/22 14:09
 */
@Data
public class SyncCabinetDTO {

    @ApiModelProperty(value = "钥匙柜编号")
    private String code;

    @ApiModelProperty(value = "柜格信息")
    private List<SyncGridDTO> gridDTOList;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncGridDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.doumee.dao.business.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2026/1/22 14:08
 */
@Data
public class SyncGridDTO {

    @ApiModelProperty(value = "板号")
    private String boardCode;

    @ApiModelProperty(value = "通道号")
    private String channelCode;

    @ApiModelProperty(value = "实际钥匙编码")
    private String actualLable;
}


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetGrid.java

@@ -110,4 +110,7 @@
    @TableField(exist = false)
    private Integer keyStatus;

    @ApiModelProperty(value = "实际钥匙编码（如：7B7A092F ï¼‰")
    @ExcelColumn(name="实际钥匙编码（如：7B7A092F ï¼‰")
    private String actualLable;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetGridService.java

@@ -148,10 +148,10 @@



//    /**
//     * åŒæ­¥æŸœæ ¼å®žé™…钥匙编号
//     * @param dto
//     */
//    void syncGridData(SyncCabinetDTO dto);
    /**
     * åŒæ­¥æŸœæ ¼å®žé™…钥匙编号
     * @param dto
     */
    void syncGridData(SyncCabinetDTO dto);

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java

@@ -1144,50 +1144,50 @@



//    @Override
//    public void syncGridData(SyncCabinetDTO dto){
//        if(Objects.isNull(dto)
//                ||StringUtils.isBlank(dto.getCode())
//                || CollectionUtils.isEmpty(dto.getGridDTOList())){
//            return;
//        }
//        List<JkCabinetGrid> jkCabinetGridList =
//                jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class, new MPJLambdaWrapper<JkCabinetGrid>()
//                        .selectAll(JkCabinetGrid.class)
//                        .selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
//                        .selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
//                        .selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
//                        .leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
//                        .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
//                        .eq(JkCabinet::getCode,dto.getCode())
//                        .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
//                        .isNotNull(JkCabinetGrid::getBoardCode)
//                        .isNotNull(JkCabinetGrid::getChannelCode)
//                        .orderByAsc(JkCabinetGrid::getCode)
//                );
//        if(CollectionUtils.isEmpty(jkCabinetGridList)){
//            return;
//        }
//        List<SyncGridDTO> gridDTOList = dto.getGridDTOList();
//        for (JkCabinetGrid jkCabinetGrid:jkCabinetGridList) {
//            List<SyncGridDTO> gridSyncList = gridDTOList.stream().filter(i->StringUtils.isNotBlank(i.getBoardCode())&&
//                    StringUtils.isNotBlank(i.getChannelCode())&&StringUtils.isNotBlank(i.getActualLable())&&i.getBoardCode().equals(jkCabinetGrid.getBoardCode())
//                    && i.getChannelCode().equals(jkCabinetGrid.getChannelCode())).collect(Collectors.toList());
//            if(CollectionUtils.isEmpty(gridSyncList)){
//                continue;
//            }
//            SyncGridDTO syncGridDTO = gridSyncList.get(Constants.ZERO);
//            if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
//                    || (!jkCabinetGrid.getKeyCode().equals(syncGridDTO.getActualLable())
//                    && !jkCabinetGrid.getActualLable().equals(syncGridDTO.getActualLable()))){
//                //更新数据 æ ‡è®°å¯¹åº”code
//                jkCabinetGridMapper.update(null,new UpdateWrapper<JkCabinetGrid>().lambda()
//                        .set(JkCabinetGrid::getActualLable,syncGridDTO.getActualLable())
//                        .eq(JkCabinetGrid::getId,jkCabinetGrid.getId())
//                );
//            }
//        }
//    }
    @Override
    public void syncGridData(SyncCabinetDTO dto){
        if(Objects.isNull(dto)
                ||StringUtils.isBlank(dto.getCode())
                || CollectionUtils.isEmpty(dto.getGridDTOList())){
            return;
        }
        List<JkCabinetGrid> jkCabinetGridList =
                jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class, new MPJLambdaWrapper<JkCabinetGrid>()
                        .selectAll(JkCabinetGrid.class)
                        .selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
                        .selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
                        .selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
                        .leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
                        .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
                        .eq(JkCabinet::getCode,dto.getCode())
                        .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
                        .isNotNull(JkCabinetGrid::getBoardCode)
                        .isNotNull(JkCabinetGrid::getChannelCode)
                        .orderByAsc(JkCabinetGrid::getCode)
                );
        if(CollectionUtils.isEmpty(jkCabinetGridList)){
            return;
        }
        List<SyncGridDTO> gridDTOList = dto.getGridDTOList();
        for (JkCabinetGrid jkCabinetGrid:jkCabinetGridList) {
            List<SyncGridDTO> gridSyncList = gridDTOList.stream().filter(i->StringUtils.isNotBlank(i.getBoardCode())&&
                    StringUtils.isNotBlank(i.getChannelCode())&&StringUtils.isNotBlank(i.getActualLable())&&i.getBoardCode().equals(jkCabinetGrid.getBoardCode())
                    && i.getChannelCode().equals(jkCabinetGrid.getChannelCode())).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(gridSyncList)){
                continue;
            }
            SyncGridDTO syncGridDTO = gridSyncList.get(Constants.ZERO);
            if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
                    || (!jkCabinetGrid.getKeyCode().equals(syncGridDTO.getActualLable())
                    && !jkCabinetGrid.getActualLable().equals(syncGridDTO.getActualLable()))){
                //更新数据 æ ‡è®°å¯¹åº”code
                jkCabinetGridMapper.update(null,new UpdateWrapper<JkCabinetGrid>().lambda()
                        .set(JkCabinetGrid::getActualLable,syncGridDTO.getActualLable())
                        .eq(JkCabinetGrid::getId,jkCabinetGrid.getId())
                );
            }
        }
    }