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

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

Browse Source
This commit is contained in:
chenjinsong
2018-03-06 11:50:34 +08:00
parent 80bf284a1e 752f59b360
commit e9acb15078
44 changed files with 1438 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

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

3
src/main/java/com/nis/domain/configuration/ServiceDictInfo.java → src/main/java/com/nis/domain/basics/ServiceDictInfo.java
View File

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

2
src/main/java/com/nis/domain/configuration/SysDictInfo.java → src/main/java/com/nis/domain/basics/SysDictInfo.java
View File

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

23
src/main/java/com/nis/domain/configuration/RequestInfo.java
View File

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

131
src/main/java/com/nis/domain/configuration/TaskInfo.java Normal file
View File

@@ -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;
}
}

8
src/main/java/com/nis/util/ConfigDictUtils.java
View File

@@ -9,11 +9,11 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.SysDataDictionaryName; 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.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; import com.nis.web.service.SpringContextHolder;

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

@@ -26,6 +26,8 @@ import com.nis.web.service.OfficeService;
import com.nis.web.service.RoleService; import com.nis.web.service.RoleService;
import com.nis.web.service.SystemService; import com.nis.web.service.SystemService;
import com.nis.web.service.UserService; 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.AppCfgService;
import com.nis.web.service.configuration.ComplexStringCfgService; import com.nis.web.service.configuration.ComplexStringCfgService;
import com.nis.web.service.configuration.FtpCfgService; 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.MediaCfgService;
import com.nis.web.service.configuration.NumCfgService; import com.nis.web.service.configuration.NumCfgService;
import com.nis.web.service.configuration.RequestInfoService; 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.SslCfgService;
import com.nis.web.service.configuration.StringCfgService; 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.TunnelCfgService;
import com.nis.web.service.configuration.WebCfgService; import com.nis.web.service.configuration.WebCfgService;
import com.nis.web.service.systemService.ServiceConfigInfoService; import com.nis.web.service.systemService.ServiceConfigInfoService;

51
src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java → src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
View File

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

53
src/main/java/com/nis/web/controller/configuration/SysDictInfoController.java → src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

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

2
src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
View File

@@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.RequestInfo; 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.util.Constants;
import com.nis.web.controller.BaseController; import com.nis.web.controller.BaseController;

4
src/main/java/com/nis/web/controller/configuration/IpCfgController.java
View File

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

2
src/main/java/com/nis/web/controller/configuration/NumCfgController.java
View File

@@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.NumBoundaryCfg; import com.nis.domain.configuration.NumBoundaryCfg;
import com.nis.domain.configuration.RequestInfo; 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.util.Constants;
import com.nis.web.controller.BaseController; import com.nis.web.controller.BaseController;

282
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -1,136 +1,146 @@
package com.nis.web.controller.configuration; package com.nis.web.controller.configuration;
import javax.servlet.http.HttpServletRequest; import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.ui.Model;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.nis.domain.Page; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.configuration.RequestInfo;
import com.nis.util.Constants; import com.nis.domain.Page;
import com.nis.util.StringUtils; import com.nis.domain.configuration.RequestInfo;
import com.nis.web.controller.BaseController; import com.nis.domain.configuration.TaskInfo;
import com.nis.web.service.configuration.RequestInfoService; import com.nis.web.controller.BaseController;
import com.nis.web.service.configuration.RequestInfoService;
/**
* 测试类 @Controller
* @RequestMapping("${adminPath}/cfg/request")
*/ public class RequestInfoController extends BaseController{
@Controller
@RequestMapping("${adminPath}/cfg/request") @Autowired
public class RequestInfoController extends BaseController{ private RequestInfoService requestInfoService;
@Autowired
private RequestInfoService requestInfoService; /**
*来函列表
*/
/** @RequestMapping(value = {"list",""})
*来函列表 public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
*/ Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response), requestInfo);
@RequestMapping(value = {"list",""}) model.addAttribute("page", page);
public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) { return "/cfg/requestList";
Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response), requestInfo); }
model.addAttribute("page", page); /**
return "/cfg/requestList"; * 进入用户添加或修改页面
} */
/** @RequestMapping(value={"form"})
* 进入用户添加或修改页面 public String form(RequestInfo requestInfo, Model model) {
*/ TaskInfo taskInfo = new TaskInfo();
@RequestMapping(value={"form"}) taskInfo.setId(requestInfo.getTaskId());
public String form(RequestInfo requestInfo, Model model) { showTask(taskInfo,model);
if(requestInfo.getId()!=null){ if(requestInfo.getId()!=null){
requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId()); requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId());
model.addAttribute("requestInfo", requestInfo); model.addAttribute("requestInfo", requestInfo);
} }else{
model.addAttribute("requestInfo", requestInfo); model.addAttribute("requestInfo", requestInfo);
return "/cfg/requestForm"; }
} return "/cfg/requestForm";
}
/**
* 新增/修改 /**
*/ * 新增/修改
@RequestMapping(value = "saveOrUpdate") */
public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) { @RequestMapping(value = "saveOrUpdate")
try { public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
if(requestInfo.getId()!=null){ try {
// 保存用户信息 if(requestInfo.getId()!=null){
logger.info(requestInfo.getId()+"修改成功"); // 保存用户信息
requestInfoService.saveOrUpdate(requestInfo); logger.info(requestInfo.getId()+"修改成功");
addMessage(redirectAttributes, "success"); requestInfoService.saveOrUpdate(requestInfo);
}else{ addMessage(redirectAttributes, "success");
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ }else{
logger.info(requestInfo.getRequestNumber()+"重复数据"); if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
addMessage(model, "error"); logger.info(requestInfo.getRequestNumber()+"重复数据");
return form(requestInfo, model); addMessage(model, "error");
} return form(requestInfo, model);
// 保存用户信息 }
requestInfoService.saveOrUpdate(requestInfo); // 保存用户信息
addMessage(redirectAttributes, "success"); requestInfoService.saveOrUpdate(requestInfo);
logger.info(requestInfo.getId()+"保存成功"); addMessage(redirectAttributes, "success");
} logger.info(requestInfo.getId()+"保存成功");
} catch (Exception e) { }
logger.error(e.getMessage()); } catch (Exception e) {
e.printStackTrace(); logger.error(e.getMessage());
addMessage(model, "error"); e.printStackTrace();
} addMessage(model, "error");
return "redirect:" + adminPath + "/cfg/request/list?repage"; }
} return "redirect:" + adminPath + "/cfg/request/list?repage";
}
/**
* 验证是否有效 /**
*/ * 验证是否有效
@ResponseBody */
@RequestMapping(value = "checkRequestNumber") @ResponseBody
public String checkRequestNumber(String requestNumber) { @RequestMapping(value = "checkRequestNumber")
if (requestNumber !=null && requestInfoService.getRequestInfoByRequestNumber(requestNumber) == null) { public String checkRequestNumber(String requestNumber) {
return "true"; if (requestNumber !=null && requestInfoService.getRequestInfoByRequestNumber(requestNumber) == null) {
} return "true";
return "false"; }
} return "false";
}
/**
* 审核 /**
* @param requestInfo * 审核
* @param model * @param requestInfo
* @return * @param model
*/ * @return
@RequestMapping(value = "requestExamine") */
public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ @RequestMapping(value = "requestExamine")
requestInfoService.requestExamine(requestInfo); public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
addMessage(redirectAttributes, "success"); requestInfoService.requestExamine(requestInfo);
return "redirect:" + adminPath + "/cfg/request/list?repage"; addMessage(redirectAttributes, "success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
/** }
* 取消审核 /**
* @param requestInfo * 取消审核
* @param model * @param requestInfo
* @return * @param model
*/ * @return
@RequestMapping(value = "requestCancelExamine") */
public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ @RequestMapping(value = "requestCancelExamine")
requestInfoService.requestCancelExamine(requestInfo); public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
addMessage(redirectAttributes, "success"); requestInfoService.requestCancelExamine(requestInfo);
return "redirect:" + adminPath + "/cfg/request/list?repage"; addMessage(redirectAttributes, "success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
/** }
* 删除 /**
* @param requestInfo * 删除
* @param model * @param requestInfo
* @return * @param model
*/ * @return
@RequestMapping(value = "delete") */
public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ @RequestMapping(value = "delete")
requestInfoService.delete(requestInfo); public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
addMessage(redirectAttributes, "success"); requestInfoService.delete(requestInfo);
return "redirect:" + adminPath + "/cfg/request/list?repage"; addMessage(redirectAttributes, "success");
return "redirect:" + adminPath + "/cfg/request/list?repage";
}
}
}
/**
* 查询专项任务
* @param taskInfo
* @param model
*/
public void showTask(TaskInfo taskInfo ,Model model){
List<TaskInfo> taskInfos = requestInfoService.showTask(taskInfo);
model.addAttribute("taskInfos", taskInfos);
}
}

