Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

pom.xml

@@ -642,6 +642,12 @@
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 			<version>2.8.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.code.gson</groupId>
+					<artifactId>gson-parent</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 </project>

src/main/java/com/nis/domain/basics/ServiceDictInfo.java

@@ -1,4 +1,4 @@
-package com.nis.domain.configuration;
+package com.nis.domain.basics;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -131,6 +131,7 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	public static void sortList(List<ServiceDictInfo> list, List<ServiceDictInfo> sourcelist, Integer parentId, boolean cascade){
 		for (int i=0; i<sourcelist.size(); i++){
 			ServiceDictInfo serviceDictInfo = sourcelist.get(i);
+			//System.out.println(serviceDictInfo.getServiceDictId()+">>>>>"+serviceDictInfo.getParent().getServiceDictId());
 			if (serviceDictInfo.getParent()!=null && serviceDictInfo.getParent().getServiceDictId()!=null
 					&& serviceDictInfo.getParent().getServiceDictId().equals(parentId)){
 				list.add(serviceDictInfo);

src/main/java/com/nis/domain/basics/SysDictInfo.java

@@ -1,4 +1,4 @@
-package com.nis.domain.configuration;
+package com.nis.domain.basics;
 
 import java.util.ArrayList;
 import java.util.Date;

src/main/java/com/nis/domain/configuration/RequestInfo.java

@@ -1,11 +1,14 @@
 package com.nis.domain.configuration;
 
 import java.util.Date;
+import java.util.List;
 
 import com.nis.domain.BaseEntity;
 
 public class RequestInfo extends BaseEntity<RequestInfo>{
 	
+	private Long taskId;
+	
     private String requestNumber;
 
     private String requestOrg;
@@ -39,6 +42,16 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
     private Date beginDate;//开始时间
     private Date endDate;//结束时间
     private String timeType;//时间类型
+    private String taskName;//专项任务
+    
+
+	public Long getTaskId() {
+		return taskId;
+	}
+
+	public void setTaskId(Long taskId) {
+		this.taskId = taskId;
+	}
 
 	public String getRequestNumber() {
         return requestNumber;
@@ -192,4 +205,12 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
 		this.timeType = timeType;
 	}
 
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+    
 }

src/main/java/com/nis/domain/configuration/TaskInfo.java

@@ -0,0 +1,131 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+import com.nis.domain.BaseEntity;
+
+public class TaskInfo extends BaseEntity<TaskInfo> {
+	private static final long serialVersionUID = 1L;
+
+	private String taskName;
+
+	private String taskOrg;
+
+	private Date taskTime;
+
+	private String taskDesc;
+
+	private Integer isValid;
+
+	private Integer isAudit;
+
+	private Integer creatorId;
+
+	private Date createTime;
+
+	private Integer editorId;
+
+	private Date editTime;
+
+	private Integer auditorId;
+
+	private Date auditTime;
+
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+
+	public String getTaskOrg() {
+		return taskOrg;
+	}
+
+	public void setTaskOrg(String taskOrg) {
+		this.taskOrg = taskOrg;
+	}
+
+	public Date getTaskTime() {
+		return taskTime;
+	}
+
+	public void setTaskTime(Date taskTime) {
+		this.taskTime = taskTime;
+	}
+
+	public String getTaskDesc() {
+		return taskDesc;
+	}
+
+	public void setTaskDesc(String taskDesc) {
+		this.taskDesc = taskDesc;
+	}
+
+	public Integer getIsValid() {
+		return isValid;
+	}
+
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+
+	public Integer getIsAudit() {
+		return isAudit;
+	}
+
+	public void setIsAudit(Integer isAudit) {
+		this.isAudit = isAudit;
+	}
+
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getEditorId() {
+		return editorId;
+	}
+
+	public void setEditorId(Integer editorId) {
+		this.editorId = editorId;
+	}
+
+	public Date getEditTime() {
+		return editTime;
+	}
+
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+
+	public Integer getAuditorId() {
+		return auditorId;
+	}
+
+	public void setAuditorId(Integer auditorId) {
+		this.auditorId = auditorId;
+	}
+
+	public Date getAuditTime() {
+		return auditTime;
+	}
+
+	public void setAuditTime(Date auditTime) {
+		this.auditTime = auditTime;
+	}
+
+	
+}

src/main/java/com/nis/util/ConfigDictUtils.java

@@ -9,11 +9,11 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.SysDataDictionaryName;
-import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.domain.basics.ServiceDictInfo;
-import com.nis.domain.configuration.SysDictInfo;
+import com.nis.domain.basics.SysDictInfo;
 import com.nis.web.dao.SysDictDao;
-import com.nis.web.dao.configuration.ServiceDictInfoDao;
+import com.nis.web.dao.basics.ServiceDictInfoDao;
-import com.nis.web.dao.configuration.SysDictInfoDao;
+import com.nis.web.dao.basics.SysDictInfoDao;
 import com.nis.web.service.SpringContextHolder;
 
 

src/main/java/com/nis/web/controller/BaseController.java

@@ -26,6 +26,8 @@ import com.nis.web.service.OfficeService;
 import com.nis.web.service.RoleService;
 import com.nis.web.service.SystemService;
 import com.nis.web.service.UserService;
+import com.nis.web.service.basics.ServiceDictInfoService;
+import com.nis.web.service.basics.SysDictInfoService;
 import com.nis.web.service.configuration.AppCfgService;
 import com.nis.web.service.configuration.ComplexStringCfgService;
 import com.nis.web.service.configuration.FtpCfgService;
@@ -34,10 +36,8 @@ import com.nis.web.service.configuration.MailCfgService;
 import com.nis.web.service.configuration.MediaCfgService;
 import com.nis.web.service.configuration.NumCfgService;
 import com.nis.web.service.configuration.RequestInfoService;
-import com.nis.web.service.configuration.ServiceDictInfoService;
 import com.nis.web.service.configuration.SslCfgService;
 import com.nis.web.service.configuration.StringCfgService;
-import com.nis.web.service.configuration.SysDictInfoService;
 import com.nis.web.service.configuration.TunnelCfgService;
 import com.nis.web.service.configuration.WebCfgService;
 import com.nis.web.service.systemService.ServiceConfigInfoService;

src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java

@@ -1,4 +1,4 @@
-package com.nis.web.controller.configuration;
+package com.nis.web.controller.basics;
 
 import java.util.Arrays;
 import java.util.List;
@@ -19,14 +19,13 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.nis.domain.Page;
-import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.domain.basics.ServiceDictInfo;
-import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
 
 @Controller
-@RequestMapping(value = "${adminPath}/configuration/serviceDictInfo")
+@RequestMapping(value = "${adminPath}/basics/serviceDictInfo")
 public class ServiceDictInfoController extends BaseController {
 	
 
@@ -78,6 +77,7 @@ public class ServiceDictInfoController extends BaseController {
 			model.addAttribute("selectedType", serviceDictInfo.getItemType());
 		}else{
 			model.addAttribute("selectedType", selectedType);
+			serviceDictInfo.setItemType(selectedType);
 		}
 		
 		//查出顶层分页数据
@@ -87,32 +87,19 @@ public class ServiceDictInfoController extends BaseController {
 		List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictList();
 		//处理数据，保留顶层中的所有下层数据
 		List<ServiceDictInfo> list = Lists.newArrayList();
-		boolean flag = false;
 		for(int i=allList.size()-1;i>=0;i--){
-			ServiceDictInfo temp = allList.get(i);
+			ServiceDictInfo se = allList.get(i);
-			if(temp.getParent()!=null&&temp.getParent().getServiceDictId()!=null&&temp.getParent().getServiceDictId()==0){
+			if(se!=null&&se.getParent()!=null&&se.getParent().getServiceDictId()!=null&&se.getParent().getServiceDictId()==0){
-				for(ServiceDictInfo topTemp:page.getList()){
+				allList.remove(se);
-					if(temp.getServiceDictId()==topTemp.getServiceDictId()){
-						flag = true;
-						break;
 			}
 		}
-				if(!flag){
+		allList.addAll(page.getList());
-					allList.remove(temp);
-					flag=false;
-				}else{
-					flag=false;
-				}
-			}
-			
-		}
-		
 		ServiceDictInfo.sortList(list,allList,0,true);
 		
 		model.addAttribute("itType", itType);
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("list", list);
-		return "/cfg/serviceDictList";
+		return "/basics/serviceDictList";
 	}
 	
 	
@@ -134,9 +121,9 @@ public class ServiceDictInfoController extends BaseController {
 			Integer selectedType = null;
 			if(serviceDictInfo.getItemType()!=null){
 				selectedType = serviceDictInfo.getItemType();
-				return "redirect:"+ adminPath + "/configuration/serviceDictInfo/list?itType="+itType+"&selectedType="+selectedType;
+				return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType+"&selectedType="+selectedType;
 			}
-			return "redirect:"+ adminPath + "/configuration/serviceDictInfo/list?itType="+itType;
+			return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType;
 		}
 		String[] strArr = itType.split("-");
 		Integer[] intArr = new Integer[strArr.length];
@@ -149,7 +136,7 @@ public class ServiceDictInfoController extends BaseController {
         model.addAttribute("page", page);
         
        
-		return "/cfg/serviceDictInfoSearchList";
+		return "/basics/serviceDictInfoSearchList";
 	}
 	
 	
@@ -162,12 +149,12 @@ public class ServiceDictInfoController extends BaseController {
 	@RequestMapping(value={"form"})
 	public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) {
 		if(doAction!=null&&doAction.equals("0")){
-			return "/cfg/serviceDictInfo";
+			return "/basics/serviceDictInfo";
 		}
 		if (serviceDictInfo.getParent() == null || serviceDictInfo.getParent().getServiceDictId() == null||serviceDictInfo.getParent().getServiceDictId() == 0) {
 			ServiceDictInfo parent = new ServiceDictInfo();
 			parent.setServiceDictId(0);
-			parent.setItemValue("无上级");
+			parent.setItemValue("根节点");
 			serviceDictInfo.setParent(parent);
 		}
 		String[] strArr = itType.split("-");
@@ -178,7 +165,7 @@ public class ServiceDictInfoController extends BaseController {
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("serviceDictInfo", serviceDictInfo);
 		model.addAttribute("itType", itType);
-		return "/cfg/serviceDictForm";
+		return "/basics/serviceDictForm";
 	}
 	/**
 	 * 新增或修改
@@ -199,7 +186,7 @@ public class ServiceDictInfoController extends BaseController {
 			addMessage(redirectAttributes, "保存配置失败！");
 		}
 		
-		return "redirect:" + adminPath + "/configuration/serviceDictInfo/list?itType="+itType;
+		return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
 		
 		
 	}
@@ -220,7 +207,7 @@ public class ServiceDictInfoController extends BaseController {
 			e.printStackTrace();
 			addMessage(redirectAttributes, "删除配置失败！");
 		}
-		return "redirect:" + adminPath + "/configuration/serviceDictInfo/list?itType="+itType;
+		return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
 	}
 	
 	
@@ -237,9 +224,9 @@ public class ServiceDictInfoController extends BaseController {
 	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) {
 		List<Map<String, Object>> mapList = Lists.newArrayList();
 		Map<String, Object> map2 = Maps.newHashMap();
-		map2.put("id", -1);
+		map2.put("id", 0);
 		map2.put("pId", 0);
-		map2.put("name","无上级");
+		map2.put("name","根节点");
 		//map2.put("placeholder","0");
 		mapList.add(map2);
 		//找出该类型所有的非叶子配置

src/main/java/com/nis/web/controller/basics/SysDictInfoController.java

@@ -1,4 +1,4 @@
-package com.nis.web.controller.configuration;
+package com.nis.web.controller.basics;
 
 import java.util.Arrays;
 import java.util.List;
@@ -19,14 +19,13 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.nis.domain.Page;
-import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.domain.basics.SysDictInfo;
-import com.nis.domain.configuration.SysDictInfo;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
 
 @Controller
-@RequestMapping(value = "${adminPath}/configuration/sysDictInfo")
+@RequestMapping(value = "${adminPath}/basics/sysDictInfo")
 public class SysDictInfoController extends BaseController {
 	
 
@@ -78,6 +77,7 @@ public class SysDictInfoController extends BaseController {
 			model.addAttribute("selectedType", sysDictInfo.getItemType());
 		}else{
 			model.addAttribute("selectedType", selectedType);
+			sysDictInfo.setItemType(selectedType);
 		}
 		
 		//查出顶层分页数据
@@ -87,32 +87,19 @@ public class SysDictInfoController extends BaseController {
 		List<SysDictInfo> allList = sysDictInfoService.findAllDictList();
 		//处理数据，保留顶层中的所有下层数据
 		List<SysDictInfo> list = Lists.newArrayList();
-		boolean flag = false;
 		for(int i=allList.size()-1;i>=0;i--){
-			SysDictInfo temp = allList.get(i);
+			SysDictInfo se = allList.get(i);
-			if(temp.getParent()!=null&&temp.getParent().getSysDictId()!=null&&temp.getParent().getSysDictId()==0){
+			if(se!=null&&se.getParent()!=null&&se.getParent().getSysDictId()!=null&&se.getParent().getSysDictId()==0){
-				for(SysDictInfo topTemp:page.getList()){
+				allList.remove(se);
-					if(temp.getSysDictId()==topTemp.getSysDictId()){
-						flag = true;
-						break;
 			 }	
 		}
-				if(!flag){
+		allList.addAll(page.getList());
-					allList.remove(temp);
-					flag=false;
-				}else{
-					flag=false;
-				}
-			}
-					
-		}
-		
 		SysDictInfo.sortList(list,allList,0,true);
 		
 		model.addAttribute("itType", itType);
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("list", list);
-		return "/cfg/sysDictList";
+		return "/basics/sysDictList";
 	}
 	
 	/**
@@ -133,9 +120,9 @@ public class SysDictInfoController extends BaseController {
 			Integer selectedType = null;
 			if(sysDictInfo.getItemType()!=null){
 				selectedType = sysDictInfo.getItemType();
-				return "redirect:"+ adminPath + "/configuration/sysDictInfo/list?itType="+itType+"&selectedType="+selectedType;
+				return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&selectedType="+selectedType;
 			}
-			return "redirect:"+ adminPath + "/configuration/sysDictInfo/list?itType="+itType;
+			return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType;
 		}
 		String[] strArr = itType.split("-");
 		Integer[] intArr = new Integer[strArr.length];
@@ -148,7 +135,7 @@ public class SysDictInfoController extends BaseController {
         model.addAttribute("page", page);
         
        
-		return "/cfg/sysDictInfoSearchList";
+		return "/basics/sysDictInfoSearchList";
 	}
 	
 	
@@ -169,12 +156,12 @@ public class SysDictInfoController extends BaseController {
 	@RequestMapping(value={"form"})
 	public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType) {
 		if(doAction!=null&&doAction.equals("0")){
-			return "/cfg/sysDictInfo";
+			return "/basics/sysDictInfo";
 		}
 		if (sysDictInfo.getParent() == null || sysDictInfo.getParent().getSysDictId() == null||sysDictInfo.getParent().getSysDictId() == 0) {
 			SysDictInfo parent = new SysDictInfo();
 			parent.setSysDictId(0);
-			parent.setItemValue("无上级");
+			parent.setItemValue("根节点");
 			sysDictInfo.setParent(parent);
 		}
 		String[] strArr = itType.split("-");
@@ -185,7 +172,7 @@ public class SysDictInfoController extends BaseController {
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("sysDictInfo", sysDictInfo);
 		model.addAttribute("itType", itType);
-		return "/cfg/sysDictForm";
+		return "/basics/sysDictForm";
 	}
 	/**
 	 * 新增或修改
@@ -206,7 +193,7 @@ public class SysDictInfoController extends BaseController {
 			addMessage(redirectAttributes, "保存配置失败！");
 		}
 		
-		return "redirect:" + adminPath + "/configuration/sysDictInfo/list?itType="+itType;
+		return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
 	}
 	
 	/**
@@ -224,7 +211,7 @@ public class SysDictInfoController extends BaseController {
 			e.printStackTrace();
 			addMessage(redirectAttributes, "删除配置失败！");
 		}
-		return "redirect:" + adminPath + "/configuration/sysDictInfo/list?itType="+itType;
+		return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
 	}
 	
 	
@@ -241,9 +228,9 @@ public class SysDictInfoController extends BaseController {
 	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) {
 		List<Map<String, Object>> mapList = Lists.newArrayList();
 		Map<String, Object> map2 = Maps.newHashMap();
-		map2.put("id", -1);
+		map2.put("id", 0);
 		map2.put("pId", 0);
-		map2.put("name","无上级");
+		map2.put("name","根节点");
 		//map2.put("placeholder","0");
 		mapList.add(map2);
 		//找出该类型所有的非叶子配置

src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java

@@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 

src/main/java/com/nis/web/controller/configuration/IpCfgController.java

@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.nis.domain.Page;
 import com.nis.domain.ServiceConfigInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.domain.configuration.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 

src/main/java/com/nis/web/controller/configuration/NumCfgController.java

@@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.NumBoundaryCfg;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 

src/main/java/com/nis/web/controller/configuration/RequestInfoController.java

@@ -1,5 +1,7 @@
 package com.nis.web.controller.configuration;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -12,15 +14,10 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.util.Constants;
+import com.nis.domain.configuration.TaskInfo;
-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{
@@ -43,11 +40,15 @@ public class RequestInfoController extends BaseController{
 	 */
 	@RequestMapping(value={"form"})
 	public String form(RequestInfo requestInfo, Model model) {
+		TaskInfo taskInfo = new TaskInfo();
+		taskInfo.setId(requestInfo.getTaskId());
+		showTask(taskInfo,model);
 		if(requestInfo.getId()!=null){
 			requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId());
 			model.addAttribute("requestInfo", requestInfo);
-		}
+		}else{
 			model.addAttribute("requestInfo", requestInfo);
+		}
 		return "/cfg/requestForm";
 	}
 
@@ -133,4 +134,13 @@ public class RequestInfoController extends BaseController{
 		
 	}
 
+	/**
+	 * 查询专项任务
+	 * @param taskInfo
+	 * @param model
+	 */
+	public void showTask(TaskInfo taskInfo ,Model model){
+		List<TaskInfo> taskInfos = requestInfoService.showTask(taskInfo);
+		model.addAttribute("taskInfos", taskInfos);
+	}
 }

src/main/java/com/nis/web/controller/configuration/StringCfgController.java

@@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 

src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java

@@ -1,11 +1,11 @@
-package com.nis.web.dao.configuration;
+package com.nis.web.dao.basics;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
 import com.nis.domain.SysMenu;
-import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
@@ -70,6 +70,11 @@ public interface ServiceDictInfoDao extends CrudDao<ServiceDictInfo> {
 	 * @return
 	 */
 	List<ServiceDictInfo> findByItemCode(Integer itemCode);
+	/**
+	 * 查询itemCode最大值
+	 * @return
+	 */
+	Integer findMaxItemCode();
 
 	
 	
@@ -89,4 +94,5 @@ public interface ServiceDictInfoDao extends CrudDao<ServiceDictInfo> {
 
 
 	
+	
 }

src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml

@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.nis.web.dao.basics.ServiceDictInfoDao" >
+  
+  <resultMap id="dictResultMap" type="com.nis.domain.basics.ServiceDictInfo" >
+    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
+    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+     <!-- 父id -->
+	    <association property="parent" javaType="com.nis.domain.basics.ServiceDictInfo">
+	     <id column="parent_id" property="serviceDictId" jdbcType="INTEGER" />
+	    </association>
+	 <!-- 创建人员 -->
+        <association property="serviceDictCreator" javaType="com.nis.domain.SysUser">
+	     <id property="id" column="creator_id"/>
+		<result property="loginId" column="login_id"/>
+		<result property="name" column="name"/>
+	    </association>
+	 <!-- 修改人员 -->
+        <association property="serviceDictEditor" javaType="com.nis.domain.SysUser">
+	     <id property="id" column="editor_id"/>
+		<result property="loginId" column="login_id"/>
+		<result property="name" column="name"/>
+	    </association>
+  </resultMap>
+  
+    <sql id="serviceDictInfoColumns">
+		s.service_dict_id AS serviceDictId,
+		s.item_type AS itemType,
+		s.item_code AS itemCode,
+		s.item_value AS itemValue,
+		s.item_desc AS itemDesc,
+		s.parent_id AS "parent.serviceDictId",
+		s.is_leaf AS isLeaf,
+		s.is_valid AS isValid,
+		s.creator_id AS "serviceDictCreator.id",
+		s.create_time AS createTime,
+		s.editor_id AS "serviceDictEditor.id",
+		s.edit_time AS editTime
+	</sql>
+  
+  
+  
+  <!-- 查询顶层分页列表 (==)-->
+    <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1 AND parent_id = 0
+	
+	<if test="itemValue != null and itemValue != '' " >
+      AND item_value like '%${itemValue}%'
+    </if>
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+    <if test="itemType != null and itemType != '' " >
+      AND item_type = #{itemType}
+    </if>
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+  
+   <!-- 查询顶层分页列表 (!=)-->
+<select id="findTopDictListN" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1 AND parent_id = 0
+	
+	<if test="itemValue != null and itemValue != '' " >
+      AND item_value like '%${itemValue}%'
+    </if>
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+    <if test="itemType != null and itemType != '' " >
+      AND item_type != #{itemType}
+    </if>
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+   
+  
+  
+  
+  
+  <!-- 查出所有 -->
+      <select id="findAllDictList" resultType="serviceDictInfo">
+		SELECT
+			<include refid="serviceDictInfoColumns"/>
+		FROM service_dict_info s
+		<include refid="menuJoins"/>
+		WHERE s.is_valid =1 
+	</select>
+
+	<!-- 查询所有非叶子配置 -->
+	<select id="findAllNoLeafDictList" resultType="com.nis.domain.basics.ServiceDictInfo" parameterType="java.lang.Integer">
+	SELECT 
+	<include refid="serviceDictInfoColumns"/>
+	FROM service_dict_info s
+	WHERE s.is_valid = 1 AND s.is_leaf = 0 AND item_type = #{itemType}
+	</select>
+
+  
+    <!-- 条件查询分页(==) -->
+        <select id="findDictSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1  
+	
+	<if test="itemType != null and itemType != '' " >
+      AND item_type like '%${itemType}%'
+    </if>
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+    <if test="itemValue!= null and itemValue != '' " >
+      AND item_value like '%${itemValue}%'
+    </if>
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+       
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+  
+      <!-- 条件查询分页(!=) -->
+        <select id="findDictSearchListN" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1  
+	
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+    <if test="itemValue!= null and itemValue != '' " >
+      AND item_value like '%${itemValue}%'
+    </if>
+    <if test="itemType != null and itemType != '' " >
+      AND item_type != ${itemType}
+    </if>
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+       
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+
+  
+  <!-- 根据主键查询字典详细信息 -->
+  
+  <select id="getDictById" resultType="com.nis.domain.basics.ServiceDictInfo">
+  select 
+  <include refid="serviceDictInfoColumns"/>
+  from service_dict_info s where s.service_dict_id = #{serviceDictId}
+  </select>
+  
+    <!-- 根据上级id选出所有下级 -->
+  
+  <select id="getDictByParentId" resultMap="dictResultMap">
+  select *
+  from service_dict_info s where parent_id = #{parentId}
+  </select>
+  
+  
+    <!-- 根据itemCode查询字典对象列表 -->
+  
+  <select id="findByItemCode" resultType="com.nis.domain.basics.ServiceDictInfo">
+  select 
+  <include refid="serviceDictInfoColumns"/>
+  from service_dict_info s where s.item_code = #{itemCode}
+  </select>
+  
+  <!-- 查出最大的itemCode值 -->
+  <select id="findMaxItemCode" resultType="java.lang.Integer">
+  select max(s.item_code) from service_dict_info s 
+  </select>
+  
+  <!-- 新增字典信息 -->
+  
+   <insert id="insertDict" parameterType="com.nis.domain.basics.ServiceDictInfo" useGeneratedKeys="true" keyProperty="id" >
+    insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time)
+    values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, 
+             #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, 
+             #{parent.serviceDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER}, 
+             #{serviceDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+             #{serviceDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP})
+  </insert>
+  
+
+  
+  <!-- 修改 -->
+  	<update id="update">
+		UPDATE service_dict_info s SET 
+	    s.service_dict_id = #{serviceDictId},
+		s.item_type = #{itemType},
+		s.item_code = #{itemCode},
+		s.item_value = #{itemValue},
+		s.item_desc = #{itemDesc},
+		s.parent_id = #{parent.serviceDictId},
+		s.is_leaf = #{isLeaf},
+		s.creator_id = #{serviceDictCreator.id},
+		s.editor_id = #{serviceDictEditor.id},
+		s.edit_time = #{editTime}
+		WHERE s.service_dict_id = #{serviceDictId}
+	</update>
+  
+  <!-- 删除 -->
+  
+  <update id="delete">
+  UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId}
+  </update>
+  
+  <select id="findItemDict" resultMap="dictResultMap">
+   select 
+   <include refid="serviceDictInfoColumns" />
+   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid};
+   </select>
+  <select id="findAllItemDict" resultMap="dictResultMap">
+   select 
+   <include refid="serviceDictInfoColumns" />
+   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType};
+   </select>
+   
+   	<sql id="menuJoins">
+		LEFT JOIN service_dict_info p ON p.service_dict_id = s.parent_id
+    </sql>
+
+   
+   
+   
+   
+   
+ 
+</mapper>

