From c0d555bcd9ff0e8fa35e5a8636bc4c05743dc1e9 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 14 Jun 2024 11:36:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java | 1 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java | 7 +++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgDeviceService.java | 9 +++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java | 14 ++++++++++++++
4 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java
index 4f003c2..99ab05c 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgDeviceDO.java
@@ -72,6 +72,7 @@
/**
* 创建人
*/
+ @TableField(exist = false)
private Long createUser;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
index 0df9160..e601fe8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java
@@ -15,6 +15,7 @@
import java.util.Arrays;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -107,4 +108,10 @@
SgDeviceDO sgDeviceDO = sgDeviceService.getById(id);
return R.data(sgDeviceDO);
}
+
+ @GetMapping(value = "/getDeviceList")
+ public R queryPageList(@RequestParam(name="programId",required=true) String programId) {
+ List<SgDeviceDO> page = sgDeviceService.getDeviceList(programId);
+ return R.data(page);
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgDeviceService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgDeviceService.java
index da57aec..c1de827 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgDeviceService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgDeviceService.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
* <p>
* 施工子设备表 服务类
@@ -16,4 +18,11 @@
public interface SgDeviceService extends IService<SgDeviceDO> {
IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO);
+
+ /**
+ * 根据项目id查询下下面的设备list
+ * @param programId
+ * @return
+ */
+ List<SgDeviceDO> getDeviceList(String programId);
}
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 9a1a589..c6c99a6 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
@@ -4,6 +4,7 @@
import cn.gistack.sm.sg.DTO.SgDeviceSearchDTO;
import cn.gistack.sm.sg.mapper.SgDeviceMapper;
import cn.gistack.sm.sg.service.SgDeviceService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -26,4 +27,17 @@
List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(searchDTO);
return page.setRecords(sgDeviceDOS);
}
+
+ /**
+ * 根据项目id查询下下面的设备list
+ *
+ * @param programId
+ * @return
+ */
+ @Override
+ public List<SgDeviceDO> getDeviceList(String programId) {
+ QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("program_id",programId);
+ return baseMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.9.3