From 0eb4bcffe0c6e017f9a9967576f12818c9b05db7 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期六, 11 九月 2021 13:36:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/LocTypeDto.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index ecf4732..276d7b7 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -4,11 +4,15 @@
 import com.zy.asrs.entity.BasDevp;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * Created by vincent on 2020/10/19
  */
 @Data
-public class LocTypeDto {
+public class LocTypeDto implements Cloneable, Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
     private Short locType1;
@@ -19,8 +23,7 @@
     // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
     private Short locType3;
 
-    public LocTypeDto() {
-    }
+
 
     public LocTypeDto(BasDevp basDevp) {
         if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
@@ -28,12 +31,10 @@
         }
         if (basDevp.getLocType1() == 1) {
             this.locType1 = 1; // 浣庡簱浣�
-        } else if (basDevp.getLocType1() == 2){
-            this.locType1 = 2; // 涓簱浣�
         } else {
-            this.locType1 = 3; // 楂樺簱浣�
+            this.locType1 = 2; // 楂樺簱浣�
         }
-//        if (basDevp.getLocType2() == 0) {
+//        if (basDevp.getLocType2() == null || basDevp.getLocType2() == 0) {
 //            throw new CoolException("plc瀹界獎妫�娴嬪紓甯�");
 //        }
 //        if (basDevp.getLocType2() == 1) {
@@ -41,7 +42,7 @@
 //        } else {
 //            this.locType2 = 2; // 瀹藉簱浣�
 //        }
-//        if (basDevp.getLocType3() == 0) {
+//        if (basDevp.getLocType3() == null || basDevp.getLocType3() == 0) {
 //            throw new CoolException("plc杞婚噸妫�娴嬪紓甯�");
 //        }
 //        if (basDevp.getLocType3() == 1) {
@@ -51,4 +52,14 @@
 //        }
     }
 
+    @Override
+    public LocTypeDto clone() {
+        try {
+            return (LocTypeDto) super.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 }

--
Gitblit v1.9.1