diff --git a/src/main/java/com/nis/domain/configuration/RequestInfo.java b/src/main/java/com/nis/domain/configuration/RequestInfo.java index 7bcb0235d..daae1e716 100644 --- a/src/main/java/com/nis/domain/configuration/RequestInfo.java +++ b/src/main/java/com/nis/domain/configuration/RequestInfo.java @@ -39,11 +39,13 @@ public class RequestInfo extends BaseEntity{ private String creatorName; private String editorName; private String auditorName; - private Date beginDate;//开始时间 - private Date endDate;//结束时间 + private Date beginDate;//来函开始时间 + private Date endDate;//来函结束时间 private String timeType;//时间类型 private String taskName;//专项任务 - + private String seltype;//选中类型 + private Date dobeginDate;//操作开始时间 + private Date doendDate;//操作结束时间 public Long getTaskId() { return taskId; @@ -212,5 +214,29 @@ public class RequestInfo extends BaseEntity{ public void setTaskName(String taskName) { this.taskName = taskName; } + + public String getSeltype() { + return seltype; + } + + public void setSeltype(String seltype) { + this.seltype = seltype; + } + + public Date getDobeginDate() { + return dobeginDate; + } + + public void setDobeginDate(Date dobeginDate) { + this.dobeginDate = dobeginDate; + } + + public Date getDoendDate() { + return doendDate; + } + + public void setDoendDate(Date doendDate) { + this.doendDate = doendDate; + } } \ No newline at end of file diff --git a/src/main/java/com/nis/domain/configuration/TaskInfo.java b/src/main/java/com/nis/domain/configuration/TaskInfo.java index efe9a4fc6..96c8ac3b6 100644 --- a/src/main/java/com/nis/domain/configuration/TaskInfo.java +++ b/src/main/java/com/nis/domain/configuration/TaskInfo.java @@ -30,6 +30,16 @@ public class TaskInfo extends BaseEntity { private Integer auditorId; private Date auditTime; + + //自定义 创建人员 修改人员 审核人员 + private String creatorName; + private String editorName; + private String auditorName; + private Date beginDate;//来函开始时间 + private Date endDate;//来函结束时间 + private String seltype;//选中类型 + private Date dobeginDate;//操作开始时间 + private Date doendDate;//操作结束时间 public String getTaskName() { return taskName; @@ -127,5 +137,69 @@ public class TaskInfo extends BaseEntity { this.auditTime = auditTime; } + public String getCreatorName() { + return creatorName; + } + + public void setCreatorName(String creatorName) { + this.creatorName = creatorName; + } + + public String getEditorName() { + return editorName; + } + + public void setEditorName(String editorName) { + this.editorName = editorName; + } + + public String getAuditorName() { + return auditorName; + } + + public void setAuditorName(String auditorName) { + this.auditorName = auditorName; + } + + public Date getBeginDate() { + return beginDate; + } + + public void setBeginDate(Date beginDate) { + this.beginDate = beginDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public String getSeltype() { + return seltype; + } + + public void setSeltype(String seltype) { + this.seltype = seltype; + } + + public Date getDobeginDate() { + return dobeginDate; + } + + public void setDobeginDate(Date dobeginDate) { + this.dobeginDate = dobeginDate; + } + + public Date getDoendDate() { + return doendDate; + } + + public void setDoendDate(Date doendDate) { + this.doendDate = doendDate; + } + } \ No newline at end of file diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java new file mode 100644 index 000000000..0837f8185 --- /dev/null +++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java @@ -0,0 +1,150 @@ +package com.nis.web.controller.basics; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.nis.domain.Page; +import com.nis.domain.configuration.TaskInfo; +import com.nis.web.controller.BaseController; +import com.nis.web.service.basics.TaskInfoService; + +@Controller +@RequestMapping("${adminPath}/basics/taskInfo") +public class TaskInfoController extends BaseController{ + + @Autowired + private TaskInfoService taskInfoService; + + + /** + *来函列表 + */ + @RequestMapping(value = {"list",""}) + public String list(TaskInfo taskInfo, HttpServletRequest request, HttpServletResponse response, Model model) { + Page page = taskInfoService.findTaskInfo(new Page(request, response), taskInfo); + model.addAttribute("page", page); + return "/basics/taskInfoList"; + } + /** + * 进入用户添加或修改页面 + */ + @RequestMapping(value={"form"}) + public String form(TaskInfo taskInfo, Model model) { + if(taskInfo.getId()!=null){ + taskInfo = taskInfoService.getTaskInfoById(taskInfo.getId()); + model.addAttribute("taskInfo", taskInfo); + }else{ + model.addAttribute("taskInfo", taskInfo); + } + return "/basics/taskInfoForm"; + } + + /** + * 新增/修改 + */ + @RequestMapping(value = "saveOrUpdate") + public String saveOrUpdate(TaskInfo taskInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) { + try { + if(taskInfo.getId()!=null){ + // 保存用户信息 + logger.info(taskInfo.getId()+"修改成功"); + taskInfoService.saveOrUpdate(taskInfo); + addMessage(redirectAttributes, "success"); + }else{ + if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){ + logger.info(taskInfo.getTaskName()+"重复数据"); + addMessage(model, "error"); + return form(taskInfo, model); + } + // 保存用户信息 + taskInfoService.saveOrUpdate(taskInfo); + addMessage(redirectAttributes, "success"); + logger.info(taskInfo.getId()+"保存成功"); + } + } catch (Exception e) { + logger.error(e.getMessage()); + e.printStackTrace(); + addMessage(model, "error"); + } + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + } + + /** + * 验证是否有效 + */ + @ResponseBody + @RequestMapping(value = "checkTaskName") + public String checkTaskName(String taskName) { + if (taskName !=null && taskInfoService.getTaskInfoByTaskName(taskName) == null) { + return "true"; + } + return "false"; + } + + /** + * 审核通过 + * @param taskInfo + * @param model + * @return + */ + @RequestMapping(value = "taskExamine") + public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] exId = ids.split(","); + taskInfoService.taskExamine(exId); + addMessage(redirectAttributes, "success"); + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + + } + /** + * 审核未通过 + * @param taskInfo + * @param model + * @return + */ + @RequestMapping(value = "taskExamineNo") + public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] noId = ids.split(","); + taskInfoService.taskExamineNo(noId); + addMessage(redirectAttributes, "success"); + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + + } + /** + * 取消审核 + * @param taskInfo + * @param model + * @return + */ + @RequestMapping(value = "taskCancelExamine") + public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] canclelId = ids.split(","); + taskInfoService.taskCancelExamine(canclelId); + addMessage(redirectAttributes, "success"); + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + + } + /** + * 删除 + * @param taskInfo + * @param model + * @return + */ + @RequestMapping(value = "delete") + public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] delId = ids.split(","); + taskInfoService.delete(delId); + addMessage(redirectAttributes, "success"); + return "redirect:" + adminPath + "/basics/taskInfo/list?repage"; + + } + +} diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index e45d0055b..85d816c50 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -44,7 +44,7 @@ public class ComplexStringCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); cfg.setTableName(tableName); - Page page = complexStringCfgService.findPage(new Page(request, response), cfg); + Page page = complexStringCfgService.findPage(new Page(request, response,"r"), cfg); model.addAttribute("page", page); model.addAttribute("action", cfg.getAction()); model.addAttribute("tableName", tableName); diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 226263b6c..5aa2a68fb 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -5,7 +5,6 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -13,10 +12,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.NumBoundaryCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController; @@ -40,17 +39,11 @@ public class NumCfgController extends BaseController{ model.addAttribute("serviceId", serviceId); ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ - Page searchPage=new Page(request, response, 1); - if(pageNo!=null) searchPage.setPageNo(pageNo); - if(pageSize!=null) searchPage.setPageSize(pageSize); - if(cfg.getPage()!=null){ - if(!StringUtils.isBlank(cfg.getPage().getOrderBy())); - searchPage.setOrderBy(cfg.getPage().getOrderBy()); - } + Page searchPage=new Page(request, response, "r"); Page page = numCfgService.findPage(searchPage, cfg); model.addAttribute("page", page); model.addAttribute("action", cfg.getAction()); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java index d21b50a03..84883214d 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -101,8 +101,9 @@ public class RequestInfoController extends BaseController{ * @return */ @RequestMapping(value = "requestExamine") - public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ - requestInfoService.requestExamine(requestInfo); + public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] exId = ids.split(","); + requestInfoService.requestExamine(exId); addMessage(redirectAttributes, "success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; @@ -114,8 +115,9 @@ public class RequestInfoController extends BaseController{ * @return */ @RequestMapping(value = "requestExamineNo") - public String requestExamineNo(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ - requestInfoService.requestExamineNo(requestInfo); + public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] noId = ids.split(","); + requestInfoService.requestExamineNo(noId); addMessage(redirectAttributes, "success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; @@ -127,8 +129,9 @@ public class RequestInfoController extends BaseController{ * @return */ @RequestMapping(value = "requestCancelExamine") - public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ - requestInfoService.requestCancelExamine(requestInfo); + public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] canclelId = ids.split(","); + requestInfoService.requestCancelExamine(canclelId); addMessage(redirectAttributes, "success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; @@ -140,8 +143,9 @@ public class RequestInfoController extends BaseController{ * @return */ @RequestMapping(value = "delete") - public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){ - requestInfoService.delete(requestInfo); + public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ + String[] delId = ids.split(","); + requestInfoService.delete(delId); addMessage(redirectAttributes, "success"); return "redirect:" + adminPath + "/cfg/request/list?repage"; @@ -156,4 +160,5 @@ public class RequestInfoController extends BaseController{ List taskInfos = requestInfoService.showTask(taskInfo); model.addAttribute("taskInfos", taskInfos); } + } diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index fbd83d76c..2430efdc8 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController; @@ -44,11 +44,11 @@ public class StringCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); stringCfg.setTableName(tableName); - Page page = stringCfgService.findPage(new Page(request,response), stringCfg); + Page page = stringCfgService.findPage(new Page(request,response,"r"), stringCfg); model.addAttribute("page", page); model.addAttribute("action", stringCfg.getAction()); model.addAttribute("tableName", tableName); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml index f086ae03c..7267ef454 100644 --- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml @@ -39,12 +39,30 @@ SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN - + + + + + ${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc,${page.alias}.DISTRICT as district, ${page.alias}.KEYWORDS as keywords, ${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit, + ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime, + ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify, + ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.EXPR_TYPE as exprType,${page.alias}.MATCH_METHOD as matchMethod,${page.alias}.IS_HEXBIN as isHexbin, + ${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds + + + r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.DISTRICT as district, r.KEYWORDS as keywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, + r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, + r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, + r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin, + r.AREA_EFFECTIVE_IDS AS areaEffectiveIds + + CFG_DESC,DISTRICT,KEYWORDS, ACTION,IS_VALID,IS_AUDIT, @@ -149,14 +167,7 @@ @@ -153,11 +153,11 @@ where id = #{id,jdbcType=BIGINT} - + update request_info - - is_valid=#{isValid} + + is_valid=-1 where id = #{id,jdbcType=BIGINT} and is_audit !=1 diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index 36afe76a7..f9fc17fe4 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -61,12 +61,29 @@ SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN - + + + + + ${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc, ${page.alias}.CFG_KEYWORDS as cfgKeywords,${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit, + ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime, + ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify, + ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds + + + r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, + r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, + r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, + r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin, + r.AREA_EFFECTIVE_IDS AS areaEffectiveIds + + CFG_DESC, CFG_KEYWORDS, ACTION,IS_VALID,IS_AUDIT, @@ -166,16 +183,10 @@ + - - delete from task_info + + + + + + insert into task_info (id, task_name, task_org, task_time, task_desc, is_valid, @@ -46,92 +91,8 @@ #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE}, #{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE}) - - 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, - - - - - #{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}, - - - - + + update task_info @@ -173,20 +134,14 @@ where id = #{id,jdbcType=BIGINT} - - 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 task_info + + + is_valid=-1 + + + where id = #{id,jdbcType=BIGINT} and is_audit !=1 \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/basics/TaskInfoService.java b/src/main/java/com/nis/web/service/basics/TaskInfoService.java new file mode 100644 index 000000000..e4ebe5fb0 --- /dev/null +++ b/src/main/java/com/nis/web/service/basics/TaskInfoService.java @@ -0,0 +1,99 @@ +package com.nis.web.service.basics; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.nis.domain.Page; +import com.nis.domain.configuration.TaskInfo; +import com.nis.util.Constants; +import com.nis.util.StringUtil; +import com.nis.web.dao.configuration.TaskInfoDao; +import com.nis.web.security.UserUtils; +import com.nis.web.service.BaseService; + +@Service +@Transactional(readOnly=true) +public class TaskInfoService extends BaseService{ + + @Autowired + private TaskInfoDao taskInfoDao; + + public Page findTaskInfo(Page page, TaskInfo taskInfo) { + // 设置分页参数 + taskInfo.setPage(page); + // 执行分页查询 + page.setList(taskInfoDao.findTaskInfo(taskInfo)); + return page; + } + + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void saveOrUpdate(TaskInfo taskInfo) { + if (StringUtil.isEmpty(taskInfo.getId())) { + //设置默认参数值 + taskInfo.setIsValid(1);//有效 + taskInfo.setIsAudit(0);//未审核 + taskInfo.setCreatorId((UserUtils.getUser().getId()).intValue());//创建人员 + taskInfo.setCreateTime(new Date());//创建时间 + taskInfoDao.insert(taskInfo); + }else{ + taskInfo.setEditorId((UserUtils.getUser().getId()).intValue());//修改人员 + taskInfo.setEditTime(new Date());//修改时间 + taskInfoDao.update(taskInfo); + } + + } + + public TaskInfo getTaskInfoByTaskName(String taskName) { + + return taskInfoDao.getTaskInfoByTaskName(taskName); + } + public TaskInfo getTaskInfoById(Long id) { + + return taskInfoDao.getTaskInfoById(id); + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void taskExamine(String[] exId){ + TaskInfo taskInfo = new TaskInfo(); + for (int i = 0; i < exId.length; i++) { + taskInfo.setId(Long.valueOf(exId[i])); + taskInfo.setIsAudit(1);//审核通过 + taskInfo.setAuditTime(new Date()); + taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 + taskInfoDao.update(taskInfo); + } + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void taskExamineNo(String[] noId){ + TaskInfo taskInfo = new TaskInfo(); + for (int i = 0; i < noId.length; i++) { + taskInfo.setId(Long.valueOf(noId[i])); + taskInfo.setIsAudit(2);//审核未通过 + taskInfo.setAuditTime(new Date()); + taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 + taskInfoDao.update(taskInfo); + } + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void taskCancelExamine(String[] cancelId){ + TaskInfo taskInfo = new TaskInfo(); + for (int i = 0; i < cancelId.length; i++) { + taskInfo.setId(Long.valueOf(cancelId[i])); + taskInfo.setIsAudit(3);//取消审核通过 + taskInfo.setAuditTime(new Date()); + taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 + taskInfoDao.update(taskInfo); + } + } + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public void delete(String[] delId){ + for (int i = 0; i < delId.length; i++) { + taskInfoDao.delete(Long.valueOf(delId[i]));//删除 + } + } +} diff --git a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java index fe2e0f119..f74bc07c5 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -62,24 +62,43 @@ public class RequestInfoService extends BaseService{ return requestInfoDao.getRequestInfoById(id); } @Transactional(readOnly=false,rollbackFor=DataAccessException.class) - public void requestExamine(RequestInfo requestInfo){ - requestInfo.setIsAudit(1);//审核通过 - requestInfoDao.update(requestInfo); + public void requestExamine(String[] exId){ + RequestInfo requestInfo = new RequestInfo(); + for (int i = 0; i < exId.length; i++) { + requestInfo.setId(Long.valueOf(exId[i])); + requestInfo.setIsAudit(1);//审核通过 + requestInfo.setAuditTime(new Date()); + requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 + requestInfoDao.update(requestInfo); + } } @Transactional(readOnly=false,rollbackFor=DataAccessException.class) - public void requestExamineNo(RequestInfo requestInfo){ - requestInfo.setIsAudit(2);//审核未通过 - requestInfoDao.update(requestInfo); + public void requestExamineNo(String[] noId){ + RequestInfo requestInfo = new RequestInfo(); + for (int i = 0; i < noId.length; i++) { + requestInfo.setId(Long.valueOf(noId[i])); + requestInfo.setIsAudit(2);//审核未通过 + requestInfo.setAuditTime(new Date()); + requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 + requestInfoDao.update(requestInfo); + } } @Transactional(readOnly=false,rollbackFor=DataAccessException.class) - public void requestCancelExamine(RequestInfo requestInfo){ - requestInfo.setIsAudit(3);//取消审核通过 - int update = requestInfoDao.update(requestInfo); + public void requestCancelExamine(String[] cancelId){ + RequestInfo requestInfo = new RequestInfo(); + for (int i = 0; i < cancelId.length; i++) { + requestInfo.setId(Long.valueOf(cancelId[i])); + requestInfo.setIsAudit(3);//取消审核通过 + requestInfo.setAuditTime(new Date()); + requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员 + requestInfoDao.update(requestInfo); + } } @Transactional(readOnly=false,rollbackFor=DataAccessException.class) - public void delete(RequestInfo requestInfo){ - requestInfo.setIsValid(-1); - requestInfoDao.delete(requestInfo);//删除 + public void delete(String[] delId){ + for (int i = 0; i < delId.length; i++) { + requestInfoDao.delete(Long.valueOf(delId[i]));//删除 + } } public List getValidRequestInfo(){ RequestInfo requestInfo=new RequestInfo(); diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index ae12e8bc9..435b04547 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -26,21 +26,21 @@ configuration_manage=\u914d\u7f6e\u7ba1\u7406 text_enhance_manage=\u6587\u672c\u589e\u5f3a\u7ba1\u63a7 text_enhance_monitor=\u6587\u672c\u589e\u5f3a\u76d1\u6d4b plaintext_manage=\u660e\u6587\u5185\u5bb9\u7ba1\u63a7 -monitor_white=\u7ba1\u63a7\u767d\u540d\u5355 -ip_monitor_white=IP\u7ba1\u63a7\u767d\u540d\u5355 -monitor_grey=\u7ba1\u63a7\u7070\u540d\u5355 social_app_grey=\u793e\u4ea4\u5e94\u7528\u7070\u540d\u5355 -encryption_monitor=\u52a0\u5bc6\u5185\u5bb9\u7ba1\u63a7 -specific_agreement_monitor=\u7279\u5b9a\u534f\u8bae\u7ba1\u63a7 -social_app_monitor=\u793e\u4ea4\u5e94\u7528\u7ba1\u63a7 -online_media_monitor=\u5728\u7ebf\u5a92\u4f53\u7ba1\u63a7 -sip_ip_monitor=SIP\u534f\u8baeIP\u7ba1\u63a7 -domain_monitor_white=\u57df\u540d\u7ba1\u63a7\u767d\u540d\u5355 -ip_address_monitor=IP\u5730\u5740\u7ba1\u63a7 -ip_monitor=IP\u7ba1\u63a7 -ip_port_monitor=IP+\u7aef\u53e3\u7ba1\u63a7 -domain_monitor=\u57df\u540d\u7ba1\u63a7 -dns_monitor=DNS\u7ba1\u63a7 +encryption_control=\u52a0\u5bc6\u5185\u5bb9\u7ba1\u63a7 +control_white=\u7ba1\u63a7\u767d\u540d\u5355 +ip_control_white=IP\u7ba1\u63a7\u767d\u540d\u5355 +control_grey=\u7ba1\u63a7\u7070\u540d\u5355 +specific_agreement_control=\u7279\u5b9a\u534f\u8bae\u7ba1\u63a7 +social_app_control=\u793e\u4ea4\u5e94\u7528\u7ba1\u63a7 +online_media_control=\u5728\u7ebf\u5a92\u4f53\u7ba1\u63a7 +sip_ip_control=SIP\u534f\u8baeIP\u7ba1\u63a7 +ip_control=IP\u7ba1\u63a7 +domain_control_white=\u57df\u540d\u7ba1\u63a7\u767d\u540d\u5355 +ip_port_control=IP+\u7aef\u53e3\u7ba1\u63a7 +ip_address_control=IP\u5730\u5740\u7ba1\u63a7 +domain_control=\u57df\u540d\u7ba1\u63a7 +dns_control=DNS\u7ba1\u63a7 basic_configuration=\u57fa\u672c\u914d\u7f6e letter_from=\u6765\u51fd\u5355\u4f4d classification=\u5206\u7c7b\u6027\u8d28 @@ -55,38 +55,38 @@ protect_list=\u4fdd\u62a4\u540d\u5355 effect_range=\u751f\u6548\u8303\u56f4 agreement_ip_configuration=\u534f\u8baeIP\u914d\u7f6e ip_spoofing_configuration=\u6b3a\u9a97IP\u914d\u7f6e -website_monitor=\u7f51\u7ad9\u7ba1\u63a7 -host_monitor=HOST\u7ba1\u63a7 -url_monitor=URL\u7ba1\u63a7 -website_keyword_monitor=\u7f51\u9875\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7 -mail_monitor=\u90ae\u4ef6\u7ba1\u63a7 -recipient_monitor=\u6536\u4ef6\u4eba\u7ba1\u63a7 -sender_monitor=\u53d1\u4ef6\u4eba\u7ba1\u63a7 -theme_monitor=\u4e3b\u9898\u7ba1\u63a7 -mail_keyword_monitor=\u90ae\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7 -mail_attachment_name_monitor=\u90ae\u4ef6\u9644\u4ef6\u540d\u5173\u952e\u5b57\u7ba1\u63a7 -mail_attachment_content_monitor=\u90ae\u4ef6\u9644\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7 -file_transfer_monitor=\u6587\u4ef6\u4f20\u8f93\u7ba1\u63a7 -ftp_address_monitor=FTP\u5730\u5740\u7ba1\u63a7 -ftp_name_monitor=FTP\u6587\u4ef6\u540d\u7ba1\u63a7 -ftp_content_monitor=FTP \u6587\u4ef6\u5185\u5bb9\u7ba1\u63a7 +website_control=\u7f51\u7ad9\u7ba1\u63a7 +host_control=HOST\u7ba1\u63a7 +url_control=URL\u7ba1\u63a7 +website_keyword_control=\u7f51\u9875\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7 +mail_control=\u90ae\u4ef6\u7ba1\u63a7 +recipient_control=\u6536\u4ef6\u4eba\u7ba1\u63a7 +sender_control=\u53d1\u4ef6\u4eba\u7ba1\u63a7 +theme_control=\u4e3b\u9898\u7ba1\u63a7 +mail_keyword_control=\u90ae\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7 +mail_attachment_name_control=\u90ae\u4ef6\u9644\u4ef6\u540d\u5173\u952e\u5b57\u7ba1\u63a7 +mail_attachment_content_control=\u90ae\u4ef6\u9644\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7 +file_transfer_control=\u6587\u4ef6\u4f20\u8f93\u7ba1\u63a7 +ftp_address_control=FTP\u5730\u5740\u7ba1\u63a7 +ftp_name_control=FTP\u6587\u4ef6\u540d\u7ba1\u63a7 +ftp_content_control=FTP \u6587\u4ef6\u5185\u5bb9\u7ba1\u63a7 http_app_feature=\u793e\u4ea4\u5e94\u7528HTTP\u7279\u5f81 ssl_app_feature=\u793e\u4ea4\u5e94\u7528SSL\u7279\u5f81 -tunnel_protocol_monitor=\u96a7\u9053\u534f\u8bae\u7ba1\u63a7 -l2tp_ip_monitor=L2TP\u534f\u8baeIP\u7ba1\u63a7 -pptp_ip_monitor=pptp\u534f\u8baeIP\u7ba1\u63a7 -openvpn_monitor=OpenVPN\u7ba1\u63a7 -ssh_monitor=SSH\u7ba1\u63a7 -ssl_monitor=SSL\u7ba1\u63a7 -ssl_feature_monitor=SSL\u8bc1\u4e66\u7279\u5f81\u7ba1\u63a7 -ssl_sni_monitor=SSL\uff08SNI\uff09\u7ba1\u63a7 -ssl_address_monitor=SSL\u5730\u5740\u7ba1\u63a7 +tunnel_protocol_control=\u96a7\u9053\u534f\u8bae\u7ba1\u63a7 +l2tp_ip_control=L2TP\u534f\u8baeIP\u7ba1\u63a7 +pptp_ip_control=pptp\u534f\u8baeIP\u7ba1\u63a7 +openvpn_control=OpenVPN\u7ba1\u63a7 +ssh_control=SSH\u7ba1\u63a7 +ssl_control=SSL\u7ba1\u63a7 +ssl_feature_control=SSL\u8bc1\u4e66\u7279\u5f81\u7ba1\u63a7 +ssl_sni_control=SSL\uff08SNI\uff09\u7ba1\u63a7 +ssl_address_control=SSL\u5730\u5740\u7ba1\u63a7 https_website_content_replace=HTTPS\u7f51\u7ad9\u5185\u5bb9\u66ff\u6362 -https_website_monitor=HTTPS\u7f51\u7ad9\u7ba1\u63a7 -rtp_ip_monitor=RTP\u534f\u8baeIP\u7ba1\u63a7 -mms_ip_monitor=MMS\u534f\u8baeIP\u7ba1\u63a7 -rtsp_ip_monitor=RTSP\u534f\u8baeIP\u7ba1\u63a7 -rtmp_ip_monitor=RTMP\u534f\u8baeIP\u7ba1\u63a7 +https_website_control=HTTPS\u7f51\u7ad9\u7ba1\u63a7 +rtp_ip_control=RTP\u534f\u8baeIP\u7ba1\u63a7 +mms_ip_control=MMS\u534f\u8baeIP\u7ba1\u63a7 +rtsp_ip_control=RTSP\u534f\u8baeIP\u7ba1\u63a7 +rtmp_ip_control=RTMP\u534f\u8baeIP\u7ba1\u63a7 examine_manage=\u5ba1\u6838\u7ba1\u7406 audit_manage=\u5ba1\u8ba1\u7ba1\u7406 log_search=\u65e5\u5fd7\u68c0\u7d22 @@ -137,6 +137,10 @@ begin_date=\u5f00\u59cb\u65f6\u95f4 end_date=\u7ed3\u675f\u65f6\u95f4 delete=\u5220\u9664 special_task=\u4e13\u9879\u4efb\u52a1 +cancel_approved=\u914d\u7f6e\u53d6\u6d88 +task_name=\u4e13\u9879\u540d\u79f0 +task_org=\u62a5\u9001\u5355\u4f4d +task_time=\u62a5\u9001\u65f6\u95f4 #==========laihan end===================== #==========message begin===================== @@ -156,6 +160,17 @@ turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762 login_timeout=\u672a\u767b\u5f55\u6216\u767b\u5f55\u8d85\u65f6,\u8bf7\u91cd\u65b0\u767b\u5f55,\u8c22\u8c22! captcha_error=\u9a8c\u8bc1\u7801\u4e0d\u6b63\u786e enter_captcha=\u8bf7\u8f93\u5165\u9a8c\u8bc1\u7801 +input=\u8bf7\u8f93\u5165 +input_title=\u8bf7\u8f93\u5165\u6807\u9898 +all_states=\u6240\u6709\u72b6\u6001 +filter=\u7b5b\u9009 +to=\u5230 +reset=\u91cd\u7f6e +info=\u63d0\u793a +has_approved=\u5df2\u7ecf\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01 +hasnot_approved=\u672a\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01 +check_one=\u8bf7\u9009\u62e9\u4e00\u6761\u6570\u636e\uff01 +one_more=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u6761\u6570\u636e! #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 663019d58..c91da6d59 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -5,7 +5,7 @@
- +
+
- -
+ +
+
- -
+ +
+
<%--
-
+
checked @@ -62,14 +65,15 @@ <%-- --%>
+
- -
+ +
+
- -
+ +
+
- -
+ +
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index 56e83b668..7886da9a8 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -4,7 +4,7 @@
- +
@@ -13,7 +13,7 @@
- +
@@ -37,7 +37,7 @@
- +
@@ -48,7 +48,7 @@
- +
@@ -57,7 +57,7 @@
- +
@@ -68,7 +68,7 @@
- +
@@ -77,7 +77,7 @@
- +
@@ -88,7 +88,7 @@
- +
@@ -97,7 +97,7 @@
- +
@@ -108,7 +108,7 @@
- +
> @@ -163,7 +163,7 @@
- +