jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 43192d68af87feb3670575800732bc88f8f4e77d

Authored by jiangjiazhi
2 parents ad5be77ac9 447ab4cc51
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java View file @ 43192d6
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +
  4 +
  5 +/**
  6 + * 项目类型
  7 + * Created by lqy on 2016/08/11
  8 + */
  9 +public enum ProjectTypeEnums {
  10 +
  11 +
  12 + YNXT(1,"院内系统web版"),QYPT(2,"区域平台");
  13 +
  14 + ProjectTypeEnums(int id, String name) {
  15 + this.id = id;
  16 + this.name = name;
  17 + }
  18 +
  19 + private int id;
  20 + private String name;
  21 +
  22 + public String getName() {
  23 + return name;
  24 + }
  25 +
  26 + public void setName(String name) {
  27 + this.name = name;
  28 + }
  29 +
  30 + public int getId() {
  31 + return id;
  32 + }
  33 +
  34 + public void setId(int id) {
  35 + this.id = id;
  36 + }
  37 +
  38 +
  39 +}
platform-common/src/main/java/com/lyms/platform/common/enums/SmsProviderEnums.java View file @ 43192d6
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +
  4 +
  5 +/**
  6 + * 短信商
  7 + * Created by lqy on 2016/08/11
  8 + */
  9 +public enum SmsProviderEnums {
  10 +
  11 +
  12 + ALDY(1,"阿里大鱼"),YM(2,"易美");
  13 +
  14 + SmsProviderEnums(int id, String name) {
  15 + this.id = id;
  16 + this.name = name;
  17 + }
  18 +
  19 + private int id;
  20 + private String name;
  21 +
  22 + public String getName() {
  23 + return name;
  24 + }
  25 +
  26 + public void setName(String name) {
  27 + this.name = name;
  28 + }
  29 +
  30 + public int getId() {
  31 + return id;
  32 + }
  33 +
  34 + public void setId(int id) {
  35 + this.id = id;
  36 + }
  37 +
  38 +
  39 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 43192d6
... ... @@ -9,6 +9,7 @@
9 9 import com.lyms.platform.common.utils.*;
10 10 import com.lyms.platform.operate.web.request.*;
11 11 import com.lyms.platform.operate.web.result.*;
  12 +import com.lyms.platform.operate.web.utils.MessageCenterService;
12 13 import com.lyms.platform.permission.model.Organization;
13 14 import com.lyms.platform.permission.model.OrganizationQuery;
14 15 import com.lyms.platform.permission.model.Users;
... ... @@ -453,8 +454,8 @@
453 454 mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
454 455 mr.setPhone(babyModel.getMphone());
455 456 //短信商
456   - mr.setServiceType(1);//待定
457   - mr.setTypeId(1); //待定
  457 + mr.setServiceType(SmsProviderEnums.ALDY.getId());
  458 + mr.setTypeId(ProjectTypeEnums.YNXT.getId());
458 459 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
459 460 mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
460 461  
461 462  
... ... @@ -464,9 +465,9 @@
464 465 messages.add(mr);
465 466  
466 467 if (CollectionUtils.isNotEmpty(messages)) {
467   - smsList.setTypeId(1);
  468 + smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
468 469 smsList.setMessages(messages);
469   - //调用发送接口 TODO
  470 + MessageCenterService.saveSmsCenter(smsList);
470 471 }
471 472 }
472 473 }
... ... @@ -1394,8 +1395,8 @@
1394 1395 mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
1395 1396 mr.setPhone(model.getMphone());
1396 1397 //短信商
1397   - mr.setServiceType(1);//待定
1398   - mr.setTypeId(1); //待定
  1398 + mr.setServiceType(SmsProviderEnums.ALDY.getId());
  1399 + mr.setTypeId(ProjectTypeEnums.YNXT.getId());
1399 1400 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
1400 1401 mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
1401 1402  
1402 1403  
... ... @@ -1406,9 +1407,10 @@
1406 1407 }
1407 1408  
1408 1409 if (CollectionUtils.isNotEmpty(messages)) {
1409   - smsList.setTypeId(1);
  1410 + smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
1410 1411 smsList.setMessages(messages);
1411   - //调用发送接口 TODO
  1412 + //调用发送接口
  1413 + MessageCenterService.saveSmsCenter(smsList);
1412 1414 }
1413 1415 BaseResponse objectResponse = new BaseResponse();
1414 1416 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 43192d6
... ... @@ -14,6 +14,7 @@
14 14 import com.lyms.platform.operate.web.result.BasicConfigResult;
15 15 import com.lyms.platform.operate.web.result.BookbuildingRecordResult;
16 16 import com.lyms.platform.operate.web.result.PregnantInfoResult;
  17 +import com.lyms.platform.operate.web.utils.MessageCenterService;
17 18 import com.lyms.platform.permission.model.Organization;
18 19 import com.lyms.platform.permission.model.OrganizationQuery;
19 20 import com.lyms.platform.permission.model.Users;
... ... @@ -268,8 +269,8 @@
268 269 mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
269 270 mr.setPhone(patient.getPhone());
270 271 //短信商
271   - mr.setServiceType(1);//待定
272   - mr.setTypeId(1); //待定
  272 + mr.setServiceType(SmsProviderEnums.ALDY.getId());
  273 + mr.setTypeId(ProjectTypeEnums.YNXT.getId());
273 274 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
274 275 mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
275 276  
276 277  
... ... @@ -279,9 +280,10 @@
279 280 messages.add(mr);
280 281  
281 282 if (CollectionUtils.isNotEmpty(messages)) {
282   - smsList.setTypeId(1);
  283 + mr.setTypeId(ProjectTypeEnums.YNXT.getId());
283 284 smsList.setMessages(messages);
284   - //调用发送接口 TODO
  285 + //调用发送接口
  286 + MessageCenterService.saveSmsCenter(smsList);
285 287 }
286 288 }
287 289 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ 43192d6
... ... @@ -48,16 +48,16 @@
48 48 */
49 49 public static boolean saveSmsCenter(MessageListRequest list)
50 50 {
51   - String json = JsonUtil.obj2JsonString(list);
52   - String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN);
53   - if (StringUtils.isNotEmpty(result))
54   - {
55   - Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
56   - if ("0".equals(map.get("errorcode")))
57   - {
58   - return true;
59   - }
60   - }
  51 +// String json = JsonUtil.obj2JsonString(list);
  52 +// String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN);
  53 +// if (StringUtils.isNotEmpty(result))
  54 +// {
  55 +// Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
  56 +// if ("0".equals(map.get("errorcode")))
  57 +// {
  58 +// return true;
  59 +// }
  60 +// }
61 61 return false;
62 62 }
63 63