Hu Jie 7 жил өмнө
parent
commit
b00b572503

+ 14 - 3
src/main/java/com/uas/platform/b2b/erp/listen/model/Listen.java

@@ -18,13 +18,24 @@ public class Listen {
     private Long id;
 
     @Column(name = "mac_address")
-    String macAddress;
+    private String macAddress;
 
     @Column(name = "name", length = 2000)
-    String name;
+    private String name;
 
     @Column(name = "date")
-    Date date;
+    private Date date;
+
+    @Column(name = "description")
+    private String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 
     public String getMacAddress() {
         return macAddress;

+ 4 - 1
src/main/java/com/uas/platform/b2b/erp/listen/service/impl/ListenServiceImpl.java

@@ -30,8 +30,11 @@ public class ListenServiceImpl implements ListenService {
             listens.forEach(listen -> {
                 Listen exitListen = listenDao.findByMacAddress(listen.getMacAddress());
                 if (!StringUtils.isEmpty(exitListen)) {
-                    exitListen.setName(listen.getName());
+                    if (!StringUtils.isEmpty(listen.getName())) {
+                        exitListen.setName(listen.getName());
+                    }
                     exitListen.setDate(new Date());
+                    exitListen.setDescription(listen.getDescription());
                     listenDao.save(exitListen);
                 } else {
                     listen.setDate(new Date());