2
src/main/java/com/nis/web/controller/configuration/StringCfgController.java
View File

@@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.RequestInfo; 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.util.Constants;
import com.nis.web.controller.BaseController; import com.nis.web.controller.BaseController;

10
src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java → src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java
View File

@@ -1,11 +1,11 @@
package com.nis.web.dao.configuration; package com.nis.web.dao.basics;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.nis.domain.SysMenu; 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.CrudDao;
import com.nis.web.dao.MyBatisDao; import com.nis.web.dao.MyBatisDao;
@@ -70,12 +70,18 @@ public interface ServiceDictInfoDao extends CrudDao<ServiceDictInfo> {
* @return * @return
*/ */
List<ServiceDictInfo> findByItemCode(Integer itemCode); List<ServiceDictInfo> findByItemCode(Integer itemCode);
/**
* 查询itemCode最大值
* @return
*/
Integer findMaxItemCode();
List<ServiceDictInfo> findItemDict(@Param("itemType")int itemType,@Param("isValid")int isValid); List<ServiceDictInfo> findItemDict(@Param("itemType")int itemType,@Param("isValid")int isValid);
List<ServiceDictInfo> findAllItemDict(@Param("itemType")int itemType); List<ServiceDictInfo> findAllItemDict(@Param("itemType")int itemType);

284
src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml Normal file
View File

@@ -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>

10
src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.java → src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java
View File

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

33
src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml → src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-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" > <!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" /> <id column="sys_dict_id" property="sysDictId" jdbcType="INTEGER" />
<result column="item_type" property="itemType" jdbcType="INTEGER" /> <result column="item_type" property="itemType" jdbcType="INTEGER" />
<result column="item_code" property="itemCode" jdbcType="INTEGER" /> <result column="item_code" property="itemCode" jdbcType="INTEGER" />
@@ -13,23 +13,18 @@
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="edit_time" property="editTime" jdbcType="TIMESTAMP" /> <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
<!-- 父id --> <!-- 父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>
<!-- 创建人员 --> <!-- 创建人员 -->
<association property="sysDictCreator" javaType="com.nis.domain.SysUser"> <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="loginId" column="login_id"/>
<result property="name" column="name"/> <result property="name" column="name"/>
</association> </association>
<!-- 修改人员 --> <!-- 修改人员 -->
<association property="sysDictEditor" javaType="com.nis.domain.SysUser"> <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="loginId" column="login_id"/>
<result property="name" column="name"/> <result property="name" column="name"/>
</association> </association>
@@ -54,7 +49,7 @@
</sql> </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 SELECT * FROM sys_dict_info WHERE is_valid=1 AND parent_id = 0
<if test="itemValue != null and itemValue != '' " > <if test="itemValue != null and itemValue != '' " >
@@ -94,7 +89,7 @@
</select> </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 SELECT * FROM sys_dict_info WHERE is_valid=1
<if test="itemType != null and itemType != '' " > <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 select
<include refid="sysDictInfoColumns"/> <include refid="sysDictInfoColumns"/>
from sys_dict_info s where s.sys_dict_id = #{sysDictId} 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) 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}, values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER},
#{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, #{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 SELECT
<include refid="sysDictInfoColumns"/> <include refid="sysDictInfoColumns"/>
FROM sys_dict_info s FROM sys_dict_info s
@@ -179,7 +174,7 @@
<!-- 根据itemCode查询字典对象列表 --> <!-- 根据itemCode查询字典对象列表 -->
<select id="findByItemCode" resultType="com.nis.domain.configuration.SysDictInfo"> <select id="findByItemCode" resultType="com.nis.domain.basics.SysDictInfo">
select select
<include refid="sysDictInfoColumns"/> <include refid="sysDictInfoColumns"/>
from sys_dict_info s where s.item_code = #{itemCode} from sys_dict_info s where s.item_code = #{itemCode}
@@ -192,5 +187,9 @@
from sys_dict_info s where parent_id = #{parentId} from sys_dict_info s where parent_id = #{parentId}
</select> </select>
<!-- 查询最大itemCode值 -->
<select id="findMaxItemCode" resultType="java.lang.Integer">
select max(s.item_code) from sys_dict_info s
</select>
</mapper> </mapper>

9
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java
View File

@@ -6,6 +6,7 @@ import java.util.Map;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.nis.domain.configuration.RequestInfo; import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.configuration.TaskInfo;
import com.nis.web.dao.CrudDao; import com.nis.web.dao.CrudDao;
import com.nis.web.dao.MyBatisDao; import com.nis.web.dao.MyBatisDao;
@@ -20,14 +21,8 @@ public interface RequestInfoDao extends CrudDao {
int deleteByPrimaryKey(Long id); 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);
} }

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

