diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java index 0ffd699..fbf9d9b 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java @@ -2,12 +2,15 @@ import java.io.Serializable; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.core.base.json.DateDeserializer; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -56,6 +59,7 @@ * 创建时间 */ @TableField("CREATE_TIME") + @JSONField(serializeUsing = DateDeserializer.class) private Date createTime; @Override diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java index 0ffd699..fbf9d9b 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java @@ -2,12 +2,15 @@ import java.io.Serializable; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.core.base.json.DateDeserializer; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -56,6 +59,7 @@ * 创建时间 */ @TableField("CREATE_TIME") + @JSONField(serializeUsing = DateDeserializer.class) private Date createTime; @Override diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java index 62c76f9..8f66228 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.modular.system.constant.SocketConst.SOCKET_SUCCESS_MSG; + /** *

* 服务实现类 @@ -97,7 +99,7 @@ List errorList = new ArrayList<>(); for (Device device : deviceList) { Map socketRes = SocketClientUtil.sendMessage(device.getDevIp(),port,socketMsg); - if(!(boolean)socketRes.get("success")){ + if(!(boolean)socketRes.get("success") || !SOCKET_SUCCESS_MSG.equals(String.valueOf(socketRes.get("message")))){ errorList.add(device.getDevCode()); } } @@ -114,7 +116,7 @@ List errorList = new ArrayList<>(); for (Device device : deviceList) { Map socketRes = SocketClientUtil.sendMessage(device.getDevIp(),port,socketMsg); - if(!(boolean)socketRes.get("success")){ + if(!(boolean)socketRes.get("success") || !SOCKET_SUCCESS_MSG.equals(String.valueOf(socketRes.get("message")))){ errorList.add(device.getDevCode()); } } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java index 0ffd699..fbf9d9b 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/AcsPermission.java @@ -2,12 +2,15 @@ import java.io.Serializable; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.core.base.json.DateDeserializer; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -56,6 +59,7 @@ * 创建时间 */ @TableField("CREATE_TIME") + @JSONField(serializeUsing = DateDeserializer.class) private Date createTime; @Override diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java index 62c76f9..8f66228 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/AcsPermissionServiceImpl.java @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.modular.system.constant.SocketConst.SOCKET_SUCCESS_MSG; + /** *

* 服务实现类 @@ -97,7 +99,7 @@ List errorList = new ArrayList<>(); for (Device device : deviceList) { Map socketRes = SocketClientUtil.sendMessage(device.getDevIp(),port,socketMsg); - if(!(boolean)socketRes.get("success")){ + if(!(boolean)socketRes.get("success") || !SOCKET_SUCCESS_MSG.equals(String.valueOf(socketRes.get("message")))){ errorList.add(device.getDevCode()); } } @@ -114,7 +116,7 @@ List errorList = new ArrayList<>(); for (Device device : deviceList) { Map socketRes = SocketClientUtil.sendMessage(device.getDevIp(),port,socketMsg); - if(!(boolean)socketRes.get("success")){ + if(!(boolean)socketRes.get("success") || !SOCKET_SUCCESS_MSG.equals(String.valueOf(socketRes.get("message")))){ errorList.add(device.getDevCode()); } } diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/constant/SocketConst.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/constant/SocketConst.java index aa02d50..2aff6d4 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/constant/SocketConst.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/constant/SocketConst.java @@ -16,4 +16,9 @@ * 人员数据下发socket前缀 */ public static final String SOCKET_PREFIX_ADD_PERSON = "addPerson:"; + + /** + * socket返回成功信息 + */ + public static final String SOCKET_SUCCESS_MSG = "ok"; }