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

①修复新增，修改，列表展示配置时分类性质标签展示的问题

Browse Source 
②列表展示时采用遍历分类性质标签的方法展示，减少数据库查询时的压力
③取掉了一些不需要展示的列
④新增Maat转换的bean
⑤采用gson的方式对在bean上做注解做转换，禁止了htmlescape
This commit is contained in:
wangxin
2018-03-05 16:30:16 +08:00
parent 363544a443
commit 848087dbef
33 changed files with 797 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/main/java/com/nis/web/service/CrudService.java
View File

@@ -3,6 +3,7 @@
*/
package com.nis.web.service;
import java.util.ArrayList;
import java.util.List;
import org.apache.ibatis.session.ExecutorType;
@@ -10,8 +11,17 @@ import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.nis.domain.BaseEntity;
import com.nis.domain.Page;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.ToMaatBean;
import com.nis.web.dao.CrudDao;
/**
@@ -174,5 +184,82 @@ public abstract class CrudService<D extends CrudDao<T>, T extends BaseEntity<T>>
}
}
}
/**
*
* sendToMaatConvertor(转换配置为Maat格式)
* (所有的配置需拥有一样的编译ID，action,serviceId,等属性)
* @param cfg
* @return
*boolean
* @exception
* @since 1.0.0
*/
public boolean sendToMaatConvertor(AreaIpCfg[] areaCfg,T ... cfg){
if(cfg==null){
throw new RuntimeException("转换出错,配置为空");
}
long compileId=0l;
ToMaatBean toMaatBean=new ToMaatBean();
MaatCfg maatCfg=new MaatCfg();
if(cfg[0] instanceof BaseIpCfg){
maatCfg.setIpCfg((BaseIpCfg[])cfg);
compileId=((BaseIpCfg)cfg[0]).getCompileId();
}else if(cfg[0] instanceof BaseStringCfg){
maatCfg.setStrCfg((BaseStringCfg[])cfg);
compileId=((BaseStringCfg)cfg[0]).getCompileId();
}else if(cfg[0] instanceof ComplexkeywordCfg){
maatCfg.setComplexStrCfg((ComplexkeywordCfg[])cfg);
compileId=((ComplexkeywordCfg)cfg[0]).getCompileId();
}
if(areaCfg!=null){
AreaIpCfg[] cfgArray=new AreaIpCfg[1];
}
List<MaatCfg> serviceCfg=new ArrayList<>();
serviceCfg.add(maatCfg);
BaseCfg baseCfg=(BaseCfg)cfg[0];
if(compileId==0l){
throw new RuntimeException("转换出错,未获取到正确的compileId");
}else{
toMaatBean.setCompileId(compileId);
}
if(baseCfg.getAction()==null){
throw new RuntimeException("转换出错,未获取到正确的action");
}else{
toMaatBean.setAction(baseCfg.getAction());
}
if(baseCfg.getIsAreaEffective()==null){
throw new RuntimeException("转换出错,未获取到正确的isAreaEffective");
}else{
toMaatBean.setIsAreaEffective(baseCfg.getIsAreaEffective());
}
if(baseCfg.getIsValid()==null){
throw new RuntimeException("转换出错,未获取到正确的isValid");
}else{
toMaatBean.setIsValid(baseCfg.getIsValid());
}
if(baseCfg.getRequestId()==null){
throw new RuntimeException("转换出错,未获取到正确的requestId");
}else{
toMaatBean.setRequestId(baseCfg.getRequestId());
}
if(baseCfg.getServiceId()==null){
throw new RuntimeException("转换出错,未获取到正确的serviceId");
}else{
toMaatBean.setServiceId(baseCfg.getServiceId());
}
toMaatBean.setAreaEffectiveIds(baseCfg.getAreaEffectiveIds()==null?"":baseCfg.getAreaEffectiveIds());
toMaatBean.setAttribute(baseCfg.getAttribute()==null?"":baseCfg.getAttribute());
toMaatBean.setClassify(baseCfg.getClassify()==null?"":baseCfg.getClassify());
toMaatBean.setLable(baseCfg.getLable()==null?"":baseCfg.getLable());
Gson gson=new GsonBuilder().disableHtmlEscaping()
.setDateFormat("yyyy-MM-dd HH:mm:ss")
/*.setPrettyPrinting().serializeNulls()*/
.excludeFieldsWithoutExposeAnnotation()
.create();
String json=gson.toJson(toMaatBean);
//发送至maat,待完成
return false;
}
}