@@ -16,6 +16,7 @@
<result column="edit_time" jdbcType="DATE" property="editTime" /> <result column="edit_time" jdbcType="DATE" property="editTime" />
<result column="auditor_id" jdbcType="INTEGER" property="auditorId" /> <result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
<result column="audit_time" jdbcType="DATE" property="auditTime" /> <result column="audit_time" jdbcType="DATE" property="auditTime" />
<result column="task_id" jdbcType="BIGINT" property="taskId" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, request_number, request_org, request_time, request_title, request_content, is_valid, id, request_number, request_org, request_time, request_title, request_content, is_valid,
@@ -25,6 +26,7 @@
<select id="findRequestInfo" resultMap="BaseResultMap"> <select id="findRequestInfo" resultMap="BaseResultMap">
select select
r.id AS id, r.id AS id,
r.task_id AS taskId,
r.request_number AS requestNumber, r.request_number AS requestNumber,
r.request_org AS requestOrg, r.request_org AS requestOrg,
r.request_time AS requestTime, r.request_time AS requestTime,
@@ -37,11 +39,13 @@
u.name AS editorName, u.name AS editorName,
r.edit_time AS editTime, r.edit_time AS editTime,
e.name AS currentName, e.name AS currentName,
r.audit_time AS auditTime r.audit_time AS auditTime,
t.task_name AS taskName
from request_info r from request_info r
left join sys_user s on r.creator_id=s.id 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 u on r.editor_id=u.id
left join sys_user e on r.auditor_id=e.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 where r.is_valid=1 and r.is_audit !=3
<if test="requestTitle != null and requestTitle != ''"> <if test="requestTitle != null and requestTitle != ''">
AND r.request_title like AND r.request_title like
@@ -159,159 +163,4 @@
where id = #{id,jdbcType=BIGINT} and is_audit !=1 where id = #{id,jdbcType=BIGINT} and is_audit !=1
</update> </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> </mapper>

8
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java Normal file
View File

@@ -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>{
}

192
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml Normal file
View File

@@ -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>

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

