From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 01 Jul 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java
index df9e821..dec2a85 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java
@@ -53,7 +53,7 @@
     SysWarehouseService sysWarehouseService;
 
     @Transactional(propagation = Propagation.REQUIRED)
-    public List<SysWarehouseContainer> getSysWarehouseContainerList(String warehouseType, String warehouseName, String warehouseId, Integer first, Integer pageSize) {
+    public List<SysWarehouseContainer> getSysWarehouseContainerList(String warehouseType, String warehouseName, Long warehouseId, Integer first, Integer pageSize) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             if (StringUtils.isNotBlank(warehouseType)) {
@@ -62,7 +62,7 @@
             if (StringUtils.isNotBlank(warehouseName)) {
                 params.put("warehouseName", "%" + warehouseName + "%");
             }
-            if (StringUtils.isNotBlank(warehouseId)) {
+            if (warehouseId!=null) {
                 params.put("warehouseId", warehouseId);
             }
             params.put("first", first);
@@ -75,7 +75,7 @@
     }
 
     @Transactional(propagation = Propagation.REQUIRED)
-    public List<SysWarehouseContainer> getSysWarehouseContainerList(String warehouseId){
+    public List<SysWarehouseContainer> getSysWarehouseContainerList(Long warehouseId){
         return getSysWarehouseContainerList(null,null,warehouseId,null,null);
     }
 
@@ -97,7 +97,7 @@
     }
 
     @Transactional(propagation = Propagation.REQUIRED)
-    public SysWarehouseContainer getSysWarehouseContainer(String id) {
+    public SysWarehouseContainer getSysWarehouseContainer(Long id) {
         try {
             return this.sysWarehouseContainerDao.getSysWarehouseContainer(id);
         } catch (DataAccessException e) {
@@ -109,9 +109,9 @@
     @Transactional(propagation = Propagation.REQUIRED)
     public SysWarehouseContainer insertSysWarehouseContainer(SysWarehouseContainer sysWarehouseContainer) {
         try {
-            if (sysWarehouseContainer.getId() == null) {
-                sysWarehouseContainer.setId(IDUtils.uuid());
-            }
+//            if (sysWarehouseContainer.getId() == null) {
+//                sysWarehouseContainer.setId(IDUtils.uuid());
+//            }
             this.sysWarehouseContainerDao.insertSysWarehouseContainer(sysWarehouseContainer);
             return sysWarehouseContainer;
         } catch (DuplicateKeyException ex) {
@@ -154,7 +154,7 @@
                 return false;
             }
 
-            List<String> ids = new ArrayList<String>();
+            List<Long> ids = new ArrayList<Long>();
             for (SysWarehouseContainer sysWarehouseContainer : sysWarehouseContainerList) {
                 ids.add(sysWarehouseContainer.getId());
             }
@@ -175,7 +175,7 @@
     }
 
     @Transactional(propagation = Propagation.REQUIRED)
-    public boolean isSysWarehouseContainerExist(String containerCode, String editId) {
+    public boolean isSysWarehouseContainerExist(String containerCode, Long editId) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("containerCode", containerCode);
@@ -217,7 +217,7 @@
         //1.新建实验室
         SysLaboratory sl = new SysLaboratory();
 
-        sl.setId(IDUtils.uuid());
+        //sl.setId(IDUtils.uuid());
         sl.setType(baseMetaService.getBaseMetaList(Constants.BASE_META_GROUP_LABORATORY_TYPE).get(0).getId());
         //判断是否已经存在该名称实验室
         SysLaboratory sysLaboratory = sysLaboratoryDao.getSysLaboratoryByName(sysWarehouse.getName());
@@ -241,7 +241,7 @@
         //判断是否已经存在该条码柜子
         if (count < 1) {
             SysLaboratoryContainer slc = new SysLaboratoryContainer();
-            slc.setId(IDUtils.uuid());
+       //     slc.setId(IDUtils.uuid());
             // (#{id}, #{laboratoryId}, #{type}, #{containerCode}, #{infoCode}, #{structure},
             // #{name}, 1, #{characterLeft}, #{characterRight}, now(), now(), #{controllerCode},#{project})
             slc.setLaboratoryId(sl.getId());
@@ -280,7 +280,7 @@
     public void deleteSysWarehouseContainer2(List<SysWarehouseContainer> selectedList) {
         //1.删除自己
         this.deleteSysWarehouseContainer(selectedList);
-        List<String> ids = new ArrayList<>();
+        List<Long> ids = new ArrayList<>();
         for (SysWarehouseContainer swc : selectedList) {
             SysLaboratoryContainer slc = sysLaboratoryContainerDao.getSysLaboratoryContainerByContainerCode(swc.getContainerCode());
             if (slc != null) {

--
Gitblit v1.9.2