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

（1）maat配置转换0.0.1版本jar提交，获取编译id可用，审核，取消审核部分报错，待凯歌修复完成测试通过之后更新版本。

Browse Source 
（2）基础类配置精简后台代码，加入了从maat转换工具获取编译ID。审核，取消审核目前不可用，等jar包修复完成继续调整。
（3）编译ID字段改为int类型
（4）多域类配置后台提交。查询采用查一张主表，根据主表中的编译ID分开查其他表的方式关联。界面功能尚在调整。
This commit is contained in:
wangxin
2018-03-26 14:43:58 +08:00
parent bb8cd7be79
commit 9d50205d5f
38 changed files with 2392 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,9 +13,10 @@ 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.BaseCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
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;
@@ -27,7 +28,6 @@ import com.nis.web.controller.BaseController;
@Controller
@RequestMapping("${adminPath}/cfg/num")
public class NumCfgController extends BaseController{
@RequestMapping(value = {"list"})
public String cfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")NumBoundaryCfg cfg,HttpServletRequest request,HttpServletResponse response) {
model.addAttribute("cfgName", cfgName);
@@ -136,16 +136,11 @@ public class NumCfgController extends BaseController{
model.addAttribute("cfgType","num");
model.addAttribute("audit", Constants.CFG_PAGE);
logger.info("saveOrUpdateStringCfg loaded");
if(cfg==null){
logger.error("无法保存空的配置！");
addMessage(model,"保存失败！");
}else if(cfg.getServiceId()!=null){
try{
int serviceId=cfg.getServiceId();
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
long compileId=getCompileId(cfg);
// cfg.setCreatorId(cfg.getCurrentUser().getId());
// cfg.setCreateTime(new Date());
int compileId=new ConvertTool().getCompileId();
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId);
@@ -162,11 +157,11 @@ public class NumCfgController extends BaseController{
model.addAttribute("action",cfg.getAction());
addMessage(model,"保存成功,正在为您跳转页面...");
}
}else{
}catch(Exception e){
logger.error("保存失败", e);
addMessage(model,"保存失败！");
logger.error("无法确定IP配置的表名！");
}
return "/cfg/resultPage";//StringEscapeUtils.escapeHtml4("?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName="+cfgName);
return "/cfg/resultPage";
}
/**
@@ -182,31 +177,42 @@ public class NumCfgController extends BaseController{
public String auditStringCfg(String cfgName,NumBoundaryCfg cfg,Model model) {
model.addAttribute("cfgName", cfgName);
model.addAttribute("audit", Constants.AUDIT_PAGE);
if(cfg==null){
logger.error("无法审核空的配置！");
}else if(cfg.getServiceId()!=null){
model.addAttribute("serviceId", cfg.getServiceId());
model.addAttribute("action", cfg.getAction());
try{
int serviceId=cfg.getServiceId();
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
int audit=numCfgService.getIsAudit(cfg);
NumBoundaryCfg bean=numCfgService.getNumCfgById(cfg);
bean.setTableName(serviceConfigInfo.getTableName());
int audit=bean.getIsAudit().intValue();
if(audit==Constants.AUDIT_YES&&cfg.getIsAudit()!=Constants.AUDIT_NOT_YES){
logger.error("审核通过的配置只能取消审核通过！");
}else{
cfg.setAuditorId(cfg.getCurrentUser().getId());
cfg.setAuditTime(new Date());
bean.setIsAudit(cfg.getIsAudit());
if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
cfg.setIsValid(Constants.VALID_NO);
bean.setIsValid(Constants.VALID_NO);
bean.setMaatTable(serviceConfigInfo.getMaatTable());
}else if(cfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1
cfg.setIsValid(Constants.VALID_YES);
bean.setIsValid(Constants.VALID_YES);
}
int result=numCfgService.auditNumCfg(cfg);
model.addAttribute("serviceId", serviceId);
model.addAttribute("action", cfg.getAction());
int result=numCfgService.auditNumCfg(bean,cfg);
if(result!=0){
addMessage(model, "审核成功");
}else{
addMessage(model, "审核失败");
}
}
}
}else{
logger.error("无法确定IP配置的表名！");
}catch (Exception e) {
// TODO: handle exception
logger.error("审核失败",e);
addMessage(model, "审核失败");
}
return "redirect:" + adminPath + "/cfg/num/list";
}
@@ -257,7 +263,14 @@ public class NumCfgController extends BaseController{
* @exception
* @since 1.0.0
*/
protected long getCompileId(BaseCfg cfg){
return 0;
protected long getCompileId(NumBoundaryCfg cfg){
long compileId=0l;
try {
compileId = cfg.getCompileId()==null?new ConvertTool().getCompileId():cfg.getCompileId();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return compileId;
}
}