From 316ce3af8b9b04b490468b15243454c7fba0d2ea Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 28 Oct 2024 18:10:58 +0800
Subject: [PATCH] 湖北水库：所有项目添加测量定位工序
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
index a6cb732..fa2bc41 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
@@ -52,8 +52,6 @@
@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("测量定位");
@@ -61,7 +59,7 @@
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;
--
Gitblit v1.9.3