src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java

@@ -1,8 +1,8 @@
-package com.nis.web.dao.configuration;
+package com.nis.web.dao.basics;
 
 import java.util.List;
 
-import com.nis.domain.configuration.SysDictInfo;
+import com.nis.domain.basics.SysDictInfo;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
@@ -69,6 +69,12 @@ public interface SysDictInfoDao extends CrudDao<SysDictInfo> {
 	 */
 	List<SysDictInfo> getDictByParentId(Integer parentId);
 
+	/**
+	 * 查询最大itemCode值
+	 * @return
+	 */
+	Integer findMaxItemCode();
+
 
 
 

src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.nis.web.dao.configuration.SysDictInfoDao" >
+<mapper namespace="com.nis.web.dao.basics.SysDictInfoDao" >
   
-  <resultMap id="dictResultMap" type="com.nis.domain.configuration.SysDictInfo" >
+  <resultMap id="dictResultMap" type="com.nis.domain.basics.SysDictInfo" >
     <id column="sys_dict_id" property="sysDictId" jdbcType="INTEGER" />
     <result column="item_type" property="itemType" jdbcType="INTEGER" />
     <result column="item_code" property="itemCode" jdbcType="INTEGER" />
@@ -13,23 +13,18 @@
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
      <!-- 父id -->
-	    <association property="parent" javaType="com.nis.domain.configuration.SysDictInfo">
+	    <association property="parent" javaType="com.nis.domain.basics.SysDictInfo">
-	     <id column="sys_dict_id" property="sysDictId" jdbcType="INTEGER" />
+	     <id column="parent_id" property="sysDictId" jdbcType="INTEGER" />
-	    <result column="item_type" property="itemType" jdbcType="INTEGER" />
-	    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
-	    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
-	    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
-	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
 	    </association>
 	 <!-- 创建人员 -->
         <association property="sysDictCreator" javaType="com.nis.domain.SysUser">
-	     <id property="id" column="id"/>
+	     <id property="id" column="creator_id"/>
 		<result property="loginId" column="login_id"/>
 		<result property="name" column="name"/>
 	    </association>
 	 <!-- 修改人员 -->
         <association property="sysDictEditor" javaType="com.nis.domain.SysUser">
-	     <id property="id" column="id"/>
+	     <id property="id" column="editor_id"/>
 		<result property="loginId" column="login_id"/>
 		<result property="name" column="name"/>
 	    </association>
@@ -54,7 +49,7 @@
     </sql>
   
    <!-- 查询顶层分页列表 (==)-->
-    <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.SysDictInfo">
+    <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.SysDictInfo">
 	SELECT * FROM sys_dict_info WHERE  is_valid=1 AND parent_id = 0
 	
 	<if test="itemValue != null and itemValue != '' " >
@@ -94,7 +89,7 @@
 	</select>
 	
 	  <!-- 条件查询分页(==) -->
-        <select id="findDictSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.SysDictInfo">
+        <select id="findDictSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.SysDictInfo">
 	SELECT * FROM sys_dict_info WHERE  is_valid=1  
 	
 	<if test="itemType != null and itemType != '' " >
@@ -127,7 +122,7 @@
   
   <!-- 根据主键查询字典详细信息 -->
   
-  <select id="getDictById" resultType="com.nis.domain.configuration.SysDictInfo">
+  <select id="getDictById" resultType="com.nis.domain.basics.SysDictInfo">
   select 
   <include refid="sysDictInfoColumns"/>
   from sys_dict_info s where s.sys_dict_id = #{sysDictId}
@@ -135,7 +130,7 @@
   
   <!-- 新增字典信息 -->
   
-  <insert id="insertDict" parameterType="com.nis.domain.configuration.SysDictInfo" useGeneratedKeys="true" keyProperty="id" >
+  <insert id="insertDict" parameterType="com.nis.domain.basics.SysDictInfo" useGeneratedKeys="true" keyProperty="id" >
     insert into sys_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time)
     values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, 
              #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, 