@@ -1,265 +1,265 @@
/** /**
* Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved. * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
*/ */
package com.nis.web.service; package com.nis.web.service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.nis.domain.BaseEntity; import com.nis.domain.BaseEntity;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.maat.MaatCfg; import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.ToMaatBean; import com.nis.domain.maat.ToMaatBean;
import com.nis.web.dao.CrudDao; import com.nis.web.dao.CrudDao;
/** /**
* Service基类 * Service基类
* @author ThinkGem * @author ThinkGem
* @version 2014-05-16 * @version 2014-05-16
*/ */
public abstract class CrudService<D extends CrudDao<T>, T extends BaseEntity<T>> extends BaseService { public abstract class CrudService<D extends CrudDao<T>, T extends BaseEntity<T>> extends BaseService {
/** /**
* 持久层对象 * 持久层对象
*/ */
@Autowired @Autowired
protected D dao; protected D dao;
/** /**
* 获取单条数据 * 获取单条数据
* @param id * @param id
* @return * @return
*/ */
public T get(Long id) { public T get(Long id) {
return dao.get(id); return dao.get(id);
} }
/** /**
* 获取单条数据 * 获取单条数据
* @param entity * @param entity
* @return * @return
*/ */
public T get(T entity) { public T get(T entity) {
return dao.get(entity); return dao.get(entity);
} }
/** /**
* 查询列表数据 * 查询列表数据
* @param entity * @param entity
* @return * @return
*/ */
public List<T> findList(T entity) { public List<T> findList(T entity) {
return dao.findList(entity); return dao.findList(entity);
} }
/** /**
* 查询分页数据 * 查询分页数据
* @param page 分页对象 * @param page 分页对象
* @param entity * @param entity
* @return * @return
*/ */
public Page<T> findPage(Page<T> page, T entity) { public Page<T> findPage(Page<T> page, T entity) {
entity.setPage(page); entity.setPage(page);
page.setList(dao.findList(entity)); page.setList(dao.findList(entity));
return page; return page;
} }
/** /**
* 保存数据（插入或更新） * 保存数据（插入或更新）
* @param entity * @param entity
*/ */
public void save(T entity) { public void save(T entity) {
if (entity.getIsNewRecord()){ if (entity.getIsNewRecord()){
dao.insert(entity); dao.insert(entity);
}else{ }else{
dao.update(entity); dao.update(entity);
} }
} }
/** /**
* 删除数据 * 删除数据
* @param entity * @param entity
*/ */
public void delete(T entity) { public void delete(T entity) {
dao.delete(entity); dao.delete(entity);
} }
/** /**
* *
* saveBatch(批量全部保存数据) * saveBatch(批量全部保存数据)
* (这里描述这个方法适用条件 – 可选) * (这里描述这个方法适用条件 – 可选)
* @param data 数据集合 * @param data 数据集合
* @param mClass 传入的dao.xml里的mapper * @param mClass 传入的dao.xml里的mapper
* @author wx * @author wx
* @since 1.0.0 * @since 1.0.0
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void saveBatch(List<T> data,@SuppressWarnings("rawtypes")Class mClass) { public void saveBatch(List<T> data,@SuppressWarnings("rawtypes")Class mClass) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null; SqlSession batchSqlSession = null;
try{ try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(int index = 0; index < data.size();index++){ for(int index = 0; index < data.size();index++){
T t = data.get(index); T t = data.get(index);
((CrudDao<T>) batchSqlSession.getMapper(mClass)).insert(t); ((CrudDao<T>) batchSqlSession.getMapper(mClass)).insert(t);
} }
batchSqlSession.commit(); batchSqlSession.commit();
// }catch (Exception e){ // }catch (Exception e){
// batchSqlSession.rollback(); // batchSqlSession.rollback();
// throw e; // throw e;
}finally { }finally {
if(batchSqlSession != null){ if(batchSqlSession != null){
batchSqlSession.close(); batchSqlSession.close();
} }
} }
} }
/** /**
* *
* updateBatch(批量更新全部数据) * updateBatch(批量更新全部数据)
* (这里描述这个方法适用条件 – 可选) * (这里描述这个方法适用条件 – 可选)
* @param data 数据集合 * @param data 数据集合
* @param mClass 传入的dao.xml里的mapper * @param mClass 传入的dao.xml里的mapper
* @author wx * @author wx
* @since 1.0.0 * @since 1.0.0
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void updateBatch(List<T> data,@SuppressWarnings("rawtypes") Class mClass) { public void updateBatch(List<T> data,@SuppressWarnings("rawtypes") Class mClass) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null; SqlSession batchSqlSession = null;
try{ try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(int index = 0; index < data.size();index++){ for(int index = 0; index < data.size();index++){
T t = data.get(index); T t = data.get(index);
((CrudDao<T>) batchSqlSession.getMapper(mClass)).update(t); ((CrudDao<T>) batchSqlSession.getMapper(mClass)).update(t);
} }
batchSqlSession.commit(); batchSqlSession.commit();
// }catch (Exception e){ // }catch (Exception e){
// batchSqlSession.rollback(); // batchSqlSession.rollback();
// throw e; // throw e;
}finally { }finally {
if(batchSqlSession != null){ if(batchSqlSession != null){
batchSqlSession.close(); batchSqlSession.close();
} }
} }
} }
/** /**
* *
* deleteBatch(批量删除全部数据) * deleteBatch(批量删除全部数据)
* (这里描述这个方法适用条件 – 可选) * (这里描述这个方法适用条件 – 可选)
* @param data 数据集合 * @param data 数据集合
* @param mClass 传入的dao.xml里的mapper * @param mClass 传入的dao.xml里的mapper
* @author wx * @author wx
* @since 1.0.0 * @since 1.0.0
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void deleteBatch(List<T> data,@SuppressWarnings("rawtypes") Class mClass) { public void deleteBatch(List<T> data,@SuppressWarnings("rawtypes") Class mClass) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null; SqlSession batchSqlSession = null;
try{ try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(int index = 0; index < data.size();index++){ for(int index = 0; index < data.size();index++){
T t = data.get(index); T t = data.get(index);
((CrudDao<T>) batchSqlSession.getMapper(mClass)).delete(t); ((CrudDao<T>) batchSqlSession.getMapper(mClass)).delete(t);
} }
batchSqlSession.commit(); batchSqlSession.commit();
// }catch (Exception e){ // }catch (Exception e){
// batchSqlSession.rollback(); // batchSqlSession.rollback();
// throw e; // throw e;
}finally { }finally {
if(batchSqlSession != null){ if(batchSqlSession != null){
batchSqlSession.close(); batchSqlSession.close();
} }
} }
} }
/** /**
* *
* sendToMaatConvertor(转换配置为Maat格式) * sendToMaatConvertor(转换配置为Maat格式)
* (所有的配置需拥有一样的编译ID，action,serviceId,等属性) * (所有的配置需拥有一样的编译ID，action,serviceId,等属性)
* @param cfg * @param cfg
* @return * @return
*boolean *boolean
* @exception * @exception
* @since 1.0.0 * @since 1.0.0
*/ */
public boolean sendToMaatConvertor(AreaIpCfg[] areaCfg,T ... cfg){ public boolean sendToMaatConvertor(AreaIpCfg[] areaCfg,T ... cfg){
if(cfg==null){ if(cfg==null){
throw new RuntimeException("转换出错,配置为空"); throw new RuntimeException("转换出错,配置为空");
} }
long compileId=0l; long compileId=0l;
ToMaatBean toMaatBean=new ToMaatBean(); ToMaatBean toMaatBean=new ToMaatBean();
MaatCfg maatCfg=new MaatCfg(); MaatCfg maatCfg=new MaatCfg();
if(cfg[0] instanceof BaseIpCfg){ if(cfg[0] instanceof BaseIpCfg){
maatCfg.setIpCfg((BaseIpCfg[])cfg); maatCfg.setIpCfg((BaseIpCfg[])cfg);
compileId=((BaseIpCfg)cfg[0]).getCompileId(); compileId=((BaseIpCfg)cfg[0]).getCompileId();
}else if(cfg[0] instanceof BaseStringCfg){ }else if(cfg[0] instanceof BaseStringCfg){
maatCfg.setStrCfg((BaseStringCfg[])cfg); maatCfg.setStrCfg((BaseStringCfg[])cfg);
compileId=((BaseStringCfg)cfg[0]).getCompileId(); compileId=((BaseStringCfg)cfg[0]).getCompileId();
}else if(cfg[0] instanceof ComplexkeywordCfg){ }else if(cfg[0] instanceof ComplexkeywordCfg){
maatCfg.setComplexStrCfg((ComplexkeywordCfg[])cfg); maatCfg.setComplexStrCfg((ComplexkeywordCfg[])cfg);
compileId=((ComplexkeywordCfg)cfg[0]).getCompileId(); compileId=((ComplexkeywordCfg)cfg[0]).getCompileId();
} }
if(areaCfg!=null){ if(areaCfg!=null){
AreaIpCfg[] cfgArray=new AreaIpCfg[1]; AreaIpCfg[] cfgArray=new AreaIpCfg[1];
} }
List<MaatCfg> serviceCfg=new ArrayList<>(); List<MaatCfg> serviceCfg=new ArrayList<>();
serviceCfg.add(maatCfg); serviceCfg.add(maatCfg);
BaseCfg baseCfg=(BaseCfg)cfg[0]; BaseCfg baseCfg=(BaseCfg)cfg[0];
if(compileId==0l){ if(compileId==0l){
throw new RuntimeException("转换出错,未获取到正确的compileId"); throw new RuntimeException("转换出错,未获取到正确的compileId");
}else{ }else{
toMaatBean.setCompileId(compileId); toMaatBean.setCompileId(compileId);
} }
if(baseCfg.getAction()==null){ if(baseCfg.getAction()==null){
throw new RuntimeException("转换出错,未获取到正确的action"); throw new RuntimeException("转换出错,未获取到正确的action");
}else{ }else{
toMaatBean.setAction(baseCfg.getAction()); toMaatBean.setAction(baseCfg.getAction());
} }
if(baseCfg.getIsAreaEffective()==null){ if(baseCfg.getIsAreaEffective()==null){
throw new RuntimeException("转换出错,未获取到正确的isAreaEffective"); throw new RuntimeException("转换出错,未获取到正确的isAreaEffective");
}else{ }else{
toMaatBean.setIsAreaEffective(baseCfg.getIsAreaEffective()); toMaatBean.setIsAreaEffective(baseCfg.getIsAreaEffective());
} }
if(baseCfg.getIsValid()==null){ if(baseCfg.getIsValid()==null){
throw new RuntimeException("转换出错,未获取到正确的isValid"); throw new RuntimeException("转换出错,未获取到正确的isValid");
}else{ }else{
toMaatBean.setIsValid(baseCfg.getIsValid()); toMaatBean.setIsValid(baseCfg.getIsValid());
} }
if(baseCfg.getRequestId()==null){ if(baseCfg.getRequestId()==null){
throw new RuntimeException("转换出错,未获取到正确的requestId"); throw new RuntimeException("转换出错,未获取到正确的requestId");
}else{ }else{
toMaatBean.setRequestId(baseCfg.getRequestId()); toMaatBean.setRequestId(baseCfg.getRequestId());
} }
if(baseCfg.getServiceId()==null){ if(baseCfg.getServiceId()==null){
throw new RuntimeException("转换出错,未获取到正确的serviceId"); throw new RuntimeException("转换出错,未获取到正确的serviceId");
}else{ }else{
toMaatBean.setServiceId(baseCfg.getServiceId()); toMaatBean.setServiceId(baseCfg.getServiceId());
} }
toMaatBean.setAreaEffectiveIds(baseCfg.getAreaEffectiveIds()==null?"":baseCfg.getAreaEffectiveIds()); toMaatBean.setAreaEffectiveIds(baseCfg.getAreaEffectiveIds()==null?"":baseCfg.getAreaEffectiveIds());
toMaatBean.setAttribute(baseCfg.getAttribute()==null?"":baseCfg.getAttribute()); toMaatBean.setAttribute(baseCfg.getAttribute()==null?"":baseCfg.getAttribute());
toMaatBean.setClassify(baseCfg.getClassify()==null?"":baseCfg.getClassify()); toMaatBean.setClassify(baseCfg.getClassify()==null?"":baseCfg.getClassify());
toMaatBean.setLable(baseCfg.getLable()==null?"":baseCfg.getLable()); toMaatBean.setLable(baseCfg.getLable()==null?"":baseCfg.getLable());
Gson gson=new GsonBuilder().disableHtmlEscaping() Gson gson=new GsonBuilder().disableHtmlEscaping()
.setDateFormat("yyyy-MM-dd HH:mm:ss") .setDateFormat("yyyy-MM-dd HH:mm:ss")
/*.setPrettyPrinting().serializeNulls()*/ /*.setPrettyPrinting().serializeNulls()*/
.excludeFieldsWithoutExposeAnnotation() .excludeFieldsWithoutExposeAnnotation()
.create(); .create();
String json=gson.toJson(toMaatBean); String json=gson.toJson(toMaatBean);
//发送至maat,待完成 //发送至maat,待完成
return false; return false;
} }
} }

