diff --git a/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java index 9608bae09..5a5d65a9f 100644 --- a/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java @@ -49,7 +49,7 @@ public class AsnIpTemplate extends BasicTemplate{ public void setOrganization(String organization) { this.organization = organization; } - @ExcelField(title="country_code",align=2,sort=14) + @ExcelField(title="country",align=2,sort=14) public String getCountry() { return country; } diff --git a/src/main/java/com/nis/web/controller/basics/AsnGroupController.java b/src/main/java/com/nis/web/controller/basics/AsnGroupController.java index 75a9b34d9..dbd3b8eca 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnGroupController.java @@ -22,6 +22,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.basics.AsnGroupInfo; import com.nis.domain.basics.AsnIpCfg; +import com.nis.domain.configuration.AsnKeywordCfg; import com.nis.domain.specific.ConfigGroupInfo; import com.nis.exceptions.MaatConvertException; import com.nis.util.StringUtil; @@ -230,4 +231,64 @@ public class AsnGroupController extends BaseController { } return orgaList; } + /** + * 校验是否有配置的ASN域已被删除 + * @param model + * @return + */ + @RequestMapping(value="checkAsnRegionIsDeleted") + @ResponseBody + public Map checkAsnRegionIsDeleted(@RequestParam(required=true,value="compileIds")String compileIds,Model model){ + Map resultMap=new HashMap<>(); + try { + if(!StringUtil.isEmpty(compileIds)){ + compileIds=compileIds.substring(0,compileIds.length()-1); + Map> compileWithGroupMap=new HashMap<>(); + Map groupIdWithAsn=new HashMap<>(); + //先查询此compileId下是否有is_valid=0和is_audit=0的asn_keyword_cfgs + List asnList=asnGroupInfoService.findAsnKeywordCfgByCompileId(compileIds); + String groupIds=""; + for (AsnKeywordCfg asnKeywordCfg : asnList) { + //根据asnKeyword的userRegion2[asn group Id] + groupIds+=asnKeywordCfg.getUserRegion2()+","; + + if(compileWithGroupMap.keySet().contains(asnKeywordCfg.getCompileId())){ + List groupList=compileWithGroupMap.get(asnKeywordCfg.getCompileId()); + groupList.add(asnKeywordCfg.getUserRegion2()); + compileWithGroupMap.put(asnKeywordCfg.getCompileId(), groupList); + }else{ + List groupList=new ArrayList<>(); + groupList.add(asnKeywordCfg.getUserRegion2()); + compileWithGroupMap.put(asnKeywordCfg.getCompileId(), groupList); + } + groupIdWithAsn.put(asnKeywordCfg.getUserRegion2(), asnKeywordCfg.getCfgKeywords()); + } + if(!StringUtil.isEmpty(groupIds)){ + Properties prop=this.getMsgProp(); + groupIds=groupIds.substring(0,groupIds.length()-1); + List groupIdList=asnGroupInfoService.findAsnGroupIdByGroupIds(groupIds); + for (Integer compileId : compileWithGroupMap.keySet()) { + for (String groupIdOld : compileWithGroupMap.get(compileId)) { + if(!groupIdList.contains(groupIdOld)){ + String tip=prop.getProperty("deletedAsnTip").replace("asnId", groupIdWithAsn.get(groupIdOld)); + tip=tip.replace("cfgId", compileId+""); + resultMap.put(compileId, tip); + } + } + } + } + } + } catch (Exception e) { + logger.error("校验编译下的asn是否被删除失败",e); + return resultMap; + } + /*List orgaList=new ArrayList<>(); + try { + orgaList=asnGroupInfoService.findAsnGroupList(asnGroup); + } catch (Exception e) { + logger.error("异步获取ASN NO信息失败",e); + return orgaList; + }*/ + return resultMap; + } } diff --git a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java index 541a587a1..bbb03ce43 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java @@ -32,4 +32,5 @@ public interface AsnGroupInfoDao extends CrudDao { List findAsnGroupInfoByAsnGroup(AsnGroupInfo asnGroupInfo); void updateIsUsedAndIsValid(@Param("groupIds")List groupIds,@Param("isUsed")Integer isUsed,@Param("isValid")Integer isValid); List findAsnGroupInfoByGroupIds(@Param("groupIds")List groupIds,@Param("isUsed")Integer isUsed); + List findAsnGroupIdByGroupIds(@Param("groupIds")String groupIds); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml index 49f5f55f9..a9587d401 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml @@ -377,4 +377,14 @@ + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java index 891e4ecbc..a71ef7fe7 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java @@ -58,4 +58,6 @@ public interface StringCfgDao extends CrudDao{ // 导入配置时数据批量入库使用 public void saveStringCfgBatch(BaseStringCfg cfg); public void saveComplexkeywordCfgBatch(ComplexkeywordCfg cfg); + + public List findAsnKeywordCfgByCompileId(@Param("compileIds")String compileIds); } diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index 8ac2fba5b..4f310f90d 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -977,4 +977,8 @@ #{isHexbin,jdbcType=INTEGER} ) + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java b/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java index bbe5602c3..e7393b509 100644 --- a/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java +++ b/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -15,6 +16,7 @@ import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.basics.AsnGroupInfo; import com.nis.domain.configuration.AsnKeywordCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.maat.GroupReuseAddBean; import com.nis.domain.maat.GroupReuseCfg; import com.nis.domain.maat.MaatCfg; @@ -44,6 +46,8 @@ public class AsnGroupInfoService extends BaseService{ private ConfigGroupInfoDao configGroupInfoDao; @Autowired private AsnIpCfgDao asnIpCfgDao; + @Autowired + private StringCfgDao stringCfgDao; /** * @param page @@ -368,5 +372,18 @@ public class AsnGroupInfoService extends BaseService{ List list=asnGroupInfoDao.findAsnGroupInfoByAsnGroup(asnGroupInfo); return list; } + /** + * 根据compileIds获取所有需要审核通过的asn + * @param compileIds + * @return + */ + public List findAsnKeywordCfgByCompileId(String compileIds){ + List asnKeywordCfgs=stringCfgDao.findAsnKeywordCfgByCompileId(compileIds); + return asnKeywordCfgs; + } + public List findAsnGroupIdByGroupIds(String groupIds){ + List asGroupIds=asnGroupInfoDao.findAsnGroupIdByGroupIds(groupIds); + return asGroupIds; + } } diff --git a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java index 1a899e984..cdcf9befa 100644 --- a/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java +++ b/src/main/java/com/nis/web/service/basics/AsnIpCfgService.java @@ -186,6 +186,7 @@ public class AsnIpCfgService extends CrudService, AsnIpCfg> { AsnGroupInfo info=e.getValue(); info.setAsnId(e.getKey()); info.setIsValid(0); + info.setIsUsed(0); info.setCreatorId(UserUtils.getUser().getId()); info.setCreateTime(createTime); info.setGroupId(groupIds.get(index)); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4a2bcd22f..2f0d7e1a1 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1477,4 +1477,6 @@ ssl_record=SSL Records http_record=HTTP Records second_bps=bps ip_existed=IP has existed! -user_check=In use, Can not be deleted! \ No newline at end of file +user_check=In use, Can not be deleted! +deletedAsnTip=The asnId ASN configuration with ID cfgId is deleted; +reedit=Please re-edit! \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 71583cb17..5562bb73d 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1481,4 +1481,6 @@ mail_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0447\u0442\u044b ssl_record=SSL \u0417\u0430\u043f\u0438\u0441\u0438 http_record=HTTP \u0417\u0430\u043f\u0438\u0441\u0438 ip_existed=IP \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442! -user_check=\u0414\u0430\u043D\u043D\u044B\u0439 \u043E\u0431\u044A\u0435\u043A\u0442 \u0437\u0430\u043D\u044F\u0442, \u043D\u0435\u043B\u044C\u0437\u044F \u0443\u0434\u0430\u043B\u0438\u0442\u044C! \ No newline at end of file +user_check=\u0414\u0430\u043D\u043D\u044B\u0439 \u043E\u0431\u044A\u0435\u043A\u0442 \u0437\u0430\u043D\u044F\u0442, \u043D\u0435\u043B\u044C\u0437\u044F \u0443\u0434\u0430\u043B\u0438\u0442\u044C! +deletedAsnTip=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u2116 cfgId \u0441 ASN asnId \u0431\u044B\u043B\u0430 \u0443\u0434\u0430\u043B\u0435\u043D\u0430; +reedit=\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0443\u0439\u0442\u0435 \u0437\u0430\u043D\u043E\u0432\u043E! \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 6608edf83..c924cf4b2 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1477,4 +1477,6 @@ ssl_record=SSL\u6cdb\u6536 http_record=HTTP\u6cdb\u6536 second_bps=bps ip_existed=IP\u5DF2\u5B58\u5728\uFF01 -user_check=\u6B63\u5728\u4F7F\u7528\uFF0C\u4E0D\u80FD\u5220\u9664\uFF01 \ No newline at end of file +user_check=\u6B63\u5728\u4F7F\u7528\uFF0C\u4E0D\u80FD\u5220\u9664\uFF01 +deletedAsnTip=\u914D\u7F6EID\u4E3AcfgId\u7684asnId ASN\u914D\u7F6E\u5DF2\u88AB\u5220\u9664; +reedit=\u8BF7\u91CD\u65B0\u7F16\u8F91\uFF01 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp index 9de7f64e1..5ea6a6a95 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp @@ -297,7 +297,7 @@ - +