@@ -147,7 +142,7 @@
   
 
    <!-- 查询所有非叶子配置 -->
-	<select id="findAllNoLeafDictList" resultType="com.nis.domain.configuration.SysDictInfo" parameterType="java.lang.Integer">
+	<select id="findAllNoLeafDictList" resultType="com.nis.domain.basics.SysDictInfo" parameterType="java.lang.Integer">
 	SELECT 
 	<include refid="sysDictInfoColumns"/>
 	FROM sys_dict_info s
@@ -179,7 +174,7 @@
   
       <!-- 根据itemCode查询字典对象列表 -->
   
-  <select id="findByItemCode" resultType="com.nis.domain.configuration.SysDictInfo">
+  <select id="findByItemCode" resultType="com.nis.domain.basics.SysDictInfo">
   select 
   <include refid="sysDictInfoColumns"/>
   from sys_dict_info s where s.item_code = #{itemCode}
@@ -192,5 +187,9 @@
   from sys_dict_info s where parent_id = #{parentId}
   </select>
   
+      <!-- 查询最大itemCode值 -->
+  <select id="findMaxItemCode" resultType="java.lang.Integer">
+  select max(s.item_code) from sys_dict_info s
+  </select>
  
 </mapper>

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Param;
 
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.configuration.TaskInfo;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
@@ -20,14 +21,8 @@ public interface RequestInfoDao  extends CrudDao {
 	
     int deleteByPrimaryKey(Long id);
 
+	List<TaskInfo> showTask(TaskInfo taskInfo);
 
-    int insertSelective(RequestInfo requestInfo);
-
-    RequestInfo selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(RequestInfo requestInfo);
-
-    int updateByPrimaryKey(RequestInfo requestInfo);
 
 
 }

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -16,6 +16,7 @@
     <result column="edit_time" jdbcType="DATE" property="editTime" />
     <result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
     <result column="audit_time" jdbcType="DATE" property="auditTime" />
+    <result column="task_id" jdbcType="BIGINT" property="taskId" />
   </resultMap>
   <sql id="Base_Column_List">
     id, request_number, request_org, request_time, request_title, request_content, is_valid, 
@@ -25,6 +26,7 @@
   <select id="findRequestInfo" resultMap="BaseResultMap">
 	select
 		r.id AS id,
+		r.task_id AS taskId,
 		r.request_number AS requestNumber,
 		r.request_org AS requestOrg,
 		r.request_time AS requestTime,
@@ -37,11 +39,13 @@
 		u.name AS editorName,
 		r.edit_time AS editTime,
 		e.name AS currentName,
-		r.audit_time AS auditTime
+		r.audit_time AS auditTime,
+		t.task_name AS taskName
 	from request_info r
 	left join sys_user s on r.creator_id=s.id
 	left join sys_user u on r.editor_id=u.id
 	left join sys_user e on r.auditor_id=e.id
+	left join task_info t on r.task_id=t.id
 	where r.is_valid=1 and r.is_audit !=3
 	<if test="requestTitle != null and requestTitle != ''">
 			AND r.request_title like 
@@ -159,159 +163,4 @@
     where id = #{id,jdbcType=BIGINT} and is_audit !=1
   </update>
   