9
src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java
View File

@@ -2,7 +2,6 @@ package com.nis.web.service.configuration;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +28,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int addStringCfg(ComplexkeywordCfg cfg){
if(!StringUtils.isBlank(cfg.getTableName())){
return complexStringCfgDao.insert(cfg);
@@ -53,7 +52,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int updateStringCfg(ComplexkeywordCfg cfg){
if(!StringUtils.isBlank(cfg.getTableName())){
return complexStringCfgDao.updateByPrimaryKeySelective(cfg);
@@ -77,7 +76,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int auditStringCfg(ComplexkeywordCfg cfg){
if(!StringUtils.isBlank(cfg.getTableName())){
return complexStringCfgDao.audit(cfg);
@@ -101,7 +100,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteStringCfg(ComplexkeywordCfg cfg){
if(!StringUtils.isBlank(cfg.getTableName())){
return complexStringCfgDao.updateValid(cfg);

8
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -29,7 +29,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int addIpCfg(BaseIpCfg baseIpCfg){
if(!StringUtils.isBlank(baseIpCfg.getTableName())){
return ipCfgDao.insert(baseIpCfg);
@@ -53,7 +53,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int updateIpCfg(BaseIpCfg baseIpCfg){
if(!StringUtils.isBlank(baseIpCfg.getTableName())){
return ipCfgDao.updateByPrimaryKeySelective(baseIpCfg);
@@ -77,7 +77,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int auditIpCfg(BaseIpCfg baseIpCfg){
if(!StringUtils.isBlank(baseIpCfg.getTableName())){
return ipCfgDao.audit(baseIpCfg);
@@ -101,7 +101,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteIpCfg(BaseIpCfg baseIpCfg){
if(!StringUtils.isBlank(baseIpCfg.getTableName())){
return ipCfgDao.updateValid(baseIpCfg);

9
src/main/java/com/nis/web/service/configuration/NumCfgService.java
View File

@@ -1,7 +1,6 @@
package com.nis.web.service.configuration;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,7 +27,7 @@ public class NumCfgService extends CrudService<NumCfgDao,NumBoundaryCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int addNumCfg(NumBoundaryCfg cfg){
return numCfgDao.insert(cfg);
}
@@ -42,7 +41,7 @@ public class NumCfgService extends CrudService<NumCfgDao,NumBoundaryCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int updateNumCfg(NumBoundaryCfg cfg){
return numCfgDao.updateByPrimaryKeySelective(cfg);
}
@@ -56,7 +55,7 @@ public class NumCfgService extends CrudService<NumCfgDao,NumBoundaryCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int auditNumCfg(NumBoundaryCfg cfg){
return numCfgDao.audit(cfg);
}
@@ -70,7 +69,7 @@ public class NumCfgService extends CrudService<NumCfgDao,NumBoundaryCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteNumCfg(NumBoundaryCfg cfg){
return numCfgDao.updateValid(cfg);
}

8
src/main/java/com/nis/web/service/configuration/StringCfgService.java
View File

@@ -29,7 +29,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int addStringCfg(BaseStringCfg baseStringCfg){
if(!StringUtils.isBlank(baseStringCfg.getTableName())){
return stringCfgDao.insert(baseStringCfg);
@@ -53,7 +53,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int updateStringCfg(BaseStringCfg baseStringCfg){
if(!StringUtils.isBlank(baseStringCfg.getTableName())){
return stringCfgDao.updateByPrimaryKeySelective(baseStringCfg);
@@ -77,7 +77,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int auditStringCfg(BaseStringCfg baseStringCfg){
if(!StringUtils.isBlank(baseStringCfg.getTableName())){
return stringCfgDao.audit(baseStringCfg);
@@ -101,7 +101,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int deleteStringCfg(BaseStringCfg baseStringCfg){
if(!StringUtils.isBlank(baseStringCfg.getTableName())){
return stringCfgDao.updateValid(baseStringCfg);