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

1.policy_group_info表sql

Browse Source 
2.表名修改命名规范
3.serviceGroupId赋值
This commit is contained in:
tanghao
2019-02-15 18:03:36 +08:00
parent ba80f58516
commit 10394d3fd6
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -640,8 +640,8 @@ public class BaseController {
}
}
}
List<PolicyGroupInfo> dnsGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag());
model.addAttribute("policyGroupInfos", dnsGroupInfos);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag());
model.addAttribute("policyGroupInfos", policyGroupInfos);
}
protected void initUpdateFormCondition(Model model, BaseCfg cfg) {
@@ -706,8 +706,8 @@ public class BaseController {
model.addAttribute("regionList", regionList);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId());
model.addAttribute("serviceList", serviceList);
List<PolicyGroupInfo> dnsGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag());
model.addAttribute("policyGroupInfos", dnsGroupInfos);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag());
model.addAttribute("policyGroupInfos", policyGroupInfos);
}
public List<AreaBean> getAreaIsps(String areaEffectiveIds, List<AreaBean> areaIspList, List<SysDictInfo> isps,

2
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
View File

@@ -273,7 +273,7 @@
FROM policy_group_info r
where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER}
<if test="flag!=null">
and udFlag=#{flag}
and ud_flag=#{flag}
</if>
</select>
</mapper>

9
src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java
View File

@@ -108,6 +108,15 @@ public class PolicyGroupInfoService extends BaseService{
// }
}
}else if(11==entity.getGroupType()||12==entity.getGroupType()) {
int serviceGroupId=0;
List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
if(groupIds.size()>0) {
serviceGroupId=groupIds.get(0).intValue();
}else {
throw new MaatConvertException("Get asn group id failed");
}
entity.setServiceGroupId(serviceGroupId);
}
policyGroupInfoDao.insert(entity);
//修改

2
src/main/resources/sql/20190215/alter_policy_group_info.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE `policy_group_info`
ADD COLUMN `ud_flag` int(2) NOT NULL DEFAULT 0 COMMENT 'udFlag<EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>url<EFBFBD><EFBFBD><EFBFBD>Լ<EFBFBD>dns<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ع<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD> -1ɾ<31><C9BE> 1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD>ѡ״̬ 0<><30><EFBFBD>ò<EFBFBD><C3B2><EFBFBD>ѡ״̬<D7B4><CCAC>Ĭ<EFBFBD><C4AC>0';