ke
2024-11-26 b672cafe6a447c9b19691b583df9542ad84bce2c
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
@@ -52,16 +52,14 @@
   @Override
   public List<SgDeviceDO> getDeviceList(String programId) {
      List<SgDeviceDO> list = new ArrayList<>();
      QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("program_id", programId);
      SgDeviceDO sg1 = new SgDeviceDO();
      sg1.setId((long) 999);
      sg1.setDeviceName("施工准备");
      sg1.setDeviceType("sgzb");
      sg1.setDeviceName("测量定位");
      sg1.setDeviceType("cldw");
      sg1.setStatus(0);
      list.add(sg1);
      List<SgDeviceDO> sgDeviceDOS = baseMapper.selectList(queryWrapper);
      List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(null,SgDeviceSearchDTO.builder().projectId(programId).build());
      if (CollectionUtils.isNotEmpty(sgDeviceDOS)) {
         list.addAll(sgDeviceDOS);
      }
@@ -86,7 +84,7 @@
      if(deviceId.equals("998")){
         return sgGxStepMapper.queryStepLists("sgys");
      }else if (deviceId.equals("999")){
         return sgGxStepMapper.queryStepLists("sgzb");
         return sgGxStepMapper.queryStepLists("cldw");
      }
      List<SgGxStepDO> sgGxStepDOS = sgGxStepMapper.queryStepList(deviceId);
      return sgGxStepDOS;