From 759ce81088642b2c1e791009f374ed5c61c18fd4 Mon Sep 17 00:00:00 2001 From: leijun Date: Mon, 24 Dec 2018 19:16:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E5=87=BD=E4=B8=93=E9=A1=B9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0csv=E5=AF=BC=E5=87=BA=E5=8F=8A=E9=A6=96=E8=A1=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=87=E9=A2=98=E5=92=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/util/excel/ExcelCsv.java | 4 +- .../controller/basics/TaskInfoController.java | 51 +++++++++++++++++-- .../configuration/RequestInfoController.java | 51 +++++++++++++++++-- .../maintenance/UserManageController.java | 2 +- .../WEB-INF/views/basics/taskInfoList.jsp | 36 ++++++++----- 5 files changed, 120 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 766c0d7b0..6d6e04cd6 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -332,7 +332,7 @@ public class ExcelCsv { log.error("Get entity value failed",ex); val = ""; } - sb.append(val + ", "); + sb.append(val + "┆~"); } listT.add(String.valueOf(sb)); } @@ -425,7 +425,7 @@ public class ExcelCsv { // 写入文件内容 //Html 解码 data = Encodes.unescapeHtml(data.toString()); - String [] datas=data.split(","); + String [] datas=data.split("┆~"); for (String tag : datas) { StringBuffer sb = new StringBuffer(); if("null".equals(tag.trim())){ diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java index d43774474..59cfc7d21 100644 --- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java @@ -13,14 +13,17 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; +import com.nis.domain.configuration.RequestInfo; import com.nis.domain.configuration.TaskInfo; import com.nis.util.Constants; +import com.nis.util.DateUtils; import com.nis.util.StringUtil; import com.nis.util.excel.ExcelField; import com.nis.web.controller.BaseController; @@ -160,7 +163,7 @@ public class TaskInfoController extends BaseController{ } //配置导出 @RequestMapping(value = "exportTaskInfo") - public void exportTaskInfo(Model model,HttpServletRequest request,HttpServletResponse response, + public void exportTaskInfo(Model model,HttpServletRequest request,HttpServletResponse response,String hcolumn,String exType, @ModelAttribute("cfg")TaskInfo entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -189,6 +192,18 @@ public class TaskInfoController extends BaseController{ if(column.toString().length()>0) { column.append(","); } + + if(entity.getBeginDate()==null ){ + hcolumn+=",task_time,"; + } + if(entity.getDobeginDate()==null){ + hcolumn+=",edit_time,"; + } + + if(!StringUtils.isEmpty(hcolumn)){ + column.append(","+hcolumn+","); + } + noExportMap.put(entity.getMenuNameCode(),column.toString()); if(!StringUtil.isEmpty(ids)){ for(String id:ids.split(",")){ @@ -203,15 +218,43 @@ public class TaskInfoController extends BaseController{ Page page = taskInfoService.findTaskInfo(pageInfo, entity); list=page.getList(); } - dataMap.put(entity.getMenuNameCode(),list); - // 获取国际化配置 - this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + //获取国际化配置 + String timeRange = initTaskMap(entity); + noExportMap.put("timeRange", timeRange); + if ("csv".equals(exType)) { + this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } else { + this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } } catch (Exception e) { logger.error("ip addr export failed",e); addMessage(redirectAttributes,"error", "export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } + public String initTaskMap(TaskInfo info){ + Properties msgProp = getMsgProp(); + String logTime=msgProp.getProperty(info.getMenuNameCode(),info.getMenuNameCode()); + if(info.getBeginDate()!=null){ + logTime+=" "+msgProp.getProperty("task_time","task_time")+"："+DateUtils.formatDateTime(info.getBeginDate()); + if(info.getEndDate()!=null){ + logTime+="—"+DateUtils.formatDateTime(info.getEndDate()); + }else{ + logTime+="—"+DateUtils.getDateTime(); + } + } + if(info.getDobeginDate()!=null){ + logTime+=" "+msgProp.getProperty("edit_time","edit_time")+"："+DateUtils.formatDateTime(info.getDobeginDate()); + if(info.getDoendDate()!=null){ + logTime+="—"+DateUtils.formatDateTime(info.getDoendDate()); + }else{ + logTime+="—"+DateUtils.getDateTime(); + } + } + return logTime; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java index 866f1b0bb..4b1239c34 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -14,6 +14,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -22,7 +23,9 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.configuration.RequestInfo; import com.nis.domain.configuration.TaskInfo; +import com.nis.domain.log.BaseLogEntity; import com.nis.util.Constants; +import com.nis.util.DateUtils; import com.nis.util.StringUtil; import com.nis.util.excel.ExcelField; import com.nis.web.controller.BaseController; @@ -188,7 +191,7 @@ public class RequestInfoController extends BaseController{ } //配置导出 @RequestMapping(value = "exportRequestInfo") - public void exportTaskInfo(Model model,HttpServletRequest request,HttpServletResponse response, + public void exportTaskInfo(Model model,HttpServletRequest request,HttpServletResponse response, String exType,String hcolumn, @ModelAttribute("requestInfo")RequestInfo entity,String ids,RedirectAttributes redirectAttributes){ try { //export data info @@ -196,8 +199,6 @@ public class RequestInfoController extends BaseController{ Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - - //导出选中记录 List list=Lists.newArrayList(); titleList.add(entity.getMenuNameCode()); @@ -217,6 +218,17 @@ public class RequestInfoController extends BaseController{ if(column.toString().length()>0) { column.append(","); } + + if(entity.getBeginDate()==null){ + hcolumn+=",request_time,"; + } + if(entity.getDobeginDate()==null){ + hcolumn+=",edit_time,"; + } + + if(!StringUtils.isEmpty(hcolumn)){ + column.append(","+hcolumn+","); + } noExportMap.put(entity.getMenuNameCode(),column.toString()); if(!StringUtil.isEmpty(ids)){ for(String id:ids.split(",")){ @@ -231,14 +243,43 @@ public class RequestInfoController extends BaseController{ Page page = requestInfoService.findRequestInfo(pageInfo, entity); list=page.getList(); } - dataMap.put(entity.getMenuNameCode(),list); // 获取国际化配置 - this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); + String timeRange = initRequestMap(entity); + noExportMap.put("timeRange", timeRange); + if ("csv".equals(exType)) { + this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } else { + this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList, + classMap, dataMap, noExportMap); + } } catch (Exception e) { logger.error("ip addr export failed",e); addMessage(redirectAttributes,"error", "export_failed"); } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } + + public String initRequestMap(RequestInfo info){ + Properties msgProp = getMsgProp(); + String logTime=msgProp.getProperty(info.getMenuNameCode(),info.getMenuNameCode()); + if(info.getBeginDate()!=null){ + logTime+=" "+msgProp.getProperty("request_time","request_time")+"："+DateUtils.formatDateTime(info.getBeginDate()); + if(info.getEndDate()!=null){ + logTime+="—"+DateUtils.formatDateTime(info.getEndDate()); + }else{ + logTime+="—"+DateUtils.getDateTime(); + } + } + if(info.getDobeginDate()!=null){ + logTime+=" "+msgProp.getProperty("edit_time","edit_time")+"："+DateUtils.formatDateTime(info.getDobeginDate()); + if(info.getDoendDate()!=null){ + logTime+="—"+DateUtils.formatDateTime(info.getDoendDate()); + }else{ + logTime+="—"+DateUtils.getDateTime(); + } + } + return logTime; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java index 1fccb9aaa..fcefabe27 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java @@ -394,7 +394,7 @@ public class UserManageController extends BaseController{ } for (UserManage userManage : ipLists) { if(!StringUtils.isEmpty( userManage.getServerIp())){ - userManage.setServerIp(userManage.getServerIp().substring(0,userManage.getServerIp().length()-1).replaceAll(",", "，")); + userManage.setServerIp(userManage.getServerIp().substring(0,userManage.getServerIp().length()-1)); } } noExportMap.put("user_manage", cfgIndexInfoNoExport); diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index 1ccdf774d..7b75fb448 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -68,10 +68,22 @@ - + <%-- --%> + +
+ +
    +
    • +
    • +
+
+