8
src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java → src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
View File

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

12
src/main/java/com/nis/web/service/configuration/SysDictInfoService.java → src/main/java/com/nis/web/service/basics/SysDictInfoService.java
View File

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

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

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

16
src/main/resources/generatorConfig.xml
View File

@@ -5,35 +5,35 @@
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd"> "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration> <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"> <context id="mysqlTables" targetRuntime="MyBatis3">
<commentGenerator> <commentGenerator>
<property name="suppressAllComments" value="true"/> <property name="suppressAllComments" value="true"/>
</commentGenerator> </commentGenerator>
<jdbcConnection driverClass="com.mysql.jdbc.Driver" <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> </jdbcConnection>
<javaTypeResolver> <javaTypeResolver>
<property name="forceBigDecimals" value="false"/> <property name="forceBigDecimals" value="false"/>
</javaTypeResolver> </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="enableSubPackages" value="true"/>
<property name="trimStrings" value="true"/> <property name="trimStrings" value="true"/>
</javaModelGenerator> </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"/> <property name="enableSubPackages" value="true"/>
</sqlMapGenerator> </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"/> <property name="enableSubPackages" value="true"/>
</javaClientGenerator> </javaClientGenerator>
<table tableName="reg_attach_info" <table tableName="task_info"
domainObjectName="regAttachInfo" domainObjectName="TaskInfo"
enableCountByExample="false" enableCountByExample="false"
enableSelectByExample="false" enableSelectByExample="false"
enableUpdateByExample="false" enableUpdateByExample="false"

48
src/main/resources/messages/message_en.properties
View File

@@ -87,7 +87,9 @@ trmp_ip_monitor=trmp ip monitor
examine_manage=examine manage examine_manage=examine manage
audit_manage=audit manage audit_manage=audit manage
log_search=log search log_search=log search
sysService_manage=system service manage
service_manage=service type manage
system_service_manage=system service type manage
#============menu end====================== #============menu end======================
#============yewu begin====================== #============yewu begin======================
@@ -108,14 +110,14 @@ edit_time=edittime
#============laihan begin====================== #============laihan begin======================
refresh=refresh refresh=refresh
add_request=add request add=add
request_number=request number request_number=request number
state=state state=state
created=created created=created
examine=examine
unapproved=unapproved unapproved=unapproved
approved=approved approved=approved
title=title title=title
task=task
request_time=request time request_time=request time
operate_time=operate time operate_time=operate time
search=search search=search
@@ -123,16 +125,52 @@ request_organization=request organization
operator=operator operator=operator
content=content content=content
remarks=remarks remarks=remarks
update_request=update request
operation=operation operation=operation
submit=submit submit=submit
cancel=cancel cancel=cancel
begin_date=begin date begin_date=begin date
end_date=end date end_date=end date
delete=delete delete=delete
special_task=special task
#============laihan end====================== #============laihan end======================
#==========message begin===================== #==========message begin=====================
required=This field is required\uff01 required=This field is required\uff01
#==========message end===================== 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=====================

