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

1、用户管理查看提示接口异常信息

Browse Source 
2、业务配置界面展示log_total
3、修复实时报表导出部分字段转成日期型及来函信息展示is_valid为1或3的数据
4、日志界面link_id添加字典处理
This commit is contained in:
leijun
2018-12-03 17:42:35 +08:00
parent 1b899845e2
commit d17af17685
66 changed files with 282 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
View File

@@ -10,6 +10,7 @@ import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.eclipse.jetty.util.ajax.JSON;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -301,20 +302,37 @@ public class UserManageController extends BaseController{
@ResponseBody
@RequestMapping(value = "userInfo")
public List<Map<String,String>> getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){
public Map<String,Object> getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){
String[] ipArray = serverIp.split(",");
List<Map<String,String>> userManageList=new ArrayList<Map<String,String>>();
String message="";
Map<String,Object> mess=new HashMap<String,Object>();
for(String ip :ipArray){
Map<String,String> map=new HashMap<String,String>();
UserManage user=new UserManage();
IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip);
//根据ip调用接口获取数据
Map<String,String> map=userManageService.getUser(ip,userName);
if(ipReuseIpCfg!=null ){
map.put("serverIp", ipReuseIpCfg.getDestIpAddress());
userManageList.add(map);
}
try{
String recv=userManageService.getUser(ip,userName);
if (StringUtils.isNotBlank(recv)) {
map=(Map<String,String>)JSON.parse(recv);
if(ipReuseIpCfg!=null ){
map.put("serverIp", ipReuseIpCfg.getDestIpAddress());
userManageList.add(map);
}
}
} catch (Exception e) {
if(message==""){
message=ip;
}else{
message+=","+ip;
}
logger.error("查询失败", e);
}
}
return userManageList;
mess.put("message", message);
mess.put("user", userManageList);
return mess;
}
/* @RequestMapping(value = "view")

2
src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
View File

@@ -34,7 +34,7 @@ public class NtcLwhhReportController extends BaseController {
@RequestMapping("/ajaxNtcLwhhReport")
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
List<RequestInfo> requestInfos=requestInfoService.getAllLwhhRequestInfo();
model.addAttribute("requestInfos", requestInfos);
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());