diff --git a/pom.xml b/pom.xml index fa978d4b9..8feba6ef3 100644 --- a/pom.xml +++ b/pom.xml @@ -494,6 +494,12 @@ org.apache.cxf cxf-rt-frontend-jaxws 3.1.4 + + + asm + org.ow2.asm + + @@ -591,6 +597,18 @@ org.mortbay.jetty jsp-2.1 + + asm + asm + + + asm-tree + asm + + + asm-commons + asm + @@ -610,6 +628,13 @@ httpclient 4.4 + + + cglib + cglib + 3.1 + + diff --git a/src/main/java/com/nis/domain/ServiceConfigInfo.java b/src/main/java/com/nis/domain/ServiceConfigInfo.java new file mode 100644 index 000000000..c9b608332 --- /dev/null +++ b/src/main/java/com/nis/domain/ServiceConfigInfo.java @@ -0,0 +1,75 @@ +package com.nis.domain; + +import java.text.SimpleDateFormat; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +public class ServiceConfigInfo { + + private Long id; + private String tableName;//配置表名 + private String tableDesc;//表描述 + private Integer tableType;//表类型 1:ip类配置表;2:字符串类配置表;3:数值类配置表;4:增强字符串配置表; + private String maatTable;//maat中对应的表名 + private Integer serviceId;//业务id,对应SystemServiceInfo.serviceId + private Integer isValid;//有效标识 0:无效;1:有效; + + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public String getTableName() { + return tableName; + } + public void setTableName(String tableName) { + this.tableName = tableName; + } + public String getTableDesc() { + return tableDesc; + } + public void setTableDesc(String tableDesc) { + this.tableDesc = tableDesc; + } + public Integer getTableType() { + return tableType; + } + public void setTableType(Integer tableType) { + this.tableType = tableType; + } + public String getMaatTable() { + return maatTable; + } + public void setMaatTable(String maatTable) { + this.maatTable = maatTable; + } + public Integer getServiceId() { + return serviceId; + } + public void setServiceId(Integer serviceId) { + this.serviceId = serviceId; + } + public Integer getIsValid() { + return isValid; + } + public void setIsValid(Integer isValid) { + this.isValid = isValid; + } + + @Override + public String toString() { + return this.toJson(); + } + + public String toJson() { + ObjectMapper mapper = new ObjectMapper(); + mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")); + try { + return mapper.writeValueAsString(this); + } catch (JsonProcessingException e) { + return e.getMessage(); + } + } +} diff --git a/src/main/java/com/nis/domain/SystemServiceInfo.java b/src/main/java/com/nis/domain/SystemServiceInfo.java new file mode 100644 index 000000000..77e589864 --- /dev/null +++ b/src/main/java/com/nis/domain/SystemServiceInfo.java @@ -0,0 +1,108 @@ +package com.nis.domain; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +public class SystemServiceInfo extends BaseEntity { + + private static final long serialVersionUID = -8919580011013718190L; + + private Integer serviceId;//业务id + private String serviceName;//业务名称 + private String serviceDesc;//业务描述 + private Integer action;//业务动作 1:阻断;2:监测;5:FD白名单;6:监测白名单;7:FD监测白名单;8:灰名单; + private Integer isValid;//有效标识 0:无效;1:有效; + private Integer serviceType;//业务类型 1:常规(单域)业务配置;2:多域业务配置; + private SysUser creator; + private Date createTime; + private SysUser editor; + private Date editTime; + private List serviceConfigInfoList;//业务配置表 + + public Integer getServiceId() { + return serviceId; + } + public void setServiceId(Integer serviceId) { + this.serviceId = serviceId; + } + public String getServiceName() { + return serviceName; + } + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + public String getServiceDesc() { + return serviceDesc; + } + public void setServiceDesc(String serviceDesc) { + this.serviceDesc = serviceDesc; + } + public Integer getAction() { + return action; + } + public void setAction(Integer action) { + this.action = action; + } + public Integer getIsValid() { + return isValid; + } + public void setIsValid(Integer isValid) { + this.isValid = isValid; + } + public Integer getServiceType() { + return serviceType; + } + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + public SysUser getCreator() { + return creator; + } + public void setCreator(SysUser creator) { + this.creator = creator; + } + public Date getCreateTime() { + return createTime; + } + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public SysUser getEditor() { + return editor; + } + public void setEditor(SysUser editor) { + this.editor = editor; + } + public Date getEditTime() { + return editTime; + } + public void setEditTime(Date editTime) { + this.editTime = editTime; + } + + public List getServiceConfigInfoList() { + return serviceConfigInfoList; + } + public void setServiceConfigInfoList(List serviceConfigInfoList) { + this.serviceConfigInfoList = serviceConfigInfoList; + } + + @Override + public String toString() { + return this.toJson(); + } + + public String toJson() { + ObjectMapper mapper = new ObjectMapper(); + mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")); + try { + return mapper.writeValueAsString(this); + } catch (JsonProcessingException e) { + return e.getMessage(); + } + } +} diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index b9701e495..e38a0d2d8 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -34,6 +34,7 @@ import com.nis.web.service.configuration.MediaCfgService; import com.nis.web.service.configuration.SslCfgService; import com.nis.web.service.configuration.TunnelCfgService; import com.nis.web.service.configuration.WebCfgService; +import com.nis.web.service.systemService.SystemServiceService; public class BaseController { @@ -88,6 +89,9 @@ public class BaseController { @Autowired protected AppCfgService appCfgService; + @Autowired + protected SystemServiceService systemServiceService; + protected final Logger logger = Logger.getLogger(this.getClass()); diff --git a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java new file mode 100644 index 000000000..84fadeafa --- /dev/null +++ b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java @@ -0,0 +1,38 @@ +package com.nis.web.controller.systemService; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.nis.domain.Page; +import com.nis.domain.SystemServiceInfo; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping("${adminPath}/sysService") +public class SystemServiceController extends BaseController { + + @RequestMapping(value = "list") + public String list(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { + Page page = systemServiceService.findPage(new Page(request, response, 1), systemServiceInfo); + model.addAttribute("page", page); + return "/systemService/list"; + } + + @RequestMapping(value = "form") + public String detail(Model model, SystemServiceInfo systemServiceInfo) { + return "/sysService/form"; + } + + @RequestMapping(value = "save") + public String save(Model model, SystemServiceInfo systemServiceInfo) { + systemServiceInfo = systemServiceService.get(systemServiceInfo); + model.addAttribute("systemServiceInfo", systemServiceInfo); + return ""; + } + + +} diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfo.xml b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfo.xml new file mode 100644 index 000000000..00c573ab9 --- /dev/null +++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfo.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java new file mode 100644 index 000000000..8b2cb85b3 --- /dev/null +++ b/src/main/java/com/nis/web/dao/systemService/ServiceConfigInfoDao.java @@ -0,0 +1,5 @@ +package com.nis.web.dao.systemService; + +public interface ServiceConfigInfoDao { + +} diff --git a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java new file mode 100644 index 000000000..de3b35ea0 --- /dev/null +++ b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java @@ -0,0 +1,10 @@ +package com.nis.web.dao.systemService; + +import com.nis.domain.SystemServiceInfo; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface SystemServiceInfoDao extends CrudDao { + +} diff --git a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml new file mode 100644 index 000000000..b7f19c0a2 --- /dev/null +++ b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/systemService/SystemServiceService.java b/src/main/java/com/nis/web/service/systemService/SystemServiceService.java new file mode 100644 index 000000000..949c11838 --- /dev/null +++ b/src/main/java/com/nis/web/service/systemService/SystemServiceService.java @@ -0,0 +1,12 @@ +package com.nis.web.service.systemService; + +import org.springframework.stereotype.Service; + +import com.nis.domain.SystemServiceInfo; +import com.nis.web.dao.systemService.SystemServiceInfoDao; +import com.nis.web.service.CrudService; + +@Service +public class SystemServiceService extends CrudService{ + +} diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp new file mode 100644 index 000000000..d478cc382 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp @@ -0,0 +1,116 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +系统业务类型管理 + + + +
+ + +

+ 业务管理 +

+ +
+
+
+
+
+ 业务列表 +
+
+ +
+ + + +
+
+ 动作: + + 请选择 + 阻断 + 监测 + 封堵白名单 + 监测白名单 + 封堵监测白名单 + 灰名单 + + 类型: + + 请选择 + 单域 + 多域 + + 名称: + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
业务名称业务ID动作类型创建人创建时间描述操作
${ssi.serviceName }${ssi.serviceId } + + 阻断 + 监测 + 封堵白名单 + 监测白名单 + 封堵监测白名单 + 灰名单 + + 单域 + 多域 + ${ssi.creator.loginId }${ssi.serviceDesc } + 修改 + 删除 +
+
${page}
+
+
+
+
+
+
+ + \ No newline at end of file