whyclxw
2025-04-21 3a6d4de77253bb86aed3383f9b9c54be5c25752c
src/main/java/com/whyc/service/LockInfService.java
@@ -10,6 +10,7 @@
import com.whyc.dto.RealDto;
import com.whyc.dto.Response;
import com.whyc.mapper.*;
import com.whyc.pojo.plus_inf.LockAddress;
import com.whyc.pojo.plus_inf.LockInf;
import com.whyc.pojo.plus_inf.StationInf;
import com.whyc.pojo.plus_lock_ram.LockIdcard;
@@ -46,6 +47,10 @@
    @Autowired(required = false)
    private LockIdcardMapper idcardMapper;
    @Autowired(required = false)
    private LockAddressMapper addressMapper;
    @Autowired
    private ProcessSurveyService processSurveyService;
@@ -250,6 +255,8 @@
        //根据dto中stationid和包机组id查询出管理的lockid
        List<Integer> lockIdList=bjLockMapper.getLocIdByStationidAndBjId(dto.getStationId(),dto.getBaojiId());
        List<LockInf> linfs=mapper.getRealLock(lockIdList);
        //锁的位置信息
        List<LockAddress> addressList=addressMapper.getAddressList(lockIdList);
        if(linfs!=null&&linfs.size()>0){
            map.put("sumLinf",linfs.size());
            Map<Integer, List<LockInf>> onlinemap = linfs.stream().collect(Collectors.groupingBy(LockInf::getLockOnline));
@@ -276,7 +283,7 @@
        }
        PageInfo pageInfo= PageInfoUtils.list2PageInfo(linfs, dto.getPageNum(), dto.getPageSize());
        map.put("pageInfo",pageInfo);
        return new Response().setII(1,linfs!=null,map,"实时获取获取区域下所有锁的状态");
        return new Response().setIII(1,linfs!=null,map,addressList,"实时获取获取区域下所有锁的状态");
    }
    //查询锁的信息和id卡
    public Response getLockId(LockIdDto dto) {