From ce7dace117e3d3b8b004f3d9b617c7a48bcd8648 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 25 Aug 2016 11:20:19 +0800 Subject: [PATCH] code update --- .../com/lyms/platform/common/base/PageInfo.java | 3 + .../lyms/platform/common/utils/HttpRequest.java | 5 +- .../lyms/platform/common/utils/StringUtils.java | 19 +++ .../operate/web/facade/SmsConfigFacade.java | 84 +++++++++++- .../lyms/platform/operate/web/result/SmsObj.java | 151 +++++++++++++++++++++ .../platform/operate/web/result/SmsResult.java | 52 +++++++ .../operate/web/utils/MessageCenterService.java | 43 ++++-- 7 files changed, 342 insertions(+), 15 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsObj.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsResult.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/base/PageInfo.java b/platform-common/src/main/java/com/lyms/platform/common/base/PageInfo.java index c41595f..3cd877d 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/base/PageInfo.java +++ b/platform-common/src/main/java/com/lyms/platform/common/base/PageInfo.java @@ -27,6 +27,9 @@ public class PageInfo { this.limit = limit; } + public PageInfo() { + } + public Integer getPage() { return page; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java index fb24bd2..0e7912f 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java @@ -32,11 +32,11 @@ public class HttpRequest { URLConnection connection = realUrl.openConnection(); // 设置通用的请求属性 connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("Method","GET"); connection.setRequestProperty("connection", "Keep-Alive"); connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); connection.setRequestProperty("Authorization",auth); - connection.setRequestProperty("Authorization", "healthbaby2015"); // 建立实际的连接 connection.connect(); // 获取所有响应头字段 @@ -47,7 +47,7 @@ public class HttpRequest { } // 定义 BufferedReader输入流来读取URL的响应 in = new BufferedReader(new InputStreamReader( - connection.getInputStream())); + connection.getInputStream(),"utf-8")); String line; while ((line = in.readLine()) != null) { result += line; @@ -97,6 +97,7 @@ public class HttpRequest { URLConnection connection = realUrl.openConnection(); // 设置通用的请求属性 connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("Method","GET"); connection.setRequestProperty("connection", "Keep-Alive"); connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index 59fc6cc..5c4e3e8 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -124,6 +124,25 @@ public final class StringUtils { return str; } + + public static String emptyStr(String str) + { + if (str == null) + { + return ""; + } + return str; + } + + public static String emptyInt(Integer str) + { + if (str == null) + { + return ""; + } + return String.valueOf(str); + } + // public static void main(String[] arg) { // System.out.print(encryPhone("18382670036")); // } 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 725c841..9aecca5 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 @@ -6,12 +6,14 @@ import com.lyms.platform.common.enums.*; 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.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.SmsConfigRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.ConfigTask; +import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.permission.model.Departments; import com.lyms.platform.permission.model.DepartmentsQuery; import com.lyms.platform.permission.model.Organization; @@ -629,8 +631,86 @@ public class SmsConfigFacade { return objectResponse; } - public BaseObjectResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime, Integer page, Integer limit) + public BaseListResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime, Integer page, Integer limit) { - return null; + String planTimeStart = ""; + String planTimeEnd = ""; + if (StringUtils.isNotEmpty(planTime)) + { + planTimeStart = String.valueOf(DateUtil.getSecond(DateUtil.parseYMD(planTime.split(" - ")[0]))); + planTimeEnd = String.valueOf(DateUtil.getSecond(DateUtil.parseYMD(planTime.split(" - ")[1]))); + } + + String actualTimeStart = ""; + String actualTimeEnd = ""; + if (StringUtils.isNotEmpty(actualTime)) + { + + actualTimeStart = String.valueOf(DateUtil.getSecond(DateUtil.parseYMD(actualTime.split(" - ")[0]))); + actualTimeEnd = String.valueOf(DateUtil.getSecond(DateUtil.parseYMD(actualTime.split(" - ")[1]))); + } + List> list = new ArrayList<>(); + + SmsResult sms = MessageCenterService.querySmsList(hospitalId, phone, smsType, smsStatus, content, planTimeStart, planTimeEnd, actualTimeStart, actualTimeEnd, page, limit); + + if (sms != null && sms.getList() != null ) + { + List smsObjs = sms.getList(); + if (CollectionUtils.isNotEmpty(smsObjs)) + { + for(SmsObj obj : smsObjs) + { + if (obj != null) + { + + Map map = new HashMap<>(); + if (StringUtils.isNotEmpty(obj.getExt1())) + { + Organization org= organizationService.getOrganization(Integer.parseInt(obj.getExt1())); + map.put("hospitalName",org.getName()); + } + else + { + map.put("hospitalName",""); + } + map.put("smsType",SmsServiceEnums.getSmsServiceById(obj.getSubTypeId())); + map.put("phone",obj.getPhone()); + map.put("content",obj.getContent()); + + if (obj.getPlanTime() != null && obj.getPlanTime() > 0) + { + long pt = (long)obj.getPlanTime() * 1000; + String strpt = DateUtil.getyyyy_MM_dd(new Date(pt)); + map.put("planTime", strpt); + } + else + { + map.put("planTime", ""); + } + + if (obj.getActualTime() != null && obj.getActualTime() > 0) + { + long pt = (long)obj.getActualTime() * 1000; + String strpt = DateUtil.getyyyy_MM_dd(new Date(pt)); + map.put("actualTime", strpt); + } + else + { + map.put("actualTime", ""); + } + + map.put("smsStatus", SmsStatusEnums.getNameById(obj.getStatus())); + list.add(map); + } + } + } + } + + BaseListResponse objectResponse = new BaseListResponse(); + objectResponse.setData(list); + objectResponse.setPageInfo(sms.getPageInfo()); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsObj.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsObj.java new file mode 100644 index 0000000..cd1ee56 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsObj.java @@ -0,0 +1,151 @@ +package com.lyms.platform.operate.web.result; + +/** + * Created by Administrator on 2016/8/25. + */ +public class SmsObj{ + private String phone; + private Integer status; + private Integer serviceType; + private Integer id; + private String content; + private String typeName; + private Integer objType; + private String ext1; + private String ext2; + private Integer created; + private Integer planTime; + private String ext3; + private Integer actualTime; + private Integer sendCount; + private Integer subTypeId; + private Integer typeId; + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public Integer getObjType() { + return objType; + } + + public void setObjType(Integer objType) { + this.objType = objType; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public Integer getCreated() { + return created; + } + + public void setCreated(Integer created) { + this.created = created; + } + + public Integer getPlanTime() { + return planTime; + } + + public void setPlanTime(Integer planTime) { + this.planTime = planTime; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + public Integer getActualTime() { + return actualTime; + } + + public void setActualTime(Integer actualTime) { + this.actualTime = actualTime; + } + + public Integer getSendCount() { + return sendCount; + } + + public void setSendCount(Integer sendCount) { + this.sendCount = sendCount; + } + + public Integer getSubTypeId() { + return subTypeId; + } + + public void setSubTypeId(Integer subTypeId) { + this.subTypeId = subTypeId; + } + + public Integer getTypeId() { + return typeId; + } + + public void setTypeId(Integer typeId) { + this.typeId = typeId; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsResult.java new file mode 100644 index 0000000..47eb86c --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsResult.java @@ -0,0 +1,52 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.base.PageInfo; + +import java.util.List; + +/** + * Created by Administrator on 2016/8/24. + */ +public class SmsResult { + private String errormsg; + private String errorcode; + + private PageInfo pageInfo; + + private List list; + + + + + 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 getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} 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 1bcbcf6..73e0987 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 @@ -7,6 +7,10 @@ import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.MessageListRequest; 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 java.util.List; import java.util.Map; @@ -62,19 +66,36 @@ public class MessageCenterService { } - public static List querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime, Integer page, Integer limit) + public static SmsResult querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTimeStart,String planTimeEnd,String actualTimeStart,String actualTimeEnd, Integer page, Integer limit) { -//// String result = HttpRequest.sendPost(CENTER_BASE_URL + "messages/{" + hid + "}", json, CENTER_TOKEN); -// String result = HttpRequest.sendGet("http://192.168.5.13:8080/v1/messages/" + hid, json, "YMer2016"); -// if (StringUtils.isNotEmpty(result)) + String param = "typeId=4&ext1="+StringUtils.emptyStr(hospitalId)+"&phone="+StringUtils.emptyStr(phone)+"&subTypeId="+StringUtils.emptyInt(smsType)+"&content="+StringUtils.emptyStr(content)+ + "&planTimeStart="+planTimeStart+"&planTimeEnd="+planTimeEnd+"&actualTimeStart="+actualTimeStart+ + "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&page="+page+"&limit="+limit; +// String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN); + SmsResult map = null; +// String result = HttpRequest.sendGet("http://192.168.5.6:8080/v1/messages", param, "YMer2016"); +// SmsResult map = JsonUtil.str2Obj(result, SmsResult.class); +// JSONObject jsonObject = JsonUtil.getObj(result); +// if (jsonObject != null && jsonObject.getJSONArray("list") != null) // { -// Map map = JsonUtil.str2Obj(result, Map.class); -// if ("0".equals(map.get("errorcode"))) -// { -// return true; -// } +// JSONArray jsonArray = jsonObject.getJSONArray("list"); +// String list = jsonArray.toString(); +// map.setList(JsonUtil.toList(list,SmsObj.class)); // } -// return false; - return null; + return map; + } + + public static void main(String[] args){ + String param = "phone=&page=1&limit=100&typeId=4"; + + String result = HttpRequest.sendGet("http://192.168.5.6:8080/v1/messages", param, "YMer2016"); + SmsResult map = JsonUtil.str2Obj(result, SmsResult.class); + JSONObject jsonObject = JsonUtil.getObj(result); + JSONArray jsonArray = jsonObject.getJSONArray("list"); + String list = jsonArray.toString(); + map.setList(JsonUtil.toList(list, SmsObj.class)); + System.out.print(map); + + } } -- 1.8.3.1