diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java deleted file mode 100644 index 0f357a37f..000000000 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.nis.web.controller.configuration; - -import javax.servlet.http.HttpServletRequest; -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.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.util.StringUtils; -import com.nis.web.controller.BaseController; -import com.nis.web.service.configuration.RequestInfoService; - -/** - * 测试类 - * - */ -@Controller -@RequestMapping("${adminPath}/cfg/request") -public class RequestInfoController extends BaseController{ - - @Autowired - private RequestInfoService requestInfoService; - - - /** - *来函列表 - */ - @RequestMapping(value = {"list",""}) - public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) { - Page page = requestInfoService.findRequestInfo(new Page(request, response), requestInfo); - model.addAttribute("page", page); - return "/cfg/requestList"; - } - /** - * 进入用户添加或修改页面 - */ - @RequestMapping(value={"form"}) - public String form(RequestInfo requestInfo, Model model) { - if(requestInfo.getId()!=null){ - requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId()); - model.addAttribute("requestInfo", requestInfo); - } - model.addAttribute("requestInfo", requestInfo); - return "/cfg/requestForm"; - } - - /** - * 新增/修改 - */ - @RequestMapping(value = "saveOrUpdate") - public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) { - try { - if(requestInfo.getId()!=null){ - // 保存用户信息 - requestInfoService.saveOrUpdate(requestInfo); - addMessage(redirectAttributes, "保存success"); - }else{ - if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ - addMessage(model, "error"); - return form(requestInfo, model); - } - // 保存用户信息 - requestInfoService.saveOrUpdate(requestInfo); - addMessage(redirectAttributes, "success"); - } - } catch (Exception e) { - e.printStackTrace(); - addMessage(model, "error"); - } - return "redirect:" + adminPath + "/cfg/request/list?repage"; - } - - /** - * 验证是否有效 - */ - @ResponseBody - @RequestMapping(value = "checkRequestNumber") - public String checkRequestNumber(String requestNumber) { - if (requestNumber !=null && requestInfoService.getRequestInfoByRequestNumber(requestNumber) == null) { - return "true"; - } - return "false"; - } - - /** - * 审核 - * @param requestInfo - * @param model - * @return - */ - @RequestMapping(value = "requestExamine") - public String requestExamine(RequestInfo requestInfo, Model model){ - requestInfoService.requestExamine(requestInfo); - return "redirect:" + adminPath + "/cfg/request/list?repage"; - - } - /** - * 取消审核 - * @param requestInfo - * @param model - * @return - */ - @RequestMapping(value = "requestCancelExamine") - public String requestCancelExamine(RequestInfo requestInfo, Model model){ - requestInfoService.requestCancelExamine(requestInfo); - return "redirect:" + adminPath + "/cfg/request/list?repage"; - - } - /** - * 删除 - * @param requestInfo - * @param model - * @return - */ - @RequestMapping(value = "delete") - public String delete(RequestInfo requestInfo, Model model){ - requestInfoService.delete(requestInfo); - return "redirect:" + adminPath + "/cfg/request/list?repage"; - - } - -} diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp deleted file mode 100644 index dfefba161..000000000 --- a/src/main/webapp/WEB-INF/include/header.jsp +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag deleted file mode 100644 index e0406fd13..000000000 --- a/src/main/webapp/WEB-INF/tags/sys/message.tag +++ /dev/null @@ -1,10 +0,0 @@ -<%@ tag language="java" pageEncoding="UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> -<%@ attribute name="content" type="java.lang.String" required="true" description="消息内容"%> -<%@ attribute name="type" type="java.lang.String" description="消息类型：info、success、warning、error、loading"%> - - - -
${content}
- - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp deleted file mode 100644 index e44bb2714..000000000 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ /dev/null @@ -1,126 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> - - -来函信息 - - - - -
-
-
-
-
-
-
-
- -
- - - - -
-
- -
- -
-
-
- -
- -
-
-
- -
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
- - -
-
-
- - -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp deleted file mode 100644 index 3fb796fc6..000000000 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ /dev/null @@ -1,174 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> - - -来函信息 - - - - - -
- - -

- 来函管理 -

- -
-
-
-
-
- -
-
-
- -
- - - -
- : - - - - - - - - - - - - - - : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> - : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${requestInfo.id }${requestInfo.requestNumber }${requestInfo.requestOrg } - - - - - - ${requestInfo.creatorName } - - - - - - - - - - ${requestInfo.requestTitle }${requestInfo.requestContent } -
- -
    - - - -
    • -     - -
    • -
    • -
    • -     -     -
-
-
-
${page}
-
-
-
-
-
- - - - - \ No newline at end of file