Commit 718edea685579407baa925edfdc581d04747f898

Authored by yangfei

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ 718edea
... ... @@ -486,7 +486,7 @@
486 486 }
487 487  
488 488  
489   - private int getCourseCountData(String hospitalId,
  489 + private static int getCourseCountData(String hospitalId,
490 490 String subTypeId,
491 491 Integer status,
492 492 Integer sendType,
493 493  
494 494  
495 495  
496 496  
... ... @@ -503,16 +503,26 @@
503 503 param.put("sendType",sendType == null ? null : String.valueOf(sendType));
504 504 param.put("createTimeStart",createTimeStart);
505 505 param.put("createTimeEnd",createTimeEnd);
  506 + param.put("page","1");
  507 + param.put("limit","900000000");
506 508  
507   - String result = HttpClientUtil.doGet(CENTER_BASE_URL + "/biz-push-web/push", param, "utf-8", null);
  509 + String result = HttpClientUtil.doGet(CENTER_BASE_URL + "/biz-push-web/pushCount", param, "utf-8", null);
508 510  
509 511 Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
510   - if ("0".equals(map.get("errorcode")))
  512 + if ("0".equals(String.valueOf(map.get("errorcode"))))
511 513 {
512   - return Integer.parseInt(map.get("object"));
  514 + return Integer.parseInt(String.valueOf(map.get("object")));
513 515 }
514 516 return 0;
515 517 }
516   -
  518 +//
  519 +//
  520 +// public static void main(String[] args)
  521 +// {
  522 +//
  523 +// int allSends = getCourseCountData("216", String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 1,
  524 +// 1,null, null, null);
  525 +// System.out.println(allSends);
  526 +// }
517 527 }
platform-operate-api/src/main/webapp/WEB-INF/web.xml View file @ 718edea
... ... @@ -47,7 +47,7 @@
47 47 <url-pattern>/*</url-pattern>
48 48 </filter-mapping>
49 49 -->
50   - <!--end跨域结束-->
  50 + <!--end跨域结束-->
51 51  
52 52 <servlet-mapping>
53 53 <servlet-name>default</servlet-name>