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

（1）avCfgService暂时继承BaseService

Browse Source 
（2）BaseCfg字段调整，加入functionId字段，去掉maatTable字段
（3）删除SystemService相关代码
（4）字符串，增强字符串配置加入字段cfgType
（5）邮件，ssl，Ftp pojo调整，删除多余的，新增keywordCfg
(6)spring-mvc.xml注释redisDao
This commit is contained in:
wangxin
2018-05-17 19:08:37 +08:00
parent c3948a865f
commit 91ad42c562
36 changed files with 273 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,10 +209,8 @@ public class ComplexStringCfgController extends BaseController{
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("审核通过的配置只能取消审核通过！");
@@ -234,7 +232,6 @@ public class ComplexStringCfgController extends BaseController{
}
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);

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

@@ -246,10 +246,8 @@ public class IpCfgController extends BaseController{
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("审核通过的配置只能取消审核通过！");
@@ -271,7 +269,6 @@ public class IpCfgController extends BaseController{
}
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);

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

@@ -953,7 +953,6 @@ public class MultipleCfgController extends BaseController{
//根据表名，编译ID查询唯一结果
BaseIpCfg _resultCfg=ipCfgService.get(searchCfg);
if(_resultCfg!=null){
_resultCfg.setMaatTable(info.getMaatTable());
searchCfg.setAuditorId(searchCfg.getCurrentUser().getId());
searchCfg.setAuditTime(date);
searchCfg.setCfgId(_resultCfg.getCfgId());
@@ -986,7 +985,6 @@ public class MultipleCfgController extends BaseController{
//根据表名，编译ID查询唯一结果
BaseStringCfg _resultCfg=stringCfgService.get(searchCfg);
if(_resultCfg!=null){
_resultCfg.setMaatTable(info.getMaatTable());
searchCfg.setAuditorId(searchCfg.getCurrentUser().getId());
searchCfg.setAuditTime(date);
searchCfg.setCfgId(_resultCfg.getCfgId());
@@ -1019,7 +1017,6 @@ public class MultipleCfgController extends BaseController{
//根据表名，编译ID查询唯一结果
NumBoundaryCfg _resultCfg=numCfgService.get(searchCfg);
if(_resultCfg!=null){
_resultCfg.setMaatTable(info.getMaatTable());
searchCfg.setAuditorId(searchCfg.getCurrentUser().getId());
searchCfg.setAuditTime(date);
searchCfg.setCfgId(_resultCfg.getCfgId());
@@ -1052,7 +1049,6 @@ public class MultipleCfgController extends BaseController{
//根据表名，编译ID查询唯一结果
ComplexkeywordCfg _resultCfg=complexStringCfgService.get(searchCfg);
if(_resultCfg!=null){
_resultCfg.setMaatTable(info.getMaatTable());
searchCfg.setAuditorId(searchCfg.getCurrentUser().getId());
searchCfg.setAuditTime(date);
searchCfg.setCfgId(_resultCfg.getCfgId());
@@ -1084,7 +1080,6 @@ public class MultipleCfgController extends BaseController{
List<AreaIpCfg> areaCfgs=ipCfgService.getAreaCfgByCompileId(compileId);
for(AreaIpCfg areaCfg:areaCfgs){
areaCfg.setTableName(AreaIpCfg.getTablename());
areaCfg.setMaatTable(AreaIpCfg.getMaattable());
areaCfg.setAuditorId(areaCfg.getCurrentUser().getId());
areaCfg.setAuditTime(date);
areaCfg.setIsAudit(isAudit);

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

@@ -156,11 +156,9 @@ public class NumCfgController extends BaseController{
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);
bean.setMaatTable(serviceConfigInfo.getMaatTable());
}
int result=numCfgService.auditNumCfg(bean,cfg);
if(result!=0){

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

@@ -227,10 +227,8 @@ public class StringCfgController extends BaseController{
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("审核通过的配置只能取消审核通过！");
@@ -252,7 +250,6 @@ public class StringCfgController extends BaseController{
}
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);