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/controller/DangerousEncodeController.java |   99 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java b/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java
index d274fc5..0d7a196 100644
--- a/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java
@@ -4,6 +4,7 @@
 import com.nanometer.smartlab.service.DangerousEncodeService;
 import com.nanometer.smartlab.util.FacesUtils;
 import com.nanometer.smartlab.util.IDUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.primefaces.context.RequestContext;
 import org.primefaces.event.FileUploadEvent;
@@ -55,7 +56,7 @@
                         if (isSearch){
                             isSearch = false;
                         }
-
+                        selectOne = null;
                     } catch (Exception e) {
                         logger.error("error occured.", e);
                     }
@@ -64,15 +65,15 @@
 
                 @Override
                 public DangerousEncode getRowData(String rowKey) {
-                    Iterator<DangerousEncode> iterator = this.iterator();
-                    DangerousEncode su = null;
-                    while (iterator.hasNext()) {
-                        su = iterator.next();
-                        if (rowKey.equals(su.getId())) {
-                            return su;
-                        }
-                    }
-                    return null;
+//                    Iterator<DangerousEncode> iterator = this.iterator();
+//                    DangerousEncode su = null;
+//                    while (iterator.hasNext()) {
+//                        su = iterator.next();
+//                        if (Long.parseLong(rowKey) == (su.getId())) {
+//                            return su;
+//                        }
+//                    }
+                    return dangerousEncodeService.selectById(Long.parseLong(rowKey));
                 }
             };
         }
@@ -85,25 +86,83 @@
     //保存
     public void onSaveBtnClick(){
         try {
-
+            String retmsg = "";
             //插入
             if (dangerousEncode.getId() == null) {
                 //设置 id,创建者和更新时间
-                dangerousEncode.setId(IDUtils.uuid());
-                dangerousEncode.setCreator(getUser().getId());
+                dangerousEncode.setCreator(getUser().getName());
                 dangerousEncode.setUpdateTime(new Date());
+
+                if (StringUtils.isBlank(dangerousEncode.getReagentCode())){
+                    retmsg +=("试剂名称码不能为空");
+                }else {
+                    List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(dangerousEncode.getReagentCode(),null,null,null);
+                    if (list1.size() > 0){
+                        retmsg +=("试剂名称码已存在,请更换");
+                    }
+                }
+
+                if (StringUtils.isBlank(dangerousEncode.getReagentName())){
+                    retmsg +=("试剂名称不能为空");
+                }else {
+                    List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(null,dangerousEncode.getReagentName(),null,null);
+                    if (list1.size() > 0){
+                        retmsg +=("试剂名称已存在,请更换");
+                    }
+                }
+
+                if (StringUtils.isBlank(dangerousEncode.getCode())){
+                    retmsg +=("编码不能为空");
+                }else {
+                    List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(null,null,null,dangerousEncode.getCode());
+                    if (list1.size() > 0){
+                        retmsg +=("编码已存在,请更换");
+                    }
+                }
                 //插入
-                dangerousEncodeService.insertOne(dangerousEncode);
+                if (StringUtils.isBlank(retmsg)) {
+                    dangerousEncodeService.insertOne(dangerousEncode);
+                }
             }
             //更新
             else{
-                dangerousEncode.setUpdateTime(new Date());
-                dangerousEncodeService.updateOne(dangerousEncode);
+                if (StringUtils.isBlank(dangerousEncode.getReagentCode())){
+                    retmsg +=("试剂名称码不能为空");
+                }else {
+                    List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(dangerousEncode.getReagentCode(),null,null,null);
+                    if (list1.size() > 0 && !list1.get(0).getId().equals(dangerousEncode.getId())){
+                        retmsg +=("试剂名称码已存在,请更换");
+                    }
+                }
+
+                if (StringUtils.isBlank(dangerousEncode.getReagentName())){
+                    retmsg +=("试剂名称不能为空");
+                }else {
+                    List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(null,dangerousEncode.getReagentName(),null,null);
+                    if (list1.size() > 0 && !list1.get(0).getId().equals(dangerousEncode.getId())){
+                        retmsg +=("试剂名称已存在,请更换");
+                    }
+                }
+
+                if (StringUtils.isBlank(dangerousEncode.getCode())){
+                    retmsg +=("编码不能为空");
+                }else {
+                    List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(null,null,null,dangerousEncode.getCode());
+                    if (list1.size() > 0 && !list1.get(0).getId().equals(dangerousEncode.getId())){
+                        retmsg += "编码已存在,请更换";
+                    }
+                }
+                if (StringUtils.isBlank(retmsg)) {
+                    dangerousEncode.setUpdateTime(new Date());
+                    dangerousEncodeService.updateOne(dangerousEncode);
+                }
             }
-
-            FacesUtils.info("操作成功");
-            RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
-
+            if (StringUtils.isNotBlank(retmsg)){
+                FacesUtils.error(retmsg);
+            }else {
+                RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
+                FacesUtils.info("操作成功");
+            }
         }catch (Exception e){
             e.printStackTrace();
             FacesUtils.warn("操作失败");

--
Gitblit v1.9.2