-  
-  
-  <insert id="insertSelective" parameterType="com.nis.domain.configuration.RequestInfo">
-    insert into request_info
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="requestNumber != null">
-        request_number,
-      </if>
-      <if test="requestOrg != null">
-        request_org,
-      </if>
-      <if test="requestTime != null">
-        request_time,
-      </if>
-      <if test="requestTitle != null">
-        request_title,
-      </if>
-      <if test="requestContent != null">
-        request_content,
-      </if>
-      <if test="isValid != null">
-        is_valid,
-      </if>
-      <if test="isAudit != null">
-        is_audit,
-      </if>
-      <if test="creatorId != null">
-        creator_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="editorId != null">
-        editor_id,
-      </if>
-      <if test="editTime != null">
-        edit_time,
-      </if>
-      <if test="auditorId != null">
-        auditor_id,
-      </if>
-      <if test="auditTime != null">
-        audit_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="requestNumber != null">
-        #{requestNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="requestOrg != null">
-        #{requestOrg,jdbcType=VARCHAR},
-      </if>
-      <if test="requestTime != null">
-        #{requestTime,jdbcType=DATE},
-      </if>
-      <if test="requestTitle != null">
-        #{requestTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="requestContent != null">
-        #{requestContent,jdbcType=VARCHAR},
-      </if>
-      <if test="isValid != null">
-        #{isValid,jdbcType=INTEGER},
-      </if>
-      <if test="isAudit != null">
-        #{isAudit,jdbcType=INTEGER},
-      </if>
-      <if test="creatorId != null">
-        #{creatorId,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=DATE},
-      </if>
-      <if test="editorId != null">
-        #{editorId,jdbcType=INTEGER},
-      </if>
-      <if test="editTime != null">
-        #{editTime,jdbcType=DATE},
-      </if>
-      <if test="auditorId != null">
-        #{auditorId,jdbcType=INTEGER},
-      </if>
-      <if test="auditTime != null">
-        #{auditTime,jdbcType=DATE},
-      </if>
-    </trim>
-  </insert>
- 
-  <update id="updateByPrimaryKey" parameterType="com.nis.domain.configuration.RequestInfo">
-    update request_info
-    set request_number = #{requestNumber,jdbcType=VARCHAR},
-      request_org = #{requestOrg,jdbcType=VARCHAR},
-      request_time = #{requestTime,jdbcType=DATE},
-      request_title = #{requestTitle,jdbcType=VARCHAR},
-      request_content = #{requestContent,jdbcType=VARCHAR},
-      is_valid = #{isValid,jdbcType=INTEGER},
-      is_audit = #{isAudit,jdbcType=INTEGER},
-      creator_id = #{creatorId,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=DATE},
-      editor_id = #{editorId,jdbcType=INTEGER},
-      edit_time = #{editTime,jdbcType=DATE},
-      auditor_id = #{auditorId,jdbcType=INTEGER},
-      audit_time = #{auditTime,jdbcType=DATE}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="findAllList" resultMap="BaseResultMap">
-	select
-		r.id AS id,
-		r.request_number AS requestNumber,
-		r.request_org AS requestOrg,
-		r.request_time AS requestTime,
-		r.request_title AS requestTitle,
-		r.request_content AS requestContent,
-		r.is_valid AS isValid,
-		r.is_audit AS isAudit,
-		s.name AS creatorName,
-		r.create_time AS createTime,
-		u.name AS editorName,
-		r.edit_time AS editTime,
-		e.name AS currentName,
-		r.audit_time AS auditTime
-	from request_info r
-	left join sys_user s on r.creator_id=s.id
-	left join sys_user u on r.editor_id=u.id
-	left join sys_user e on r.auditor_id=e.id
-	<trim prefix="where" prefixOverrides="AND|OR">
-		<if test="requestTitle != null and requestTitle != ''">
-				AND r.request_title like 
-					<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
-		</if>
-		<if test="requestContent != null and requestContent != ''">
-				AND r.request_content like 
-					<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
-		</if>
-		<if test="requestNumber != null and requestNumber != ''">
-				AND r.request_number=#{requestNumber}
-		</if>
-		<if test="isAudit != null">
-				AND r.is_audit=${isAudit}
-		</if>
-		<if test=" timeType = 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-				AND r.request_time between #{beginDate} and #{endDate}
-	 	</if>
-		<if test="timeType = 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-				AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
-		</if> 
-	</trim>
-	order by r.request_time desc
-  </select>
 </mapper>

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java

@@ -0,0 +1,8 @@
+package com.nis.web.dao.configuration;
+
+import com.nis.domain.configuration.TaskInfo;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+@MyBatisDao
+public interface TaskInfoDao extends CrudDao<TaskInfo>{
+}

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml

