liquanyu / regional-platform

Download as
Browse Code »

Commit 96eb789328b3311bfccf6dc2a568344468d15027

Authored by liquanyu
1 parent 1f1b16825f
Exists in master and in 3 other branches 0116, dev, nobuildprocess

code update

Showing 3 changed files with 31 additions and 8 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java View file @ 96eb789
... ... @@ -297,7 +297,7 @@
297 297 result += line;
298 298 }
299 299 } catch (Exception e) {
300   - System.out.println("发送 POST 请求出现异常！"+e);
  300 + System.out.println("发送 put 请求出现异常！"+e);
301 301 e.printStackTrace();
302 302 }
303 303 //使用finally块来关闭输出流、输入流
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 96eb789
... ... @@ -279,16 +279,39 @@
279 279  
280 280 Integer serviceType = patient.getServiceType();
281 281 Integer serviceStatus = patient.getServiceStatus();
282   - if (serviceType != null && serviceStatus != null)
283   - {
284   - query.setServiceType(serviceType);
285   - query.setServiceStatus(serviceStatus);
286   - }
  282 +// if (serviceType != null && serviceStatus != null)
  283 +// {
  284 +// query.setServiceType(serviceType);
  285 +// query.setServiceStatus(serviceStatus);
  286 +// }
287 287  
288 288 List<SmsTemplateModel> temps = smsTemplateService.querySmsTemplates(query);
289 289 if (CollectionUtils.isNotEmpty(temps))
290 290 {
291   - SmsTemplateModel templateModel = temps.get(0);
  291 + SmsTemplateModel templateModel = null;
  292 + for (SmsTemplateModel temp : temps)
  293 + {
  294 + if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus)
  295 + {
  296 + templateModel = temp;
  297 + break;
  298 + }
  299 + }
  300 +
  301 +// if (templateModel == null)
  302 +// {
  303 +// for (SmsTemplateModel temp : temps)
  304 +// {
  305 +// if (temp.getServiceType() == serviceType)
  306 +// {
  307 +// templateModel = temp;
  308 +// break;
  309 +// }
  310 +// }
  311 +// }
  312 +
  313 +
  314 +
292 315  
293 316 if (templateModel != null && templateModel.getStatus() == 1)
294 317 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ 96eb789
... ... @@ -33,7 +33,7 @@
33 33 public static boolean serviceConfig(List<Config> configs,String hid)
34 34 {
35 35 String json = JsonUtil.array2JsonString(configs);
36   - String result = HttpRequest.sendPost(CENTER_BASE_URL + "serviceConfig/{" + hid + "}", json, CENTER_TOKEN);
  36 + String result = HttpRequest.sendPut(CENTER_BASE_URL + "serviceConfig/" + hid, json, CENTER_TOKEN);
37 37 if (StringUtils.isNotEmpty(result))
38 38 {
39 39 Map<String,String> map = JsonUtil.str2Obj(result, Map.class);