From c9663acfe4f0effc8693ee5b9f636c222d5388d3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 17 Nov 2016 16:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E9=A2=84=E4=BA=A7=E6=9C=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/DateUtil.java | 33 +++++---- .../lyms/platform/common/utils/HttpRequest.java | 58 +++++++++++++++ .../platform/data/controller/SmsController.java | 28 ++++++++ .../com/lyms/platform/data/service/SmsService.java | 6 ++ .../platform/data/service/impl/SmsServiceImpl.java | 84 ++++++++++++++++++++++ .../platform/data/util/SaveMessageService.java | 84 +++++++++++++--------- 6 files changed, 245 insertions(+), 48 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 2640a32..3222434 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -772,23 +772,23 @@ public class DateUtil { // System.out.println(s); // Date s = addDay(parseYMD("2016-02-26"), 168); - int start = 38; - int end = 38; +// int start = 38; +// int end = 38; +//// +//// +//// Date startDate = DateUtil.getNewDate(-end-1,"周",1+1); +//// Date endDate = DateUtil.getNewDate(-start,"周",0+1); // // -// Date startDate = DateUtil.getNewDate(-end-1,"周",1+1); -// Date endDate = DateUtil.getNewDate(-start,"周",0+1); - - - Date startDate = DateUtil.getNewDate(-end-1,"周",2+1); - Date endDate = DateUtil.getNewDate(-start,"周",2); - - - String date = y_m_d_h_m_s.format(startDate.getTime()); -// Date startDate = DateUtil.getNewDate(-end-1,"月",1); -// Date endDate = DateUtil.getNewDate(-start,"月",1); - - System.out.println(date + "==="); +// Date startDate = DateUtil.getNewDate(-end-1,"周",2+1); +// Date endDate = DateUtil.getNewDate(-start,"周",2); +// +// +// String date = y_m_d_h_m_s.format(startDate.getTime()); +//// Date startDate = DateUtil.getNewDate(-end-1,"月",1); +//// Date endDate = DateUtil.getNewDate(-start,"月",1); +// +// System.out.println(date + "==="); // Date startDate = getRangeDate(parseYMD("2016-09-07"),2,"周",-1); @@ -796,6 +796,9 @@ public class DateUtil { // int a = daysBetween(parseYMD("2013-09-13"),new Date())/7; // System.out.println(a); + + Date dueDate = DateUtil.addDay(DateUtil.addMonth(parseYMD("2016-02-08"), 9), 7); + System.out.println(getyyyy_MM_dd(dueDate)); } catch (Exception e) { 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 b6074a6..b9aca40 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 @@ -68,6 +68,64 @@ public class HttpRequest { } return result; } + + + /** + * 删除 + * @param url + * @param param + * @param auth + * @return + */ + public static String sendDelete(String url, String param,String auth) { + String result = ""; + BufferedReader in = null; + try { + String urlNameString = url + "?" + param; + URL realUrl = new URL(urlNameString); + // 打开和URL之间的连接 + HttpURLConnection connection = (HttpURLConnection)realUrl.openConnection(); + // 设置通用的请求属性 + connection.setRequestMethod("DELETE"); + + connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("Method","DELETE"); + 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.connect(); + // 获取所有响应头字段 + Map> map = connection.getHeaderFields(); + // 遍历所有的响应头字段 + for (String key : map.keySet()) { + System.out.println(key + "--->" + map.get(key)); + } + // 定义 BufferedReader输入流来读取URL的响应 + in = new BufferedReader(new InputStreamReader( + connection.getInputStream(),"utf-8")); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送DELETE请求出现异常！" + e); + e.printStackTrace(); + } + // 使用finally块来关闭输入流 + finally { + try { + if (in != null) { + in.close(); + } + } catch (Exception e2) { + e2.printStackTrace(); + } + } + return result; + } + /** * 向指定URL发送GET方法的请求 * @param url diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java b/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java index 98005f3..dc66cf8 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java @@ -1,11 +1,15 @@ package com.lyms.platform.data.controller; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.data.service.SmsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletResponse; @@ -81,4 +85,28 @@ public class SmsController extends BaseController { smsService.productChildAmsSms(); writeString(response, "child ams success"); } + + + @RequestMapping(value = "/getDueSms") + @ResponseBody + public BaseResponse getDueSms(HttpServletResponse response,@RequestParam("token")String token){ + if (!"lyms@2016!000".equals(token)) + { + return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("没有token"); + } + return smsService.getDueSms(); + } + + + @RequestMapping(value = "/deleteDueSms") + public void deleteDueSms(HttpServletResponse response,@RequestParam("token")String token){ + if (!"lyms@2016!000".equals(token)) + { + ResultUtils.buildParameterErrorResultAndWrite(response, "没有token"); + return; + } + smsService.deleteDueSms(); + writeString(response, "delete due sms success"); + } + } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/SmsService.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/SmsService.java index a78a96a..96fbdd9 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/SmsService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/SmsService.java @@ -1,6 +1,9 @@ package com.lyms.platform.data.service; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; + /** * Created by Administrator on 2016/7/5. */ @@ -14,6 +17,9 @@ public interface SmsService { void productChanAmsSms(); + BaseResponse deleteDueSms(); + BaseListResponse getDueSms(); + void serviceEnd(); void getBirthPatients(); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 0c58ca6..3404c27 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -1,7 +1,10 @@ package com.lyms.platform.data.service.impl; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.data.pojo.HighScoreResult; import com.lyms.platform.data.pojo.MessageContent; @@ -2854,6 +2857,87 @@ public class SmsServiceImpl implements SmsService{ } + @Override + public BaseResponse deleteDueSms() { + + try { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setType(3); + patientsQuery.setYn(YnEnums.YES.getId()); + String startStr = DateUtil.getyyyy_MM_dd(new Date()); + Date startDate = DateUtil.parseYMD(startStr); + Date endDate = new Date(startDate.getTime()+86400000-1); + patientsQuery.setFmDateStart(startDate); + patientsQuery.setFmDateEnd(endDate); + + List results = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + StringBuffer sb = null; + if (CollectionUtils.isNotEmpty(results)) + { + sb = new StringBuffer(); + for (Patients pat : results) + { + sb.append(pat.getPhone()); + sb.append(","); + } + System.out.println(sb); + } + if (sb != null) + { + SaveMessageService.deleteDueSms(sb.toString()); + } + + } catch (Exception e) + { + ExceptionUtils.catchException(e,"删除分娩孕妇异常"); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("失败"); + } + + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + @Override + public BaseListResponse getDueSms() { + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setType(3); + patientsQuery.setYn(YnEnums.YES.getId()); + String startStr = DateUtil.getyyyy_MM_dd(new Date()); + Date startDate = DateUtil.parseYMD(startStr); + Date endDate = new Date(startDate.getTime()+86400000-1); + + System.out.println("start = " + startStr); + System.out.println("end = " + DateUtil.getyyyy_MM_dd_hms(endDate)); + + + patientsQuery.setFmDateStart(startDate); + patientsQuery.setFmDateEnd(endDate); + List> list = new ArrayList<>(); + + List results = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (CollectionUtils.isNotEmpty(results)) + { + for (Patients pat : results) + { + Map map = new HashMap<>(); + map.put("name",pat.getUsername()); + map.put("phone",pat.getPhone()); + map.put("fmDate",pat.getFmDate() == null ? "" : DateUtil.getYmd(pat.getFmDate())); + list.add(map); + } + } + + BaseListResponse objectResponse = new BaseListResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setData(list); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + + + + public void productSms() { productTemplateSms(); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java index 56d7383..2b5e978 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java @@ -41,7 +41,6 @@ public class SaveMessageService { public static boolean isExistSms(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(CENTER_BASE_URL + "messages", param, CENTER_TOKEN); @@ -58,41 +57,60 @@ public class SaveMessageService { return false; } - public static void main(String[] areg) + + public static boolean deleteDueSms(String phones) { - MessageListRequest list = new MessageListRequest(); - List messages = new ArrayList<>(); - MessageRequest request = new MessageRequest(); - request.setTypeId(1); - request.setStatus(0); - request.setContent("cccccccccccccccccc"); - request.setObjType(1); - request.setPhone("18382670000"); - request.setPlanTime("2015-01-06 15:22:12"); - request.setServiceType(1); - request.setExt1("196"); - request.setExt2("10"); - request.setExt3("10"); - request.setSubTypeId(6); - messages.add(request); + String param = "typeId="+ ProjectTypeEnums.YNXT.getId()+"&phones="+StringUtils.emptyStr(phones); + String result = HttpRequest.sendDelete(CENTER_BASE_URL + "deleteDueSms", param, CENTER_TOKEN); + if (StringUtils.isNotEmpty(result)) + { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode"))) + { + return true; + } + } + return false; + } + public static void main(String[] areg) + { +// MessageListRequest list = new MessageListRequest(); +// List messages = new ArrayList<>(); +// MessageRequest request = new MessageRequest(); +// request.setTypeId(1); +// request.setStatus(0); +// request.setContent("cccccccccccccccccc"); +// request.setObjType(1); +// request.setPhone("18382670000"); +// request.setPlanTime("2015-01-06 15:22:12"); +// request.setServiceType(1); +// request.setExt1("196"); +// request.setExt2("10"); +// request.setExt3("10"); +// request.setSubTypeId(6); +// messages.add(request); +// +// +// MessageRequest request1 = new MessageRequest(); +// request1.setTypeId(1); +// request1.setStatus(0); +// request1.setContent("bbbbbbbbbbbbbb"); +// request1.setObjType(1); +// request1.setPhone("18382670001"); +// request1.setPlanTime("2015-01-06 15:22:12"); +// request1.setServiceType(1); +// request.setSubTypeId(7); +// request1.setExt1("196"); +// request1.setExt2("10"); +// request1.setExt3("10"); +// messages.add(request1); +// +// list.setTypeId(1); +// list.setMessages(messages); +// saveSmsCenter(list); - MessageRequest request1 = new MessageRequest(); - request1.setTypeId(1); - request1.setStatus(0); - request1.setContent("bbbbbbbbbbbbbb"); - request1.setObjType(1); - request1.setPhone("18382670001"); - request1.setPlanTime("2015-01-06 15:22:12"); - request1.setServiceType(1); - request.setSubTypeId(7); - request1.setExt1("196"); - request1.setExt2("10"); - request1.setExt3("10"); - messages.add(request1); - list.setTypeId(1); - list.setMessages(messages); - saveSmsCenter(list); + deleteDueSms("15265444440,"); } } -- 1.8.3.1