@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.nis.web.dao.configuration.TaskInfoDao">
+  <resultMap id="BaseResultMap" type="com.nis.domain.configuration.TaskInfo">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="task_name" jdbcType="VARCHAR" property="taskName" />
+    <result column="task_org" jdbcType="VARCHAR" property="taskOrg" />
+    <result column="task_time" jdbcType="DATE" property="taskTime" />
+    <result column="task_desc" jdbcType="VARCHAR" property="taskDesc" />
+    <result column="is_valid" jdbcType="INTEGER" property="isValid" />
+    <result column="is_audit" jdbcType="INTEGER" property="isAudit" />
+    <result column="creator_id" jdbcType="INTEGER" property="creatorId" />
+    <result column="create_time" jdbcType="DATE" property="createTime" />
+    <result column="editor_id" jdbcType="INTEGER" property="editorId" />
+    <result column="edit_time" jdbcType="DATE" property="editTime" />
+    <result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
+    <result column="audit_time" jdbcType="DATE" property="auditTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, task_name, task_org, task_time, task_desc, is_valid, is_audit, creator_id, create_time, 
+    editor_id, edit_time, auditor_id, audit_time
+  </sql>
+  
+  <select id="findList" parameterType="com.nis.domain.configuration.TaskInfo" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from task_info
+    <if test="id!=null">
+   	where id = #{id,jdbcType=BIGINT}
+    </if>
+  </select>
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from task_info
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.nis.domain.configuration.TaskInfo">
+    insert into task_info (id, task_name, task_org, 
+      task_time, task_desc, is_valid, 
+      is_audit, creator_id, create_time, 
+      editor_id, edit_time, auditor_id, 
+      audit_time)
+    values (#{id,jdbcType=BIGINT}, #{taskName,jdbcType=VARCHAR}, #{taskOrg,jdbcType=VARCHAR}, 
+      #{taskTime,jdbcType=DATE}, #{taskDesc,jdbcType=VARCHAR}, #{isValid,jdbcType=INTEGER}, 
+      #{isAudit,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=DATE}, 
+      #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE}, #{auditorId,jdbcType=INTEGER}, 
+      #{auditTime,jdbcType=DATE})
+  </insert>
+  <insert id="insertSelective" parameterType="com.nis.domain.configuration.TaskInfo">
+    insert into task_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="taskName != null">
+        task_name,
+      </if>
+      <if test="taskOrg != null">
+        task_org,
+      </if>
+      <if test="taskTime != null">
+        task_time,
+      </if>
+      <if test="taskDesc != null">
+        task_desc,
+      </if>
+      <if test="isValid != null">
+        is_valid,
+      </if>
+      <if test="isAudit != null">
+        is_audit,
+      </if>
+      <if test="creatorId != null">
+        creator_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="editorId != null">
+        editor_id,
+      </if>
+      <if test="editTime != null">
+        edit_time,
+      </if>
+      <if test="auditorId != null">
+        auditor_id,
+      </if>
+      <if test="auditTime != null">
+        audit_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="taskName != null">
+        #{taskName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskOrg != null">
+        #{taskOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="taskTime != null">
+        #{taskTime,jdbcType=DATE},
+      </if>
+      <if test="taskDesc != null">
+        #{taskDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="isValid != null">
+        #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null">
+        #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=DATE},
+      </if>
+      <if test="editorId != null">
+        #{editorId,jdbcType=INTEGER},
+      </if>
+      <if test="editTime != null">
+        #{editTime,jdbcType=DATE},
+      </if>
+      <if test="auditorId != null">
+        #{auditorId,jdbcType=INTEGER},
+      </if>
+      <if test="auditTime != null">
+        #{auditTime,jdbcType=DATE},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.nis.domain.configuration.TaskInfo">
+    update task_info
+    <set>
+      <if test="taskName != null">
+        task_name = #{taskName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskOrg != null">
+        task_org = #{taskOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="taskTime != null">
+        task_time = #{taskTime,jdbcType=DATE},
+      </if>
+      <if test="taskDesc != null">
+        task_desc = #{taskDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="isValid != null">
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null">
+        is_audit = #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        creator_id = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=DATE},
+      </if>
+      <if test="editorId != null">
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+      <if test="editTime != null">
+        edit_time = #{editTime,jdbcType=DATE},
+      </if>
+      <if test="auditorId != null">
+        auditor_id = #{auditorId,jdbcType=INTEGER},
+      </if>
+      <if test="auditTime != null">
+        audit_time = #{auditTime,jdbcType=DATE},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.nis.domain.configuration.TaskInfo">
+    update task_info
+    set task_name = #{taskName,jdbcType=VARCHAR},
+      task_org = #{taskOrg,jdbcType=VARCHAR},
+      task_time = #{taskTime,jdbcType=DATE},
+      task_desc = #{taskDesc,jdbcType=VARCHAR},
+      is_valid = #{isValid,jdbcType=INTEGER},
+      is_audit = #{isAudit,jdbcType=INTEGER},
+      creator_id = #{creatorId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=DATE},
+      editor_id = #{editorId,jdbcType=INTEGER},
+      edit_time = #{editTime,jdbcType=DATE},
+      auditor_id = #{auditorId,jdbcType=INTEGER},
+      audit_time = #{auditTime,jdbcType=DATE}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java

@@ -1,4 +1,4 @@
-package com.nis.web.service.configuration;
+package com.nis.web.service.basics;
 
 import java.util.Date;
 import java.util.List;
@@ -10,10 +10,10 @@ import com.google.common.collect.Lists;
 import com.nis.domain.Page;
 import com.nis.domain.SysMenu;
 import com.nis.domain.SysUser;
-import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.util.StringUtil;
-import com.nis.web.dao.configuration.ServiceDictInfoDao;
+import com.nis.web.dao.basics.ServiceDictInfoDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -172,6 +172,8 @@ public class ServiceDictInfoService extends BaseService{
 				  }
 		SysUser user = UserUtils.getUser();
       if(StringUtil.isEmpty(serviceDictInfo.getServiceDictId())) {//新增
+    	 Integer maxCode = serviceDictInfoDao.findMaxItemCode();
+    	  serviceDictInfo.setItemCode(maxCode==null?1:(maxCode+1));
     	  serviceDictInfo.setIsValid(1);
     	  serviceDictInfo.setServiceDictCreator(user);
     	  serviceDictInfo.setCreateTime(new Date());

src/main/java/com/nis/web/service/basics/SysDictInfoService.java

@@ -1,4 +1,4 @@
-package com.nis.web.service.configuration;
+package com.nis.web.service.basics;
 
 import java.util.Date;
 import java.util.List;
@@ -9,11 +9,9 @@ import org.springframework.stereotype.Service;
 import com.google.common.collect.Lists;
 import com.nis.domain.Page;
 import com.nis.domain.SysUser;
-import com.nis.domain.configuration.ServiceDictInfo;
+import com.nis.domain.basics.SysDictInfo;
-import com.nis.domain.configuration.SysDictInfo;
-import com.nis.domain.configuration.SysDictInfo;
 import com.nis.util.StringUtil;
-import com.nis.web.dao.configuration.SysDictInfoDao;
+import com.nis.web.dao.basics.SysDictInfoDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -105,6 +103,10 @@ public class SysDictInfoService extends BaseService{
 				  }
 		SysUser user = UserUtils.getUser();
       if(StringUtil.isEmpty(sysDictInfo.getSysDictId())) {//新增
+    	  if(sysDictInfo.getItemCode()==null){
+    	     Integer maxCode =  sysDictInfoDao.findMaxItemCode();
+    	     sysDictInfo.setItemCode(maxCode==null?1:(maxCode+1));
+    	  }
     	  sysDictInfo.setIsValid(1);
     	  sysDictInfo.setSysDictCreator(user);
     	  sysDictInfo.setCreateTime(new Date());

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -11,9 +11,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 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.StringUtil;
 import com.nis.web.dao.configuration.RequestInfoDao;
+import com.nis.web.dao.configuration.TaskInfoDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -23,6 +25,8 @@ public class RequestInfoService extends BaseService{
 
 	@Autowired
 	private RequestInfoDao requestInfoDao;
+	@Autowired
+	private TaskInfoDao taskInfoDao;
 	
 	public Page<RequestInfo> findRequestInfo(Page<RequestInfo> page, RequestInfo requestInfo) {
 		// 设置分页参数
@@ -81,4 +85,8 @@ public class RequestInfoService extends BaseService{
 		RequestInfo requestInfo=new RequestInfo();
 		return requestInfoDao.findAllList(requestInfo);
 	}
+
+	public List<TaskInfo> showTask(TaskInfo taskInfo) {
+		return taskInfoDao.findList(taskInfo);
+	}
 }

src/main/resources/generatorConfig.xml

@@ -5,35 +5,35 @@
    "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
   
  <generatorConfiguration>
-   <classPathEntry location="C:\Users\chenghui\.m2\repository\mysql\mysql-connector-java\5.1.36\mysql-connector-java-5.1.36.jar" />
+   <classPathEntry location="C:\Users\Administrator\.m2\repository\mysql\mysql-connector-java\5.1.36\mysql-connector-java-5.1.36.jar" />
  <context id="mysqlTables" targetRuntime="MyBatis3">
    <commentGenerator>
      <property name="suppressAllComments" value="true"/>
    </commentGenerator>
    <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-         connectionURL="jdbc:mysql://192.168.10.2:3306/bjbusxf?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull"
+         connectionURL="jdbc:mysql://10.0.6.100:3306/gwall?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull"
-         userId="root" password="ictsoft">
+         userId="dfh" password="111111">
     </jdbcConnection>
    <javaTypeResolver>
       <property name="forceBigDecimals" value="false"/>
    </javaTypeResolver>
    
-   <javaModelGenerator targetPackage="com.nis.domain" targetProject="bjbusxf/src/main/java">
+   <javaModelGenerator targetPackage="com.nis.domain.configuration" targetProject="gwall/src/main/java">
        <property name="enableSubPackages" value="true"/>
        <property name="trimStrings" value="true"/>
    </javaModelGenerator>
     
-   <sqlMapGenerator targetPackage="com.nis.web.dao" targetProject="bjbusxf/src/main/java">
+   <sqlMapGenerator targetPackage="com.nis.web.dao.configuration" targetProject="gwall/src/main/java">
         <property name="enableSubPackages" value="true"/>
    </sqlMapGenerator>
     
-  <javaClientGenerator type="XMLMAPPER" targetPackage="com.nis.web.dao" targetProject="bjbusxf/src/main/java">
+  <javaClientGenerator type="XMLMAPPER" targetPackage="com.nis.web.dao.configuration" targetProject="gwall/src/main/java">
      <property name="enableSubPackages" value="true"/>
    </javaClientGenerator>
   
    
-    <table  tableName="reg_attach_info" 
+    <table  tableName="task_info" 
-   		domainObjectName="regAttachInfo" 
+   		domainObjectName="TaskInfo" 
    		enableCountByExample="false" 
    		enableSelectByExample="false" 
    		enableUpdateByExample="false" 

src/main/resources/messages/message_en.properties

@@ -87,7 +87,9 @@ trmp_ip_monitor=trmp ip monitor
 examine_manage=examine manage
 audit_manage=audit manage
 log_search=log search
-
+sysService_manage=system service manage
+service_manage=service type manage
+system_service_manage=system service type manage
 #============menu end======================
 
 #============yewu begin======================
@@ -108,14 +110,14 @@ edit_time=edittime
 
 #============laihan begin======================
 refresh=refresh
-add_request=add request
+add=add
 request_number=request number
 state=state
 created=created
+examine=examine
 unapproved=unapproved
 approved=approved
 title=title
-task=task
 request_time=request time
 operate_time=operate time
 search=search
@@ -123,16 +125,52 @@ request_organization=request organization
 operator=operator
 content=content
 remarks=remarks
-update_request=update request
 operation=operation
 submit=submit
 cancel=cancel
 begin_date=begin date
 end_date=end date
 delete=delete
+special_task=special task
 #============laihan end======================
 
 
 #==========message begin=====================
 required=This field is required\uff01
+select=Please select
+date_list=Date List
+confirm_message=Are you sure?
+fill_loginName=Please fill in the loginName
+fill_loginPassWord=Please fill in the passWord
 #==========message end=====================
+
+#==========yewuliexingguanli begin=====================
+act=action
+block=block
+monitor=monitor
+block_white_list=block white list
+monitor_white_list=monitor white list
+block_monitor_white_list=block monitor white list
+grey_list=grey list
+type=type
+single_domain=single domain
+multi_domain=multi domain
+special_service=special service
+service_name=service name
+service_id=service ID
+repeat=repeat
+enter_error=enter a error
+single_service_message=single domain services can only associate one table
+special_service_message=special services can only associate one table
+table_name=table name
+table_type=table type
+string=string
+number=number
+strong_string=strong string
+table_des=table_describe
+detail=detail
+datebase_table=datebase table
+fill_all=fill in all
+describe=describe
+back=back
+#==========yewuliexingguanli end=====================

src/main/resources/messages/message_ru.properties

@@ -87,7 +87,9 @@ trmp_ip_monitor=trmp ip monitor
 examine_manage=examine manage
 audit_manage=audit manage
 log_search=log search
-
+sysService_manage=system service manage
+service_manage=service type manage
+system_service_manage=system service type manage
 #============menu end======================
 
 #============yewu begin======================
@@ -108,14 +110,14 @@ edit_time=edittime
 
 #============laihan begin======================
 refresh=refresh
-add_request=add request
+add=add
 request_number=request number
 state=state
 created=created
+examine=examine
 unapproved=unapproved
 approved=approved
 title=title
-task=task
 request_time=request time
 operate_time=operate time
 search=search
@@ -123,15 +125,52 @@ request_organization=request organization
 operator=operator
 content=content
 remarks=remarks
-update_request=update request
 operation=operation
 submit=submit
 cancel=cancel
 begin_date=begin date
 end_date=end date
 delete=delete
+special_task=special task
 #============laihan end======================
 
+
 #==========message begin=====================
 required=This field is required！
+select=Please select
+date_list=Date List
+confirm_message=Are you sure?
+fill_loginName=Please fill in the loginName
+fill_loginPassWord=Please fill in the passWord
 #==========message end=====================
+
+#==========yewuliexingguanli begin=====================
+act=action
+block=block
+monitor=monitor
+block_white_list=block white list
+monitor_white_list=monitor white list
+block_monitor_white_list=block monitor white list
+grey_list=grey list
+type=type
+single_domain=single domain
+multi_domain=multi domain
+special_service=special service
+service_name=service name
+service_id=service ID
+repeat=repeat
+enter_error=enter a error
+single_service_message=single domain services can only associate one table
+special_service_message=special services can only associate one table
+table_name=table name
+table_type=table type
+string=string
+number=number
+strong_string=strong string
+table_des=table_describe
+detail=detail
+datebase_table=datebase table
+fill_all=fill in all
+describe=describe
+back=back
+#==========yewuliexingguanli end=====================

src/main/resources/messages/message_zh_CN.properties

@@ -87,7 +87,9 @@ audit_manage=\u5ba1\u8ba1\u7ba1\u7406
 log_search=\u65e5\u5fd7\u68c0\u7d22
 text_control=\u6587\u672c\u5e38\u89c4\u7ba1\u63a7
 text_monitor=\u6587\u672c\u5e38\u89c4\u76d1\u6d4b
-
+sysService_manage=\u7cfb\u7edf\u4e1a\u52a1\u7ba1\u7406
+service_manage=\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
+system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
 #==========menu end=====================
 
 #==========yewu zidian begin=====================
@@ -107,14 +109,14 @@ edit_time=\u4fee\u6539\u65f6\u95f4
 
 #==========laihan begin=====================
 refresh=\u5237\u65b0
-add_request=\u65b0\u589e\u6765\u51fd
+add=\u65b0\u589e
 request_number=\u6765\u51fd\u51fd\u53f7
 state=\u72b6\u6001
 created=\u672a\u5ba1\u6838
+examine=\u5ba1\u6838
 unapproved=\u672a\u901a\u8fc7
-approved=\u5ba1\u6838\u901a\u8fc7
+approved=\u5df2\u901a\u8fc7
 title=\u6807\u9898
-task=\u4efb\u52a1
 request_time=\u6765\u51fd\u65f6\u95f4
 operate_time=\u64cd\u4f5c\u65f6\u95f4
 search=\u641c\u7d22
@@ -122,15 +124,52 @@ request_organization=\u6765\u51fd\u5355\u4f4d
 operator=\u64cd\u4f5c\u5458
 content=\u5185\u5bb9
 remarks=\u5907\u6ce8
-update_request=\u4fee\u6539\u6765\u51fd
 operation=\u64cd\u4f5c
 submit=\u63d0\u4ea4
 cancel=\u53d6\u6d88
 begin_date=\u5f00\u59cb\u65f6\u95f4
 end_date=\u7ed3\u675f\u65f6\u95f4
 delete=\u5220\u9664
+special_task=\u4e13\u9879\u4efb\u52a1
 #==========yewu zidian end=====================
 
 #==========message begin=====================
 required=\u4e0d\u80fd\u4e3a\u7a7a!
+select=--\u8bf7\u9009\u62e9--
+date_list=\u6570\u636e\u5217\u8868
+confirm_message=\u786e\u5b9a\u5417\uff1f
+fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7
+fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801
+
 #==========message end=====================
+
+#==========yewuliexingguanli begin=====================
+act=\u52a8\u4f5c
+block=\u963b\u65ad
+monitor=\u76d1\u6d4b
+block_white_list=\u5c01\u5835\u767d\u540d\u5355
+monitor_white_list=\u76d1\u6d4b\u767d\u540d\u5355
+block_monitor_white_list=\u5c01\u5835\u76d1\u6d4b\u767d\u540d\u5355
+grey_list=\u7070\u540d\u5355
+type=\u7c7b\u578b
+single_domain=\u5355\u57df
+multi_domain=\u591a\u57df
+special_service=\u7279\u5b9a\u670d\u52a1
+service_name=\u4e1a\u52a1\u540d\u79f0
+service_id=\u4e1a\u52a1ID
+repeat=\u91cd\u590d
+enter_error=\u8f93\u5165\u9519\u8bef
+single_service_message=\u5355\u57df\u4e1a\u52a1\u53ea\u80fd\u5173\u8054\u4e00\u4e2a\u8868
+special_service_message=\u7279\u5b9a\u670d\u52a1\u53ea\u80fd\u5173\u8054\u4e00\u4e2a\u8868
+table_name=\u8868\u540d
+table_type=\u8868\u7c7b\u578b
+string=\u5b57\u7b26\u4e32
+number=\u6570\u503c
+strong_string=\u589e\u5f3a\u5b57\u7b26\u4e32
+table_des=\u8868\u63cf\u8ff0
+detail=\u8be6\u60c5
+datebase_table=\u6570\u636e\u5e93\u8868
+fill_all=\u8bf7\u586b\u5199\u6240\u6709\u5b57\u6bb5
+describe=\u63cf\u8ff0
+back=\u8fd4\u56de
+#==========yewuliexingguanli end=====================

src/main/webapp/WEB-INF/include/header.jsp

@@ -60,4 +60,6 @@
 <script src="${pageContext.request.contextPath}/static/layouts/layout/scripts/layout.js" type="text/javascript"></script>
 <!-- END THEME LAYOUT SCRIPTS -->
 
+<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
+<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
 

src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp

@@ -13,7 +13,7 @@
 				type:'post',
 				async:true,
 				cache:false,
-				url:'${ctx}/configuration/serviceDictInfo/ajaxItemType',
+				url:'${ctx}/basics/serviceDictInfo/ajaxItemType',
 				data:{parent:parent},
 				success:function(data){
 					$("#itemType option").each(function(){
@@ -32,7 +32,7 @@
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/configuration/serviceDictInfo/ajaxType',
+					url:'${ctx}/basics/serviceDictInfo/ajaxType',
 					data:{parent:$("#serviceDictInfoId").val(),child:$("#itemType option:selected").val()},
 					success:function(data){
 						flag=data;
@@ -46,7 +46,7 @@
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/configuration/serviceDictInfo/ajaxChildrenType',
+					url:'${ctx}/basics/serviceDictInfo/ajaxChildrenType',
 					data:{parent:"${serviceDictInfo.serviceDictId}",newItemType:$("#itemType option:selected").val()},
 					success:function(data){
 						flag=data;
@@ -60,7 +60,7 @@
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/configuration/serviceDictInfo/ajaxLeafChange',
+					url:'${ctx}/basics/serviceDictInfo/ajaxLeafChange',
 					data:{parent:"${serviceDictInfo.serviceDictId}",newIsLeaf:$("#isLeaf option:selected").val()},
 					success:function(data){
 						flag=data;
@@ -75,14 +75,14 @@
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/configuration/serviceDictInfo/ajaxLeafHasTree',
+					url:'${ctx}/basics/serviceDictInfo/ajaxLeafHasTree',
 					data:{serviceDictId:"${serviceDictInfo.serviceDictId}",newIsLeaf:$("#isLeaf option:selected").val(),parentId:$("#serviceDictInfoId").val()},
 					success:function(data){
 						flag=data;
 					}
 				});
 				return flag;
-			},"该配置无上级，不得设为叶子节点");
+			},"该配置上级为根节点，不得设为叶子节点");
 			
 			
 			
@@ -90,12 +90,6 @@
 			$("#inputForm").validate({
 				//需验证 item_code item_value 
 				rules: {
-					'itemCode':{
-						required:true,
-						digits:true,
-						codeNumber:true,
-						remote:"${ctx}/configuration/serviceDictInfo/isItemCodeRepeat?oldItemCode=${serviceDictInfo.itemCode}"
-					},
 					'itemValue':{
 						required:true
 					},
@@ -110,12 +104,6 @@
 			
 				},
 				messages: {
-					'itemCode':{
-						required:'编码必须填写',
-						digits:'请填写整数值',
-						codeNumber:'请填写合适的数值（0~200000000）',
-						remote:"该配置编码已存在"
-					},
 					'itemValue':{
 						required:'编码对应值必须填写'
 					},
@@ -125,7 +113,7 @@
 					},
 					'isLeaf':{
 						leafChange:'该配置包含下级配置，不得改为叶子节点',
-						leafHasTree:'该配置无上级，不得设为叶子节点'
+						leafHasTree:'该配置上级为根节点，不得设为叶子节点'
 					}
 				},
 				
@@ -182,14 +170,14 @@
 					<div class="form-body">
 
 						<!-- BEGIN FORM-->	
-						<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
+						<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
 							<form:hidden path="serviceDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
 								<label class="col-md-3 control-label">上级配置:</label>
 								<div class="col-md-4">
-					                <sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq '无上级'?'无上级':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
+					                <sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
-										title="菜单" url="/configuration/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/>
+										title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
@@ -208,12 +196,12 @@
 				                    </select>
 								</div>
 							</div>
-							<div class="form-group">
+							<%-- <div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>配置编码:</label>
 								<div class="col-md-4">
 									<form:input path="itemCode" htmlEscape="false" maxlength="50" class="form-control"/>
 								</div>
-							</div>
+							</div> --%>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label>
 								<div class="col-md-4">

src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp

@@ -35,13 +35,13 @@
 					<div class="form-body">
 
 						<!-- BEGIN FORM-->	
-						<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
+						<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
 							<form:hidden path="serviceDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
 								<label class="col-md-3 control-label">上级配置:</label>
 								<div class="col-md-4">
-								  <input value="${serviceDictInfo.parent.serviceDictId == 0?'无上级':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${serviceDictInfo.parent.serviceDictId == 0?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
 							    </div>
 							</div>
 							<div class="form-group">

src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp

@@ -16,7 +16,7 @@
      		$("#intype").attr("name",$("#seltype").val());
     		$("#pageNo").val(n);
     		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}");
+    		$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
     		$("#searchForm").submit();
     		return false;
     	}
@@ -24,7 +24,7 @@
      		$("#intype").attr("name",$("#seltype").val());
     		$("#pageNo").val(n);
     		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}");
+    		$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
     		$("#searchForm").submit();
     		return false;
     	}
@@ -37,9 +37,9 @@
 </head>
 <body>
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
+		<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/configuration/serviceDictInfo/form?itType=${itType}'">新增配置</button>
+			onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'">新增配置</button>
 	</div>
 	
 		<h3 class="page-title">
@@ -58,7 +58,7 @@
 						<div class="row" >
 						   <div class="col-md-12">
 								<sys:message content="${message}"/>
-								<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}" method="post" class="form-search">
+								<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/searchList?itType=${itType}" method="post" class="form-search">
 									<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 									<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 									<div class="col-md-12">
