diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index c3398ce44..1a1d4b268 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -7,10 +7,6 @@ import java.util.Map; import com.google.gson.GsonBuilder; public final class Constants { - /** - * IPSEC协议 - */ - public static Integer IPSEC_PROTOCOL=Configurations.getIntProperty("ipsec_protocol", 8); public static final String GROUP_REUSE_SOURCES=Configurations.getStringProperty("groupReuseSources","groupReuseSources"); public static Integer APP_SPEC_SERVICE_CODE_MIN_VAL=Configurations.getIntProperty("app_spec_service_code_min_val", 300001); public static Integer APP_SPEC_SERVICE_CODE_MAX_VAL=Configurations.getIntProperty("app_spec_service_code_max_val", 268435455); diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index fda2dc950..5ea7d5287 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -136,11 +136,7 @@ public class IpCfgService extends CrudService { ipCfgDao.saveCfgIndex(entity); if(entity.getIpPortList()!=null){ for(IpPortCfg cfg:entity.getIpPortList()){ - if(Constants.IPSEC_PROTOCOL.intValue()==cfg.getProtocol().intValue()) { - BeanUtils.copyProperties(entity, cfg,new String[]{"userRegion1","cfgRegionCode","cfgType"}); - }else { - BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); - } + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); ipCfgDao.saveIpPortCfg(cfg); } } @@ -176,11 +172,7 @@ public class IpCfgService extends CrudService { entity.setCreatorId(entity.getCurrentUser().getId()); if(entity.getIpPortList()!=null){ for(IpPortCfg cfg:entity.getIpPortList()){ - if(Constants.IPSEC_PROTOCOL.intValue()==cfg.getProtocol().intValue()) { - BeanUtils.copyProperties(entity, cfg,new String[]{"userRegion1","cfgRegionCode","cfgType"}); - }else { - BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); - } + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); ipCfgDao.saveIpPortCfg(cfg); } } @@ -567,11 +559,6 @@ public class IpCfgService extends CrudService { ipCfgDao.auditCfg(cfg); } if(isAudit==1&&maatType==Constants.MAAT_TYPE){ - for(IpPortCfg cfg:entity.getIpPortList()) { - if(Constants.IPSEC_PROTOCOL==cfg.getProtocol().intValue()) { - cfg.setProtocol(Integer.parseInt(cfg.getUserRegion1())); - } - } Map map = cfgConvert(ipRegionList,entity.getIpPortList(),1,entity,groupRelationList); groupRelationList=map.get("groupList"); ipRegionList=map.get("dstList"); @@ -610,10 +597,7 @@ public class IpCfgService extends CrudService { List ipList=new ArrayList<>(); for(IpPortCfg cfg :entity.getIpPortList()) { Integer ipsecProtocol=null; - if(Constants.IPSEC_PROTOCOL==cfg.getProtocol().intValue()) { - ipsecProtocol=Integer.parseInt(cfg.getUserRegion1()); - } - BeanUtils.copyProperties(entity, cfg, new String[]{"userRegion1","cfgId"}); + BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); InlineIp ip=convertCallBackIp(cfg,null); if(ipsecProtocol!=null) { ip.setProtocol(ipsecProtocol); @@ -677,10 +661,7 @@ public class IpCfgService extends CrudService { List ipList=new ArrayList<>(); for(IpPortCfg cfg :entity.getIpPortList()) { Integer ipsecProtocol=null; - if(Constants.IPSEC_PROTOCOL==cfg.getProtocol().intValue()) { - ipsecProtocol=Integer.parseInt(cfg.getUserRegion1()); - } - BeanUtils.copyProperties(entity, cfg, new String[]{"userRegion1","cfgId"}); + BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); InlineIp ip=convertCallBackIp(cfg,null); if(ipsecProtocol!=null) { ip.setProtocol(ipsecProtocol); diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 90d8fff75..61d7ec580 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -527,5 +527,4 @@ log_time_end=2018-10-01 00:00:00 area_tag=location isp_tag=isp mmFileDigestLog=mmFileDigestLogs -ntcStreamMediaLog=ntcStreamMediaLogs -ipsec_protocol=8 \ No newline at end of file +ntcStreamMediaLog=ntcStreamMediaLogs \ No newline at end of file diff --git a/src/main/resources/sql/20181015/UPDATE_PROTOCOL_DICT.sql b/src/main/resources/sql/20181015/UPDATE_PROTOCOL_DICT.sql new file mode 100644 index 000000000..f5f828239 --- /dev/null +++ b/src/main/resources/sql/20181015/UPDATE_PROTOCOL_DICT.sql @@ -0,0 +1,3 @@ +INSERT INTO sys_data_dictionary_item VALUES(2725,50,'ESP','ESP',0,1,1,63),(2726,51,'AH','AH',0,1,1,63) + +UPDATE function_region_dict SET config_protocol='6,17,1,15,50,51' WHERE function_id=5 AND config_region_value='INLINE_IP_CB'; \ No newline at end of file diff --git a/src/main/resources/sql/20181015/update_sys_dict_area.sql b/src/main/resources/sql/20181015/update_sys_dict_area.sql new file mode 100644 index 000000000..b34f8f697 --- /dev/null +++ b/src/main/resources/sql/20181015/update_sys_dict_area.sql @@ -0,0 +1,20 @@ +delete from sys_dict_info where item_type=1; +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('8', '1', '7172', 'Astana', '阿斯塔纳市', '0', '1', '1', '1', '1', '2018-05-30 10:08:30', '1', '2018-05-30 10:11:48', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('9', '1', '7272', 'Almaty', '阿拉木图市', '0', '1', '1', '1', '1', '2018-05-30 10:09:00', '1', '2018-05-30 10:12:29', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('10', '1', '7292', 'Aktau', '阿克套', '0', '1', '1', '1', '1', '2018-05-30 10:12:12', '1', '2018-05-30 10:12:20', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('11', '1', '72822', 'Taldykurgan', '塔尔德库尔干', '0', '1', '1', '1', '1', '2018-05-30 10:13:42', '1', '2018-06-05 15:49:38', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('12', '1', '7132', 'Aktubinsk', '阿克图宾斯克', '0', '1', '1', '1', '1', '2018-05-30 10:14:36', '1', '2018-05-30 10:14:36', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('13', '1', '7122', 'Atyrau', '阿特劳州', '0', '1', '1', '1', '1', '2018-05-30 10:15:11', '1', '2018-05-30 10:15:45', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('14', '1', '7182', 'Pavlodar', '巴甫洛达尔州', '0', '1', '1', '1', '1', '2018-05-30 10:15:27', '1', '2018-05-30 10:15:38', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('15', '1', '7162', 'Kokshetau', '科克舍套', '0', '1', '1', '1', '1', '2018-05-30 10:15:59', '1', '2018-05-30 10:16:06', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('16', '1', '7212', 'Karaganda', '卡拉干达州', '0', '1', '1', '1', '1', '2018-05-30 10:16:24', '1', '2018-05-30 10:16:24', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('17', '1', '7142', 'Kostanay', '科斯塔奈州', '0', '1', '1', '1', '1', '2018-05-30 10:16:43', '1', '2018-05-30 10:16:43', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('18', '1', '7242', 'Kyzylorda', '克孜勒奥尔达州', '0', '1', '1', '1', '1', '2018-05-30 10:17:04', '1', '2018-05-30 10:22:54', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('19', '1', '7252', 'Shymkent', '奇姆肯特', '0', '1', '1', '1', '1', '2018-05-30 10:21:14', '1', '2018-05-30 10:21:14', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('20', '1', '7152', 'Petropavl', '彼得罗巴甫尔', '0', '1', '1', '1', '1', '2018-05-30 10:21:29', '1', '2018-05-30 10:22:37', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('21', '1', '7222', 'Semey', '塞米伊', '0', '1', '1', '1', '1', '2018-05-30 10:21:51', '1', '2018-05-30 10:22:45', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('22', '1', '7262', 'Taraz', '塔拉兹', '0', '1', '1', '1', '1', '2018-05-30 10:22:11', '1', '2018-05-30 10:22:11', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('23', '1', '7112', 'Uralsk', '乌拉尔斯克州', '0', '1', '1', '1', '1', '2018-05-30 10:22:28', '1', '2018-08-07 17:40:13', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('24', '1', '7232', 'Ust-Kamenogorsk', '乌斯季卡缅诺戈尔斯克', '0', '1', '1', '1', '1', '2018-10-15 12:59:02', '1', '2018-10-15 12:59:06', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('25', '1', '7102', 'Zhezkazgan', '杰兹卡兹甘', '0', '1', '1', '1', '1', '2018-10-15 13:02:07', '1', '2018-10-15 13:02:10', '0'); +INSERT INTO `sys_dict_info` (`sys_dict_id`, `item_type`, `item_code`, `item_value`, `item_desc`, `parent_id`, `is_leaf`, `level_no`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_initianlize`) VALUES ('26', '1', '717', 'NationalCenter', '国家中心', '0', '1', '1', '1', '1', '2018-10-15 13:02:58', '1', '2018-10-15 13:03:01', '0'); diff --git a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp index 89a9c0d56..d1678ed1a 100644 --- a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp @@ -66,7 +66,7 @@ $(function(){
-