49
src/main/resources/messages/message_ru.properties
View File

@@ -87,7 +87,9 @@ trmp_ip_monitor=trmp ip monitor
examine_manage=examine manage examine_manage=examine manage
audit_manage=audit manage audit_manage=audit manage
log_search=log search log_search=log search
sysService_manage=system service manage
service_manage=service type manage
system_service_manage=system service type manage
#============menu end====================== #============menu end======================
#============yewu begin====================== #============yewu begin======================
@@ -108,14 +110,14 @@ edit_time=edittime
#============laihan begin====================== #============laihan begin======================
refresh=refresh refresh=refresh
add_request=add request add=add
request_number=request number request_number=request number
state=state state=state
created=created created=created
examine=examine
unapproved=unapproved unapproved=unapproved
approved=approved approved=approved
title=title title=title
task=task
request_time=request time request_time=request time
operate_time=operate time operate_time=operate time
search=search search=search
@@ -123,15 +125,52 @@ request_organization=request organization
operator=operator operator=operator
content=content content=content
remarks=remarks remarks=remarks
update_request=update request
operation=operation operation=operation
submit=submit submit=submit
cancel=cancel cancel=cancel
begin_date=begin date begin_date=begin date
end_date=end date end_date=end date
delete=delete delete=delete
special_task=special task
#============laihan end====================== #============laihan end======================
#==========message begin===================== #==========message begin=====================
required=This field is required！ required=This field is required！
#==========message end===================== 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=====================

51
src/main/resources/messages/message_zh_CN.properties
View File

@@ -87,7 +87,9 @@ audit_manage=\u5ba1\u8ba1\u7ba1\u7406
log_search=\u65e5\u5fd7\u68c0\u7d22 log_search=\u65e5\u5fd7\u68c0\u7d22
text_control=\u6587\u672c\u5e38\u89c4\u7ba1\u63a7 text_control=\u6587\u672c\u5e38\u89c4\u7ba1\u63a7
text_monitor=\u6587\u672c\u5e38\u89c4\u76d1\u6d4b 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===================== #==========menu end=====================
#==========yewu zidian begin===================== #==========yewu zidian begin=====================
@@ -107,14 +109,14 @@ edit_time=\u4fee\u6539\u65f6\u95f4
#==========laihan begin===================== #==========laihan begin=====================
refresh=\u5237\u65b0 refresh=\u5237\u65b0
add_request=\u65b0\u589e\u6765\u51fd add=\u65b0\u589e
request_number=\u6765\u51fd\u51fd\u53f7 request_number=\u6765\u51fd\u51fd\u53f7
state=\u72b6\u6001 state=\u72b6\u6001
created=\u672a\u5ba1\u6838 created=\u672a\u5ba1\u6838
examine=\u5ba1\u6838
unapproved=\u672a\u901a\u8fc7 unapproved=\u672a\u901a\u8fc7
approved=\u5ba1\u6838\u901a\u8fc7 approved=\u5df2\u901a\u8fc7
title=\u6807\u9898 title=\u6807\u9898
task=\u4efb\u52a1
request_time=\u6765\u51fd\u65f6\u95f4 request_time=\u6765\u51fd\u65f6\u95f4
operate_time=\u64cd\u4f5c\u65f6\u95f4 operate_time=\u64cd\u4f5c\u65f6\u95f4
search=\u641c\u7d22 search=\u641c\u7d22
@@ -122,15 +124,52 @@ request_organization=\u6765\u51fd\u5355\u4f4d
operator=\u64cd\u4f5c\u5458 operator=\u64cd\u4f5c\u5458
content=\u5185\u5bb9 content=\u5185\u5bb9
remarks=\u5907\u6ce8 remarks=\u5907\u6ce8
update_request=\u4fee\u6539\u6765\u51fd
operation=\u64cd\u4f5c operation=\u64cd\u4f5c
submit=\u63d0\u4ea4 submit=\u63d0\u4ea4
cancel=\u53d6\u6d88 cancel=\u53d6\u6d88
begin_date=\u5f00\u59cb\u65f6\u95f4 begin_date=\u5f00\u59cb\u65f6\u95f4
end_date=\u7ed3\u675f\u65f6\u95f4 end_date=\u7ed3\u675f\u65f6\u95f4
delete=\u5220\u9664 delete=\u5220\u9664
special_task=\u4e13\u9879\u4efb\u52a1
#==========yewu zidian end===================== #==========yewu zidian end=====================
#==========message begin===================== #==========message begin=====================
required=\u4e0d\u80fd\u4e3a\u7a7a! required=\u4e0d\u80fd\u4e3a\u7a7a!
#==========message end===================== 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=====================

2
src/main/webapp/WEB-INF/include/header.jsp
View File

@@ -60,4 +60,6 @@
<script src="${pageContext.request.contextPath}/static/layouts/layout/scripts/layout.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/layouts/layout/scripts/layout.js" type="text/javascript"></script>
<!-- END THEME LAYOUT SCRIPTS --> <!-- 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>

36
src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp → src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

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

4
src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp → src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp
View File

@@ -35,13 +35,13 @@
<div class="form-body"> <div class="form-body">
<!-- BEGIN FORM--> <!-- 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"/> <form:hidden path="serviceDictId"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">上级配置:</label> <label class="col-md-3 control-label">上级配置:</label>
<div class="col-md-4"> <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> </div>
<div class="form-group"> <div class="form-group">

18
src/main/webapp/WEB-INF/views/cfg/serviceDictInfoSearchList.jsp → src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
View File