@@ -91,7 +91,7 @@
 										<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
 										<tbody><c:forEach items="${page.list}" var="serviceDictInfo">
 											<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
-												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
+												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
 												<td>${serviceDictInfo.itemCode}</td>
 												<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
 												<td>${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
 													<div class="btn-group btn-xs">
 													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
 													      <ul class="dropdown-menu btn-xs">
-													         <li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
+													         <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
 													         <shiro:hasPermission name="sys:dict:edit">
-														        <li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
+														        <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
 													         </shiro:hasPermission>
 													         <shiro:hasPermission name="sys:dict:edit">
-													       	 	<li><a href="${ctx}/configuration/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
+													       	 	<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>

src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp

@@ -16,7 +16,7 @@
      		$("#intype").attr("name",$("#seltype").val());
     		$("#pageNo").val(n);
     		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/list?itType=${itType}");
+    		$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/list?itType=${itType}");
     		$("#searchForm").submit();
     		return false;
     	}
@@ -24,7 +24,7 @@
      		$("#intype").attr("name",$("#seltype").val());
     		$("#pageNo").val(n);
     		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}");
+    		$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
     		$("#searchForm").submit();
     		return false;
     	}
@@ -37,9 +37,9 @@
 </head>
 <body>
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
+		<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/configuration/serviceDictInfo/form?itType=${itType}'">新增配置</button>
+			onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'">新增配置</button>
 	</div>
 	
 		<h3 class="page-title">
@@ -58,7 +58,7 @@
 						<div class="row" >
 						   <div class="col-md-12">
 								<sys:message content="${message}"/>
-								<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}" method="post" class="form-search">
+								<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/searchList?itType=${itType}" method="post" class="form-search">
 									<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 									<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 									<div class="col-md-12">
@@ -91,7 +91,7 @@
 										<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
 										<tbody><c:forEach items="${list}" var="serviceDictInfo">
 											<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
-												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
+												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
 												<td>${serviceDictInfo.itemCode}</td>
 												<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
 												<td>${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
 													<div class="btn-group btn-xs">
 													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
 													      <ul class="dropdown-menu btn-xs">
-													         <li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
+													         <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
 													         <shiro:hasPermission name="sys:dict:edit">
-														        <li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
+														        <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
 													         </shiro:hasPermission>
 													         <shiro:hasPermission name="sys:dict:edit">
-													       	 	<li><a href="${ctx}/configuration/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
+													       	 	<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>

src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp

@@ -13,7 +13,7 @@
 				type:'post',
 				async:true,
 				cache:false,
-				url:'${ctx}/configuration/sysDictInfo/ajaxItemType',
+				url:'${ctx}/basics/sysDictInfo/ajaxItemType',
 				data:{parent:parent},
 				success:function(data){
 					$("#itemType option").each(function(){
@@ -32,7 +32,7 @@
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/configuration/sysDictInfo/ajaxType',
+					url:'${ctx}/basics/sysDictInfo/ajaxType',
 					data:{parent:$("#sysDictInfoId").val(),child:$("#itemType option:selected").val()},
 					success:function(data){
 						flag=data;
@@ -46,7 +46,7 @@
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/configuration/sysDictInfo/ajaxChildrenType',
+					url:'${ctx}/basics/sysDictInfo/ajaxChildrenType',
 					data:{parent:"${sysDictInfo.sysDictId}",newItemType:$("#itemType option:selected").val()},
 					success:function(data){
 						flag=data;
@@ -60,7 +60,7 @@
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/configuration/sysDictInfo/ajaxLeafChange',
+					url:'${ctx}/basics/sysDictInfo/ajaxLeafChange',
 					data:{parent:"${sysDictInfo.sysDictId}",newIsLeaf:$("#isLeaf option:selected").val()},
 					success:function(data){
 						flag=data;
@@ -75,14 +75,14 @@
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/configuration/sysDictInfo/ajaxLeafHasTree',
+					url:'${ctx}/basics/sysDictInfo/ajaxLeafHasTree',
 					data:{sysDictId:"${sysDictInfo.sysDictId}",newIsLeaf:$("#isLeaf option:selected").val(),parentId:$("#sysDictInfoId").val()},
 					success:function(data){
 						flag=data;
 					}
 				});
 				return flag;
-			},"该配置无上级，不得设为叶子节点");
+			},"该配置上级为根节点，不得设为叶子节点");
 			
 			
 			
@@ -90,12 +90,6 @@
 			$("#inputForm").validate({
 				//需验证 item_code item_value 
 				rules: {
-					'itemCode':{
-						required:true,
-						digits:true,
-						codeNumber:true,
-						remote:"${ctx}/configuration/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}"
-					},
 					'itemValue':{
 						required:true
 					},
@@ -110,12 +104,6 @@
 			
 				},
 				messages: {
-					'itemCode':{
-						required:'编码必须填写',
-						digits:'请填写整数值',
-						codeNumber:'请填写合适的数值（0~200000000）',
-						remote:"该配置编码已存在"
-					},
 					'itemValue':{
 						required:'编码对应值必须填写'
 					},
@@ -125,7 +113,7 @@
 					},
 					'isLeaf':{
 						leafChange:'该配置包含下级配置，不得改为叶子节点',
-						leafHasTree:'该配置无上级，不得设为叶子节点'
+						leafHasTree:'该配置上级为根节点，不得设为叶子节点'
 					}
 				},
 				
@@ -182,14 +170,14 @@
 					<div class="form-body">
 
 						<!-- BEGIN FORM-->	
-						<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
+						<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
 							<form:hidden path="sysDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
 								<label class="col-md-3 control-label">上级配置:</label>
 								<div class="col-md-4">
-					                <sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.itemValue eq '无上级'?'无上级':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}"
+					                <sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}"
-										title="菜单" url="/configuration/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
+										title="菜单" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
@@ -208,12 +196,12 @@
 				                    </select>
 								</div>
 							</div>
