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

音视频文本配置列表界面选中配置，增加编译配置id

Browse Source 
导出excel增加性质、分类、标签属性值获取
This commit is contained in:
duandongmei
2018-06-15 09:33:53 +08:00
parent 74fac2333f
commit 21d9f594dc
12 changed files with 140 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -451,17 +451,17 @@ public class BaseController {
if(dict.getRegionType()==1){
List<IpCfgTemplate> list = Lists.newArrayList();
list.add(new IpCfgTemplate());
new ExportExcel(msgProp,null, IpCfgTemplate.class, 2).setDataList(msgProp,list).
new ExportExcel(msgProp,null, IpCfgTemplate.class, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
}else if(dict.getRegionType()==2){
List<StringCfgTemplate> list = Lists.newArrayList();
list.add(new StringCfgTemplate());
new ExportExcel(msgProp,null, StringCfgTemplate.class, 2).setDataList(msgProp,list).
new ExportExcel(msgProp,null, StringCfgTemplate.class, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
}else if(dict.getRegionType()==3){
List<ComplexStringCfgTemplate> list = Lists.newArrayList();
list.add(new ComplexStringCfgTemplate());
new ExportExcel(msgProp,null, ComplexStringCfgTemplate.class, 2).setDataList(msgProp,list).
new ExportExcel(msgProp,null, ComplexStringCfgTemplate.class, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
}
}

82
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -23,6 +23,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.SysUser;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.basics.SysDictInfo;
import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
@@ -53,9 +54,9 @@ public class AvContentController extends BaseController {
//音视频VOIP配置新增界面
@RequestMapping(value = {"/voipForm"})
@RequiresPermissions(value={"avVoip:config"})
public String voipFrom(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")CfgIndexInfo cfg){
if(!StringUtil.isEmpty(ids)){
cfg.setCompileId(Integer.parseInt(ids));
public String voipFrom(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")CfgIndexInfo cfg){
if(!StringUtil.isEmpty(compileIds)){
cfg.setCompileId(Integer.parseInt(compileIds));
cfg = avContentCfgService.getCfgIndexInfo(cfg);
initUpdateFormCondition(model, cfg);
}else{
@@ -118,9 +119,9 @@ public class AvContentController extends BaseController {
//修改VOIP配置审核状态
@RequestMapping(value = {"/auditAvVoip"})
@RequiresPermissions(value={"avVoip:audit"})
public String auditVoip(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
public String auditVoip(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId,RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(compileIds)){
String[] idArray = compileIds.split(",");
Date auditTime=new Date();
for(String id :idArray){
try {
@@ -167,9 +168,9 @@ public class AvContentController extends BaseController {
//音视频CONTIP新增界面
@RequestMapping(value = {"/contIpForm"})
@RequiresPermissions(value={"avContIp:config"})
public String contIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseIpCfg cfg){
if(!StringUtil.isEmpty(ids)){
cfg.setCompileId(Integer.parseInt(ids));
public String contIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")BaseIpCfg cfg){
if(!StringUtil.isEmpty(compileIds)){
cfg.setCompileId(Integer.parseInt(compileIds));
cfg = avContentCfgService.getContIpCfgById(cfg);
initUpdateFormCondition(model, cfg);
}else{
@@ -206,9 +207,9 @@ public class AvContentController extends BaseController {
//修改CONTIP配置审核
@RequestMapping(value = {"/auditAvContIp"})
@RequiresPermissions(value={"avContIp:audit"})
public String auditContIp(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
public String auditContIp(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(compileIds)){
String[] idArray = compileIds.split(",");
Date auditTime=new Date();
for(String id :idArray){
try {
@@ -238,9 +239,9 @@ public class AvContentController extends BaseController {
//音视频CONTIP新增界面
@RequestMapping(value = {"/picIpForm"})
@RequiresPermissions(value={"avPicIp:config"})
public String picIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseIpCfg cfg){
if(!StringUtil.isEmpty(ids)){
cfg.setCompileId(Integer.parseInt(ids));
public String picIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")BaseIpCfg cfg){
if(!StringUtil.isEmpty(compileIds)){
cfg.setCompileId(Integer.parseInt(compileIds));
cfg = avContentCfgService.getPicIpCfgById(cfg);
initUpdateFormCondition(model, cfg);
}else{
@@ -277,9 +278,9 @@ public class AvContentController extends BaseController {
//修改CONTIP配置审核
@RequestMapping(value = {"/auditPicIp"})
@RequiresPermissions(value={"avPicIp:audit"})
public String auditPicIp(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
public String auditPicIp(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(compileIds)){
String[] idArray = compileIds.split(",");
Date auditTime=new Date();
for(String id :idArray){
try {
@@ -309,9 +310,9 @@ public class AvContentController extends BaseController {
//音视频CONTUrl新增界面
@RequestMapping(value = {"/contUrlForm"})
@RequiresPermissions(value={"avContUrl:config"})
public String contUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseStringCfg cfg){
if(!StringUtil.isEmpty(ids)){
cfg.setCompileId(Integer.parseInt(ids));
public String contUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")BaseStringCfg cfg){
if(!StringUtil.isEmpty(compileIds)){
cfg.setCompileId(Integer.parseInt(compileIds));
cfg = avContentCfgService.getContUrlCfgById(cfg);
initUpdateFormCondition(model, cfg);
}else{
@@ -348,9 +349,9 @@ public class AvContentController extends BaseController {
//修改CONTUrl配置审核
@RequestMapping(value = {"/auditAvContUrl"})
@RequiresPermissions(value={"avContUrl:audit"})
public String auditContUrl(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
public String auditContUrl(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(compileIds)){
String[] idArray = compileIds.split(",");
Date auditTime=new Date();
for(String id :idArray){
try {
@@ -380,9 +381,9 @@ public class AvContentController extends BaseController {
//音视频CONTUrl新增界面
@RequestMapping(value = {"/picUrlForm"})
@RequiresPermissions(value={"avPicUrl:config"})
public String picUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")BaseStringCfg cfg){
if(!StringUtil.isEmpty(ids)){
cfg.setCompileId(Integer.parseInt(ids));
public String picUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")BaseStringCfg cfg){
if(!StringUtil.isEmpty(compileIds)){
cfg.setCompileId(Integer.parseInt(compileIds));
cfg = avContentCfgService.getPicUrlCfgById(cfg);
initUpdateFormCondition(model, cfg);
}else{
@@ -419,9 +420,9 @@ public class AvContentController extends BaseController {
//修改CONTUrl配置审核
@RequestMapping(value = {"/auditAvPicUrl"})
@RequiresPermissions(value={"avPicUrl:audit"})
public String auditPicUrl(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
public String auditPicUrl(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(compileIds)){
String[] idArray = compileIds.split(",");
Date auditTime=new Date();
for(String id :idArray){
try {
@@ -472,13 +473,21 @@ public class AvContentController extends BaseController {
@ModelAttribute("cfg")CfgIndexInfo entity,
String ids,
RedirectAttributes redirectAttributes){
Properties msgProp = getMsgProp();
try {
//获取国际化配置
Properties msgProp = getMsgProp();
//获取分类、性质、标签
List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
Map<Object, Object> map=new HashMap<Object, Object>();
map.put("fls", fls);
map.put("xzs", xzs);
map.put("labels", labels);
String fileName = "数据-"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
//导出选中记录
//导出选中记录
if(!StringUtil.isEmpty(ids)){
}else{
@@ -492,8 +501,6 @@ public class AvContentController extends BaseController {
}
//条件导出数据大于最大导出数，只导出最大导出条数
Page pageInfo=new Page<CfgIndexInfo>(request, response,"r");
//int pageNo=pageInfo.getPageNo();
//int pageSize=pageInfo.getPageSize();
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
@@ -501,9 +508,8 @@ public class AvContentController extends BaseController {
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
Page<CfgIndexInfo> page = avContentCfgService.findPage(pageInfo, entity);
new ExportExcel(msgProp,null, CfgIndexInfo.class,1).setDataList(msgProp,page.getList()).write(response, fileName).dispose();
new ExportExcel(msgProp,null, CfgIndexInfo.class,1).setDataList(msgProp,page.getList(),map).write(response, fileName).dispose();
}
return null;

2
src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
View File

@@ -144,7 +144,7 @@ public class SpecificServiceHostCfgController extends BaseController {
String fileName = msgProp.getProperty("agreement_ip_configuration").replaceAll(" ", "_")+".xlsx";
List<SpecificServiceHostCfg> list = Lists.newArrayList();
list.add(new SpecificServiceHostCfg());
new ExportExcel(msgProp,msgProp.getProperty("agreement_ip_configuration"), SpecificServiceHostCfg.class, 2).setDataList(msgProp,list).
new ExportExcel(msgProp,msgProp.getProperty("agreement_ip_configuration"), SpecificServiceHostCfg.class, 2).setDataList(msgProp,list,null).
write(request,response, fileName).dispose();
return null;
} catch (Exception e) {

2
src/main/java/com/nis/web/controller/sys/UserController.java
View File

@@ -199,7 +199,7 @@ public class UserController extends BaseController{
try {
String fileName = "用户数据-"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
Page<SysUser> page = userService.findUser(new Page<SysUser>(request, response, -1), user);
new ExportExcel("用户数据", SysUser.class).setDataList(getMsgProp(),page.getList()).write(response, fileName).dispose();
new ExportExcel("用户数据", SysUser.class).setDataList(getMsgProp(),page.getList(),null).write(response, fileName).dispose();
return null;
} catch (Exception e) {
addMessage(redirectAttributes, "导出用户失败！失败信息："+e.getMessage());