@@ -16,7 +16,7 @@
$("#intype").attr("name",$("#seltype").val()); $("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n); $("#pageNo").val(n);
$("#pageSize").val(s); $("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}"); $("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
$("#searchForm").submit(); $("#searchForm").submit();
return false; return false;
} }
@@ -24,7 +24,7 @@
$("#intype").attr("name",$("#seltype").val()); $("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n); $("#pageNo").val(n);
$("#pageSize").val(s); $("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}"); $("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
$("#searchForm").submit(); $("#searchForm").submit();
return false; return false;
} }
@@ -37,9 +37,9 @@
</head> </head>
<body> <body>
<div class="theme-panel hidden-xs hidden-sm"> <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" <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> </div>
<h3 class="page-title"> <h3 class="page-title">
@@ -58,7 +58,7 @@
<div class="row" > <div class="row" >
<div class="col-md-12"> <div class="col-md-12">
<sys:message content="${message}"/> <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="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12"> <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> <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"> <tbody><c:forEach items="${page.list}" var="serviceDictInfo">
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}"> <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>${serviceDictInfo.itemCode}</td>
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</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("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
<div class="btn-group btn-xs"> <div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a> <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<ul class="dropdown-menu btn-xs"> <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"> <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>
<shiro:hasPermission name="sys:dict:edit"> <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> </shiro:hasPermission>
</ul> </ul>

18
src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp → src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
View File

@@ -16,7 +16,7 @@
$("#intype").attr("name",$("#seltype").val()); $("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n); $("#pageNo").val(n);
$("#pageSize").val(s); $("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/list?itType=${itType}"); $("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/list?itType=${itType}");
$("#searchForm").submit(); $("#searchForm").submit();
return false; return false;
} }
@@ -24,7 +24,7 @@
$("#intype").attr("name",$("#seltype").val()); $("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n); $("#pageNo").val(n);
$("#pageSize").val(s); $("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}"); $("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
$("#searchForm").submit(); $("#searchForm").submit();
return false; return false;
} }
@@ -37,9 +37,9 @@
</head> </head>
<body> <body>
<div class="theme-panel hidden-xs hidden-sm"> <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" <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> </div>
<h3 class="page-title"> <h3 class="page-title">
@@ -58,7 +58,7 @@
<div class="row" > <div class="row" >
<div class="col-md-12"> <div class="col-md-12">
<sys:message content="${message}"/> <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="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12"> <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> <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"> <tbody><c:forEach items="${list}" var="serviceDictInfo">
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}"> <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>${serviceDictInfo.itemCode}</td>
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</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("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
<div class="btn-group btn-xs"> <div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a> <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<ul class="dropdown-menu btn-xs"> <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"> <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>
<shiro:hasPermission name="sys:dict:edit"> <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> </shiro:hasPermission>
</ul> </ul>

36
src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp → src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
View File

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

4
src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp → src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp
View File

@@ -35,13 +35,13 @@
<div class="form-body"> <div class="form-body">
<!-- BEGIN FORM--> <!-- 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"/> <form:hidden path="sysDictId"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">上级配置:</label> <label class="col-md-3 control-label">上级配置:</label>
<div class="col-md-4"> <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> </div>
<div class="form-group"> <div class="form-group">

18
src/main/webapp/WEB-INF/views/cfg/sysDictInfoSearchList.jsp → src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
View File

@@ -16,7 +16,7 @@
$("#intype").attr("name",$("#seltype").val()); $("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n); $("#pageNo").val(n);
$("#pageSize").val(s); $("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}"); $("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
$("#searchForm").submit(); $("#searchForm").submit();
return false; return false;
} }
@@ -24,7 +24,7 @@
$("#intype").attr("name",$("#seltype").val()); $("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n); $("#pageNo").val(n);
$("#pageSize").val(s); $("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}"); $("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
$("#searchForm").submit(); $("#searchForm").submit();
return false; return false;
} }
@@ -37,9 +37,9 @@
</head> </head>
<body> <body>
<div class="theme-panel hidden-xs hidden-sm"> <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" <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> </div>
<h3 class="page-title"> <h3 class="page-title">
@@ -58,7 +58,7 @@
<div class="row" > <div class="row" >
<div class="col-md-12"> <div class="col-md-12">
<sys:message content="${message}"/> <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="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12"> <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> <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"> <tbody><c:forEach items="${page.list}" var="sysDictInfo">
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}"> <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>${sysDictInfo.itemCode}</td>
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td> <td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td> <td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
<div class="btn-group btn-xs"> <div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a> <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<ul class="dropdown-menu btn-xs"> <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"> <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>
<shiro:hasPermission name="sys:dict:edit"> <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> </shiro:hasPermission>
</ul> </ul>

18
src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp → src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
View File

@@ -16,7 +16,7 @@
$("#intype").attr("name",$("#seltype").val()); $("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n); $("#pageNo").val(n);
$("#pageSize").val(s); $("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/list?itType=${itType}"); $("#searchForm").attr("action","${ctx}/basics/sysDictInfo/list?itType=${itType}");
$("#searchForm").submit(); $("#searchForm").submit();
return false; return false;
} }
@@ -24,7 +24,7 @@
$("#intype").attr("name",$("#seltype").val()); $("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n); $("#pageNo").val(n);
$("#pageSize").val(s); $("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}"); $("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
$("#searchForm").submit(); $("#searchForm").submit();
return false; return false;
} }
@@ -37,9 +37,9 @@
</head> </head>
<body> <body>
<div class="theme-panel hidden-xs hidden-sm"> <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" <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> </div>
<h3 class="page-title"> <h3 class="page-title">
@@ -58,7 +58,7 @@
<div class="row" > <div class="row" >
<div class="col-md-12"> <div class="col-md-12">
<sys:message content="${message}"/> <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="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12"> <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> <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"> <tbody><c:forEach items="${list}" var="sysDictInfo">
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}"> <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>${sysDictInfo.itemCode}</td>
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td> <td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td> <td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
<div class="btn-group btn-xs"> <div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a> <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<ul class="dropdown-menu btn-xs"> <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"> <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>
<shiro:hasPermission name="sys:dict:edit"> <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> </shiro:hasPermission>
</ul> </ul>

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