-							<div class="form-group">
+							<%-- <div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>配置编码:</label>
 								<div class="col-md-4">
 									<form:input path="itemCode" htmlEscape="false" maxlength="50" class="form-control"/>
 								</div>
-							</div>
+							</div> --%>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label>
 								<div class="col-md-4">

src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp

@@ -35,13 +35,13 @@
 					<div class="form-body">
 
 						<!-- BEGIN FORM-->	
-						<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
+						<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
 							<form:hidden path="sysDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
 								<label class="col-md-3 control-label">上级配置:</label>
 								<div class="col-md-4">
-								  <input value="${sysDictInfo.parent.sysDictId == 0?'无上级':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${sysDictInfo.parent.sysDictId == 0?'根节点':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
 							    </div>
 							</div>
 							<div class="form-group">

src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp

@@ -16,7 +16,7 @@
      		$("#intype").attr("name",$("#seltype").val());
     		$("#pageNo").val(n);
     		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}");
+    		$("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
     		$("#searchForm").submit();
     		return false;
     	}
@@ -24,7 +24,7 @@
      		$("#intype").attr("name",$("#seltype").val());
     		$("#pageNo").val(n);
     		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}");
+    		$("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
     		$("#searchForm").submit();
     		return false;
     	}
@@ -37,9 +37,9 @@
 </head>
 <body>
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
+		<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/configuration/sysDictInfo/form?itType=${itType}'">新增配置</button>
+			onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">新增配置</button>
 	</div>
 	
 		<h3 class="page-title">
@@ -58,7 +58,7 @@
 						<div class="row" >
 						   <div class="col-md-12">
 								<sys:message content="${message}"/>
-								<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/searchList?itType=${itType}" method="post" class="form-search">
+								<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/searchList?itType=${itType}" method="post" class="form-search">
 									<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 									<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 									<div class="col-md-12">
@@ -91,7 +91,7 @@
 										<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
 										<tbody><c:forEach items="${page.list}" var="sysDictInfo">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
-												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
+												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
 												<td>${sysDictInfo.itemCode}</td>
 												<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
 												<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
 													<div class="btn-group btn-xs">
 													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
 													      <ul class="dropdown-menu btn-xs">
-													         <li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
+													         <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
 													         <shiro:hasPermission name="sys:dict:edit">
-														        <li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
+														        <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
 													         </shiro:hasPermission>
 													         <shiro:hasPermission name="sys:dict:edit">
-													       	 	<li><a href="${ctx}/configuration/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
+													       	 	<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>

src/main/webapp/WEB-INF/views/basics/sysDictList.jsp

@@ -16,7 +16,7 @@
      		$("#intype").attr("name",$("#seltype").val());
     		$("#pageNo").val(n);
     		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/list?itType=${itType}");
+    		$("#searchForm").attr("action","${ctx}/basics/sysDictInfo/list?itType=${itType}");
     		$("#searchForm").submit();
     		return false;
     	}
@@ -24,7 +24,7 @@
      		$("#intype").attr("name",$("#seltype").val());
     		$("#pageNo").val(n);
     		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}");
+    		$("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
     		$("#searchForm").submit();
     		return false;
     	}
@@ -37,9 +37,9 @@
 </head>
 <body>
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
+		<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/configuration/sysDictInfo/form?itType=${itType}'">新增配置</button>
+			onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">新增配置</button>
 	</div>
 	
 		<h3 class="page-title">
@@ -58,7 +58,7 @@
 						<div class="row" >
 						   <div class="col-md-12">
 								<sys:message content="${message}"/>
-								<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/searchList?itType=${itType}" method="post" class="form-search">
+								<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/searchList?itType=${itType}" method="post" class="form-search">
 									<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 									<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 									<div class="col-md-12">
@@ -91,7 +91,7 @@
 										<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
 										<tbody><c:forEach items="${list}" var="sysDictInfo">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
-												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
+												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
 												<td>${sysDictInfo.itemCode}</td>
 												<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
 												<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
 													<div class="btn-group btn-xs">
 													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
 													      <ul class="dropdown-menu btn-xs">
-													         <li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
+													         <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
 													         <shiro:hasPermission name="sys:dict:edit">
-														        <li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
+														        <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
 													         </shiro:hasPermission>
 													         <shiro:hasPermission name="sys:dict:edit">
-													       	 	<li><a href="${ctx}/configuration/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
+													       	 	<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>

src/main/webapp/WEB-INF/views/cfg/requestForm.jsp

@@ -7,18 +7,18 @@
 </head>
 <body>
 
-<div class="content">
+<div class="page-content">
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="update_request"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add_request"/></c:if></div>
+						<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="edit"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add"/></c:if></div>
 				</div>
 				
 				<div class="portlet-body form">
 					<!-- BEGIN FORM-->
-					<form:form action="${ctx}/cfg/request/saveOrUpdate" class="form-horizontal" id="inputForm" method="post" >
+					<form:form action="${ctx}/cfg/request/saveOrUpdate" modelAttribute="requestInfo" class="form-horizontal" id="inputForm" method="post" >
 					<sys:message content="${message}"/>
 					<input type="hidden"  name="id" value="${requestInfo.id}"/>
 						<div class="form-body">
@@ -47,12 +47,23 @@
 									<input type="text" class="form-control" name="requestTitle" value="${requestInfo.requestTitle}">
 								</div>
 							</div>
-							<div class="form-group last">
+							<div class="form-group">
-								<label class="col-md-3 control-label"><th><spring:message code="content"></spring:message>:</label>
+								<label class="col-md-3 control-label"><spring:message code="content"></spring:message>:</label>
 								<div class="col-md-4">
 									<input type="text" class="form-control" name="requestContent" value="${requestInfo.requestContent}">
 								</div>
 							</div>
+							<div class="form-group last">
+								<label class="col-md-3 control-label"><th><spring:message code="special_task"/>:</label>
+								<div class="col-md-4">
+									<form:select path="taskId" class="selectpicker select2">
+										<form:option value=""><spring:message code="select"/></form:option>
+										<c:forEach items="${taskInfos}" var="taskInfo">
+											<form:option value="${taskInfo.id}">${taskInfo.taskName}</form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+							</div>
 						</div>
 						<div class="form-actions">
 							<div class="row">

src/main/webapp/WEB-INF/views/cfg/requestList.jsp

@@ -8,15 +8,15 @@
 
 <body>
 
-<div class="content">
+<div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/request/list'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add_request"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add"></spring:message></button>
 	</div>
 	
 	<h3 class="page-title">
-		来函管理 
+		<spring:message code="requestInfo"></spring:message>
 	</h3>
 	
 	<div class="row">
@@ -24,7 +24,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="request_number"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="date_list"/>
 					</div>
 				</div>
 				<div class="portlet-body">
@@ -35,19 +35,20 @@
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<div class="col-md-12">
 							<spring:message code="state"/> : <form:select path="isAudit" class="select2">
-								<form:option value=""></form:option>
+								<form:option value=""><spring:message code="select"></spring:message></form:option>
 								<form:option value="0"><spring:message code="created"></spring:message></form:option>
 								<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 							</form:select> 
 							
 							<select id="seltype">
+								<option value=""><spring:message code="select"></spring:message></option>
 								<option value="requestTitle"><spring:message code="title"></spring:message></option>
 								<option value="requestNumber"><spring:message code="request_number"></spring:message></option>
-								<option value="requestContent"><spring:message code="task"></spring:message></option>
+								<option value="requestContent"><spring:message code="content"></spring:message></option>
 							</select> <input id="intype">
 							 
-							<form:select id="timeType" name="timeType" path="timeType">
+							<form:select path="timeType">
-<%-- 								<form:option value=""></form:option> --%>
+							<form:option value=""><spring:message code="select"></spring:message></form:option>
 								<form:option value="requestTime"><spring:message code="request_time"></spring:message></form:option>
 								<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
 							</form:select> 
@@ -79,6 +80,7 @@
 									<th><spring:message code="operate_time"></spring:message></th>
 									<th><spring:message code="title"></spring:message></th>
 									<th><spring:message code="content"></spring:message></th>
+									<th><spring:message code="special_task"></spring:message></th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>
@@ -110,6 +112,7 @@
 									</td>
 									<td>${requestInfo.requestTitle }</td>
 									<td>${requestInfo.requestContent }</td>
+									<td>${requestInfo.taskName }</td>
 									<td>
 										<div class="btn-group btn-xs">
 									      <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
@@ -117,12 +120,12 @@
 								      <!-- 审核未通过可修改 -->
 								        	<c:choose>
 									        	<c:when test="${requestInfo.isAudit eq '1'}">
-											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="cancel"></spring:message></a></li>
+											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li>
 									        	</c:when>
 									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="approved"></spring:message></a></li>
+											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="examine"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="update_request"></spring:message></a></li>
+									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="delete"></spring:message></a></li>
+								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:otherwise>
 								        	</c:choose>
 									      </ul>

src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp

