Commit 47e860de71056b07a1f147a6e1f61eadfdabcbbd
1 parent
7a1adbf04d
Exists in
master
and in
1 other branch
短信配置
Showing 5 changed files with 44 additions and 358 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
47e860d
... | ... | @@ -809,7 +809,6 @@ |
809 | 809 | continue; |
810 | 810 | } |
811 | 811 | |
812 | - MsgListRequest smsList = new MsgListRequest(); | |
813 | 812 | List<MsgRequest> messages = new ArrayList<>(); |
814 | 813 | MsgRequest mr = new MsgRequest(); |
815 | 814 | |
816 | 815 | |
817 | 816 | |
... | ... | @@ -833,26 +832,13 @@ |
833 | 832 | mr.setRemark(""); |
834 | 833 | mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); |
835 | 834 | mr.setSmsStatus(SmsStatusEnums.WFS.getId()); |
836 | - mr.setServiceType(startType); | |
835 | + mr.setServiceType((templateModel.getTemplateType() == null || templateModel.getTemplateType() == 0) ? 1 : 3); | |
837 | 836 | |
838 | 837 | mr.setWxTempId(WxTempleteIdEnums.ER_TONG_OPEN.getId()); |
839 | 838 | messages.add(mr); |
839 | + ExceptionUtils.catchException("child build msg = " + mr); | |
840 | 840 | if (CollectionUtils.isNotEmpty(messages)) { |
841 | - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
842 | - smsList.setMessages(messages); | |
843 | - if ("4".equals(HIS_VERSION) || "20".equals(HIS_VERSION)) | |
844 | - { | |
845 | - //秦皇岛、威县建档 | |
846 | - if (syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), babyModel.getHospitalId())) { | |
847 | - ExceptionUtils.catchException("The child build is saved.;" + babyModel.getMphone() + ";name=" + babyModel.getName()); | |
848 | - } | |
849 | - } | |
850 | - else | |
851 | - { | |
852 | - //线上 | |
853 | - MessageCenterService.saveMsgCenter(smsList); | |
854 | - ExceptionUtils.catchException("The child build is saved." + babyModel.getMphone() + ";name=" + babyModel.getName()); | |
855 | - } | |
841 | + smsConfigFacade.saveMsg(messages, babyModel.getHospitalId()); | |
856 | 842 | } |
857 | 843 | } |
858 | 844 | } |
859 | 845 | |
... | ... | @@ -890,13 +876,11 @@ |
890 | 876 | String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, babyModel.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId()); |
891 | 877 | for (SmsTemplateModel templateModel : sendList) { |
892 | 878 | if (templateModel != null && templateModel.getStatus() == 1) { |
893 | - ExceptionUtils.catchException("The child build status is opened.;" + babyModel.getMphone() + ";name=" + babyModel.getName()); | |
894 | - MsgListRequest smsList = new MsgListRequest(); | |
879 | + | |
895 | 880 | List<MsgRequest> messages = new ArrayList<>(); |
896 | 881 | MsgRequest mr = new MsgRequest(); |
897 | 882 | String content = "【" + messagePrefix + "】" + templateModel.getContent(); |
898 | 883 | |
899 | - | |
900 | 884 | mr.setFirst(StringUtils.replaceBaby(babyModel.getName(), babyModel.getBirth(), content)); |
901 | 885 | mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); |
902 | 886 | mr.setPhone(babyModel.getMphone()); |
... | ... | @@ -921,18 +905,7 @@ |
921 | 905 | messages.add(mr); |
922 | 906 | |
923 | 907 | if (CollectionUtils.isNotEmpty(messages)) { |
924 | - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
925 | - smsList.setMessages(messages); | |
926 | - if ("4".equals(HIS_VERSION) || "20".equals(HIS_VERSION)) | |
927 | - { | |
928 | - //秦皇岛、威县建档 | |
929 | - syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), babyModel.getHospitalId()); | |
930 | - } | |
931 | - else | |
932 | - { | |
933 | - //线上 | |
934 | - MessageCenterService.saveMsgCenter(smsList); | |
935 | - } | |
908 | + smsConfigFacade.saveMsg(messages,babyModel.getHospitalId()); | |
936 | 909 | } |
937 | 910 | } |
938 | 911 | } |
... | ... | @@ -941,151 +914,6 @@ |
941 | 914 | |
942 | 915 | |
943 | 916 | /** |
944 | - * 创建建档短信 | |
945 | - */ | |
946 | -// public void createBuildSms(BabyModel babyModel) { | |
947 | -// | |
948 | -// //判断医院是否启动和对应的服务项是否启用 | |
949 | -// SmsConfigModel configModel = new SmsConfigModel(); | |
950 | -// BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(), configModel, SmsServiceEnums.FWKT.getId()); | |
951 | -// if (response != null) { | |
952 | -// return; | |
953 | -// } | |
954 | -// | |
955 | -// ExceptionUtils.catchException("儿童建档1---------->" + babyModel.getMphone() + ";name=" + babyModel.getName()); | |
956 | -// | |
957 | -// SmsTemplateQuery query = new SmsTemplateQuery(); | |
958 | -// query.setYn(YnEnums.YES.getId()); | |
959 | -// query.setStatus(1); | |
960 | -// query.setHospitalId(babyModel.getHospitalId()); | |
961 | -// query.setServiceObj(ServiceObjEnums.BABYOBJ.getId()); | |
962 | -// query.setSpecialDateType(SpecialDateEnums.JD.getId()); | |
963 | -// | |
964 | -// Integer serviceType = babyModel.getServiceType(); | |
965 | -// Integer serviceStatus = babyModel.getServiceStatus(); | |
966 | -// List<SmsTemplateModel> sendList = new ArrayList<>(); | |
967 | -// List<SmsTemplateModel> temps = smsTemplateService.querySmsTemplates(query); | |
968 | -// if (CollectionUtils.isNotEmpty(temps)) { | |
969 | -// | |
970 | -// for (SmsTemplateModel temp : temps) { | |
971 | -// if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { | |
972 | -// sendList.add(temp); | |
973 | -// break; | |
974 | -// } | |
975 | -// } | |
976 | -// | |
977 | -// for (SmsTemplateModel temp : temps) { | |
978 | -// if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) { | |
979 | -// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId()) { | |
980 | -// sendList.add(temp); | |
981 | -// break; | |
982 | -// } | |
983 | -// } | |
984 | -// } | |
985 | -// | |
986 | -// for (SmsTemplateModel temp : temps) { | |
987 | -// if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) { | |
988 | -// if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() | |
989 | -// || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.SUSPEND.getId()) { | |
990 | -// sendList.add(temp); | |
991 | -// break; | |
992 | -// } | |
993 | -// } | |
994 | -// } | |
995 | -// | |
996 | -// | |
997 | -// for (SmsTemplateModel temp : temps) { | |
998 | -// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) { | |
999 | -// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) { | |
1000 | -// sendList.add(temp); | |
1001 | -// break; | |
1002 | -// } | |
1003 | -// } | |
1004 | -// } | |
1005 | -// | |
1006 | -// | |
1007 | -// for (SmsTemplateModel temp : temps) { | |
1008 | -// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) { | |
1009 | -// if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()) { | |
1010 | -// sendList.add(temp); | |
1011 | -// break; | |
1012 | -// } | |
1013 | -// } | |
1014 | -// } | |
1015 | -// | |
1016 | -// | |
1017 | -// for (SmsTemplateModel temp : temps) { | |
1018 | -// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) { | |
1019 | -// if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) { | |
1020 | -// sendList.add(temp); | |
1021 | -// break; | |
1022 | -// } | |
1023 | -// } | |
1024 | -// } | |
1025 | -// | |
1026 | -// | |
1027 | -// for (SmsTemplateModel temp : temps) { | |
1028 | -// if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) { | |
1029 | -// sendList.add(temp); | |
1030 | -// break; | |
1031 | -// } | |
1032 | -// } | |
1033 | -// | |
1034 | -// if (CollectionUtils.isNotEmpty(sendList)) { | |
1035 | -// | |
1036 | -// | |
1037 | -// //短信前缀 | |
1038 | -// String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, babyModel.getBuildDoctor()); | |
1039 | -// for (SmsTemplateModel templateModel : sendList) { | |
1040 | -// if (templateModel != null && templateModel.getStatus() == 1) { | |
1041 | -// ExceptionUtils.catchException("儿童建档2---------->"+babyModel.getMphone()+";name="+babyModel.getName()); | |
1042 | -// MsgListRequest smsList = new MsgListRequest(); | |
1043 | -// List<MsgRequest> messages = new ArrayList<>(); | |
1044 | -// MsgRequest mr = new MsgRequest(); | |
1045 | -// String content = "【" + messagePrefix + "】" + templateModel.getContent(); | |
1046 | -// mr.setContent(StringUtils.replaceBaby(babyModel.getName(), babyModel.getBirth(), content)); | |
1047 | -// mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); | |
1048 | -// mr.setPhone(babyModel.getMphone()); | |
1049 | -// //短信商 | |
1050 | -// mr.setServiceType(SmsProviderEnums.YM.getId()); | |
1051 | -// mr.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
1052 | -// mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); | |
1053 | -// mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); | |
1054 | -// mr.setStatus(SmsStatusEnums.WFS.getId()); | |
1055 | -// mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); | |
1056 | -// | |
1057 | -// mr.setExt1(babyModel.getHospitalId()); | |
1058 | -// mr.setExt2(templateModel.getId()); | |
1059 | -// mr.setExt3(babyModel.getId()); | |
1060 | -// messages.add(mr); | |
1061 | -// | |
1062 | -// if (CollectionUtils.isNotEmpty(messages)) { | |
1063 | -// smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
1064 | -// smsList.setMessages(messages); | |
1065 | -// if ("4".equals(HIS_VERSION)) | |
1066 | -// { | |
1067 | -// //秦皇岛建档 | |
1068 | -// if (syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) { | |
1069 | -// ExceptionUtils.catchException("儿童建档3---------->"+babyModel.getMphone()+";name="+babyModel.getName()); | |
1070 | -// } | |
1071 | -// } | |
1072 | -// else | |
1073 | -// { | |
1074 | -// //线上 | |
1075 | -// MessageCenterService.saveSmsCenter(smsList); | |
1076 | -// ExceptionUtils.catchException("儿童建档3---------->" + babyModel.getMphone() + ";name=" + babyModel.getName()); | |
1077 | -// } | |
1078 | -// } | |
1079 | -// } | |
1080 | -// } | |
1081 | -// } | |
1082 | -// | |
1083 | -// | |
1084 | -// } | |
1085 | -// } | |
1086 | - | |
1087 | - | |
1088 | - /** | |
1089 | 917 | * 准备修改和添加的孕妇建档数据 |
1090 | 918 | * |
1091 | 919 | * @param request |
... | ... | @@ -2385,7 +2213,6 @@ |
2385 | 2213 | sendModels = getBabayListByCondition(request.getRequest(), false, babyQuery); |
2386 | 2214 | } |
2387 | 2215 | |
2388 | - MsgListRequest smsList = new MsgListRequest(); | |
2389 | 2216 | List<MsgRequest> messages = new ArrayList<>(); |
2390 | 2217 | |
2391 | 2218 | if (CollectionUtils.isNotEmpty(sendModels)) { |
... | ... | @@ -2430,21 +2257,7 @@ |
2430 | 2257 | } |
2431 | 2258 | |
2432 | 2259 | if (CollectionUtils.isNotEmpty(messages)) { |
2433 | - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
2434 | - smsList.setMessages(messages); | |
2435 | - //调用发送接口 | |
2436 | - if ("4".equals(HIS_VERSION)) | |
2437 | - { | |
2438 | - //秦皇岛 | |
2439 | - //保存到同步表中 | |
2440 | - syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId()); | |
2441 | - } | |
2442 | - else | |
2443 | - { | |
2444 | - //保存到短信中心 线上 | |
2445 | - MessageCenterService.saveMsgCenter(smsList); | |
2446 | - } | |
2447 | - | |
2260 | + smsConfigFacade.saveMsg(messages,messages.get(0).getHospitalId()); | |
2448 | 2261 | } |
2449 | 2262 | BaseResponse objectResponse = new BaseResponse(); |
2450 | 2263 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
47e860d
... | ... | @@ -607,8 +607,6 @@ |
607 | 607 | continue; |
608 | 608 | } |
609 | 609 | |
610 | - | |
611 | - MsgListRequest smsList = new MsgListRequest(); | |
612 | 610 | List<MsgRequest> messages = new ArrayList<>(); |
613 | 611 | MsgRequest mr = new MsgRequest(); |
614 | 612 | Date dueDate = DateUtil.addMonth(patient.getLastMenses(), 9); |
615 | 613 | |
... | ... | @@ -627,9 +625,8 @@ |
627 | 625 | mr.setTempId(templateModel.getId()); |
628 | 626 | mr.setPatientId(patient.getId()); |
629 | 627 | mr.setSmsStatus(SmsStatusEnums.WFS.getId()); |
630 | - mr.setServiceType(startType); | |
628 | + mr.setServiceType((templateModel.getTemplateType() == null || templateModel.getTemplateType() == 0) ? 1 : 3); //判断发送类型 | |
631 | 629 | |
632 | - | |
633 | 630 | mr.setKeyword1(patient.getUsername()); |
634 | 631 | mr.setKeyword2(DateUtil.getyyyy_MM_dd(dueDate)); |
635 | 632 | mr.setRemark(""); |
636 | 633 | |
... | ... | @@ -640,144 +637,12 @@ |
640 | 637 | messages.add(mr); |
641 | 638 | ExceptionUtils.catchException("patient build msg = " + messages); |
642 | 639 | if (CollectionUtils.isNotEmpty(messages)) { |
643 | - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
644 | - smsList.setMessages(messages); | |
645 | - //调用发送接口 | |
646 | - if ("4".equals(HIS_VERSION) || "20".equals(HIS_VERSION)) { | |
647 | - //秦皇岛 | |
648 | - //保存到同步表中 | |
649 | - syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId()); | |
650 | - } else { | |
651 | - //保存到短信中心 线上 | |
652 | - MessageCenterService.saveMsgCenter(smsList); | |
653 | - } | |
640 | + smsConfigFacade.saveMsg(messages,patient.getHospitalId()); | |
654 | 641 | } |
655 | 642 | } |
656 | 643 | } |
657 | 644 | } |
658 | 645 | } |
659 | - } | |
660 | - | |
661 | - | |
662 | - /** | |
663 | - * 创建孕妇建档短信 | |
664 | - */ | |
665 | - private void createBuildSms(Patients patient) { | |
666 | - | |
667 | - //判断医院是否启动和对应的服务项是否启用 | |
668 | - SmsConfigModel configModel = new SmsConfigModel(); | |
669 | - int startType = smsConfigFacade.hospitalIsStart(patient.getHospitalId(), configModel, SmsServiceEnums.FWKT.getId()); | |
670 | - if (startType == 0) { | |
671 | - return; | |
672 | - } | |
673 | - | |
674 | - SmsTemplateQuery query = new SmsTemplateQuery(); | |
675 | - query.setYn(YnEnums.YES.getId()); | |
676 | - query.setStatus(1); | |
677 | - query.setHospitalId(patient.getHospitalId()); | |
678 | - query.setServiceObj(ServiceObjEnums.YUNOBJ.getId()); | |
679 | - query.setSpecialDateType(SpecialDateEnums.JD.getId()); | |
680 | - | |
681 | - Integer serviceType = patient.getServiceType(); | |
682 | - Integer serviceStatus = patient.getServiceStatus(); | |
683 | - | |
684 | - List<SmsTemplateModel> sendList = new ArrayList<>(); | |
685 | - | |
686 | - List<SmsTemplateModel> temps = smsTemplateService.querySmsTemplates(query); | |
687 | - if (CollectionUtils.isNotEmpty(temps)) { | |
688 | - | |
689 | - for (SmsTemplateModel temp : temps) { | |
690 | - if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { | |
691 | - sendList.add(temp); | |
692 | - } else if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { | |
693 | - sendList.add(temp); | |
694 | - } else if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) { | |
695 | - if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() | |
696 | - || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.SUSPEND.getId()) { | |
697 | - sendList.add(temp); | |
698 | - } | |
699 | - } else if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) { | |
700 | - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) { | |
701 | - sendList.add(temp); | |
702 | - } | |
703 | - } else if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) { | |
704 | - if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) { | |
705 | - sendList.add(temp); | |
706 | - } | |
707 | - } else if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) { | |
708 | - sendList.add(temp); | |
709 | - } | |
710 | - } | |
711 | - | |
712 | - if (CollectionUtils.isNotEmpty(sendList)) { | |
713 | - | |
714 | - //短信前缀 | |
715 | - String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, patient.getBookbuildingDoctor()); | |
716 | - for (SmsTemplateModel templateModel : sendList) { | |
717 | - if (templateModel != null && templateModel.getStatus() == 1) { | |
718 | - MessageListRequest smsList = new MessageListRequest(); | |
719 | - List<MessageRequest> messages = new ArrayList<>(); | |
720 | - MessageRequest mr = new MessageRequest(); | |
721 | - Date dueDate = DateUtil.addDay(patient.getLastMenses(), 7); | |
722 | - dueDate = DateUtil.addMonth(dueDate, 9); | |
723 | - String content = StringUtils.replaceEL(patient.getUsername(), dueDate, templateModel.getContent()); | |
724 | - | |
725 | - mr.setContent("【" + messagePrefix + "】" + content); | |
726 | - mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); | |
727 | - mr.setPhone(patient.getPhone()); | |
728 | - mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); | |
729 | - //短信商 | |
730 | - mr.setServiceType(SmsProviderEnums.YM.getId()); | |
731 | - mr.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
732 | - mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); | |
733 | - mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); | |
734 | - mr.setStatus(SmsStatusEnums.WFS.getId()); | |
735 | - mr.setExt1(patient.getHospitalId()); | |
736 | - mr.setExt2(templateModel.getId()); | |
737 | - mr.setExt3(patient.getId()); | |
738 | - messages.add(mr); | |
739 | - | |
740 | - if (CollectionUtils.isNotEmpty(messages)) { | |
741 | - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
742 | - smsList.setMessages(messages); | |
743 | - //调用发送接口 | |
744 | - | |
745 | - ExceptionUtils.catchException("patient build msg = " + messages); | |
746 | - if ("4".equals(HIS_VERSION)) { | |
747 | - //秦皇岛 | |
748 | - //保存到同步表中 | |
749 | - syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1()); | |
750 | - } else { | |
751 | - //保存到短信中心 线上 | |
752 | - MessageCenterService.saveSmsCenter(smsList); | |
753 | - } | |
754 | - } | |
755 | - } | |
756 | - } | |
757 | - } | |
758 | - } | |
759 | - } | |
760 | - | |
761 | - | |
762 | - /** | |
763 | - * 判断对应服务是否启动 | |
764 | - */ | |
765 | - private boolean isStartService(Integer smsType, String serviceStr) { | |
766 | - if (StringUtils.isEmpty(serviceStr)) { | |
767 | - return false; | |
768 | - } | |
769 | - //消息服务启动 | |
770 | - List<Map> smsServices = JsonUtil.toList(serviceStr, Map.class); | |
771 | - | |
772 | - if (CollectionUtils.isNotEmpty(smsServices)) { | |
773 | - for (Map map : smsServices) { | |
774 | - String status = String.valueOf(map.get(String.valueOf(smsType))); | |
775 | - if ("true".equals(status)) { | |
776 | - return true; | |
777 | - } | |
778 | - } | |
779 | - } | |
780 | - return false; | |
781 | 646 | } |
782 | 647 | |
783 | 648 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
47e860d
... | ... | @@ -768,7 +768,6 @@ |
768 | 768 | return objectResponse; |
769 | 769 | } |
770 | 770 | |
771 | - MsgListRequest smsList = new MsgListRequest(); | |
772 | 771 | List<MsgRequest> messages = new ArrayList<>(); |
773 | 772 | List<Patients> sendModels = new ArrayList<>(); |
774 | 773 | if (CollectionUtils.isNotEmpty(patientGuideSmsRequest.getIds())) { |
... | ... | @@ -821,17 +820,7 @@ |
821 | 820 | } |
822 | 821 | |
823 | 822 | if (CollectionUtils.isNotEmpty(messages)) { |
824 | - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
825 | - smsList.setMessages(messages); | |
826 | - //调用发送接口 | |
827 | - if ("4".equals(HIS_VERSION)) { | |
828 | - //秦皇岛 | |
829 | - //保存到同步表中 | |
830 | - syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId()); | |
831 | - } else { | |
832 | - //保存到短信中心 线上 | |
833 | - MessageCenterService.saveMsgCenter(smsList); | |
834 | - } | |
823 | + smsConfigFacade.saveMsg(messages, messages.get(0).getHospitalId()); | |
835 | 824 | } |
836 | 825 | } |
837 | 826 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
47e860d
... | ... | @@ -763,7 +763,6 @@ |
763 | 763 | return objectResponse; |
764 | 764 | } |
765 | 765 | |
766 | - MsgListRequest smsList = new MsgListRequest(); | |
767 | 766 | List<MsgRequest> messages = new ArrayList<>(); |
768 | 767 | |
769 | 768 | List<ResidentsArchiveModel> sendModels = new ArrayList<>(); |
... | ... | @@ -820,21 +819,7 @@ |
820 | 819 | } |
821 | 820 | |
822 | 821 | if (CollectionUtils.isNotEmpty(messages)) { |
823 | - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
824 | - smsList.setMessages(messages); | |
825 | - smsList.setMessages(messages); | |
826 | - //调用发送接口 | |
827 | - if ("4".equals(HIS_VERSION)) | |
828 | - { | |
829 | - //秦皇岛 | |
830 | - //保存到同步表中 | |
831 | - syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId()); | |
832 | - } | |
833 | - else | |
834 | - { | |
835 | - //保存到短信中心 线上 | |
836 | - MessageCenterService.saveMsgCenter(smsList); | |
837 | - } | |
822 | + smsConfigFacade.saveMsg(messages, messages.get(0).getHospitalId()); | |
838 | 823 | } |
839 | 824 | } |
840 | 825 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
View file @
47e860d
1 | 1 | package com.lyms.platform.operate.web.facade; |
2 | 2 | |
3 | +import com.lyms.platform.beans.MsgListRequest; | |
4 | +import com.lyms.platform.beans.MsgRequest; | |
3 | 5 | import com.lyms.platform.biz.service.*; |
4 | 6 | import com.lyms.platform.common.base.PageInfo; |
5 | 7 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
... | ... | @@ -34,6 +36,8 @@ |
34 | 36 | @Component |
35 | 37 | public class SmsConfigFacade { |
36 | 38 | |
39 | + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); | |
40 | + | |
37 | 41 | @Autowired |
38 | 42 | private SmsConfigService smsConfigService; |
39 | 43 | |
... | ... | @@ -55,6 +59,9 @@ |
55 | 59 | @Autowired |
56 | 60 | private AutoMatchFacade autoMatchFacade; |
57 | 61 | |
62 | + @Autowired | |
63 | + private SyncDataService syncDataService; | |
64 | + | |
58 | 65 | /** |
59 | 66 | * 更新短信服务配置 |
60 | 67 | * @param request |
... | ... | @@ -823,6 +830,33 @@ |
823 | 830 | } |
824 | 831 | return isStart; |
825 | 832 | } |
833 | + | |
834 | + | |
835 | + /** | |
836 | + * | |
837 | + * 由于秦皇岛和威海不能访问外网,所有就只能把新建的短信或者推送保存在本地 | |
838 | + * ,然后通过线上服务器来同步这个数据 | |
839 | + * 保存短信或者推送 | |
840 | + * @param messages | |
841 | + * @param hospitalId | |
842 | + */ | |
843 | + public void saveMsg(List<MsgRequest> messages,String hospitalId) | |
844 | + { | |
845 | + MsgListRequest smsList = new MsgListRequest(); | |
846 | + smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
847 | + smsList.setMessages(messages); | |
848 | + if ("4".equals(HIS_VERSION) || "20".equals(HIS_VERSION)) | |
849 | + { | |
850 | + //秦皇岛、威县建档 保存到本地 | |
851 | + syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), hospitalId); | |
852 | + } | |
853 | + else | |
854 | + { | |
855 | + //调用发送 | |
856 | + MessageCenterService.saveMsgCenter(smsList); | |
857 | + } | |
858 | + } | |
859 | + | |
826 | 860 | |
827 | 861 | /** |
828 | 862 | * 根据服务状态和服务类型获取可以发送的模板 |