(1)avCfgService暂时继承BaseService
(2)BaseCfg字段调整,加入functionId字段,去掉maatTable字段 (3)删除SystemService相关代码 (4)字符串,增强字符串配置加入字段cfgType (5)邮件,ssl,Ftp pojo调整,删除多余的,新增keywordCfg (6)spring-mvc.xml注释redisDao
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user