@@ -1,136 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-<title>标签配置信息</title>
-<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
-<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
-	<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
-	<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$("#treeTable").treeTable({expandLevel : 3}).show();	
-		});
-    	//查询
-     	function page(n,s){
-     		$("#intype").attr("name",$("#seltype").val());
-    		$("#pageNo").val(n);
-    		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/markList");
-    		$("#searchForm").submit();
-    		return false;
-    	}
-    	function page2(n,s){
-     		$("#intype").attr("name",$("#seltype").val());
-    		$("#pageNo").val(n);
-    		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchMarkList");
-    		$("#searchForm").submit();
-    		return false;
-    	}
-	</script>
-	<style type="text/css">
-	.dropdown-menu {
-    min-width: 70px;
-}
-	</style>
-</head>
-<body>
-	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/serviceDictInfo/markList'"><spring:message code="refresh"></spring:message></button>
-		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/configuration/serviceDictInfo/markForm'">新增配置</button>
-	</div>
-	
-		<h3 class="page-title">
-			标签配置管理 
-		</h3>
-	
-		<div class="row">
-			<div class="col-md-12">
-				<div class="portlet box blue">
-					<div class="portlet-title">
-						<div class="caption">
-							<i class="fa fa-cogs"></i>标签配置列表
-						</div>
-					</div>
-					<div class="portlet-body">
-						<div class="row" >
-						   <div class="col-md-12">
-								<sys:message content="${message}"/>
-								<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/searchMarkList" method="post" class="form-search">
-									<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-									<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-									<div class="col-md-12">
-										<label class="search-lable">值：</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemValue}"/>
-										<label class="search-lable">编码：</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemCode}"/>
-					                     <label class="search-lable">数据类型：</label> <select id="itemType" name="itemType"  >
-							                   	<option selected="selected"></option>
-							                    <c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
-							                      <c:if test="${dict.itemCode eq '3'}">
-							                          <c:if test="${dict.itemCode eq serviceDictInfo.itemType}"> 
-							                         <option value="${serviceDictInfo.itemType}" selected="selected">${dict.itemValue}</option>
-							                         </c:if>
-							                        <c:if test="${dict.itemCode ne serviceDictInfo.itemType}"> 
-							                         <option value="${dict.itemCode}">${dict.itemValue}</option>
-							                         </c:if> 
-							                      </c:if> 
-							                    </c:forEach>
-						                    </select>
-						               <spring:message code="begin_date"></spring:message> : <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
-										value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-										<spring:message code="end_date"></spring:message> : <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
-										value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-										
-										<button type="button" class="btn btn-default btn-sm" onclick="return page2()">
-											<i class="fa fa-edit"></i> <spring:message code="search"></spring:message>
-										</button>
-									 </div>
-								  </form:form>
-									<table id="treeTable" class="table table-striped table-bordered table-condensed">
-										<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
-										<tbody><c:forEach items="${list}" var="serviceDictInfo">
-											<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
-												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/serviceDictInfo/markForm?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
-												<td>${serviceDictInfo.itemCode}</td>
-												<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
-												<td>${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
-												<td>${fns:getDictLabel("SYS_YES_NO",serviceDictInfo.isLeaf,"0")}</td>
-												<td><c:if test="${serviceDictInfo.serviceDictCreator != null}">
-												    ${fns:getUserById(serviceDictInfo.serviceDictCreator.id).name}
-												    </c:if></td>
-												<td><fmt:formatDate value="${serviceDictInfo.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-												<td><c:if test="${serviceDictInfo.serviceDictEditor != null}">
-												    ${fns:getUserById(serviceDictInfo.serviceDictEditor.id).name}
-												    </c:if></td>
-												<td><fmt:formatDate value="${serviceDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-												<td>
-													<div class="btn-group btn-xs">
-													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
-													      <ul class="dropdown-menu btn-xs">
-													         <li><a href="${ctx}/configuration/serviceDictInfo/markForm?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">查看</a></li>
-													         <shiro:hasPermission name="sys:dict:edit">
-														        <li><a href="${ctx}/configuration/serviceDictInfo/markForm?serviceDictId=${serviceDictInfo.serviceDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要修改吗？', this.href)">修改</a></li>
-													         </shiro:hasPermission>
-													         <shiro:hasPermission name="sys:dict:edit">
-													       	 	<li><a href="${ctx}/configuration/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要删除吗？', this.href)">删除</a></li>
-															 </shiro:hasPermission>
-													    
-													      </ul>
-													    </div>
-													</td>
-											</tr>
-										</c:forEach></tbody>
-									</table>
-								 
-								
-						    </div>
-					   </div>
-				   </div>
-				   
-				</div>
-		    </div>
-	</div>
-	 <div class="page">${page}</div>		
-</body>
-</html>

src/main/webapp/WEB-INF/views/login.jsp

@@ -47,10 +47,10 @@
                         <img src="${pageContext.request.contextPath}/static/pages/img/photo.jpg" class="login-avatar"> </div>
                     <form id="loginForm" class="login-form pull-left" action="${pageContext.request.contextPath }/login" method="post">
 						<div class="form-group">
-                            <input id="username" name="username" type="text" class="form-control placeholder-no-fix " value="${username}" placeholder="请填写登录账号"/>
+                            <input id="username" name="username" type="text" class="form-control placeholder-no-fix " value="${username}" placeholder="<spring:message code='fill_loginName'/>"/>
                         </div>
                         <div class="form-group">
-                        	<input type="password"  class="form-control placeholder-no-fix "  id="password" name="password" placeholder="请填写登录密码"/>
+                        	<input type="password"  class="form-control placeholder-no-fix "  id="password" name="password" placeholder="<spring:message code='fill_loginPassWord'/>"/>
                         </div>
                         
                       <%--  <c:if test="${not empty isValidateCodeLogin or isValidateCodeLogin==true}">

src/main/webapp/WEB-INF/views/systemService/list.jsp

@@ -18,7 +18,7 @@ function page(n,s){
 
 function deleteService(id) {
 	if (id) {
-		if (confirm("确认删除?")) {
+		if (confirm("<spring:message code='confirm_message'/>")) {
 			$("#serviceId").val(id);
 			$("#searchForm").attr("action","${ctx}/systemService/delete");
 			$("#searchForm").submit();
@@ -30,12 +30,12 @@ function deleteService(id) {
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/systemService/list'"><spring:message code="refresh"></spring:message></button>
 		<shiro:hasPermission name="system:service:view">
-			<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/systemService/systemServiceform'">新增</button>
+			<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/systemService/systemServiceform'"><spring:message code="add"></spring:message></button>
 		</shiro:hasPermission>
 	</div>
 
 	<h3 class="page-title">
-		系统业务管理
+		<spring:message code="sysService_manage"></spring:message>
 	</h3>
 
 	<div class="row">
@@ -43,7 +43,7 @@ function deleteService(id) {
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i>列表
+						<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
 					</div>
 				</div>
 				
@@ -56,35 +56,35 @@ function deleteService(id) {
 						<div class="row search-table">
 							<div class="col-md-12">
 								<span class="search-item" class="input-small">
-									<span>动作 :</span>
+									<span><spring:message code="act"/> :</span>
 									<form:select path="action">
-										<form:option value="">请选择</form:option>
+										<form:option value=""><spring:message code="select"/></form:option>
-										<form:option value="1">阻断</form:option>
+										<form:option value="1"><spring:message code="block"/></form:option>
-										<form:option value="2">监测</form:option>
+										<form:option value="2"><spring:message code="monitor"/></form:option>
-										<form:option value="5">封堵白名单</form:option>
+										<form:option value="5"><spring:message code="block_white_list"/></form:option>
-										<form:option value="6">监测白名单</form:option>
+										<form:option value="6"><spring:message code="monitor"/></form:option>
-										<form:option value="7">封堵监测白名单</form:option>
+										<form:option value="7"><spring:message code="block_monitor_white_list"/></form:option>
-										<form:option value="8">灰名单</form:option>
+										<form:option value="8"><spring:message code="grey_list"/></form:option>
 									</form:select>
 								</span>
 								
 								<span class="search-item" class="input-small">
-									<span>类型 :</span>
+									<span><spring:message code="type"/> :</span>
 									<form:select path="serviceType">
-										<form:option value="">请选择</form:option>
+										<form:option value=""><spring:message code="select"/></form:option>
-										<form:option value="1">单域</form:option>
+										<form:option value="1"><spring:message code="single_domain"/></form:option>
-										<form:option value="2">多域</form:option>
+										<form:option value="2"><spring:message code="multi_domain"/></form:option>
-										<form:option value="3">特定服务</form:option>
+										<form:option value="3"><spring:message code="special_service"/></form:option>
 									</form:select>
 								</span>
 								
 								<span class="search-item">
-									<span>业务名称 :</span>
+									<span><spring:message code="service_name"/> :</span>
 									<form:input path="serviceName" htmlEscape="false" class="input-small"/>
 								</span>
 								
 								<span class="search-item">
-									<span>业务ID :</span>
+									<span><spring:message code="service_id"/> :</span>
 									<form:input path="serviceId" htmlEscape="false" class="input-small"/>
 								</span>
 								
@@ -101,14 +101,14 @@ function deleteService(id) {
 						<table class="table table-bordered">
 							<thead>
 								<tr>
-									<th>业务名称</th>
+									<th><spring:message code="service_name"/></th>
-									<th style="width:8%">业务ID</th>
+									<th style="width:8%"><spring:message code="service_id"/></th>
-									<th>动作</th>
+									<th><spring:message code="act"/></th>
-									<th>类型</th>
+									<th><spring:message code="type"/></th>
 									<th><spring:message code="creator_id"></spring:message></th>
 									<th style="width:15%"><spring:message code="create_time"></spring:message></th>
 									<th><spring:message code="desc"></spring:message></th>
-									<th>操作</th>
+									<th><spring:message code="operation"/></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -117,17 +117,17 @@ function deleteService(id) {
 									<td>${ssi.serviceName }</td>
 									<td>${ssi.serviceId }</td>
 									<td>
-										<c:if test="${1 eq ssi.action }">阻断</c:if>
+										<c:if test="${1 eq ssi.action }"><spring:message code="block"/></c:if>
-										<c:if test="${2 eq ssi.action }">监测</c:if>
+										<c:if test="${2 eq ssi.action }"><spring:message code="monitor"/></c:if>
-										<c:if test="${5 eq ssi.action }">封堵白名单</c:if>
+										<c:if test="${5 eq ssi.action }"><spring:message code="block_white_list"/></c:if>
-										<c:if test="${6 eq ssi.action }">监测白名单</c:if>
+										<c:if test="${6 eq ssi.action }"><spring:message code="monitor_white_list"/></c:if>
-										<c:if test="${7 eq ssi.action }">封堵监测白名单</c:if>
+										<c:if test="${7 eq ssi.action }"><spring:message code="block_monitor_white_list"/></c:if>
-										<c:if test="${8 eq ssi.action }">灰名单</c:if>
+										<c:if test="${8 eq ssi.action }"><spring:message code="grey_list"/></c:if>
 									</td>
 									<td>
-										<c:if test="${1 eq ssi.serviceType }">单域</c:if>
+										<c:if test="${1 eq ssi.serviceType }"><spring:message code="single_domain"/></c:if>
-										<c:if test="${2 eq ssi.serviceType }">多域</c:if>
+										<c:if test="${2 eq ssi.serviceType }"><spring:message code="multi_domain"/></c:if>
-										<c:if test="${3 eq ssi.serviceType }">特定服务</c:if>
+										<c:if test="${3 eq ssi.serviceType }"><spring:message code="special_service"/></c:if>
 									</td>
 									<td>${ssi.creator.loginId }</td>
 									<td><fmt:formatDate value="${ssi.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>