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 4c63297..2603e91 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 @@ -223,21 +223,21 @@ public class SmsConfigController extends BaseController { * @param limit * @return */ - @RequestMapping(value = "/querySmsList", method = RequestMethod.GET) - @ResponseBody - @TokenRequired - public BaseResponse querySmsList(@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, - @RequestParam(required = false) Integer page, - @RequestParam(required = false) Integer limit) { - return smsConfigFacade.querySmsList(hospitalName, phone, smsType, smsStatus, content, planTime, actualTime, objType, page, limit); - } +// @RequestMapping(value = "/querySmsList", method = RequestMethod.GET) +// @ResponseBody +// @TokenRequired +// public BaseResponse querySmsList(@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, +// @RequestParam(required = false) Integer page, +// @RequestParam(required = false) Integer limit) { +// return smsConfigFacade.querySmsList(hospitalName, phone, smsType, smsStatus, content, planTime, actualTime, objType, page, limit); +// } /** @@ -258,10 +258,11 @@ public class SmsConfigController extends BaseController { @RequestParam(required = false) Integer objType, @RequestParam(required = false) String planTime, @RequestParam(required = false) String actualTime, + @RequestParam(required = false) String smsActualTime, @RequestParam(required = false) Integer sendType, @RequestParam(required = false) Integer dxStatus, @RequestParam(required = false) Integer timeType) { - smsConfigFacade.exportSmsList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus, timeType,httpServletResponse); + smsConfigFacade.exportSmsList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus, timeType,httpServletResponse); } @@ -289,12 +290,13 @@ public class SmsConfigController extends BaseController { @RequestParam(required = false) Integer objType, @RequestParam(required = false) String planTime, @RequestParam(required = false) String actualTime, + @RequestParam(required = false) String smsActualTime, @RequestParam(required = false) Integer sendType, @RequestParam(required = false) Integer dxStatus, @RequestParam(required = false) Integer timeType, @RequestParam(required = false) Integer page, @RequestParam(required = false) Integer limit) { - return smsConfigFacade.queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType, sendType,dxStatus,timeType,page, limit); + return smsConfigFacade.queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType, sendType,dxStatus,timeType,page, limit); } @@ -317,10 +319,11 @@ public class SmsConfigController extends BaseController { @RequestParam(required = false) Integer objType, @RequestParam(required = false) String planTime, @RequestParam(required = false) String actualTime, + @RequestParam(required = false) String smsActualTime, @RequestParam(required = false) Integer sendType, @RequestParam(required = false) Integer dxStatus, @RequestParam(required = false) Integer timeType) { - smsConfigFacade.exportMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus, timeType,httpServletResponse); + smsConfigFacade.exportMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus, timeType,httpServletResponse); } 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 bbf3191..150ba05 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 @@ -1038,12 +1038,12 @@ public class SmsConfigFacade { * @param objType 发送短信 * @param httpServletResponse */ - public void exportSmsList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, Integer objType, + public void exportSmsList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, String smsActualTime, Integer objType, Integer sendType,Integer dxStatus,Integer timeType,HttpServletResponse httpServletResponse) { try { - BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus,timeType, 1, 999999999); + BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus,timeType, 1, 999999999); List> datas = new ArrayList<>(); List> results = list.getData(); @@ -1086,7 +1086,7 @@ public class SmsConfigFacade { } public BaseListResponse queryMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus, - String planTime, String actualTime, Integer objType,Integer sendType,Integer dxStatus,Integer timeType, Integer page, Integer limit) { + String planTime, String actualTime,String smsActualTime, Integer objType,Integer sendType,Integer dxStatus,Integer timeType, Integer page, Integer limit) { String planTimeStart = ""; String planTimeEnd = ""; @@ -1104,10 +1104,21 @@ public class SmsConfigFacade { actualTimeStart = actualTime.split(" - ")[0]+"%2000:00:00"; actualTimeEnd = actualTime.split(" - ")[1] + "%2023:59:59"; } + + + String smsActualTimeStart = ""; + String smsActualTimeEnd = ""; + if (StringUtils.isNotEmpty(smsActualTime)) + { + + smsActualTimeStart = smsActualTime.split(" - ")[0]+"%2000:00:00"; + smsActualTimeEnd = smsActualTime.split(" - ")[1] + "%2023:59:59"; + } + List> list = new ArrayList<>(); MsgResult sms = MessageCenterService.queryMsgList(hospitalId, phone, smsType, smsStatus, planTimeStart, - planTimeEnd, actualTimeStart, actualTimeEnd, objType,sendType,dxStatus,timeType, page, limit); + planTimeEnd, actualTimeStart, actualTimeEnd,smsActualTimeStart, smsActualTimeEnd, objType,sendType,dxStatus,timeType, page, limit); if (sms != null && sms.getData() != null ) { @@ -1178,12 +1189,12 @@ public class SmsConfigFacade { * @param objType 发送短信 * @param httpServletResponse */ - public void exportMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, Integer objType, + public void exportMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime,String smsActualTime, Integer objType, Integer sendType,Integer dxStatus,Integer timeType,HttpServletResponse httpServletResponse) { try { - BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus,timeType, 1, 999999999); + BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus,timeType, 1, 999999999); List> datas = new ArrayList<>(); List> results = list.getData(); 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 464a043..e8a632c 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 @@ -199,7 +199,7 @@ public class MessageCenterService { public static MsgResult queryMsgList(String hospitalId, String phone,Integer smsType, Integer smsStatus,String planTimeStart, String planTimeEnd,String actualTimeStart, - String actualTimeEnd,Integer objType , + String actualTimeEnd,String smsActualTimeStart,String smsActualTimeEnd,Integer objType , Integer sendType,Integer dxStatus,Integer timeType, Integer page, Integer limit) { @@ -217,6 +217,10 @@ public class MessageCenterService { param.put("planTimeEnd",planTimeEnd); param.put("actualTimeStart",actualTimeStart); param.put("actualTimeEnd",actualTimeEnd); + + param.put("smsActualTimeStart",smsActualTimeStart); + param.put("smsActualTimeEnd",smsActualTimeEnd); + param.put("objType",objType == null ? null : String.valueOf(objType)); String result = HttpClientUtil.doGet(/*CENTER_BASE_URL+*/"https://push.stage.platform.healthbaby.com.cn/biz-push-web/push", param, "utf-8", null); if (result != null) @@ -240,8 +244,8 @@ public class MessageCenterService { public static void main(String[] args){ queryMsgList(null, null,null, null,null, - null,null, - null,null ,null,null,null, + null,null,null,null, + null,null ,2,null,null, 1,10); } }