gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

批量下发功能增加，delRow.tag中暂时不打开此功能。

Browse Source 
app topic domain和app domain业务修改domain存储cfgkeyword属性。
摘要修改level属性存储为下发的最终数值。
同步的单域配置的增加时间和状态属性从entity中获取
This commit is contained in:
DuanDongmei
2018-12-05 17:56:41 +08:00
parent e5fa7cbca8
commit bb302e3f13
37 changed files with 2406 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -1354,7 +1354,7 @@ public class AppCfgService extends BaseService {
entity.setTableName(AppDomainCfg.getTablename());
appCfgDao.auditCfg(entity);
if (isAudit == 1) {
entity.setCfgKeywords(entity.getDomain());
entity.setCfgKeywords(entity.getCfgKeywords());
List<AppDomainCfg> list = new ArrayList();
list.add(entity);
Map<String, List> map = cfgConvert(strRegionList, list, 2, entity, groupRelationList);
@@ -1391,7 +1391,7 @@ public class AppCfgService extends BaseService {
// 设置APP自定义域
String userRegion = "APP_ID=" + entity.getAppCode() + Constants.USER_REGION_SPLIT + "DOMAIN_ID="
+ entity.getCompileId() + Constants.USER_REGION_SPLIT + "DOMAIN_STR="
+ keywordsEscape(entity.getDomain());
+ keywordsEscape(entity.getCfgKeywords());
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
@@ -1440,7 +1440,7 @@ public class AppCfgService extends BaseService {
appCfgDao.auditCfg(entity);
// 域名为关键字
if (isAudit == 1) {
entity.setCfgKeywords(entity.getDomain());
entity.setCfgKeywords(entity.getCfgKeywords());
List<AppTopicDomainCfg> list = new ArrayList();
list.add(entity);
Map<String, List> map = cfgConvert(strRegionList, list, 2, entity, groupRelationList);
@@ -1476,7 +1476,7 @@ public class AppCfgService extends BaseService {
maatCfg.setIsValid(entity.getIsValid());
// 设置APP自定义域
String domain = entity.getDomain();
String domain = entity.getCfgKeywords();
WebsiteDomainTopic websiteDomainTopic = new WebsiteDomainTopic();
websiteDomainTopic.setDomain(domain);
//查询domainId