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

（1）avCfgService暂时继承BaseService

Browse Source 
（2）BaseCfg字段调整，加入functionId字段，去掉maatTable字段
（3）删除SystemService相关代码
（4）字符串，增强字符串配置加入字段cfgType
（5）邮件，ssl，Ftp pojo调整，删除多余的，新增keywordCfg
(6)spring-mvc.xml注释redisDao
This commit is contained in:
wangxin
2018-05-17 19:08:37 +08:00
parent c3948a865f
commit 91ad42c562
36 changed files with 273 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,6 @@ import com.nis.web.service.configuration.WebCfgService;
import com.nis.web.service.specific.SpecificServiceCfgService;
import com.nis.web.service.specific.SpecificServiceHostCfgService;
import com.nis.web.service.systemService.ServiceConfigInfoService;
import com.nis.web.service.systemService.SystemServiceService;
public class BaseController {
@@ -117,8 +116,6 @@ public class BaseController {
@Autowired
protected AppCfgService appCfgService;
@Autowired
protected SystemServiceService systemServiceService;
@Autowired
protected ServiceDictInfoService serviceDictInfoService;

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

@@ -209,10 +209,8 @@ public class ComplexStringCfgController extends BaseController{
for(ComplexkeywordCfg bean:beans){
ComplexkeywordCfg auditBean=new ComplexkeywordCfg();
auditBean.setTableName(tableName);
auditBean.setMaatTable(maatTable);
auditBean.setCfgId(bean.getCfgId());
bean.setTableName(tableName);
bean.setMaatTable(maatTable);
int audit=bean.getIsAudit().intValue();
if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){
logger.error("审核通过的配置只能取消审核通过！");
@@ -234,7 +232,6 @@ public class ComplexStringCfgController extends BaseController{
}
List<AreaIpCfg> areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId());
for(AreaIpCfg c:areaCfg){
c.setMaatTable(AreaIpCfg.getMaattable());
c.setTableName(AreaIpCfg.getTablename());
c.setAuditorId(c.getCurrentUser().getId());
c.setAuditTime(date);

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

@@ -246,10 +246,8 @@ public class IpCfgController extends BaseController{
for(BaseIpCfg bean:beans){
BaseIpCfg auditBean=new BaseIpCfg();
auditBean.setTableName(tableName);
auditBean.setMaatTable(maatTable);
auditBean.setCfgId(bean.getCfgId());
bean.setTableName(tableName);
bean.setMaatTable(maatTable);
int audit=bean.getIsAudit().intValue();
if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){
logger.error("审核通过的配置只能取消审核通过！");
@@ -271,7 +269,6 @@ public class IpCfgController extends BaseController{
}
List<AreaIpCfg> areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId());
for(AreaIpCfg c:areaCfg){
c.setMaatTable(AreaIpCfg.getMaattable());
c.setTableName(AreaIpCfg.getTablename());
c.setAuditorId(c.getCurrentUser().getId());
c.setAuditTime(date);

5
src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
View File

@@ -953,7 +953,6 @@ public class MultipleCfgController extends BaseController{
//根据表名，编译ID查询唯一结果
BaseIpCfg _resultCfg=ipCfgService.get(searchCfg);
if(_resultCfg!=null){
_resultCfg.setMaatTable(info.getMaatTable());
searchCfg.setAuditorId(searchCfg.getCurrentUser().getId());
searchCfg.setAuditTime(date);
searchCfg.setCfgId(_resultCfg.getCfgId());
@@ -986,7 +985,6 @@ public class MultipleCfgController extends BaseController{
//根据表名，编译ID查询唯一结果
BaseStringCfg _resultCfg=stringCfgService.get(searchCfg);
if(_resultCfg!=null){
_resultCfg.setMaatTable(info.getMaatTable());
searchCfg.setAuditorId(searchCfg.getCurrentUser().getId());
searchCfg.setAuditTime(date);
searchCfg.setCfgId(_resultCfg.getCfgId());
@@ -1019,7 +1017,6 @@ public class MultipleCfgController extends BaseController{
//根据表名，编译ID查询唯一结果
NumBoundaryCfg _resultCfg=numCfgService.get(searchCfg);
if(_resultCfg!=null){
_resultCfg.setMaatTable(info.getMaatTable());
searchCfg.setAuditorId(searchCfg.getCurrentUser().getId());
searchCfg.setAuditTime(date);
searchCfg.setCfgId(_resultCfg.getCfgId());
@@ -1052,7 +1049,6 @@ public class MultipleCfgController extends BaseController{
//根据表名，编译ID查询唯一结果
ComplexkeywordCfg _resultCfg=complexStringCfgService.get(searchCfg);
if(_resultCfg!=null){
_resultCfg.setMaatTable(info.getMaatTable());
searchCfg.setAuditorId(searchCfg.getCurrentUser().getId());
searchCfg.setAuditTime(date);
searchCfg.setCfgId(_resultCfg.getCfgId());
@@ -1084,7 +1080,6 @@ public class MultipleCfgController extends BaseController{
List<AreaIpCfg> areaCfgs=ipCfgService.getAreaCfgByCompileId(compileId);
for(AreaIpCfg areaCfg:areaCfgs){
areaCfg.setTableName(AreaIpCfg.getTablename());
areaCfg.setMaatTable(AreaIpCfg.getMaattable());
areaCfg.setAuditorId(areaCfg.getCurrentUser().getId());
areaCfg.setAuditTime(date);
areaCfg.setIsAudit(isAudit);

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

@@ -156,11 +156,9 @@ public class NumCfgController extends BaseController{
if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0
cfg.setIsValid(Constants.VALID_NO);
bean.setIsValid(Constants.VALID_NO);
bean.setMaatTable(serviceConfigInfo.getMaatTable());
}else if(cfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1
cfg.setIsValid(Constants.VALID_YES);
bean.setIsValid(Constants.VALID_YES);
bean.setMaatTable(serviceConfigInfo.getMaatTable());
}
int result=numCfgService.auditNumCfg(bean,cfg);
if(result!=0){

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

@@ -227,10 +227,8 @@ public class StringCfgController extends BaseController{
for(BaseStringCfg bean:beans){
BaseStringCfg auditBean=new BaseStringCfg();
auditBean.setTableName(tableName);
auditBean.setMaatTable(maatTable);
auditBean.setCfgId(bean.getCfgId());
bean.setTableName(tableName);
bean.setMaatTable(maatTable);
int audit=bean.getIsAudit().intValue();
if(audit==Constants.AUDIT_YES&&isAudit!=Constants.AUDIT_NOT_YES){
logger.error("审核通过的配置只能取消审核通过！");
@@ -252,7 +250,6 @@ public class StringCfgController extends BaseController{
}
List<AreaIpCfg> areaCfg=ipCfgService.getAreaCfgByCompileId(bean.getCompileId());
for(AreaIpCfg c:areaCfg){
c.setMaatTable(AreaIpCfg.getMaattable());
c.setTableName(AreaIpCfg.getTablename());
c.setAuditorId(c.getCurrentUser().getId());
c.setAuditTime(date);

196
src/main/java/com/nis/web/controller/systemService/SystemServiceController.java
View File

@@ -1,196 +0,0 @@
package com.nis.web.controller.systemService;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
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.ServiceConfigInfo;
import com.nis.domain.SystemServiceInfo;
import com.nis.util.Collections3;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@Controller
@RequestMapping("${adminPath}/systemService")
public class SystemServiceController extends BaseController {
@ModelAttribute
public SystemServiceInfo get(Long id) {
if (!StringUtil.isEmpty(id)){
return systemServiceService.get(id);
}else{
return new SystemServiceInfo();
}
}
@RequiresPermissions("system:service:view")
@RequestMapping(value = "list")
public String list(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) {
systemServiceInfo.setIsValid(1);
Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 30), systemServiceInfo);
model.addAttribute("page", page);
return "/systemService/list";
}
@RequiresPermissions("system:service:edit")
@RequestMapping(value = "systemServiceform")
public String detail(Model model, SystemServiceInfo systemServiceInfo) {
return "/systemService/form";
}
/**
* 保存(新增、修改)
*/
@RequiresPermissions("system:service:edit")
@RequestMapping(value = "save")
public String save(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, RedirectAttributes redirectAttributes) {
Date now = new Date();
//新增
if (systemServiceInfo.getId() == null) {
systemServiceInfo.setCreateTime(now);
systemServiceInfo.setCreator(UserUtils.getUser());
systemServiceInfo.setIsValid(1);
systemServiceInfo.setIsInitianlize(0);
}
//更新
else {
//初始数据不允许非admin修改
if (!UserUtils.getUser().getLoginId().equals("admin") && systemServiceInfo.getIsInitianlize().intValue() == 1) {
return "/error/403";
}
systemServiceInfo.setEditTime(now);
systemServiceInfo.setEditor(UserUtils.getUser());
}
//接收serviceConfigInfo
String[] reqSciIds = request.getParameterValues("sciId");
String[] sciIsValids = request.getParameterValues("sciIsValid");
String[] reqTableNames = request.getParameterValues("tableName");
String[] reqTableTypes = request.getParameterValues("tableType");
String[] reqTableDescs = request.getParameterValues("tableDesc");
String[] reqMaatTables = request.getParameterValues("maatTable");
//新增的serviceConfigInfo
List<ServiceConfigInfo> insertServiceConfigInfoList = new ArrayList<ServiceConfigInfo>();
//更新的serviceConfigInfo
List<ServiceConfigInfo> updateServiceConfigInfoList = new ArrayList<ServiceConfigInfo>();
if (reqSciIds != null && reqSciIds.length > 0) {
for (int i = 0; i < reqSciIds.length; i++) {
ServiceConfigInfo sci = new ServiceConfigInfo();
sci.setId(Long.valueOf(reqSciIds[i]));
sci.setTableName(reqTableNames[i]);
sci.setIsValid(Integer.valueOf(sciIsValids[i]));
sci.setTableType(Integer.valueOf(reqTableTypes[i]));
sci.setTableDesc(reqTableDescs[i]);
sci.setMaatTable(reqMaatTables[i]);
sci.setServiceId(systemServiceInfo.getServiceId());
if (sci.getId() == 0) {
sci.setIsInitianlize(0);
insertServiceConfigInfoList.add(sci);
} else {
updateServiceConfigInfoList.add(sci);
}
}
}
try {
systemServiceService.save(systemServiceInfo, insertServiceConfigInfoList, updateServiceConfigInfoList);
addMessage(redirectAttributes, "save_success");
} catch (Exception e) {
addMessage(redirectAttributes, "save_failed");
e.printStackTrace();
}
return "redirect:" + adminPath + "/systemService/list";
}
@RequiresPermissions("system:service:edit")
@RequestMapping(value = "delete")
public String delete(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) {
//增加后台校验，当数据是初始数据时不允许删除
if(systemServiceInfo.getIsInitianlize().intValue() == 1) {
return "/error/403";
}
systemServiceService.deleteService(systemServiceInfo);
try {
systemServiceInfo.setIsValid(1);
Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 1), systemServiceInfo);
model.addAttribute("page", page);
addMessage(model, "delete_success");
} catch (Exception e) {
addMessage(model, "delete_failed");
e.printStackTrace();
}
return "/systemService/list";
}
/**
* serviceId校验
*/
@ResponseBody
@RequestMapping(value = "serviceIdValidate")
public String serviceIdValidate(String serviceId, Long id) {
List<SystemServiceInfo> list = systemServiceService.getSystemServiceByServiceId(serviceId);
if (Collections3.isEmpty(list)) {
return "true";
} else {
if (id != null) {
for (SystemServiceInfo info : list) {
if (info.getId().longValue() == id.longValue()) {
return "true";
}
}
return "false";
} else {
return "false";
}
}
}
/**
* 通过serviceId前缀获取可用的serviceId
*/
@ResponseBody
@RequestMapping(value = "newServiceId")
public Integer getNewServiceId(Integer serviceIdPre) {
if (serviceIdPre != null) {
SystemServiceInfo ssi = new SystemServiceInfo();
ssi.setServiceIdPre(serviceIdPre);
ssi.setIsValid(null);
//查找并排序，取得最小的可用serviceId
List<SystemServiceInfo> list = systemServiceService.findList(ssi);
if (!Collections3.isEmpty(list)) {
Collections.sort(list, new Comparator<SystemServiceInfo>() {
@Override
public int compare(SystemServiceInfo arg0, SystemServiceInfo arg1) {
return arg1.getServiceId().compareTo(arg0.getServiceId());
}
});
return list.get(0).getServiceId() + 1;
} else {
return serviceIdPre * 100;
}
}
return 0;
}
}