From 8dc769153ebbb1aa88ebac31cd0727e2c787a969 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 19 Apr 2018 09:54:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=AD=A6=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msg/worker/TempleteMsgGenerateWorker.java | 4 +++ .../platform/operate/web/facade/CourseFacade.java | 33 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index b31f7d4..601a3bf 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -219,6 +219,8 @@ public class TempleteMsgGenerateWorker implements Runnable { Integer sendTimeType = template.getSendTimeType(); + logger.info("generateChildTempMsg info : serviceType = "+serviceType +";templateId="+template.getId()+";smsType="+smsType); + BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); babyModelQuery.setHospitalId(template.getHospitalId()); @@ -829,6 +831,7 @@ public class TempleteMsgGenerateWorker implements Runnable { //发送时间 SendTimeEnums DT(0,"当天"),QYT(1,"前一天"),QLT(2,"前两天"),QST(3,"前三天"); Integer sendTimeType = template.getSendTimeType(); + logger.info("generateYunTempMsg info : serviceType = "+serviceType +";templateId="+template.getId()+";smsType="+smsType); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); @@ -983,6 +986,7 @@ public class TempleteMsgGenerateWorker implements Runnable { //发送时间 SendTimeEnums DT(0,"当天"),QYT(1,"前一天"),QLT(2,"前两天"),QST(3,"前三天"); Integer sendTimeType = template.getSendTimeType(); + logger.info("generateYunTempMsg info : serviceType = "+serviceType +";templateId="+template.getId()+";smsType="+smsType); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index a5c3bac..b260966 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -12,6 +12,9 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.HttpClientUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.operate.web.request.CourseRequest; import com.lyms.platform.operate.web.result.CourseResult; import com.lyms.platform.operate.web.result.CourseTypeResult; @@ -37,6 +40,8 @@ import java.util.*; @Component public class CourseFacade { + public static final String CENTER_BASE_URL= PropertiesUtils.getPropertyValue("center_base_url"); + @Autowired private CourseService courseService; @@ -470,4 +475,32 @@ public class CourseFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + + private int getCourseCountData(String hospitalId, + String subTypeId, + Integer smsStatus, + Integer sendType, + String createTimeStart, + String createTimeEnd) + { + Map param = new HashMap<>(); + + param.put("hospitalId",hospitalId); + param.put("subTypeId",subTypeId); + param.put("status",smsStatus == null ? null : String.valueOf(smsStatus)); + param.put("sendType",sendType == null ? null : String.valueOf(sendType)); + param.put("createTimeStart",createTimeStart); + param.put("createTimeEnd",createTimeEnd); + + String result = HttpClientUtil.doGet(CENTER_BASE_URL + "/biz-push-web/push", param, "utf-8", null); + + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode"))) + { + return Integer.parseInt(map.get("object")); + } + return 0; + } + } \ No newline at end of file -- 1.8.3.1