bug修复

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/AlarmRecordVo.java

@@ -1,6 +1,8 @@
 package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,6 +27,7 @@ public class AlarmRecordVo {
     /**
      * 主键
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "${comment}")
     private Long id;
     /**

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/BottleStorageErrorVo.java

@@ -1,6 +1,8 @@
 package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,6 +29,7 @@ public class BottleStorageErrorVo {
     /**
      * 主键id,数据唯一标识
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "${comment}")
     private Long id;
 

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/UseRecordVo.java

@@ -1,6 +1,8 @@
 package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.bottle.domain.BottleStorage;
 import com.zd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModel;
@@ -26,8 +28,10 @@ public class UseRecordVo {
     /**
      * 主键id,数据唯一标识
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "${comment}")
     private Long id;
+
     private Long userId;
     /**
      * 联系人

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/UsegasApplyDetailVo.java

@@ -1,6 +1,8 @@
 package com.zd.bottle.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zd.bottle.domain.UsegasAuditRecord;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,9 +10,13 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @author Administrator
+ */
 @ApiModel("用气资格详情")
 public class UsegasApplyDetailVo {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "${comment}")
     private Long id;
 

zd-modules/zd-netty/src/main/java/com/zd/netty/service/impl/SendServiceImpl.java

@@ -81,7 +81,8 @@ public class SendServiceImpl implements ISendService {
 
     private void sendStock(InventoryTag tag, GClient client) {
         try {
-            remoteStockService.rfidCheck(tag);
+            boolean result = remoteStockService.rfidCheck(tag);
+            alarm(client, result);
         } catch (Exception e) {
             log.info("化学品服务异常：" + e.getMessage());
         }
@@ -91,20 +92,24 @@ public class SendServiceImpl implements ISendService {
         R<Boolean> result;
         try {
             result = bottleService.remoteAdd(tag);
-            alarm(client, result);
+            if (result.getCode()==HttpStatus.SUCCESS){
+                alarm(client, result.getData());
+            }
         } catch (Exception e) {
             log.info("气瓶服务异常：" + e.getMessage());
         }
         try {
             result = remoteBottleService.remoteAdd(tag);
-            alarm(client, result);
+            if (result.getCode()==HttpStatus.SUCCESS){
+                alarm(client, result.getData());
+            }
         } catch (Exception e) {
             log.info("新气瓶服务异常：" + e.getMessage());
         }
     }
 
-    private void alarm(GClient client, R<Boolean> result) {
-        if (client != null && result.getCode() == HttpStatus.SUCCESS && Boolean.TRUE.equals(result.getData())) {
+    private void alarm(GClient client, Boolean result) {
+        if (client != null && Boolean.TRUE.equals(result)) {
             DeJuRFIDServerImpl.alarm(client);
         }
     }