@@ -7,18 +7,18 @@
</head> </head>
<body> <body>
<div class="content"> <div class="page-content">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <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>
<div class="portlet-body form"> <div class="portlet-body form">
<!-- BEGIN 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}"/> <sys:message content="${message}"/>
<input type="hidden" name="id" value="${requestInfo.id}"/> <input type="hidden" name="id" value="${requestInfo.id}"/>
<div class="form-body"> <div class="form-body">
@@ -47,12 +47,23 @@
<input type="text" class="form-control" name="requestTitle" value="${requestInfo.requestTitle}"> <input type="text" class="form-control" name="requestTitle" value="${requestInfo.requestTitle}">
</div> </div>
</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"> <div class="col-md-4">
<input type="text" class="form-control" name="requestContent" value="${requestInfo.requestContent}"> <input type="text" class="form-control" name="requestContent" value="${requestInfo.requestContent}">
</div> </div>
</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>
<div class="form-actions"> <div class="form-actions">
<div class="row"> <div class="row">

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

@@ -8,15 +8,15 @@
<body> <body>
<div class="content"> <div class="page-content">
<div class="theme-panel hidden-xs hidden-sm"> <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-default" onclick="location='${ctx}/cfg/request/list'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary" <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> </div>
<h3 class="page-title"> <h3 class="page-title">
来函管理 <spring:message code="requestInfo"></spring:message>
</h3> </h3>
<div class="row"> <div class="row">
@@ -24,7 +24,7 @@
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <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> </div>
<div class="portlet-body"> <div class="portlet-body">
@@ -35,19 +35,20 @@
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12"> <div class="col-md-12">
<spring:message code="state"/> : <form:select path="isAudit" class="select2"> <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="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
</form:select> </form:select>
<select id="seltype"> <select id="seltype">
<option value=""><spring:message code="select"></spring:message></option>
<option value="requestTitle"><spring:message code="title"></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="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"> </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="requestTime"><spring:message code="request_time"></spring:message></form:option>
<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option> <form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
</form:select> </form:select>
@@ -79,6 +80,7 @@
<th><spring:message code="operate_time"></spring:message></th> <th><spring:message code="operate_time"></spring:message></th>
<th><spring:message code="title"></spring:message></th> <th><spring:message code="title"></spring:message></th>
<th><spring:message code="content"></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> <th><spring:message code="operation"></spring:message></th>
</tr> </tr>
</thead> </thead>
@@ -110,6 +112,7 @@
</td> </td>
<td>${requestInfo.requestTitle }</td> <td>${requestInfo.requestTitle }</td>
<td>${requestInfo.requestContent }</td> <td>${requestInfo.requestContent }</td>
<td>${requestInfo.taskName }</td>
<td> <td>
<div class="btn-group btn-xs"> <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> <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:choose>
<c:when test="${requestInfo.isAudit eq '1'}"> <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:when>
<c:otherwise> <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:otherwise>
</c:choose> </c:choose>
</ul> </ul>

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

@@ -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>

4
src/main/webapp/WEB-INF/views/login.jsp
View File

@@ -47,10 +47,10 @@
<img src="${pageContext.request.contextPath}/static/pages/img/photo.jpg" class="login-avatar"> </div> <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"> <form id="loginForm" class="login-form pull-left" action="${pageContext.request.contextPath }/login" method="post">
<div class="form-group"> <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>
<div class="form-group"> <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> </div>
<%-- <c:if test="${not empty isValidateCodeLogin or isValidateCodeLogin==true}"> <%-- <c:if test="${not empty isValidateCodeLogin or isValidateCodeLogin==true}">

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

@@ -18,7 +18,7 @@ function page(n,s){
function deleteService(id) { function deleteService(id) {
if (id) { if (id) {
if (confirm("确认删除?")) { if (confirm("<spring:message code='confirm_message'/>")) {
$("#serviceId").val(id); $("#serviceId").val(id);
$("#searchForm").attr("action","${ctx}/systemService/delete"); $("#searchForm").attr("action","${ctx}/systemService/delete");
$("#searchForm").submit(); $("#searchForm").submit();
@@ -30,12 +30,12 @@ function deleteService(id) {
<div class="theme-panel hidden-xs hidden-sm"> <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> <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"> <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> </shiro:hasPermission>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
系统业务管理 <spring:message code="sysService_manage"></spring:message>
</h3> </h3>
<div class="row"> <div class="row">
@@ -43,7 +43,7 @@ function deleteService(id) {
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-cogs"></i>列表 <i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
</div> </div>
</div> </div>
@@ -56,35 +56,35 @@ function deleteService(id) {
<div class="row search-table"> <div class="row search-table">
<div class="col-md-12"> <div class="col-md-12">
<span class="search-item" class="input-small"> <span class="search-item" class="input-small">
<span>动作 :</span> <span><spring:message code="act"/> :</span>
<form:select path="action"> <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> </form:select>
</span> </span>
<span class="search-item" class="input-small"> <span class="search-item" class="input-small">
<span>类型 :</span> <span><spring:message code="type"/> :</span>
<form:select path="serviceType"> <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> </form:select>
</span> </span>
<span class="search-item"> <span class="search-item">
<span>业务名称 :</span> <span><spring:message code="service_name"/> :</span>
<form:input path="serviceName" htmlEscape="false" class="input-small"/> <form:input path="serviceName" htmlEscape="false" class="input-small"/>
</span> </span>
<span class="search-item"> <span class="search-item">
<span>业务ID :</span> <span><spring:message code="service_id"/> :</span>
<form:input path="serviceId" htmlEscape="false" class="input-small"/> <form:input path="serviceId" htmlEscape="false" class="input-small"/>
</span> </span>
@@ -101,14 +101,14 @@ function deleteService(id) {
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <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><spring:message code="creator_id"></spring:message></th>
<th style="width:15%"><spring:message code="create_time"></spring:message></th> <th style="width:15%"><spring:message code="create_time"></spring:message></th>
<th><spring:message code="desc"></spring:message></th> <th><spring:message code="desc"></spring:message></th>
<th>操作</th> <th><spring:message code="operation"/></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -117,17 +117,17 @@ function deleteService(id) {
<td>${ssi.serviceName }</td> <td>${ssi.serviceName }</td>
<td>${ssi.serviceId }</td> <td>${ssi.serviceId }</td>
<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>
<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>
<td>${ssi.creator.loginId }</td> <td>${ssi.creator.loginId }</td>
<td><fmt:formatDate value="${ssi.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> <td><fmt:formatDate value="${ssi.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>