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

修复mapper.xml中expr_type字段带的空格

Browse Source 
ServiceConfigInfo添加列表查询
IP,字符串,增强字符串配置修复创建时间创建人在更新的时候覆盖的bug
This commit is contained in:
wangxin
2018-03-14 13:47:43 +08:00
parent aa8568adbe
commit 52ae5c0c43
9 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,8 +186,8 @@ public class ComplexStringCfgController extends BaseController{
}else if(!StringUtils.isBlank(cfg.getTableName())){
int serviceId=cfg.getServiceId();
long compileId=getCompileId(cfg);
cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date());
// cfg.setCreatorId(cfg.getCurrentUser().getId());
// cfg.setCreateTime(new Date());
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId);
@@ -211,8 +211,8 @@ public class ComplexStringCfgController extends BaseController{
if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId(cfg);
cfg.setTableName(tableName);
cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date());
// cfg.setCreatorId(cfg.getCurrentUser().getId());
// cfg.setCreateTime(new Date());
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId);

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

@@ -262,8 +262,8 @@ public class IpCfgController extends BaseController{
if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId();
ipCfg.setTableName(tableName);
ipCfg.setCreatorId(ipCfg.getCurrentUser().getId());
ipCfg.setCreateTime(new Date());
// ipCfg.setCreatorId(ipCfg.getCurrentUser().getId());
// ipCfg.setCreateTime(new Date());
ipCfg.setIsValid(Constants.VALID_NO);
ipCfg.setIsAudit(Constants.AUDIT_NOT_YET);
ipCfg.setCompileId(compileId);

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

@@ -144,8 +144,8 @@ public class NumCfgController extends BaseController{
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
long compileId=getCompileId(cfg);
cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date());
// cfg.setCreatorId(cfg.getCurrentUser().getId());
// cfg.setCreateTime(new Date());
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId);

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

@@ -186,8 +186,8 @@ public class StringCfgController extends BaseController{
}else if(!StringUtils.isBlank(stringCfg.getTableName())){
int serviceId=stringCfg.getServiceId();
long compileId=getCompileId(stringCfg);
stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
stringCfg.setCreateTime(new Date());
// stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
// stringCfg.setCreateTime(new Date());
stringCfg.setIsValid(Constants.VALID_NO);
stringCfg.setIsAudit(Constants.AUDIT_NOT_YET);
stringCfg.setCompileId(compileId);
@@ -211,8 +211,8 @@ public class StringCfgController extends BaseController{
if(!StringUtils.isBlank(tableName)){
long compileId=getCompileId(stringCfg);
stringCfg.setTableName(tableName);
stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
stringCfg.setCreateTime(new Date());
// stringCfg.setCreatorId(stringCfg.getCurrentUser().getId());
// stringCfg.setCreateTime(new Date());
stringCfg.setIsValid(Constants.VALID_NO);
stringCfg.setIsAudit(Constants.AUDIT_NOT_YET);
stringCfg.setCompileId(compileId);