1.导入配置数据入库优化 2.修复VoIP配置 无IP域配置数据不显示BUG

This commit is contained in:
zhangwq
2018-11-17 23:59:50 +08:00
parent 2e4817e39b
commit 85123852b0
13 changed files with 346 additions and 101 deletions

View File

@@ -9,15 +9,18 @@ import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.BaseEntity;
import com.nis.domain.Page;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.IpCfgDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.dao.configuration.WebsiteCfgDao;
/**
@@ -92,6 +95,7 @@ public abstract class CrudService<D extends CrudDao<T>, T extends BaseEntity<T>>
public void delete(T entity) {
dao.delete(entity);
}
/**
*
* saveBatch(批量全部保存数据)
@@ -101,8 +105,8 @@ public abstract class CrudService<D extends CrudDao<T>, T extends BaseEntity<T>>
* @author wx
* @since 1.0.0
*/
@SuppressWarnings("unchecked")
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveBatch(List<T> data,@SuppressWarnings("rawtypes")Class mClass) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null;
@@ -126,17 +130,22 @@ public abstract class CrudService<D extends CrudDao<T>, T extends BaseEntity<T>>
}
}
}
@SuppressWarnings("unchecked")
public void saveStringCfgBatch(List<BaseStringCfg<?>> listPage,@SuppressWarnings("rawtypes")Class mClass, String tableName) {
/**
* 导入配置时数据批量入库(增强字符串配置)
* @param data
* @param tableName
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveComplexkeywordCfgBatch(List<ComplexkeywordCfg> data, String tableName) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null;
try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
//Object obj = mClass.newInstance();
for(int index = 0; index < listPage.size();index++){
BaseStringCfg<?> cfg = listPage.get(index);
for(int index = 0; index < data.size();index++){
ComplexkeywordCfg cfg = data.get(index);
cfg.setTableName(tableName);
((WebsiteCfgDao) batchSqlSession.getMapper(mClass)).saveWebsiteCfgForBatch(cfg);
((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveComplexkeywordCfgBatch(cfg);
}
batchSqlSession.commit();
}finally {