From 12c80e4554ce9c49b10159327bcfffe3177ed9b3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 24 Jul 2017 17:49:48 +0800 Subject: [PATCH] update code --- .../lyms/platform/common/utils/HttpClientUtil.java | 91 +++++++++- .../platform/msg/remote/SaveMessageService.java | 68 ++++++-- .../src/main/resources/config.properties | 4 +- .../main/resources/spring/applicationContext.xml | 2 +- .../web/controller/AreaCountController.java | 3 - .../web/controller/SmsConfigController.java | 75 ++++++++- .../operate/web/facade/AreaCountFacade.java | 9 - .../operate/web/facade/SmsConfigFacade.java | 137 +++++++++++++++ .../lyms/platform/operate/web/result/MsgObj.java | 187 +++++++++++++++++++++ .../platform/operate/web/result/MsgResult.java | 59 +++++++ .../operate/web/utils/MessageCenterService.java | 51 +++++- .../operate/web/worker/CheckWeeksNumWorker.java | 4 - 12 files changed, 643 insertions(+), 47 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgObj.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgResult.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java index d387bce..4eda780 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java @@ -6,14 +6,19 @@ package com.lyms.platform.common.utils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; import org.apache.http.client.HttpClient; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; +import java.io.IOException; import java.util.*; import java.util.Map.Entry; @@ -22,6 +27,30 @@ import java.util.Map.Entry; */ public class HttpClientUtil { + private static PoolingHttpClientConnectionManager connMgr; + private static RequestConfig requestConfig; + private static final int MAX_TIMEOUT = 7000; + + static { + // 设置连接池 + connMgr = new PoolingHttpClientConnectionManager(); + // 设置连接池大小 + connMgr.setMaxTotal(10); + connMgr.setDefaultMaxPerRoute(connMgr.getMaxTotal()); + + RequestConfig.Builder configBuilder = RequestConfig.custom(); + // 设置连接超时 + configBuilder.setConnectTimeout(MAX_TIMEOUT); + // 设置读取超时 + configBuilder.setSocketTimeout(MAX_TIMEOUT); + // 设置从连接池获取连接实例的超时 + configBuilder.setConnectionRequestTimeout(MAX_TIMEOUT); + // 在提交请求之前 测试连接是否可用 + configBuilder.setStaleConnectionCheckEnabled(true); + requestConfig = configBuilder.build(); + } + + public static String doPost(String url,Map map,String charset){ HttpClient httpClient = null; HttpPost httpPost = null; @@ -62,6 +91,10 @@ public class HttpClientUtil { while(keys.hasNext()){ String key = keys.next(); String value = params.get(key); + if (!StringUtils.isNotEmpty(value)) + { + continue; + } if(sb.length()==0)sb.append("?"); else sb.append("&"); sb.append(key+"="+value); @@ -77,6 +110,13 @@ public class HttpClientUtil { httpGet.addHeader("Authorization", authorization); HttpResponse response = httpClient.execute(httpGet); if(response != null){ + + int statusCode = response.getStatusLine().getStatusCode(); + System.out.println("return code = "+ HttpStatus.SC_OK); + if (statusCode != HttpStatus.SC_OK) { + return null; + } + HttpEntity resEntity = response.getEntity(); if(resEntity != null){ result = EntityUtils.toString(resEntity,charset); @@ -88,15 +128,48 @@ public class HttpClientUtil { return result; } - public static void main(String[] args) throws Exception { - Map map = new HashMap(); - map.put("vcCardNo","C40064690"); - map.put("sortType","1"); - long start = System.currentTimeMillis(); - String s = doGet("https://area-qhd-api.healthbaby.com.cn:18019/getLisAndRisData", map, "utf-8","luc805966f6591ff8a51e5186cfee32e58e"); - long end = System.currentTimeMillis(); - System.out.print(end -start); - System.out.println(s); + /** + * 发送 SSL POST 请求（HTTPS），JSON形式 + * @param apiUrl API接口URL + * @param json JSON对象 + * @return + */ + public static String doPostSSL(String apiUrl, Object json) { + HttpClient httpClient = null; + HttpPost httpPost = new HttpPost(apiUrl); + HttpResponse response = null; + String httpStr = null; + + try { + httpClient = new SSLClient(); + httpPost.setConfig(requestConfig); + StringEntity stringEntity = new StringEntity(json.toString(),"UTF-8");//解决中文乱码问题 + stringEntity.setContentEncoding("UTF-8"); + stringEntity.setContentType("application/json"); + httpPost.setEntity(stringEntity); + response = httpClient.execute(httpPost); + int statusCode = response.getStatusLine().getStatusCode(); + System.out.println("return code = "+ HttpStatus.SC_OK); + if (statusCode != HttpStatus.SC_OK) { + return null; + } + HttpEntity entity = response.getEntity(); + if (entity == null) { + return null; + } + httpStr = EntityUtils.toString(entity, "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (response != null) { + try { + EntityUtils.consume(response.getEntity()); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return httpStr; } } \ No newline at end of file diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java index a04fa41..11999f2 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java @@ -1,15 +1,21 @@ package com.lyms.platform.msg.remote; import com.lyms.platform.beans.MessageListRequest; +import com.lyms.platform.beans.MessageRequest; +import com.lyms.platform.common.enums.MsgStatusEnums; import com.lyms.platform.common.enums.ProjectTypeEnums; +import com.lyms.platform.common.enums.SmsTimeTypeEnums; +import com.lyms.platform.common.utils.HttpClientUtil; import com.lyms.platform.common.utils.HttpRequest; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.msg.constants.ConfigInterface; +import com.lyms.platform.msg.utils.DateUtils; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.commons.httpclient.HttpClient; -import java.util.Map; +import java.util.*; /** * Created by Administrator on 2016/7/5. @@ -25,11 +31,11 @@ public class SaveMessageService { public static boolean saveMsgCenter(MessageListRequest list) { String json = JsonUtil.obj2JsonString(list); - String result = HttpRequest.sendPost(ConfigInterface.CENTER_BASE_URL+"saveCreatedSMS",json,ConfigInterface.CENTER_TOKEN); + String result = HttpClientUtil.doPostSSL(ConfigInterface.CENTER_BASE_URL+"/biz-push-web/push",json); if (StringUtils.isNotEmpty(result)) { Map map = JsonUtil.str2Obj(result, Map.class); - if ("0".equals(map.get("errorcode"))) + if ("0".equals(String.valueOf(map.get("errorcode")))) { return true; } @@ -47,15 +53,18 @@ public class SaveMessageService { public static boolean isExistMsg(String patientId,String tempId) { - String param = "typeId="+ ProjectTypeEnums.YNXT.getId()+"&ext2="+StringUtils.emptyStr(tempId)+"&ext3="+StringUtils.emptyStr(patientId)+"&page=1&limit=10"; - String result = HttpRequest.sendGet(ConfigInterface.CENTER_BASE_URL + "messages", param, ConfigInterface.CENTER_TOKEN); - + Map param = new HashMap<>(); + param.put("page","1"); + param.put("limit","10"); + param.put("patientId",patientId); + param.put("tempId",tempId); + String result = HttpClientUtil.doGet(ConfigInterface.CENTER_BASE_URL + "/biz-push-web/push", param,"utf-8",null); JSONObject jsonObject = JsonUtil.getObj(result); - if (jsonObject != null && jsonObject.getJSONArray("list") != null) + if (jsonObject != null && jsonObject.getJSONObject("pageInfo") != null) { - JSONArray jsonArray = jsonObject.getJSONArray("list"); - String list = jsonArray.toString(); - if (StringUtils.isNotEmpty(list) && !"[]".equals(list)) + JSONObject jsonObject1 = jsonObject.getJSONObject("pageInfo"); + int count = jsonObject1.getInt("count"); + if (count > 0) { return true; } @@ -65,5 +74,44 @@ public class SaveMessageService { public static void main(String[] areg) { +// MessageListRequest list = new MessageListRequest(); +// +// +// List messages = new ArrayList<>(); +// +// +// MessageRequest request = new MessageRequest(); +// //平台ID +// request.setTypeId(ProjectTypeEnums.YNXT.getId()); +// //服务对象 1孕妇 2儿童 3产妇 +// request.setObjType(1); +// request.setPhone("154568526845"); +// //计划发送时间 +// request.setPlanTime(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D) + " " + ConfigInterface.SEND_TIME +":00"); +// +// request.setSubTypeId(1); +// request.setStatus(MsgStatusEnums.NO_SEND.getId()); +// request.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId()); +// request.setHospitalId("1"); +// request.setPatientId("2"); +// request.setTempId("2"); +// request.setWxTempId("bbb"); +// request.setCreated(DateUtils.getDateStr(new Date(), DateUtils.Y_M_D_H_M_S)); +// +// request.setFirst("aaa"); +// request.setKeyword1("bbb"); +// request.setKeyword2("cc"); +// request.setRemark("ddd"); +// +// +// messages.add(request); +// +// list.setMessages(messages); +// list.setTypeId(ProjectTypeEnums.YNXT.getId()); +// +// saveMsgCenter( list); + + + isExistMsg("2","2"); } } diff --git a/platform-msg-generate/src/main/resources/config.properties b/platform-msg-generate/src/main/resources/config.properties index 7f76be2..22fd6b6 100644 --- a/platform-msg-generate/src/main/resources/config.properties +++ b/platform-msg-generate/src/main/resources/config.properties @@ -1,6 +1,6 @@ -#短信中心url +#消息中心url #center_base_url=http://sms.healthbaby.com.cn/v1/ -center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/ +center_base_url=https://push.stage.platform.healthbaby.com.cn #区域平台访问短信中心的token center_token=e0c56363-00d6-42ee-bbe0-23c553583062 diff --git a/platform-msg-generate/src/main/resources/spring/applicationContext.xml b/platform-msg-generate/src/main/resources/spring/applicationContext.xml index a5fe03a..8a8b1aa 100644 --- a/platform-msg-generate/src/main/resources/spring/applicationContext.xml +++ b/platform-msg-generate/src/main/resources/spring/applicationContext.xml @@ -41,5 +41,5 @@ - + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index d92ff00..d1f6b86 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -24,9 +24,6 @@ public class AreaCountController extends BaseController { @Autowired private AreaCountFacade areaCountFacade; - /**=============================================***/ - - /** * 产检节点统计 * @param request diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java index e1bb920..7b4a728 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java @@ -196,7 +196,20 @@ public class SmsConfigController extends BaseController { } - + /** + * 查询短信列表 + * @param hospitalName + * @param phone + * @param smsType + * @param smsStatus + * @param objType + * @param content + * @param planTime + * @param actualTime + * @param page + * @param limit + * @return + */ @RequestMapping(value = "/querySmsList", method = RequestMethod.GET) @ResponseBody public BaseResponse querySmsList(@RequestParam(required = false) String hospitalName, @@ -223,22 +236,74 @@ public class SmsConfigController extends BaseController { * @param content * @param planTime * @param actualTime - */ @RequestMapping(value = "/exportSmsList", method = RequestMethod.GET) public void exportSmsList(HttpServletResponse httpServletResponse,@RequestParam(required = false) String hospitalName, + @RequestParam(required = false) String phone, + @RequestParam(required = false) Integer smsType, + @RequestParam(required = false) Integer smsStatus, + @RequestParam(required = false) Integer objType, + @RequestParam(required = false) String content, + @RequestParam(required = false) String planTime, + @RequestParam(required = false) String actualTime) { + smsConfigFacade.exportSmsList(hospitalName, phone, smsType, smsStatus, content, planTime, actualTime, objType, httpServletResponse); + } + + + /** + * 查询推送消息列表 + * @param hospitalId + * @param phone + * @param smsType + * @param smsStatus + * @param objType + * @param planTime + * @param actualTime + * @param page + * @param limit + * @return + */ + @RequestMapping(value = "/queryMsgList", method = RequestMethod.GET) + @ResponseBody + public BaseResponse queryMsgList(@RequestParam(required = false) String hospitalId, @RequestParam(required = false) String phone, @RequestParam(required = false) Integer smsType, @RequestParam(required = false) Integer smsStatus, @RequestParam(required = false) Integer objType, - @RequestParam(required = false) String content, @RequestParam(required = false) String planTime, - @RequestParam(required = false) String actualTime) { - smsConfigFacade.exportSmsList(hospitalName, phone, smsType, smsStatus, content, planTime, actualTime, objType, httpServletResponse); + @RequestParam(required = false) String actualTime, + @RequestParam(required = false) Integer page, + @RequestParam(required = false) Integer limit) { + return smsConfigFacade.queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType, page, limit); + } + + + /** + * 导出推送 + * @param hospitalId + * @param phone + * @param smsType + * @param smsStatus + * @param objType + * @param planTime + * @param actualTime + */ + @RequestMapping(value = "/exportMsgList", method = RequestMethod.GET) + public void exportMsgList(HttpServletResponse httpServletResponse,@RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String phone, + @RequestParam(required = false) Integer smsType, + @RequestParam(required = false) Integer smsStatus, + @RequestParam(required = false) Integer objType, + @RequestParam(required = false) String planTime, + @RequestParam(required = false) String actualTime) { + smsConfigFacade.exportMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType, httpServletResponse); } + + + @RequestMapping(value = "/sendBabyBuildSms", method = RequestMethod.GET) @ResponseBody public String sendBabyBuildSms() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 22fec9f..30860e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -6,7 +6,6 @@ import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.DataPermissionService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; @@ -15,31 +14,23 @@ import com.lyms.platform.common.utils.*; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.FunvCommonUtil; -import com.lyms.platform.operate.web.worker.AntExRecordWorker; import com.lyms.platform.operate.web.worker.CheckPointCountWorker; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; -import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.AntExChuModel; -import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.DataPermissionsModel; import com.lyms.platform.pojo.Patients; -import com.lyms.platform.query.AntExChuQuery; -import com.lyms.platform.query.AntExQuery; import com.lyms.platform.query.DataPermissionsModelQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import java.util.*; import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index f7be2e7..804539c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -932,4 +932,141 @@ public class SmsConfigFacade { e.printStackTrace(); } } + + public BaseListResponse queryMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus, + String planTime, String actualTime, Integer objType, Integer page, Integer limit) { + + String planTimeStart = ""; + String planTimeEnd = ""; + if (StringUtils.isNotEmpty(planTime)) + { + planTimeStart = String.valueOf(DateUtil.getSecond(DateUtil.parseYMD(planTime.split(" - ")[0])) +" 00:00:00"); + planTimeEnd = String.valueOf(DateUtil.getSecond(DateUtil.parseYMD(planTime.split(" - ")[1]))+" 00:00:00"); + } + + String actualTimeStart = ""; + String actualTimeEnd = ""; + if (StringUtils.isNotEmpty(actualTime)) + { + + actualTimeStart = String.valueOf(DateUtil.getSecond(DateUtil.parseYMD(actualTime.split(" - ")[0]))+" 00:00:00"); + actualTimeEnd = String.valueOf(DateUtil.getSecond(DateUtil.parseYMD(actualTime.split(" - ")[1])) + " 00:00:00"); + } + List> list = new ArrayList<>(); + + MsgResult sms = MessageCenterService.queryMsgList(hospitalId, phone, smsType, smsStatus, planTimeStart, + planTimeEnd, actualTimeStart, actualTimeEnd, objType, page, limit); + + if (sms != null && sms.getData() != null ) + { + List msgObjs = sms.getData(); + if (CollectionUtils.isNotEmpty(msgObjs)) + { + for(MsgObj obj : msgObjs) + { + if (obj != null) + { + Map map = new HashMap<>(); + if (StringUtils.isNotEmpty(obj.getHospitalId())) + { + Organization org= organizationService.getOrganization(Integer.parseInt(obj.getHospitalId())); + if(null!=org){ + map.put("hospitalName",org.getName()); + }else{ + map.put("hospitalName",""); + } + } + else + { + map.put("hospitalName",""); + } + map.put("smsType",SmsServiceEnums.getSmsServiceById(obj.getSubTypeId())); + map.put("phone",obj.getPhone()); + map.put("objType",ServiceObjEnums.getServiceObjById(obj.getObjtype())); + map.put("planTime", obj.getPlanTime()); + map.put("actualTime", obj.getActualTime() == null ? "" : obj.getActualTime()); + map.put("timeType",SmsTimeTypeEnums.getNameById(obj.getTimeType())); + map.put("smsStatus", SmsStatusEnums.getNameById(obj.getStatus())); + map.put("first", obj.getFirst()); + map.put("keyword1", obj.getKeyword1()); + map.put("keyword2",obj.getKeyword2()); + map.put("remark", obj.getRemark()); + list.add(map); + } + } + } + } + + BaseListResponse objectResponse = new BaseListResponse(); + objectResponse.setData(list); + objectResponse.setPageInfo(sms == null ? new PageInfo() : sms.getPageInfo()); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + + /** + * 导出推送列表 + * + * @param hospitalId 医院id + * @param phone 手机号码 + * @param smsType 短信类型 + * @param smsStatus 短信状态 + * @param planTime 计划发送时间 + * @param actualTime 实际发送时间 + * @param objType 发送短信 + * @param httpServletResponse + */ + public void exportMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, Integer objType,HttpServletResponse httpServletResponse) { + + try + { + BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType, 1, 999999999); + List> datas = new ArrayList<>(); + List> results = list.getData(); + + if (CollectionUtils.isNotEmpty(results)) + { + for(Map map : results) + { + Map data = new HashMap<>(); + data.put("hospitalName",map.get("hospitalName")); + data.put("objType",map.get("objType")); + data.put("smsType",map.get("smsType")); + data.put("phone",map.get("phone")); + data.put("planTime",map.get("planTime")); + data.put("actualTime",map.get("actualTime")); + data.put("smsStatus",map.get("smsStatus")); + data.put("timeType",map.get("timeType")); + map.put("first", map.get("first")); + map.put("keyword1", map.get("keyword1")); + map.put("keyword2",map.get("keyword2")); + map.put("remark", map.get("remark")); + datas.add(data); + } + } + + OutputStream out = httpServletResponse.getOutputStream(); + Map cnames = new LinkedHashMap<>(); + cnames.put("hospitalName", "医院"); + cnames.put("objType", "发送对象"); + cnames.put("smsType", "短信类型"); + cnames.put("phone", "电话号码"); + cnames.put("first", "推送内容"); + cnames.put("keyword1","推送标题"); + cnames.put("keyword2","推送时间"); + cnames.put("remark", "推送备注"); + cnames.put("planTime", "计划发送时间"); + cnames.put("actualTime", "实际发送时间"); + cnames.put("smsStatus", "状态"); + cnames.put("timeType", "是否及时"); + httpServletResponse.setContentType("application/octet-stream"); + httpServletResponse.setCharacterEncoding("UTF-8"); + httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=msg.xls"); + ExcelUtil.toExcel(out, datas, cnames); + } catch (IOException e) { + e.printStackTrace(); + } + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgObj.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgObj.java new file mode 100644 index 0000000..5899eb5 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgObj.java @@ -0,0 +1,187 @@ +package com.lyms.platform.operate.web.result; + +/** + * Created by Administrator on 2017-07-24. + */ +public class MsgObj { + private int id; + private String memberId; + private int typeId; + private String msgId; + private int status; + private String created; + private String planTime; + private String actualTime; + private String hospitalId; + private String patientId; + private String wxTempId; + private String tempId; + private int subTypeId; + private int timeType; + private String first; + private String keyword1; + private String keyword2; + private int objtype; + private String phone; + private String remark; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getMemberId() { + return memberId; + } + + public void setMemberId(String memberId) { + this.memberId = memberId; + } + + public int getTypeId() { + return typeId; + } + + public void setTypeId(int typeId) { + this.typeId = typeId; + } + + public String getMsgId() { + return msgId; + } + + public void setMsgId(String msgId) { + this.msgId = msgId; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public String getCreated() { + return created; + } + + public void setCreated(String created) { + this.created = created; + } + + public String getPlanTime() { + return planTime; + } + + public void setPlanTime(String planTime) { + this.planTime = planTime; + } + + public String getActualTime() { + return actualTime; + } + + public void setActualTime(String actualTime) { + this.actualTime = actualTime; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getWxTempId() { + return wxTempId; + } + + public void setWxTempId(String wxTempId) { + this.wxTempId = wxTempId; + } + + public String getTempId() { + return tempId; + } + + public void setTempId(String tempId) { + this.tempId = tempId; + } + + public int getSubTypeId() { + return subTypeId; + } + + public void setSubTypeId(int subTypeId) { + this.subTypeId = subTypeId; + } + + public int getTimeType() { + return timeType; + } + + public void setTimeType(int timeType) { + this.timeType = timeType; + } + + public String getFirst() { + return first; + } + + public void setFirst(String first) { + this.first = first; + } + + public String getKeyword1() { + return keyword1; + } + + public void setKeyword1(String keyword1) { + this.keyword1 = keyword1; + } + + public String getKeyword2() { + return keyword2; + } + + public void setKeyword2(String keyword2) { + this.keyword2 = keyword2; + } + + public int getObjtype() { + return objtype; + } + + public void setObjtype(int objtype) { + this.objtype = objtype; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgResult.java new file mode 100644 index 0000000..6b40473 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgResult.java @@ -0,0 +1,59 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.base.PageInfo; + +import java.util.List; + +/** + * Created by Administrator on 2017-07-24. + */ +public class MsgResult { + + private String errormsg; + private String errorcode; + private Object object; + + private PageInfo pageInfo; + + private List data; + + public String getErrormsg() { + return errormsg; + } + + public void setErrormsg(String errormsg) { + this.errormsg = errormsg; + } + + public String getErrorcode() { + return errorcode; + } + + public void setErrorcode(String errorcode) { + this.errorcode = errorcode; + } + + public PageInfo getPageInfo() { + return pageInfo; + } + + public void setPageInfo(PageInfo pageInfo) { + this.pageInfo = pageInfo; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public Object getObject() { + return object; + } + + public void setObject(Object object) { + this.object = object; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index 79827d9..d55ce1b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -4,16 +4,17 @@ package com.lyms.platform.operate.web.utils; import com.lyms.platform.common.enums.ProjectTypeEnums; import com.lyms.platform.common.enums.SmsStatusEnums; import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.HttpClientUtil; import com.lyms.platform.operate.web.request.MessageListRequest; import com.lyms.platform.operate.web.request.MessageRequest; +import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.result.Config; -import com.lyms.platform.operate.web.result.SmsObj; -import com.lyms.platform.operate.web.result.SmsResult; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -173,9 +174,47 @@ public class MessageCenterService { return map; } + + public static MsgResult queryMsgList(String hospitalId, String phone,Integer smsType, + Integer smsStatus,String planTimeStart, + String planTimeEnd,String actualTimeStart, + String actualTimeEnd,Integer objType , + Integer page, Integer limit) + { + Map param = new HashMap<>(); + param.put("page",page == null ? null : String.valueOf(page)); + param.put("limit",limit == null ? null : String.valueOf(limit)); + param.put("hospitalId",hospitalId); + param.put("phone",phone); + param.put("subTypeId",smsType == null ? null : String.valueOf(smsType)); + param.put("status",smsStatus == null ? null : String.valueOf(smsStatus)); + param.put("planTimeStart",planTimeStart); + param.put("planTimeEnd",planTimeEnd); + param.put("actualTimeStart",actualTimeStart); + param.put("actualTimeEnd",actualTimeEnd); + param.put("objType",objType == null ? null : String.valueOf(objType)); + String result = HttpClientUtil.doGet("https://push.stage.platform.healthbaby.com.cn/biz-push-web/push", param, "utf-8", null); + if (result != null) + { + MsgResult map = JsonUtil.str2Obj(result, MsgResult.class); + + JSONObject jsonObject = JsonUtil.getObj(result); + if (jsonObject != null && jsonObject.getJSONArray("data") != null) + { + JSONArray jsonArray = jsonObject.getJSONArray("data"); + String list = jsonArray.toString(); + map.setData(JsonUtil.toList(list, MsgObj.class)); + } + + return map; + } + + return null; + } + public static void main(String[] args){ // String param = "phone=&page=1&limit=100&typeId=4&ext1=196"; -// +//d // MessageListRequest list = new MessageListRequest(); // List messages = new ArrayList<>(); // MessageRequest request = new MessageRequest(); @@ -210,7 +249,11 @@ public class MessageCenterService { // map.setList(JsonUtil.toList(list, SmsObj.class)); // System.out.print(map); - + queryMsgList("1", null,null, + null,null, + null,null, + null,null , + 1,10); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java index e60b6a9..ebf98ed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java @@ -43,9 +43,6 @@ public class CheckWeeksNumWorker implements Callable> { @Override public Map call() throws Exception { Map map = new HashMap<>(); - - long start = System.currentTimeMillis(); - if (week == 0) { int itemnum12 = antenatalExaminationService.queryWeekPointCount(0, 12, hospitalId, startTime, endTime, pointType); @@ -71,7 +68,6 @@ public class CheckWeeksNumWorker implements Callable> { int itemnum40 = antenatalExaminationService.queryWeekPointCount(37, 40, hospitalId, startTime,endTime, pointType); map.put("itemnum40",itemnum40); } - System.out.println(week+"==="+hospitalId+"---------"+ (System.currentTimeMillis()-start)); return map; } } -- 1.8.3.1