baibx месяцев назад: 2
Родитель
Сommit
cc6731e842

+ 6 - 6
com.sharemao.core.task/src/main/java/com/sharemao/core/task/sta/CalcCdrCost.java

@@ -76,11 +76,11 @@ public class CalcCdrCost
76 76
 					alldev.append(",'"+devid+"'");
77 77
 				}
78 78
 				//流量卡相关
79
-//				if(datause>450)
80
-//				{
81
-//					//logger.info("无效统计iccid="+scid+",datause="+datause);
82
-//				}
83
-//				else
79
+				if(datause>1000)
80
+				{
81
+					logger.info("无效统计iccid="+scid+",datause="+datause);
82
+				}
83
+				else
84 84
 				{
85 85
 					if(lcScids.indexOf(scid)<0){
86 86
 						lcScids.append(",'"+scid+"'");
@@ -225,7 +225,7 @@ public class CalcCdrCost
225 225
 					+ simInfo.getRestnet()+",netstat="+simInfo.getNetstat()+",tdloc="+simInfo.getTdloc()+",tdnet="
226 226
 					+ simInfo.getTdnet()+",tddate="+simInfo.getTddate()+",tloc="+simInfo.getTloc()+",tnet="+simInfo.getTnet()
227 227
 					+ " where id = "+simInfo.getSimid();
228
-			//logger.info(sqli);
228
+			logger.info(sqli);
229 229
 			simlst.add(sqli);
230 230
 		}
231 231
 		SimpBaseDao.execBatch(simlst);

+ 2 - 2
com.shuhaiwifi.task/src/main/java/com/shuhaiwifi/task/DistributeSMD.java

@@ -61,7 +61,7 @@ public class DistributeSMD {
61 61
 			}
62 62
 		});
63 63
 		
64
-		List<Map<String,Object>> simlist=RCPService.getSimpService().getMapList("select iccid,scgrpid from sim where imsi like '46001%' or  imsi like '46006%' or  imsi like '46009%' or scgrpid=14 order by id");
64
+		List<Map<String,Object>> simlist=RCPService.getSimpService().getMapList("select iccid,scgrpid from sim s inner join simgroup g on s.scgrpid=g.id where ispid='46001'");
65 65
 		Map<String, String> iccidmap = new LinkedHashMap<>();
66 66
 		Map<String, String> iccidCuMap = new HashMap<String, String>();
67 67
 		simlist.stream().forEach(item->{
@@ -145,7 +145,7 @@ public class DistributeSMD {
145 145
 		}
146 146
 		
147 147
 		
148
-		String sql = "SELECT min(iccid) iccid,sn,rmode FROM `smd` where `rmode` in (5,6,7,8,1) group by sn,rmode having count(*)>1";
148
+		String sql = "SELECT min(iccid) iccid,sn,rmode FROM `smd` where `rmode` in (5,6,7,8,23,47,51,1) group by sn,rmode having count(*)>1";
149 149
 		List<Map<String, Object>> smdList2=RCPService.getBaseService().getMapList(sql);
150 150
 		if (smdList2!=null) {
151 151
 			for (Map<String, Object> map : smdList2) {