jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ab1f8c6845f0c8300a737e535c97bf26f39054d2

Authored by liquanyu
1 parent c8ad0a4c1e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

短信修改

Showing 3 changed files with 45 additions and 27 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java View file @ ab1f8c6
... ... @@ -223,21 +223,21 @@
223 223 * @param limit
224 224 * @return
225 225 */
226   - @RequestMapping(value = "/querySmsList", method = RequestMethod.GET)
227   - @ResponseBody
228   - @TokenRequired
229   - public BaseResponse querySmsList(@RequestParam(required = false) String hospitalName,
230   - @RequestParam(required = false) String phone,
231   - @RequestParam(required = false) Integer smsType,
232   - @RequestParam(required = false) Integer smsStatus,
233   - @RequestParam(required = false) Integer objType,
234   - @RequestParam(required = false) String content,
235   - @RequestParam(required = false) String planTime,
236   - @RequestParam(required = false) String actualTime,
237   - @RequestParam(required = false) Integer page,
238   - @RequestParam(required = false) Integer limit) {
239   - return smsConfigFacade.querySmsList(hospitalName, phone, smsType, smsStatus, content, planTime, actualTime, objType, page, limit);
240   - }
  226 +// @RequestMapping(value = "/querySmsList", method = RequestMethod.GET)
  227 +// @ResponseBody
  228 +// @TokenRequired
  229 +// public BaseResponse querySmsList(@RequestParam(required = false) String hospitalName,
  230 +// @RequestParam(required = false) String phone,
  231 +// @RequestParam(required = false) Integer smsType,
  232 +// @RequestParam(required = false) Integer smsStatus,
  233 +// @RequestParam(required = false) Integer objType,
  234 +// @RequestParam(required = false) String content,
  235 +// @RequestParam(required = false) String planTime,
  236 +// @RequestParam(required = false) String actualTime,
  237 +// @RequestParam(required = false) Integer page,
  238 +// @RequestParam(required = false) Integer limit) {
  239 +// return smsConfigFacade.querySmsList(hospitalName, phone, smsType, smsStatus, content, planTime, actualTime, objType, page, limit);
  240 +// }
241 241  
242 242  
243 243 /**
244 244  
... ... @@ -258,10 +258,11 @@
258 258 @RequestParam(required = false) Integer objType,
259 259 @RequestParam(required = false) String planTime,
260 260 @RequestParam(required = false) String actualTime,
  261 + @RequestParam(required = false) String smsActualTime,
261 262 @RequestParam(required = false) Integer sendType,
262 263 @RequestParam(required = false) Integer dxStatus,
263 264 @RequestParam(required = false) Integer timeType) {
264   - smsConfigFacade.exportSmsList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus, timeType,httpServletResponse);
  265 + smsConfigFacade.exportSmsList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus, timeType,httpServletResponse);
265 266 }
266 267  
267 268  
268 269  
... ... @@ -289,12 +290,13 @@
289 290 @RequestParam(required = false) Integer objType,
290 291 @RequestParam(required = false) String planTime,
291 292 @RequestParam(required = false) String actualTime,
  293 + @RequestParam(required = false) String smsActualTime,
292 294 @RequestParam(required = false) Integer sendType,
293 295 @RequestParam(required = false) Integer dxStatus,
294 296 @RequestParam(required = false) Integer timeType,
295 297 @RequestParam(required = false) Integer page,
296 298 @RequestParam(required = false) Integer limit) {
297   - return smsConfigFacade.queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType, sendType,dxStatus,timeType,page, limit);
  299 + return smsConfigFacade.queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType, sendType,dxStatus,timeType,page, limit);
298 300 }
299 301  
300 302  
301 303  
... ... @@ -317,10 +319,11 @@
317 319 @RequestParam(required = false) Integer objType,
318 320 @RequestParam(required = false) String planTime,
319 321 @RequestParam(required = false) String actualTime,
  322 + @RequestParam(required = false) String smsActualTime,
320 323 @RequestParam(required = false) Integer sendType,
321 324 @RequestParam(required = false) Integer dxStatus,
322 325 @RequestParam(required = false) Integer timeType) {
323   - smsConfigFacade.exportMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus, timeType,httpServletResponse);
  326 + smsConfigFacade.exportMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus, timeType,httpServletResponse);
324 327 }
325 328  
326 329  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ ab1f8c6
... ... @@ -1038,12 +1038,12 @@
1038 1038 * @param objType 发送短信
1039 1039 * @param httpServletResponse
1040 1040 */
1041   - public void exportSmsList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, Integer objType,
  1041 + public void exportSmsList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, String smsActualTime, Integer objType,
