From c2faf2a2a3770676205e00f88d232aa63c7ecf8e Mon Sep 17 00:00:00 2001
From: shangguanyanfei <shangguan@zdjizhi.com>
Date: Thu, 4 Apr 2019 18:09:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BB=9F=E8=AE=A1=20=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=92=8C=E6=9C=8D=E5=8A=A1=E7=AB=AF=E7=9A=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=80=BB=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/StatisticSysUserWarnNumber.java       | 12 +++++--
 .../controller/sys/SysUserWarnController.java |  4 +--
 .../java/com/nis/web/dao/SysUserWarnDao.java  |  4 +++
 .../java/com/nis/web/dao/SysUserWarnDao.xml   | 33 +++++++++++++++----
 .../nis/web/service/SysUserWarnService.java   | 13 +++++++-
 5 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/sys/StatisticSysUserWarnNumber.java b/src/main/java/com/nis/web/controller/sys/StatisticSysUserWarnNumber.java
index 6e4a5860b..76229d8a7 100644
--- a/src/main/java/com/nis/web/controller/sys/StatisticSysUserWarnNumber.java
+++ b/src/main/java/com/nis/web/controller/sys/StatisticSysUserWarnNumber.java
@@ -72,7 +72,15 @@ public class StatisticSysUserWarnNumber {
 						entity.setId(Integer.parseInt(map1.get("id").toString()));
 						entity.setTableName(map1.get("tableName").toString());
 						//根据serviceID和表名查询界面各个业务的配置数量
-						Integer cfgCount = sysUserWarnService.getCfgCount(entity);
+						Integer cfgCount=0;
+						if(map1.get("id").toString().equals("400")){//ASN IP(特殊的业务，需单独查询)
+							cfgCount = sysUserWarnService.getASNIPTotal();
+						}else if(map1.get("id").toString().equals("1028")){// APP IP 
+							
+							cfgCount = sysUserWarnService.getAPPIPTotal();
+						}else{
+							cfgCount = sysUserWarnService.getCfgCount(entity);
+						}
 						//查询服务端的各个业务的配置数量
 						List<String> list = effective.get(map1.get("id"));
 						SysUserWarn  sysUserWarn=new SysUserWarn();
@@ -93,7 +101,7 @@ public class StatisticSysUserWarnNumber {
 					}
 					//判断表中是否有数据
 					Integer total = sysUserWarnService.getAllInfoCount();
-					if(total !=null && total>0){//说明有数据  先删除 后添加
+					if(total != null && total > 0){//说明有数据  先删除 后添加
 						sysUserWarnService.deleteAllData();
 						sysUserWarnService.insert(listTotal);
 					}else{// 没有 直接 添加
diff --git a/src/main/java/com/nis/web/controller/sys/SysUserWarnController.java b/src/main/java/com/nis/web/controller/sys/SysUserWarnController.java
index 4e811fcd0..b9a6034be 100644
--- a/src/main/java/com/nis/web/controller/sys/SysUserWarnController.java
+++ b/src/main/java/com/nis/web/controller/sys/SysUserWarnController.java
@@ -49,7 +49,7 @@ public class SysUserWarnController extends BaseController{
 		return findServiceSum;
 	}
 	
-	public static void main(String[] args) {
+/*	public static void main(String[] args) {
 		
 		List<Map<String, Object>> serviceList = ServiceConfigTemplateUtil.getServiceList();
 		System.out.println(serviceList);
@@ -57,5 +57,5 @@ public class SysUserWarnController extends BaseController{
 			System.out.println(map.get("id"));
 			System.out.println(map.get("tableName"));
 		}
-	}
+	}*/
 }
diff --git a/src/main/java/com/nis/web/dao/SysUserWarnDao.java b/src/main/java/com/nis/web/dao/SysUserWarnDao.java
index 3978a7224..ee05181f8 100644
--- a/src/main/java/com/nis/web/dao/SysUserWarnDao.java
+++ b/src/main/java/com/nis/web/dao/SysUserWarnDao.java
@@ -19,4 +19,8 @@ public interface SysUserWarnDao extends CrudDao<SysUserWarn>{
 	public int  insert(List<SysUserWarn> list);
 	//删除所有的数据
 	public int  deleteAllData();
+	//查询ASN IP 页面配置总量
+	public Integer  getASNIPTotal();
+	//查询APP IP 页面配置总量
+	public Integer  getAPPIPTotal();
 }
diff --git a/src/main/java/com/nis/web/dao/SysUserWarnDao.xml b/src/main/java/com/nis/web/dao/SysUserWarnDao.xml
index d38d881d8..04cd4267a 100644
--- a/src/main/java/com/nis/web/dao/SysUserWarnDao.xml
+++ b/src/main/java/com/nis/web/dao/SysUserWarnDao.xml
@@ -50,13 +50,15 @@
   </select>
   
   <select id="getCfgCount" parameterType="com.nis.domain.SysUserWarn" resultType="java.lang.Integer">
-  
-	  select count(cfg_id) cfgTotal from ${tableName}
-	  
-	  <where>
-	  	 service_id = #{id}
-	     and is_valid=1
-	  </where>
+
+	  SELECT COUNT(a.compile_id) cfgTotal from (
+		  select compile_id from ${tableName}
+		  
+		  <where>
+		  	 service_id = #{id}
+		     and is_valid=1
+		  </where>
+		  GROUP BY  compile_id)a
   
   </select>
   
@@ -87,5 +89,22 @@
   
   	delete  from  sys_user_warn
   </delete>
+   <!-- 查询ASN IP 页面配置总量 -->
+  <select id="getASNIPTotal" resultType="java.lang.Integer">
+  		select count(compile_id) cfgTotal  from asn_group_info
+		  
+		where is_valid=1
+		
+  </select>
+  <!-- 查询APP IP 页面配置总量 -->
+  <select id="getAPPIPTotal" resultType="java.lang.Integer">
+  
+  	select count(compile_id) cfgTotal  from config_group_info
+		  
+		where is_issued=1
+  			and group_type=1
+  
+  </select>
+ 
   
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/SysUserWarnService.java b/src/main/java/com/nis/web/service/SysUserWarnService.java
index b66abd20c..6bb8fd506 100644
--- a/src/main/java/com/nis/web/service/SysUserWarnService.java
+++ b/src/main/java/com/nis/web/service/SysUserWarnService.java
@@ -39,7 +39,7 @@ public class SysUserWarnService extends BaseService{
 		page.setList(allList);
 		return page;
 	}
-	//根据serviceID和表名查询业务配置的数量
+	//查询总的记录数
 	public Integer  getAllInfoCount(){
 		
 		return sysUserWarnDao.getAllInfoCount();
@@ -69,4 +69,15 @@ public class SysUserWarnService extends BaseService{
 		return allSum;
 	}
 	
+	//查询ASN IP 页面配置总量
+	public Integer  getASNIPTotal(){
+		
+		return sysUserWarnDao.getASNIPTotal();
+	}
+	//查询APP IP 页面配置总量
+	public Integer  getAPPIPTotal(){
+		
+		return sysUserWarnDao.getAPPIPTotal();
+	}
+	
 }