From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
index 03812b6..4e15afb 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
@@ -37,7 +37,7 @@
@Transactional(propagation = Propagation.REQUIRED)
public List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName,
- String laboratoryId,String project,String controllerName, Integer first, Integer pageSize) {
+ Long laboratoryId,String project, Integer first, Integer pageSize) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(laboratoryType)) {
@@ -46,11 +46,10 @@
if (StringUtils.isNotBlank(laboratoryName)) {
params.put("laboratoryName", "%" + laboratoryName + "%");
}
- if (StringUtils.isNotBlank(laboratoryId)) {
+ if (laboratoryId!=null) {
params.put("laboratoryId", laboratoryId);
}
params.put("project", project);
- params.put("controllerName", controllerName);
params.put("first", first);
params.put("pageSize", pageSize);
return this.sysLaboratoryContainerDao.getSysLaboratoryContainerList(params);
@@ -95,12 +94,12 @@
@Transactional(propagation = Propagation.REQUIRED)
public List<SysLaboratoryContainer> getSysLaboratoryContainerList(
- String laboratoryId) {
- return getSysLaboratoryContainerList(null,null,laboratoryId,null,null,null,null);
+ Long laboratoryId) {
+ return getSysLaboratoryContainerList(null,null,laboratoryId,null,null,null);
}
@Transactional(propagation = Propagation.REQUIRED)
- public int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName, String laboratoryId,String project,String controllerName) {
+ public int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName, Long laboratoryId,String project) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(laboratoryType)) {
@@ -109,11 +108,10 @@
if (StringUtils.isNotBlank(laboratoryName)) {
params.put("laboratoryName", "%" + laboratoryName + "%");
}
- if (StringUtils.isNotBlank(laboratoryId)) {
+ if (laboratoryId!=null) {
params.put("laboratoryId", laboratoryId);
}
params.put("project", project);
- params.put("controllerName", controllerName);
return this.sysLaboratoryContainerDao.getSysLaboratoryContainerTotalCount(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -123,7 +121,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public SysLaboratoryContainer getSysLaboratoryContainer(String id) {
+ public SysLaboratoryContainer getSysLaboratoryContainer(Long id) {
try {
return this.sysLaboratoryContainerDao.getSysLaboratoryContainer(id);
} catch (DataAccessException e) {
@@ -147,9 +145,9 @@
@Transactional(propagation = Propagation.REQUIRED)
public SysLaboratoryContainer insertSysLaboratoryContainer(SysLaboratoryContainer sysLaboratoryContainer) {
try {
- if (sysLaboratoryContainer.getId() == null) {
- sysLaboratoryContainer.setId(IDUtils.uuid());
- }
+// if (sysLaboratoryContainer.getId() == null) {
+// sysLaboratoryContainer.setId(IDUtils.uuid());
+// }
this.sysLaboratoryContainerDao.insertSysLaboratoryContainer(sysLaboratoryContainer);
this.sysLaboratoryContainerDao.updateSLContainerUser(sysLaboratoryContainer);
return sysLaboratoryContainer;
@@ -194,7 +192,7 @@
return false;
}
- List<String> ids = new ArrayList<String>();
+ List<Long> ids = new ArrayList<Long>();
for (SysLaboratoryContainer sysLaboratoryContainer : sysLaboratoryContainerList) {
ids.add(sysLaboratoryContainer.getId());
this.sysLaboratoryContainerDao.updateSLContainerUser(sysLaboratoryContainer);
@@ -213,7 +211,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public boolean isSysLaboratoryContainerExist(String containerCode, String editId) {
+ public boolean isSysLaboratoryContainerExist(String containerCode, Long editId) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("containerCode", containerCode);
@@ -244,16 +242,16 @@
container.setId(containermpl.getId());
this.sysLaboratoryContainerDao.updateSysLaboratoryContainer(container);
}else{
- if (containermpl == null) {
- container.setId(IDUtils.uuid());
- }
+// if (containermpl == null) {
+// container.setId(IDUtils.uuid());
+// }
this.sysLaboratoryContainerDao.insertSysLaboratoryContainer(container);
}
}
}
@Transactional(propagation = Propagation.REQUIRED)
- public void updateInfo(Float temp,Float humidity,Float voc1,String containerId,String flag) {
+ public void updateInfo(Float temp,Float humidity,Float voc1,Long containerId,String flag) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("temp", temp);
@@ -339,7 +337,7 @@
return false;
}
- List<String> ids = new ArrayList<String>();
+ List<Long> ids = new ArrayList<Long>();
for (SysLaboratory sysLaboratory : sysLaboratoryList) {
ids.add(sysLaboratory.getId());
}
--
Gitblit v1.9.2