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

(1)为了使用批量更新，修改了updateByPrimaryKeySelective方法的方法名为update

Browse Source 
(2)多域类配置加入地域IP
(3)多域类配置可任选
(4)多域类配置加入批量删除，审核
This commit is contained in:
wangxin
2018-04-13 13:50:29 +08:00
parent 0dd7f79af0
commit 9a130d864d
28 changed files with 1218 additions and 1437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,7 +325,7 @@ public class BaseController {
}
protected void setSaveOrUpdateProps(Model model,BaseCfg cfg,String areaCfgIds) throws Exception{
String tableName=cfg.getTableName();
List<AreaIpCfg> areaCfg=cfg.getAreaCfg();
List<BaseIpCfg> areaCfg=cfg.getAreaCfg();
List<AreaBean> areaIsps=cfg.getAreaIsp();
if(Constants.IS_AREA_EFFECTIVE_NO==cfg.getIsAreaEffective()){
cfg.setAreaEffectiveIds("");
@@ -372,11 +372,11 @@ public class BaseController {
Date date=new Date();
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
if(cfg.getCfgId()==null){
if(cfg.getCfgId()==null){//新增
cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(date);
if(Constants.IS_AREA_EFFECTIVE_YES==cfg.getIsAreaEffective()&&areaCfg!=null){
for(AreaIpCfg area:areaCfg){
for(BaseIpCfg area:areaCfg){
area.setTableName(AreaIpCfg.getTablename());
area.setServiceId(serviceId);
area.setCompileId(cfg.getCompileId());
@@ -400,18 +400,18 @@ public class BaseController {
}else if(cfg instanceof ComplexkeywordCfg){
complexStringCfgService.addStringCfg((ComplexkeywordCfg)cfg,areaCfg);
}
}else{
}else{//修改
cfg.setEditorId(cfg.getCurrentUser().getId());
cfg.setEditTime(new Date());
List<AreaIpCfg> updateAreaCfg=new ArrayList<>();
List<AreaIpCfg> deleteAreaCfg=new ArrayList<>();
List<AreaIpCfg> addAreaCfg=new ArrayList<>();
List<BaseIpCfg> updateAreaCfg=new ArrayList<>();
List<BaseIpCfg> deleteAreaCfg=new ArrayList<>();
List<BaseIpCfg> addAreaCfg=new ArrayList<>();
String[] cfgIds=null;
if(!StringUtils.isBlank(areaCfgIds)){
cfgIds=areaCfgIds.split(",");
}
if(Constants.IS_AREA_EFFECTIVE_YES==cfg.getIsAreaEffective()&&areaCfg!=null){
for(AreaIpCfg area:areaCfg){
for(BaseIpCfg area:areaCfg){
area.setTableName(AreaIpCfg.getTablename());
area.setServiceId(serviceId);
area.setCompileId(cfg.getCompileId());

19
src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
View File

@@ -204,13 +204,15 @@ public class ComplexStringCfgController extends BaseController{
if(StringUtils.isNotBlank(ids)){
List<ComplexkeywordCfg> beans=complexStringCfgService.getList(tableName,ids);
List<ComplexkeywordCfg> auditBeans=new ArrayList<>();
List<AreaIpCfg> auditAreaBeans=new ArrayList<>();
List<BaseIpCfg> auditAreaBeans=new ArrayList<>();
Date date=new Date();
for(ComplexkeywordCfg bean:beans){
ComplexkeywordCfg auditBean=new ComplexkeywordCfg();
auditBean.setTableName(tableName);
auditBean.setMaatTable(maatTable);
auditBean.setCfgId(bean.getCfgId());
bean.setTableName(tableName);
bean.setMaatTable(maatTable);
int audit=bean.getIsAudit().intValue();
if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){
logger.error("审核通过的配置只能取消审核通过！");
@@ -225,18 +227,23 @@ public class ComplexStringCfgController extends BaseController{
bean.setIsAudit(isAudit);
if(isAudit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
auditBean.setIsValid(Constants.VALID_NO);
auditBean.setMaatTable(maatTable);
bean.setIsValid(Constants.VALID_NO);
bean.setMaatTable(maatTable);
}else if(isAudit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
auditBean.setIsValid(Constants.VALID_YES);
auditBean.setMaatTable(maatTable);
bean.setIsValid(Constants.VALID_YES);
bean.setMaatTable(maatTable);
}
List<AreaIpCfg> areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId());
for(AreaIpCfg c:areaCfg){
c.setMaatTable(AreaIpCfg.getMaattable());
c.setTableName(AreaIpCfg.getTablename());
c.setAuditorId(c.getCurrentUser().getId());
c.setAuditTime(date);
c.setIsAudit(isAudit);
if(isAudit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
c.setIsValid(Constants.VALID_NO);
}else if(isAudit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
c.setIsValid(Constants.VALID_YES);
}
}
bean.setAreaCfg(areaCfg);
auditAreaBeans.addAll(areaCfg);
@@ -277,7 +284,7 @@ public class ComplexStringCfgController extends BaseController{
}
}
List<ComplexkeywordCfg> complexCfgs=new ArrayList<ComplexkeywordCfg>();
List<AreaIpCfg> areaCfgs=new ArrayList<AreaIpCfg>();
List<BaseIpCfg> areaCfgs=new ArrayList<BaseIpCfg>();
Date date =new Date();
if(StringUtils.isNotBlank(ids)){
for(String compileIdStr:ids.split(",")){

55
src/main/java/com/nis/web/controller/configuration/IpCfgController.java
View File

@@ -31,44 +31,6 @@ import com.nis.web.controller.BaseController;
@Controller
@RequestMapping("${adminPath}/cfg/ip")
public class IpCfgController extends BaseController{
/**
*
* cfgList(配置列表)
* (这里描述这个方法适用条件 – 可选)
* @param model
* @param cfgName
* @param ipCfg
* @param request
* @param response
* @return
*String
* @exception
* @since 1.0.0
*/
// @RequestMapping(value = {"cfgList"})
// @RequiresPermissions("cfg:ip:edit")
// public String cfgList(Model model,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response){
// return ipCfgList(model,Constants.CFG_PAGE,cfgName,ipCfg,request,response);
// }
/**
*
* auditList(审核列表)
* (这里描述这个方法适用条件 – 可选)
* @param model
* @param cfgName
* @param ipCfg
* @param request
* @param response
* @return
*String
* @exception
* @since 1.0.0
*/
// @RequestMapping(value = {"auditList"})
// @RequiresPermissions("cfg:ip:audit")
// public String auditList(Model model,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response){
// return ipCfgList(model,Constants.AUDIT_PAGE,cfgName,ipCfg,request,response);
// }
@RequestMapping(value = {"list"})
@RequiresPermissions(value={"cfg:ip:view"})
public String ipCfgList(Model model,Integer audit,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) {
@@ -279,13 +241,15 @@ public class IpCfgController extends BaseController{
if(StringUtils.isNotBlank(ids)){
List<BaseIpCfg> beans=ipCfgService.getList(tableName,ids);
List<BaseIpCfg> auditBeans=new ArrayList<>();
List<AreaIpCfg> auditAreaBeans=new ArrayList<>();
List<BaseIpCfg> auditAreaBeans=new ArrayList<>();
Date date=new Date();
for(BaseIpCfg bean:beans){
BaseIpCfg auditBean=new BaseIpCfg();
auditBean.setTableName(tableName);
auditBean.setMaatTable(maatTable);
auditBean.setCfgId(bean.getCfgId());
bean.setTableName(tableName);
bean.setMaatTable(maatTable);
int audit=bean.getIsAudit().intValue();
if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){
logger.error("审核通过的配置只能取消审核通过！");
@@ -300,18 +264,23 @@ public class IpCfgController extends BaseController{
bean.setIsAudit(isAudit);
if(isAudit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
auditBean.setIsValid(Constants.VALID_NO);
auditBean.setMaatTable(maatTable);
bean.setIsValid(Constants.VALID_NO);
bean.setMaatTable(maatTable);
}else if(isAudit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
auditBean.setIsValid(Constants.VALID_YES);
auditBean.setMaatTable(maatTable);
bean.setIsValid(Constants.VALID_YES);
bean.setMaatTable(maatTable);
}
List<AreaIpCfg> areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId());
for(AreaIpCfg c:areaCfg){
c.setMaatTable(AreaIpCfg.getMaattable());
c.setTableName(AreaIpCfg.getTablename());
c.setAuditorId(c.getCurrentUser().getId());
c.setAuditTime(date);
c.setIsAudit(isAudit);
if(isAudit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
c.setIsValid(Constants.VALID_NO);
}else if(isAudit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
c.setIsValid(Constants.VALID_YES);
}
}
bean.setAreaCfg(areaCfg);
auditAreaBeans.addAll(areaCfg);

844
src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
View File

File diff suppressed because it is too large Load Diff

11
src/main/java/com/nis/web/controller/configuration/NumCfgController.java
View File

@@ -1,6 +1,5 @@
package com.nis.web.controller.configuration;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -12,9 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import com.nis.domain.Page;
import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.configuration.NumBoundaryCfg;
import com.nis.domain.configuration.RequestInfo;
import com.nis.main.ConvertTool;
import com.nis.util.Constants;
import com.nis.web.controller.BaseController;
@@ -136,8 +133,8 @@ public class NumCfgController extends BaseController{
* @exception
* @since 1.0.0
*/
@RequestMapping(value = {"auditCfg"})
public String auditStringCfg(String cfgName,NumBoundaryCfg cfg,Model model) {
@RequestMapping(value = {"audit"})
public String auditCfg(String cfgName,NumBoundaryCfg cfg,Model model) {
model.addAttribute("cfgName", cfgName);
model.addAttribute("audit", Constants.AUDIT_PAGE);
model.addAttribute("cfgType","num");
@@ -190,8 +187,8 @@ public class NumCfgController extends BaseController{
* @exception
* @since 1.0.0
*/
@RequestMapping(value = {"deleteCfg"})
public String deleteStringCfg(int action,long cfgId,String cfgName,Integer serviceId,Model model) {
@RequestMapping(value = {"delete"})
public String deleteCfg(int action,long cfgId,String cfgName,Integer serviceId,Model model) {
model.addAttribute("serviceId", serviceId);
model.addAttribute("cfgName", cfgName);
model.addAttribute("action", action);

20
src/main/java/com/nis/web/controller/configuration/StringCfgController.java
View File

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import com.nis.domain.Page;
import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.util.Constants;
import com.nis.web.controller.BaseController;
@@ -221,13 +222,15 @@ public class StringCfgController extends BaseController{
if(StringUtils.isNotBlank(ids)){
List<BaseStringCfg> beans=stringCfgService.getList(tableName,ids);
List<BaseStringCfg> auditBeans=new ArrayList<>();
List<AreaIpCfg> auditAreaBeans=new ArrayList<>();
List<BaseIpCfg> auditAreaBeans=new ArrayList<>();
Date date=new Date();
for(BaseStringCfg bean:beans){
BaseStringCfg auditBean=new BaseStringCfg();
auditBean.setTableName(tableName);
auditBean.setMaatTable(maatTable);
auditBean.setCfgId(bean.getCfgId());
bean.setTableName(tableName);
bean.setMaatTable(maatTable);
int audit=bean.getIsAudit().intValue();
if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){
logger.error("审核通过的配置只能取消审核通过！");
@@ -242,18 +245,23 @@ public class StringCfgController extends BaseController{
bean.setIsAudit(isAudit);
if(isAudit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
auditBean.setIsValid(Constants.VALID_NO);
auditBean.setMaatTable(maatTable);
bean.setIsValid(Constants.VALID_NO);
bean.setMaatTable(maatTable);
}else if(isAudit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
auditBean.setIsValid(Constants.VALID_YES);
auditBean.setMaatTable(maatTable);
bean.setIsValid(Constants.VALID_YES);
bean.setMaatTable(maatTable);
}
List<AreaIpCfg> areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId());
for(AreaIpCfg c:areaCfg){
c.setMaatTable(AreaIpCfg.getMaattable());
c.setTableName(AreaIpCfg.getTablename());
c.setAuditorId(c.getCurrentUser().getId());
c.setAuditTime(date);
c.setIsAudit(isAudit);
if(isAudit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
c.setIsValid(Constants.VALID_NO);
}else if(isAudit==Constants.AUDIT_YES){//审核通过，设置有效标志为1
c.setIsValid(Constants.VALID_YES);
}
}
bean.setAreaCfg(areaCfg);
auditAreaBeans.addAll(areaCfg);
@@ -297,7 +305,7 @@ public class StringCfgController extends BaseController{
}
model.addAttribute("tableName", tableName);
List<BaseStringCfg> stringCfgs=new ArrayList<BaseStringCfg>();
List<AreaIpCfg> areaCfgs=new ArrayList<AreaIpCfg>();
List<BaseIpCfg> areaCfgs=new ArrayList<BaseIpCfg>();
Date date =new Date();
if(StringUtils.isNotBlank(ids)){
for(String compileIdStr:ids.split(",")){