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

2、业务配置界面展示log_total
3、修复实时报表导出部分字段转成日期型及来函信息展示is_valid为1或3的数据
4、日志界面link_id添加字典处理

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

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

src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java

@@ -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());

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java

@@ -26,6 +26,8 @@ public interface RequestInfoDao  extends CrudDao {
 	void delete(@Param("id") Long id);
 	
 	String getRequestTitleById(@Param("id")Long id);
+	
+	List<RequestInfo> findAllLwhhList();
 
 
 }

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

@@ -218,6 +218,13 @@
 	from request_info
   </select>
   
+    <select id="findAllLwhhList" resultMap="BaseResultMap">
+	select
+		<include refid="Base_Column_List" />
+	from request_info
+	where  is_audit =1 or is_audit=3 
+  </select>
+  
   <select id="getRequestTitleById" resultType="string">
   	select request_title requestTitle from request_info where id=#{id}
   </select>

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -114,6 +114,11 @@ public class RequestInfoService extends BaseService{
 		RequestInfo requestInfo=new RequestInfo();
 		return requestInfoDao.findAllList(requestInfo);
 	}
+	
+	public List<RequestInfo> getAllLwhhRequestInfo(){
+		return requestInfoDao.findAllLwhhList();
+	}
+	
 
 	public List<TaskInfo> showTask(TaskInfo taskInfo) {
 		return taskInfoDao.findList(taskInfo);

src/main/java/com/nis/web/service/configuration/UserManageService.java

@@ -194,22 +194,15 @@ public class UserManageService extends BaseService{
 	}
 	
 	//根据vpn服务器ip获取用户vpn服务器ip信息
-	public Map<String,String>  getUser(String serverIp,String userName){
+	public String  getUser(String serverIp,String userName){
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("cmd", Constants.NTC_IP_REUSE_USER_GET);
 		params.put("server_ip", serverIp);
 		params.put("user_name", userName);
 		Map<String,String> map=new HashMap<String,String>();
-		try{ 
-			String url =Constants.IP_REUSE_CALL_CGI_URL;
-			String recv = ConfigServiceUtil.getCGI(url, params);
-				if (StringUtils.isNotBlank(recv)) {
-					map=(Map<String,String>)JSON.parse(recv);
-				}
-			} catch (Exception e) {
-				logger.error("查询失败", e);
-		}
-		return map;
+		String url =Constants.IP_REUSE_CALL_CGI_URL;
+		String recv = ConfigServiceUtil.getCGI(url, params);
+		return recv;
 	}