diff --git a/src/main/java/com/nis/domain/maat/DnsIpRecvData.java b/src/main/java/com/nis/domain/maat/DnsIpRecvData.java index eaeb4564e..fe568816a 100644 --- a/src/main/java/com/nis/domain/maat/DnsIpRecvData.java +++ b/src/main/java/com/nis/domain/maat/DnsIpRecvData.java @@ -2,11 +2,17 @@ package com.nis.domain.maat; import java.io.Serializable; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + public class DnsIpRecvData implements Serializable { private static final long serialVersionUID = -3438469380427993582L; - + @Expose + @SerializedName("cfgId") private Long cfgId; + @Expose + @SerializedName("fakeId") private Integer fakeId; public Long getCfgId() { diff --git a/src/main/java/com/nis/domain/maat/FromMaatBean.java b/src/main/java/com/nis/domain/maat/FromMaatBean.java index fc579cf9f..41ecc6802 100644 --- a/src/main/java/com/nis/domain/maat/FromMaatBean.java +++ b/src/main/java/com/nis/domain/maat/FromMaatBean.java @@ -3,10 +3,14 @@ package com.nis.domain.maat; import java.io.Serializable; import java.util.List; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + public class FromMaatBean implements Serializable { private static final long serialVersionUID = 1277140754421705676L; - + @Expose + @SerializedName("data") private List data; public List getData() { diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml index 696cc60a8..8c43cc875 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml @@ -116,6 +116,9 @@ #{isValid}, #{isAudit}, #{creator.id}, #{createTime}, #{request.id}, #{fakeId}, #{classify}, #{attribute}, #{lable} ) + + select LAST_INSERT_ID() as cfg_id + diff --git a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java index bcf711b98..803f95feb 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java @@ -3,7 +3,9 @@ package com.nis.web.service.configuration; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -22,6 +24,7 @@ import com.nis.web.service.CrudService; public class DnsIpCfgService extends CrudService{ @Override + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void save(DnsIpCfg dnsIpCfg) { dao.insert(dnsIpCfg); @@ -48,7 +51,7 @@ public class DnsIpCfgService extends CrudService{ throw new RuntimeException("欺骗ip配置新增下发失败:通讯异常"); } - if (!StringUtil.isEmpty(recvJson)) { + if (StringUtils.isBlank(recvJson)) { logger.error("新增欺骗ip配置失败:收到空的返回结果,cfgId:" + dnsIpCfg.getCfgId()); throw new RuntimeException("新增欺骗ip配置失败:收到空的返回结果"); } @@ -70,6 +73,7 @@ public class DnsIpCfgService extends CrudService{ } public void delete(String cfgIds) { + if(cfgIds.endsWith(","))cfgIds=cfgIds.substring(0,cfgIds.lastIndexOf(",")); String[] cfgIdsArr = cfgIds.split(","); for (String cfgId : cfgIdsArr) { DnsIpCfg d = new DnsIpCfg();