(1)ip,字符串,增强字符串mapper.xml里的get方法删除多余参数,只保留cfgId以及compileId。
(2)系统字典表更新方法查询多域增强字符串配置的匹配区域。mysql这里查询好像自动大小写忽略,待测试。 (3)多域界面提交。界面展示采用查一张主表再查其他表的方式展示,非所有表都有的字段只能查主表的,这里界面查询条件已做限制;另外表单提交未做验证;多个同类型(字符串,增强字符串)的表现在界面无法区分,后面会将界面展示意义不明的字段调整展示名称。
This commit is contained in:
@@ -20,6 +20,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.basics.SysDictInfo;
|
||||
import com.nis.domain.configuration.BaseCfg;
|
||||
import com.nis.domain.configuration.BaseIpCfg;
|
||||
import com.nis.domain.configuration.BaseStringCfg;
|
||||
@@ -85,18 +86,18 @@ public class MultipleCfgController extends BaseController{
|
||||
List<ServiceConfigInfo> serviceConfigInfos=serviceConfigInfoService.findList(serviceId);
|
||||
List<MultipleCfg> resultList=new ArrayList<MultipleCfg>();
|
||||
resultPage.setList(resultList);
|
||||
|
||||
List<? extends BaseCfg> mainList=null;
|
||||
//查询主表,将主表中的数据set到结果中
|
||||
for(ServiceConfigInfo info:serviceConfigInfos){
|
||||
int type=info.getTableType();
|
||||
String tableName=info.getTableName();
|
||||
if(mainTable.equals(tableName)){
|
||||
model.addAttribute("mainTableType", String.valueOf(info.getTableType()));
|
||||
cfg.setMainTableType(String.valueOf(type));
|
||||
if(Constants.TABLE_TYPE_COMPLEX==type){//增强字符串类型
|
||||
ComplexkeywordCfg _cfg=cfg.getComplexCfg()==null?new ComplexkeywordCfg():cfg.getComplexCfg();
|
||||
_cfg.setTableName(mainTable);
|
||||
this.setProperties(cfg, null, null, null, _cfg);
|
||||
this.setProperties(cfg,_cfg);
|
||||
Page<ComplexkeywordCfg> mainPage=complexStringCfgService.findPage(new Page<ComplexkeywordCfg>(request,response,"r"), _cfg);
|
||||
setPageProps(mainPage,resultPage);
|
||||
mainList=mainPage.getList();//主表结果
|
||||
@@ -120,7 +121,7 @@ public class MultipleCfgController extends BaseController{
|
||||
}else if(Constants.TABLE_TYPE_STRING==type){//字符串类型
|
||||
BaseStringCfg _cfg=cfg.getStringCfg()==null?new BaseStringCfg():cfg.getStringCfg();
|
||||
_cfg.setTableName(mainTable);
|
||||
this.setProperties(cfg, null, _cfg, null,null);
|
||||
this.setProperties(cfg,_cfg);
|
||||
Page<BaseStringCfg> mainPage=stringCfgService.findPage(new Page<BaseStringCfg>(request,response,"r"), _cfg);
|
||||
mainList=mainPage.getList();//主表结果
|
||||
setPageProps(mainPage,resultPage);
|
||||
@@ -143,7 +144,7 @@ public class MultipleCfgController extends BaseController{
|
||||
}else if(Constants.TABLE_TYPE_IP==type){//字符串类型
|
||||
BaseIpCfg _cfg=cfg.getIpCfg()==null?new BaseIpCfg():cfg.getIpCfg();
|
||||
_cfg.setTableName(mainTable);
|
||||
this.setProperties(cfg, _cfg,null,null,null);
|
||||
this.setProperties(cfg, _cfg);
|
||||
Page<BaseIpCfg> mainPage=ipCfgService.findPage(new Page<BaseIpCfg>(request,response,"r"), _cfg);
|
||||
mainList=mainPage.getList();//主表结果
|
||||
setPageProps(mainPage,resultPage);
|
||||
@@ -166,7 +167,7 @@ public class MultipleCfgController extends BaseController{
|
||||
}else if(Constants.TABLE_TYPE_NUMBER==type){
|
||||
NumBoundaryCfg _cfg=cfg.getNumCfg()==null?new NumBoundaryCfg():cfg.getNumCfg();
|
||||
_cfg.setTableName(mainTable);
|
||||
this.setProperties(cfg, null,null,_cfg,null);
|
||||
this.setProperties(cfg,_cfg);
|
||||
Page<NumBoundaryCfg> mainPage=numCfgService.findPage(new Page<NumBoundaryCfg>(request,response,"r"), _cfg);
|
||||
mainList=mainPage.getList();//主表结果
|
||||
setPageProps(mainPage,resultPage);
|
||||
@@ -214,7 +215,7 @@ public class MultipleCfgController extends BaseController{
|
||||
if(Constants.TABLE_TYPE_COMPLEX==type){//增强字符串类型
|
||||
ComplexkeywordCfg _cfg=cfg.getComplexCfg()==null?new ComplexkeywordCfg():cfg.getComplexCfg();
|
||||
_cfg.setTableName(info.getTableName());
|
||||
this.setProperties(cfg, null, null, null, _cfg);
|
||||
this.setProperties(cfg,_cfg);
|
||||
List<ComplexkeywordCfg> list=complexStringCfgService
|
||||
.findPage(page, _cfg)
|
||||
.getList();
|
||||
@@ -246,7 +247,7 @@ public class MultipleCfgController extends BaseController{
|
||||
}else if(Constants.TABLE_TYPE_STRING==type){//字符串类型
|
||||
BaseStringCfg _cfg=cfg.getStringCfg()==null?new BaseStringCfg():cfg.getStringCfg();
|
||||
_cfg.setTableName(info.getTableName());
|
||||
this.setProperties(cfg, null, _cfg, null,null);
|
||||
this.setProperties(cfg,_cfg);
|
||||
List<BaseStringCfg> list=stringCfgService
|
||||
.findPage(page, _cfg)
|
||||
.getList();
|
||||
@@ -279,7 +280,7 @@ public class MultipleCfgController extends BaseController{
|
||||
tableBean.setCanEmpty(true);
|
||||
BaseIpCfg _cfg=cfg.getIpCfg()==null?new BaseIpCfg():cfg.getIpCfg();
|
||||
_cfg.setTableName(info.getTableName());
|
||||
this.setProperties(cfg, _cfg,null,null,null);
|
||||
this.setProperties(cfg, _cfg);
|
||||
List<BaseIpCfg> list=ipCfgService
|
||||
.findPage(page, _cfg)
|
||||
.getList();
|
||||
@@ -311,7 +312,7 @@ public class MultipleCfgController extends BaseController{
|
||||
}else if(Constants.TABLE_TYPE_NUMBER==type){
|
||||
NumBoundaryCfg _cfg=cfg.getNumCfg()==null?new NumBoundaryCfg():cfg.getNumCfg();
|
||||
_cfg.setTableName(info.getTableName());
|
||||
this.setProperties(cfg, null,null,_cfg,null);
|
||||
this.setProperties(cfg,_cfg);
|
||||
List<NumBoundaryCfg> list=numCfgService
|
||||
.findPage(page, _cfg)
|
||||
.getList();
|
||||
@@ -435,7 +436,8 @@ public class MultipleCfgController extends BaseController{
|
||||
Map<String,ComplexkeywordCfg> map=cfg.getComplexCfg();
|
||||
map.put(tableName,complexCfg);
|
||||
}
|
||||
|
||||
List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName);
|
||||
model.addAttribute("districts", districts);
|
||||
}
|
||||
}
|
||||
cfg.setAction(action);
|
||||
@@ -501,6 +503,21 @@ public class MultipleCfgController extends BaseController{
|
||||
if(mainTable.equals(info.getTableName())){
|
||||
this.setPropertiesToMultipleCfg(resultCfg, resultIpCfg,"update");
|
||||
}
|
||||
}else{
|
||||
resultIpCfg=(BaseIpCfg)this.getClassBean(info.getTableName(), true);
|
||||
resultIpCfg.initDefaultValue();
|
||||
resultIpCfg.setCompileId(compileId);
|
||||
if(resultCfg.getIpCfg()==null){
|
||||
Map<String,BaseIpCfg> map=new HashMap<String,BaseIpCfg>();
|
||||
map.put(info.getTableName(), resultIpCfg);
|
||||
resultCfg.setIpCfg(map);
|
||||
}else{
|
||||
Map<String,BaseIpCfg> map=resultCfg.getIpCfg();
|
||||
map.put(info.getTableName(), resultIpCfg);
|
||||
}
|
||||
if(mainTable.equals(info.getTableName())){
|
||||
this.setPropertiesToMultipleCfg(resultCfg, resultIpCfg,"update");
|
||||
}
|
||||
}
|
||||
}else if(Constants.TABLE_TYPE_STRING==type){
|
||||
BaseStringCfg searchStringCfg=new BaseStringCfg();
|
||||
@@ -709,7 +726,7 @@ public class MultipleCfgController extends BaseController{
|
||||
ipCfg.getValue().setIsValid(Constants.VALID_NO);
|
||||
ipCfg.getValue().setIsAudit(Constants.AUDIT_NOT_YET);
|
||||
ipCfg.getValue().setCompileId(compileId);
|
||||
setProperties(cfg,ipCfg.getValue(),null,null,null);
|
||||
setProperties(cfg,ipCfg.getValue());
|
||||
if(ipCfg.getValue().getCfgId()==null){
|
||||
ipCfg.getValue().setCreatorId(cfg.getCurrentUser().getId());
|
||||
ipCfg.getValue().setCreateTime(date);
|
||||
@@ -728,7 +745,7 @@ public class MultipleCfgController extends BaseController{
|
||||
stringCfg.getValue().setIsValid(Constants.VALID_NO);
|
||||
stringCfg.getValue().setIsAudit(Constants.AUDIT_NOT_YET);
|
||||
stringCfg.getValue().setCompileId(compileId);
|
||||
setProperties(cfg,null,stringCfg.getValue(),null,null);
|
||||
setProperties(cfg,stringCfg.getValue());
|
||||
if(stringCfg.getValue().getCfgId()==null){
|
||||
stringCfg.getValue().setCreatorId(cfg.getCurrentUser().getId());
|
||||
stringCfg.getValue().setCreateTime(date);
|
||||
@@ -747,7 +764,7 @@ public class MultipleCfgController extends BaseController{
|
||||
numCfg.getValue().setIsValid(Constants.VALID_NO);
|
||||
numCfg.getValue().setIsAudit(Constants.AUDIT_NOT_YET);
|
||||
numCfg.getValue().setCompileId(compileId);
|
||||
setProperties(cfg,null,null,numCfg.getValue(),null);
|
||||
setProperties(cfg,numCfg.getValue());
|
||||
if(numCfg.getValue().getCfgId()==null){
|
||||
numCfg.getValue().setCreatorId(cfg.getCurrentUser().getId());
|
||||
numCfg.getValue().setCreateTime(date);
|
||||
@@ -757,7 +774,6 @@ public class MultipleCfgController extends BaseController{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}else if(Constants.TABLE_TYPE_COMPLEX==info.getTableType()){
|
||||
if(cfg.getComplexCfg()!=null){
|
||||
@@ -767,7 +783,7 @@ public class MultipleCfgController extends BaseController{
|
||||
complexCfg.getValue().setIsValid(Constants.VALID_NO);
|
||||
complexCfg.getValue().setIsAudit(Constants.AUDIT_NOT_YET);
|
||||
complexCfg.getValue().setCompileId(compileId);
|
||||
setProperties(cfg,null,null,null,complexCfg.getValue());
|
||||
setProperties(cfg,complexCfg.getValue());
|
||||
if(complexCfg.getValue().getCfgId()==null){
|
||||
complexCfg.getValue().setCreatorId(cfg.getCurrentUser().getId());
|
||||
complexCfg.getValue().setCreateTime(date);
|
||||
@@ -808,28 +824,46 @@ public class MultipleCfgController extends BaseController{
|
||||
public String auditCfg(String cfgName,MultipleCfg cfg,Model model) {
|
||||
model.addAttribute("cfgName", cfgName);
|
||||
model.addAttribute("audit", Constants.AUDIT_PAGE);
|
||||
model.addAttribute("cfgType", "multiple");
|
||||
model.addAttribute("serviceId", cfg.getServiceId());
|
||||
model.addAttribute("action", cfg.getAction());
|
||||
model.addAttribute("mainTable", cfg.getMainTable());
|
||||
int compileId=cfg.getCompileId().intValue();
|
||||
int audit=cfg.getIsAudit();
|
||||
try{
|
||||
MultipleCfg resultCfg=new MultipleCfg();
|
||||
MultipleCfg searchCfg=new MultipleCfg();
|
||||
searchCfg.setIsAudit(cfg.getIsAudit());
|
||||
List<ServiceConfigInfo> serviceConfigInfos=serviceConfigInfoService.findList(cfg.getServiceId());
|
||||
Date date=new Date();
|
||||
for(ServiceConfigInfo info:serviceConfigInfos){
|
||||
int type=info.getTableType();
|
||||
String tableName=info.getTableName();
|
||||
if(cfg.getMainTable().equals(tableName)){
|
||||
model.addAttribute("mainTableType", String.valueOf(type));
|
||||
}
|
||||
if(Constants.TABLE_TYPE_IP==type){
|
||||
BaseIpCfg searchIpCfg=new BaseIpCfg();
|
||||
searchIpCfg.setTableName(tableName);
|
||||
searchIpCfg.setCompileId(compileId);
|
||||
//根据表名,编译ID查询唯一结果
|
||||
BaseIpCfg resultIpCfg=ipCfgService.get(searchIpCfg);
|
||||
searchIpCfg.setAuditorId(searchIpCfg.getCurrentUser().getId());
|
||||
searchIpCfg.setAuditTime(date);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过,设置有效标志为0
|
||||
searchIpCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultIpCfg!=null){
|
||||
resultIpCfg.setIsValid(Constants.VALID_NO);
|
||||
resultIpCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过,设置有效标志为1
|
||||
searchIpCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultIpCfg!=null){
|
||||
resultIpCfg.setIsValid(Constants.VALID_YES);
|
||||
resultIpCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getIpCfg()==null){
|
||||
Map<String,BaseIpCfg> map=new HashMap<String,BaseIpCfg>();
|
||||
map.put(tableName, searchIpCfg);
|
||||
@@ -838,17 +872,40 @@ public class MultipleCfgController extends BaseController{
|
||||
Map<String,BaseIpCfg> map=searchCfg.getIpCfg();
|
||||
map.put(tableName, searchIpCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultIpCfg!=null){
|
||||
if(resultCfg.getIpCfg()==null){
|
||||
Map<String,BaseIpCfg> map=new HashMap<String,BaseIpCfg>();
|
||||
map.put(tableName, resultIpCfg);
|
||||
resultCfg.setIpCfg(map);
|
||||
}else{
|
||||
Map<String,BaseIpCfg> map=resultCfg.getIpCfg();
|
||||
map.put(tableName, resultIpCfg);
|
||||
}
|
||||
}
|
||||
|
||||
}else if(Constants.TABLE_TYPE_STRING==type){
|
||||
BaseStringCfg searchStringCfg=new BaseStringCfg();
|
||||
searchStringCfg.setTableName(tableName);
|
||||
searchStringCfg.setCompileId(compileId);
|
||||
//根据表名,编译ID查询唯一结果
|
||||
BaseStringCfg resultStringCfg=stringCfgService.get(searchStringCfg);
|
||||
searchStringCfg.setAuditorId(searchStringCfg.getCurrentUser().getId());
|
||||
searchStringCfg.setAuditTime(date);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过,设置有效标志为0
|
||||
searchStringCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultStringCfg!=null){
|
||||
resultStringCfg.setIsValid(Constants.VALID_NO);
|
||||
resultStringCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过,设置有效标志为1
|
||||
searchStringCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultStringCfg!=null){
|
||||
resultStringCfg.setIsValid(Constants.VALID_YES);
|
||||
resultStringCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getStringCfg()==null){
|
||||
Map<String,BaseStringCfg> map=new HashMap<String,BaseStringCfg>();
|
||||
map.put(tableName, searchStringCfg);
|
||||
@@ -857,17 +914,38 @@ public class MultipleCfgController extends BaseController{
|
||||
Map<String,BaseStringCfg> map=searchCfg.getStringCfg();
|
||||
map.put(tableName, searchStringCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultStringCfg!=null){
|
||||
if(resultCfg.getStringCfg()==null){
|
||||
Map<String,BaseStringCfg> map=new HashMap<String,BaseStringCfg>();
|
||||
map.put(tableName, resultStringCfg);
|
||||
resultCfg.setStringCfg(map);
|
||||
}else{
|
||||
Map<String,BaseStringCfg> map=resultCfg.getStringCfg();
|
||||
map.put(tableName, resultStringCfg);
|
||||
}
|
||||
}
|
||||
}else if(Constants.TABLE_TYPE_NUMBER==type){
|
||||
NumBoundaryCfg searchNumCfg=new NumBoundaryCfg();
|
||||
searchNumCfg.setTableName(tableName);
|
||||
searchNumCfg.setCompileId(compileId);
|
||||
NumBoundaryCfg resultNumCfg=numCfgService.get(searchNumCfg);
|
||||
searchNumCfg.setAuditorId(searchNumCfg.getCurrentUser().getId());
|
||||
searchNumCfg.setAuditTime(date);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过,设置有效标志为0
|
||||
searchNumCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultNumCfg!=null){
|
||||
resultNumCfg.setIsValid(Constants.VALID_NO);
|
||||
resultNumCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过,设置有效标志为1
|
||||
searchNumCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultNumCfg!=null){
|
||||
resultNumCfg.setIsValid(Constants.VALID_YES);
|
||||
resultNumCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getNumCfg()==null){
|
||||
Map<String,NumBoundaryCfg> map=new HashMap<String,NumBoundaryCfg>();
|
||||
map.put(tableName, searchNumCfg);
|
||||
@@ -876,17 +954,38 @@ public class MultipleCfgController extends BaseController{
|
||||
Map<String,NumBoundaryCfg> map=searchCfg.getNumCfg();
|
||||
map.put(tableName, searchNumCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultNumCfg!=null){
|
||||
if(resultCfg.getNumCfg()==null){
|
||||
Map<String,NumBoundaryCfg> map=new HashMap<String,NumBoundaryCfg>();
|
||||
map.put(tableName, resultNumCfg);
|
||||
resultCfg.setNumCfg(map);
|
||||
}else{
|
||||
Map<String,NumBoundaryCfg> map=resultCfg.getNumCfg();
|
||||
map.put(tableName, resultNumCfg);
|
||||
}
|
||||
}
|
||||
}else if(Constants.TABLE_TYPE_COMPLEX==type){
|
||||
ComplexkeywordCfg searchComplexCfg=new ComplexkeywordCfg();
|
||||
searchComplexCfg.setTableName(tableName);
|
||||
searchComplexCfg.setCompileId(compileId);
|
||||
ComplexkeywordCfg resultComplexCfg=complexStringCfgService.get(searchComplexCfg);
|
||||
searchComplexCfg.setAuditorId(searchComplexCfg.getCurrentUser().getId());
|
||||
searchComplexCfg.setAuditTime(date);
|
||||
if(audit==Constants.AUDIT_NOT_YES){//取消审核通过,设置有效标志为0
|
||||
searchComplexCfg.setIsValid(Constants.VALID_NO);
|
||||
if(resultComplexCfg!=null){
|
||||
resultComplexCfg.setIsValid(Constants.VALID_NO);
|
||||
resultComplexCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}else if(audit==Constants.AUDIT_YES){//审核通过,设置有效标志为1
|
||||
searchComplexCfg.setIsValid(Constants.VALID_YES);
|
||||
if(resultComplexCfg!=null){
|
||||
resultComplexCfg.setIsValid(Constants.VALID_YES);
|
||||
resultComplexCfg.setMaatTable(info.getMaatTable());
|
||||
}
|
||||
}
|
||||
//更新gwall库表数据
|
||||
if(searchCfg.getComplexCfg()==null){
|
||||
Map<String,ComplexkeywordCfg> map=new HashMap<String,ComplexkeywordCfg>();
|
||||
map.put(tableName, searchComplexCfg);
|
||||
@@ -895,11 +994,30 @@ public class MultipleCfgController extends BaseController{
|
||||
Map<String,ComplexkeywordCfg> map=searchCfg.getComplexCfg();
|
||||
map.put(tableName, searchComplexCfg);
|
||||
}
|
||||
//传入maat数据
|
||||
if(resultComplexCfg!=null){
|
||||
if(resultCfg.getComplexCfg()==null){
|
||||
Map<String,ComplexkeywordCfg> map=new HashMap<String,ComplexkeywordCfg>();
|
||||
map.put(tableName, resultComplexCfg);
|
||||
resultCfg.setComplexCfg(map);
|
||||
}else{
|
||||
Map<String,ComplexkeywordCfg> map=resultCfg.getComplexCfg();
|
||||
map.put(tableName, resultComplexCfg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
multipleCfgService.auditCfg(searchCfg);
|
||||
|
||||
return "redirect:" + adminPath + "/cfg/multiple/list";
|
||||
int result=multipleCfgService.auditCfg(resultCfg,searchCfg);
|
||||
if(result==0){
|
||||
addMessage(model,"审核失败");
|
||||
}else{
|
||||
addMessage(model,"审核成功,正在为您跳转页面...");
|
||||
}
|
||||
}catch (Exception e) {
|
||||
logger.error("审核失败",e);
|
||||
addMessage(model,"审核失败");
|
||||
}
|
||||
return "/cfg/resultPage";
|
||||
}
|
||||
/**
|
||||
*
|
||||
@@ -942,7 +1060,8 @@ public class MultipleCfgController extends BaseController{
|
||||
Field[] fieldArray=cfg.getClass().getDeclaredFields();
|
||||
for(Field field:fieldArray){
|
||||
field.setAccessible(true);
|
||||
if(field.get(cfg)!=null&&!"serialVersionUID".equals(field.getName())){
|
||||
if(field.get(cfg)!=null&&!"serialVersionUID".equals(field.getName())
|
||||
&&!field.getName().endsWith("ShowName")&&!field.getName().endsWith("cfgDesc")){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -965,6 +1084,7 @@ public class MultipleCfgController extends BaseController{
|
||||
resultCfg.setIsValid(_cfg.getIsValid());
|
||||
resultCfg.setRequestId(_cfg.getRequestId());
|
||||
resultCfg.setServiceId(_cfg.getServiceId());
|
||||
resultCfg.setRequestName(_cfg.getRequestName());
|
||||
if("select".equals(option)){//列表时设置以下属性
|
||||
resultCfg.setCreatorId(_cfg.getCreatorId());
|
||||
resultCfg.setCreatorName(_cfg.getCreatorName());
|
||||
@@ -977,126 +1097,51 @@ public class MultipleCfgController extends BaseController{
|
||||
resultCfg.setAuditTime(_cfg.getAuditTime());
|
||||
}
|
||||
}
|
||||
protected void setProperties(MultipleSearchCfg source,BaseIpCfg ipCfg,BaseStringCfg stringCfg,NumBoundaryCfg numCfg,ComplexkeywordCfg complexCfg){
|
||||
if(ipCfg!=null){
|
||||
ipCfg.setAction(source.getAction());
|
||||
ipCfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
ipCfg.setAttribute(source.getAttribute());
|
||||
ipCfg.setClassify(source.getClassify());
|
||||
ipCfg.setLable(source.getLable());
|
||||
ipCfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
ipCfg.setRequestId(source.getRequestId());
|
||||
ipCfg.setServiceId(source.getServiceId());
|
||||
ipCfg.setCreatorId(source.getCreatorId());
|
||||
ipCfg.setCreatorName(source.getCreatorName());
|
||||
ipCfg.setCreateTime(source.getCreateTime());
|
||||
ipCfg.setEditorId(source.getEditorId());
|
||||
ipCfg.setEditorName(source.getEditorName());
|
||||
ipCfg.setEditTime(source.getEditTime());
|
||||
ipCfg.setAuditorId(source.getAuditorId());
|
||||
ipCfg.setAuditorName(source.getAuditorName());
|
||||
ipCfg.setAuditTime(source.getAuditTime());
|
||||
@SuppressWarnings("rawtypes")
|
||||
protected void setProperties(MultipleSearchCfg source,BaseCfg cfg){
|
||||
if(cfg!=null){
|
||||
cfg.setIsValid(source.getIsValid());
|
||||
cfg.setIsAudit(source.getIsAudit());
|
||||
cfg.setAction(source.getAction());
|
||||
cfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
cfg.setAttribute(source.getAttribute());
|
||||
cfg.setClassify(source.getClassify());
|
||||
cfg.setLable(source.getLable());
|
||||
cfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
cfg.setRequestId(source.getRequestId());
|
||||
cfg.setServiceId(source.getServiceId());
|
||||
cfg.setCreatorId(source.getCreatorId());
|
||||
cfg.setCreatorName(source.getCreatorName());
|
||||
cfg.setCreateTime(source.getCreateTime());
|
||||
cfg.setEditorId(source.getEditorId());
|
||||
cfg.setEditorName(source.getEditorName());
|
||||
cfg.setEditTime(source.getEditTime());
|
||||
cfg.setAuditorId(source.getAuditorId());
|
||||
cfg.setAuditorName(source.getAuditorName());
|
||||
cfg.setAuditTime(source.getAuditTime());
|
||||
cfg.setSeltype(source.getSeltype());
|
||||
cfg.setSearch_create_time_start(source.getSearch_create_time_start());
|
||||
cfg.setSearch_create_time_end(source.getSearch_create_time_end());
|
||||
cfg.setSearch_edit_time_start(source.getSearch_edit_time_start());
|
||||
cfg.setSearch_edit_time_end(source.getSearch_edit_time_end());
|
||||
cfg.setSearch_audit_time_start(source.getSearch_audit_time_start());
|
||||
cfg.setSearch_audit_time_end(source.getSearch_audit_time_end());
|
||||
}
|
||||
if(stringCfg!=null){
|
||||
stringCfg.setAction(source.getAction());
|
||||
stringCfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
stringCfg.setAttribute(source.getAttribute());
|
||||
stringCfg.setClassify(source.getClassify());
|
||||
stringCfg.setLable(source.getLable());
|
||||
stringCfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
stringCfg.setRequestId(source.getRequestId());
|
||||
stringCfg.setServiceId(source.getServiceId());
|
||||
stringCfg.setCreatorId(source.getCreatorId());
|
||||
stringCfg.setCreatorName(source.getCreatorName());
|
||||
stringCfg.setCreateTime(source.getCreateTime());
|
||||
stringCfg.setEditorId(source.getEditorId());
|
||||
stringCfg.setEditorName(source.getEditorName());
|
||||
stringCfg.setEditTime(source.getEditTime());
|
||||
stringCfg.setAuditorId(source.getAuditorId());
|
||||
stringCfg.setAuditorName(source.getAuditorName());
|
||||
stringCfg.setAuditTime(source.getAuditTime());
|
||||
}
|
||||
if(numCfg!=null){
|
||||
numCfg.setAction(source.getAction());
|
||||
numCfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
numCfg.setAttribute(source.getAttribute());
|
||||
numCfg.setClassify(source.getClassify());
|
||||
numCfg.setLable(source.getLable());
|
||||
numCfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
numCfg.setRequestId(source.getRequestId());
|
||||
numCfg.setServiceId(source.getServiceId());
|
||||
numCfg.setCreatorId(source.getCreatorId());
|
||||
numCfg.setCreatorName(source.getCreatorName());
|
||||
numCfg.setCreateTime(source.getCreateTime());
|
||||
numCfg.setEditorId(source.getEditorId());
|
||||
numCfg.setEditorName(source.getEditorName());
|
||||
numCfg.setEditTime(source.getEditTime());
|
||||
numCfg.setAuditorId(source.getAuditorId());
|
||||
numCfg.setAuditorName(source.getAuditorName());
|
||||
numCfg.setAuditTime(source.getAuditTime());
|
||||
}
|
||||
if(complexCfg!=null){
|
||||
complexCfg.setAction(source.getAction());
|
||||
complexCfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
complexCfg.setAttribute(source.getAttribute());
|
||||
complexCfg.setClassify(source.getClassify());
|
||||
complexCfg.setLable(source.getLable());
|
||||
complexCfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
complexCfg.setRequestId(source.getRequestId());
|
||||
complexCfg.setServiceId(source.getServiceId());
|
||||
complexCfg.setCreatorId(source.getCreatorId());
|
||||
complexCfg.setCreatorName(source.getCreatorName());
|
||||
complexCfg.setCreateTime(source.getCreateTime());
|
||||
complexCfg.setEditorId(source.getEditorId());
|
||||
complexCfg.setEditorName(source.getEditorName());
|
||||
complexCfg.setEditTime(source.getEditTime());
|
||||
complexCfg.setAuditorId(source.getAuditorId());
|
||||
complexCfg.setAuditorName(source.getAuditorName());
|
||||
complexCfg.setAuditTime(source.getAuditTime());
|
||||
}
|
||||
}
|
||||
protected void setProperties(MultipleCfg source,BaseIpCfg ipCfg,BaseStringCfg stringCfg,NumBoundaryCfg numCfg,ComplexkeywordCfg complexCfg){
|
||||
if(ipCfg!=null){
|
||||
ipCfg.setAction(source.getAction());
|
||||
ipCfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
ipCfg.setAttribute(source.getAttribute());
|
||||
ipCfg.setClassify(source.getClassify());
|
||||
ipCfg.setLable(source.getLable());
|
||||
ipCfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
ipCfg.setRequestId(source.getRequestId());
|
||||
ipCfg.setServiceId(source.getServiceId());
|
||||
}
|
||||
if(stringCfg!=null){
|
||||
stringCfg.setAction(source.getAction());
|
||||
stringCfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
stringCfg.setAttribute(source.getAttribute());
|
||||
stringCfg.setClassify(source.getClassify());
|
||||
stringCfg.setLable(source.getLable());
|
||||
stringCfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
stringCfg.setRequestId(source.getRequestId());
|
||||
stringCfg.setServiceId(source.getServiceId());
|
||||
}
|
||||
if(numCfg!=null){
|
||||
numCfg.setAction(source.getAction());
|
||||
numCfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
numCfg.setAttribute(source.getAttribute());
|
||||
numCfg.setClassify(source.getClassify());
|
||||
numCfg.setLable(source.getLable());
|
||||
numCfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
numCfg.setRequestId(source.getRequestId());
|
||||
numCfg.setServiceId(source.getServiceId());
|
||||
}
|
||||
if(complexCfg!=null){
|
||||
complexCfg.setAction(source.getAction());
|
||||
complexCfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
complexCfg.setAttribute(source.getAttribute());
|
||||
complexCfg.setClassify(source.getClassify());
|
||||
complexCfg.setLable(source.getLable());
|
||||
complexCfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
complexCfg.setRequestId(source.getRequestId());
|
||||
complexCfg.setServiceId(source.getServiceId());
|
||||
|
||||
}
|
||||
protected void setProperties(MultipleCfg source,BaseCfg cfg){
|
||||
if(cfg!=null){
|
||||
cfg.setAction(source.getAction());
|
||||
cfg.setAreaEffectiveIds(source.getAreaEffectiveIds());
|
||||
cfg.setAttribute(source.getAttribute());
|
||||
cfg.setClassify(source.getClassify());
|
||||
cfg.setLable(source.getLable());
|
||||
cfg.setIsAreaEffective(source.getIsAreaEffective());
|
||||
cfg.setRequestId(source.getRequestId());
|
||||
cfg.setServiceId(source.getServiceId());
|
||||
}
|
||||
}
|
||||
@SuppressWarnings("rawtypes")
|
||||
protected void setPageProps(Page source,Page target){
|
||||
target.setCount(source.getCount());
|
||||
target.setPageNo(source.getPageNo());
|
||||
|
||||
Reference in New Issue
Block a user