1042 1042 Integer sendType,Integer dxStatus,Integer timeType,HttpServletResponse httpServletResponse) {
1043 1043  
1044 1044 try
1045 1045 {
1046   - BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus,timeType, 1, 999999999);
  1046 + BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus,timeType, 1, 999999999);
1047 1047 List<Map<String, Object>> datas = new ArrayList<>();
1048 1048 List<Map<String,String>> results = list.getData();
1049 1049  
... ... @@ -1086,7 +1086,7 @@
1086 1086 }
1087 1087  
1088 1088 public BaseListResponse queryMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus,
1089   - String planTime, String actualTime, Integer objType,Integer sendType,Integer dxStatus,Integer timeType, Integer page, Integer limit) {
  1089 + String planTime, String actualTime,String smsActualTime, Integer objType,Integer sendType,Integer dxStatus,Integer timeType, Integer page, Integer limit) {
1090 1090  
1091 1091 String planTimeStart = "";
1092 1092 String planTimeEnd = "";
1093 1093  
... ... @@ -1104,10 +1104,21 @@
1104 1104 actualTimeStart = actualTime.split(" - ")[0]+"%2000:00:00";
1105 1105 actualTimeEnd = actualTime.split(" - ")[1] + "%2023:59:59";
1106 1106 }
  1107 +
  1108 +
  1109 + String smsActualTimeStart = "";
  1110 + String smsActualTimeEnd = "";
  1111 + if (StringUtils.isNotEmpty(smsActualTime))
  1112 + {
  1113 +
  1114 + smsActualTimeStart = smsActualTime.split(" - ")[0]+"%2000:00:00";
  1115 + smsActualTimeEnd = smsActualTime.split(" - ")[1] + "%2023:59:59";
  1116 + }
  1117 +
1107 1118 List<Map<String,String>> list = new ArrayList<>();
1108 1119  
1109 1120 MsgResult sms = MessageCenterService.queryMsgList(hospitalId, phone, smsType, smsStatus, planTimeStart,
1110   - planTimeEnd, actualTimeStart, actualTimeEnd, objType,sendType,dxStatus,timeType, page, limit);
  1121 + planTimeEnd, actualTimeStart, actualTimeEnd,smsActualTimeStart, smsActualTimeEnd, objType,sendType,dxStatus,timeType, page, limit);
1111 1122  
1112 1123 if (sms != null && sms.getData() != null )
1113 1124 {
1114 1125  
... ... @@ -1178,12 +1189,12 @@
1178 1189 * @param objType 发送短信
1179 1190 * @param httpServletResponse
1180 1191 */
1181   - public void exportMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, Integer objType,
  1192 + public void exportMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime,String smsActualTime, Integer objType,
1182 1193 Integer sendType,Integer dxStatus,Integer timeType,HttpServletResponse httpServletResponse) {
1183 1194  
1184 1195 try
1185 1196 {
1186   - BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus,timeType, 1, 999999999);
  1197 + BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus,timeType, 1, 999999999);
1187 1198 List<Map<String, Object>> datas = new ArrayList<>();
1188 1199 List<Map<String,String>> results = list.getData();
1189 1200  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ ab1f8c6
... ... @@ -199,7 +199,7 @@
199 199 public static MsgResult queryMsgList(String hospitalId, String phone,Integer smsType,
200 200 Integer smsStatus,String planTimeStart,
201 201 String planTimeEnd,String actualTimeStart,
202   - String actualTimeEnd,Integer objType ,
  202 + String actualTimeEnd,String smsActualTimeStart,String smsActualTimeEnd,Integer objType ,
203 203 Integer sendType,Integer dxStatus,Integer timeType,
204 204 Integer page, Integer limit)
205 205 {
... ... @@ -217,6 +217,10 @@
217 217 param.put("planTimeEnd",planTimeEnd);
218 218 param.put("actualTimeStart",actualTimeStart);
219 219 param.put("actualTimeEnd",actualTimeEnd);
  220 +
  221 + param.put("smsActualTimeStart",smsActualTimeStart);
  222 + param.put("smsActualTimeEnd",smsActualTimeEnd);
  223 +
220 224 param.put("objType",objType == null ? null : String.valueOf(objType));
221 225 String result = HttpClientUtil.doGet(/*CENTER_BASE_URL+*/"https://push.stage.platform.healthbaby.com.cn/biz-push-web/push", param, "utf-8", null);
222 226 if (result != null)
... ... @@ -240,8 +244,8 @@
240 244 public static void main(String[] args){
241 245 queryMsgList(null, null,null,
242 246 null,null,
243   - null,null,
244   - null,null ,null,null,null,
  247 + null,null,null,null,
  248 + null,null ,2,null,null,
245 249 1,10);
246 250 }
247 251 }