diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java index 61522e4..ef8ebb0 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java @@ -9,20 +9,16 @@ public enum WxTempleteIdEnums { YUN_FU_OPEN("A_ibmE_8_tl76m8TFc0agyN8QSA-cBpELnVnJPqD16k","开通成功提醒"), //孕妇开通 ER_TONG_OPEN("k3vUsqiG1JTL6_VlVNvmUvl2QCxj6mo3iOZfdJx01xc","开通成功提醒"),//儿童开通 - - CHAN_JIAN_TI_XING("EngJ9RKaHaPEEc2GapV6dJO-uu8rkqitEQd21yc4EPY","产检提醒"), //产检预约提醒 ER_TONG_TI_XING("9BUY6THL261MmbVRb9iPZANQwJ5yKNzkE1VGCLPuI94","儿童月龄提醒"), //儿保预约提醒 ER_TONG_YI_MIAO_TIXING("JV6fUbUSbjuscTsv45xpexFTAQESNWFwXNO-BiHWQFk","疫苗接种提醒"), //疫苗接种提醒 CHAN_HOU_FU_CHA("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产后复查"),//产后预约和产后复查 - GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"),//孕妇高危 - YUN_YI_BAN_ZHI_DAO("98i1P6zh3slBxEKLftweaESnnem4w6SDmzvJIBWRXNE","孕妇一般指导"),//孕妇 CHAN_YI_BAN_ZHI_DAO("H2_ucLqVEbsZAv-EZcmUDpD1Zul5NGqMoJktHT0u4gw","产妇一般指导"),//产妇 BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导"),//儿童 YUN_XUE_KE_CHEN_TX("","孕妇学校课程提醒"),//孕妇学校课程提醒 - FU_WU_DING_GOU_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","服务订购提醒"),//孕妇学校课程提醒 + FU_WU_DING_GOU_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","服务订购提醒"),//服务订购提醒 YI_SHENG_ZHI_DAO("OggqiSHitLkCgSLCaCH72reCZzaw5NyG8iO56InQiQg","医生指导");//指导 // WEI_JI_ZHI_DAO("fNkkLSp_gS-YWvzji6gwgdTddl4XBlk8SNP7FRksrfk","危急值提醒");//危急值提醒 diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 6188670..ccfad95 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -29,6 +29,8 @@ public class AntExChuModel extends BaseModel { /** 是否打印过 1=已打印 有这个字段就算打印 */ private Integer isPrient; + // 是否需要发送 + private Boolean isSendMsg; /** 处理意见 */ private Map> treatmentOpinion2; @@ -344,6 +346,14 @@ public class AntExChuModel extends BaseModel { //操作人 private Integer operator; + public Boolean getSendMsg() { + return isSendMsg; + } + + public void setSendMsg(Boolean sendMsg) { + isSendMsg = sendMsg; + } + public List getScreenResult() { return screenResult; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index e632dc5..d011a53 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -24,45 +24,10 @@ public class AntenatalExaminationModel extends BaseModel { //诸城妇幼复诊特有字段 随机血糖单位mmol/L private String randomBloodSugar; - public String getLisCheckItems() { - return lisCheckItems; - } - - public void setLisCheckItems(String lisCheckItems) { - this.lisCheckItems = lisCheckItems; - } - - public String getGenRemark() { - return genRemark; - } - - public void setGenRemark(String genRemark) { - this.genRemark = genRemark; - } - - /** - * 是否打印过 1=已打印 有这个字段就算打印 - */ - private Integer isPrient; - public Integer getIsPrient() { - return isPrient; - } - - public void setIsPrient(Integer isPrient) { - this.isPrient = isPrient; - } - - private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid(); - List mHighRiskReason; - - public List getmHighRiskReason() { - return mHighRiskReason; - } + // 是否需要发送 + private Boolean isSendMsg; - public void setmHighRiskReason(List mHighRiskReason) { - this.mHighRiskReason = mHighRiskReason; - } /** * 处理意见 @@ -78,45 +43,6 @@ public class AntenatalExaminationModel extends BaseModel { */ private String quickenRemark; - public String getQuicken() { - return quicken; - } - - public void setQuicken(String quicken) { - this.quicken = quicken; - } - - public String getQuickenRemark() { - return quickenRemark; - } - - public void setQuickenRemark(String quickenRemark) { - this.quickenRemark = quickenRemark; - } - - public List getTreatmentOpinion2Types() { - return treatmentOpinion2Types; - } - - public Map> getTreatmentOpinion2() { - return treatmentOpinion2; - } - - public void setTreatmentOpinion2(Map> treatmentOpinion2) { - this.treatmentOpinion2 = treatmentOpinion2; - } - - public void setTreatmentOpinion2Types(List treatmentOpinion2Types) { - this.treatmentOpinion2Types = treatmentOpinion2Types; - } - - public String getRandomBloodSugar() { - return randomBloodSugar; - } - - public void setRandomBloodSugar(String randomBloodSugar) { - this.randomBloodSugar = randomBloodSugar; - } //筛查结果 private List screenResult; @@ -286,6 +212,95 @@ public class AntenatalExaminationModel extends BaseModel { public String apolipb; //心电图 public String electr; + public List mHighRiskReason; + + public Boolean getSendMsg() { + return isSendMsg; + } + + public void setSendMsg(Boolean sendMsg) { + isSendMsg = sendMsg; + } + public String getLisCheckItems() { + return lisCheckItems; + } + + public void setLisCheckItems(String lisCheckItems) { + this.lisCheckItems = lisCheckItems; + } + + public String getGenRemark() { + return genRemark; + } + + public void setGenRemark(String genRemark) { + this.genRemark = genRemark; + } + + /** + * 是否打印过 1=已打印 有这个字段就算打印 + */ + private Integer isPrient; + + public Integer getIsPrient() { + return isPrient; + } + + public void setIsPrient(Integer isPrient) { + this.isPrient = isPrient; + } + + private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid(); + + + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } + + + public String getQuicken() { + return quicken; + } + + public void setQuicken(String quicken) { + this.quicken = quicken; + } + + public String getQuickenRemark() { + return quickenRemark; + } + + public void setQuickenRemark(String quickenRemark) { + this.quickenRemark = quickenRemark; + } + + public List getTreatmentOpinion2Types() { + return treatmentOpinion2Types; + } + + public Map> getTreatmentOpinion2() { + return treatmentOpinion2; + } + + public void setTreatmentOpinion2(Map> treatmentOpinion2) { + this.treatmentOpinion2 = treatmentOpinion2; + } + + public void setTreatmentOpinion2Types(List treatmentOpinion2Types) { + this.treatmentOpinion2Types = treatmentOpinion2Types; + } + + public String getRandomBloodSugar() { + return randomBloodSugar; + } + + public void setRandomBloodSugar(String randomBloodSugar) { + this.randomBloodSugar = randomBloodSugar; + } public List getScreenResult() { return screenResult; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 2046869..ba7ab66 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -42,7 +42,8 @@ public class Patients extends BaseModel { // 月经周期开始天数 private String mensEndDay; - + // 初诊复诊发送推送消息时间 + private Date sendMsgTime; /** * 身份证号码 */ @@ -347,6 +348,14 @@ public class Patients extends BaseModel { this.lastMenstrualPeriodBasis = lastMenstrualPeriodBasis; } + public Date getSendMsgTime() { + return sendMsgTime; + } + + public void setSendMsgTime(Date sendMsgTime) { + this.sendMsgTime = sendMsgTime; + } + public String getLastMenstrualPeriodBasisDoctorId() { return lastMenstrualPeriodBasisDoctorId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 935e3f2..4337847 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -17,9 +17,12 @@ import com.lyms.platform.operate.web.utils.InitDataUtils; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.operate.web.utils.ResolveUtils; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.PatientService; +import com.lyms.platform.permission.model.PatientServiceQuery; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; @@ -57,8 +60,7 @@ public class AntenatalExaminationFacade { private static List mainBasicConfigList; @Autowired private AntenatalExaminationService antenatalExaminationService; - @Autowired - private PatientsService patientsService; + @Autowired private BasicConfigFacade basicConfigFacade; @Autowired @@ -105,7 +107,10 @@ public class AntenatalExaminationFacade { private MongoTemplate mongoTemplate; @Autowired private OperateLogFacade operateLogFacade; - + @Autowired + private PatientsService patientsService; + @Autowired + private PatientServiceService patientServiceService; @Autowired private DzfyHisService dzfyHisService; @Autowired @@ -344,6 +349,19 @@ public class AntenatalExaminationFacade { @Override public void run() { try { + //发送推送消息 + if (antExamModel.getSendMsg() != null && antExamModel.getSendMsg()) { + Patients patients = patientsService.findOnePatientById(antExamModel.getParentId()); + if(patients!=null){ + //发送推送消息 + patients.setSendMsgTime(new Date()); + patientsService.updatePatient(patients); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + try { //更新主档案或者子档案下次预约时间冗余到patient表的数据 patientsService.updateNextCheckTime(DateUtil.getyyyy_MM_dd(antExamModel.getNextCheckTime()), antExamModel.getParentId()); } catch (Exception e) { @@ -391,10 +409,12 @@ public class AntenatalExaminationFacade { } catch (Exception e) { e.printStackTrace(); } - try{ - //发送推送短信 - createSendMsg(antExamModel.getParentId()); - }catch (Exception e){ + try { + if (antExamModel.getSendMsg() != null && antExamModel.getSendMsg()) { + //发送推送短信 + createSendMsg(antExamModel.getParentId()); + } + } catch (Exception e) { e.printStackTrace(); } } @@ -648,7 +668,6 @@ public class AntenatalExaminationFacade { /** * 产检生成推送消息：只针对标准服务的用户 - * */ private void createSendMsg(String patientId) { Patients patient = patientsService.findOnePatientById(patientId); @@ -676,14 +695,16 @@ public class AntenatalExaminationFacade { //健康类型 0健康 1高危 if (isHightRisk) {//高危孕妇 query.setHealthType(1); - }else{//健康 + } else {//健康 query.setHealthType(0); } List temps = smsTemplateService.querySmsTemplates(query); - Integer serviceType = patient.getServiceType(); - Integer serviceStatus = patient.getServiceStatus(); + // Integer serviceType = patient.getServiceType(); + // Integer serviceStatus = patient.getServiceStatus(); + Integer serviceType = 0; + Integer serviceStatus = 0; //根据服务状态和服务类型获取可以发送的模板 List sendList = smsConfigFacade.getSendTemplateByServiceStatus(temps, serviceType, serviceStatus); @@ -710,11 +731,11 @@ public class AntenatalExaminationFacade { List messages = new ArrayList<>(); MsgRequest mr = new MsgRequest(); String content = ""; - if(isHightRisk){ + if (isHightRisk) { //风险名称 String riskNmae = queryRiskNameStr(patient.getRiskFactorId()); content = com.lyms.platform.common.utils.StringUtils.replaceNameRisk(patient.getUsername(), riskNmae, templateModel.getContent()); - }else{ + } else { content = com.lyms.platform.common.utils.StringUtils.replaceName(patient.getUsername(), templateModel.getContent()); } @@ -736,10 +757,8 @@ public class AntenatalExaminationFacade { if (users != null && users.getYn() == YnEnums.YES.getId()) { mr.setKeyword1(users.getName()); } - } - catch (Exception e) - { - System.out.print(e+patient.getLastCheckEmployeeId()); + } catch (Exception e) { + System.out.print(e + patient.getLastCheckEmployeeId()); } mr.setKeyword2(DateUtil.getymd()); @@ -771,6 +790,10 @@ public class AntenatalExaminationFacade { public void run() { Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); try { + //发送推送消息 + if (excAddRequest.getIsSendMsg()) { + patients.setSendMsgTime(new Date()); + } patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId()); patientsService.updatePatient(patients); @@ -830,9 +853,12 @@ public class AntenatalExaminationFacade { e.printStackTrace(); } - try{ - createSendMsg(patients.getId()); - }catch (Exception e){ + try { + //发送推送消息 + if (excAddRequest.getIsSendMsg()) { + createSendMsg(patients.getId()); + } + } catch (Exception e) { e.printStackTrace(); } } @@ -2459,6 +2485,38 @@ public class AntenatalExaminationFacade { AntexListResult antexListResult = new AntexListResult(); + String pid = patients.getId(); + + //查询档案信息 + if (patients != null) { + //如果有数据源id，取主档案id + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(patients.getSource())) { + pid = patients.getSource(); + } + + if(patients.getSendMsgTime()!=null){ + String sendMsgTime = DateUtil.getyyyy_mm(patients.getSendMsgTime()); + Integer day = DateUtil.daysBetween(new Date(),patients.getSendMsgTime()); + + String sendMsg = "(上次发送时间"+sendMsgTime+"【"+day+"天前】)"; + antexListResult.setLastSendMsg(sendMsg); + } + } + + + + //根据用户id获取医院ID + // String hospitalId = autoMatchFacade.getHospitalId(id); + PatientServiceQuery patientQuery = new PatientServiceQuery(); + patientQuery.setParentid(pid); + patientQuery.setSerStatus(1);//开通 + patientQuery.setSerType(1);//精准医疗服务 + patientQuery.setPerType(1);//孕妇 + patientQuery.setSort("create_date desc"); + List patientServices = patientServiceService.queryPatientService(patientQuery); + if (CollectionUtils.isNotEmpty(patientServices)) { + antexListResult.setIsSendTui(1); + } AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setPid(patients.getPid()); antExChuQuery.setYn(YnEnums.YES.getId()); @@ -2557,15 +2615,11 @@ public class AntenatalExaminationFacade { antexListResult.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数 } - if (patients != null) { - //测量数据 antexListResult.setMeasureData(measureInfoFacade.getMeasureInfo(patients.getPcerteTypeId(), patients.getCardNo(), hospitalId)); - //产筛状态 antexListResult.setSieveStatus(sieveFacade.getSieveStatus(patients.getId(), hospitalId)); - DiagnoseConfigQuery diagnoseConfigQuery = new DiagnoseConfigQuery(); diagnoseConfigQuery.setHospitalId(hospitalId); List configModels = diagnoseConfigService.queryDiagnoseConfigs(diagnoseConfigQuery); @@ -2626,12 +2680,12 @@ public class AntenatalExaminationFacade { String key = (String) l.get(i); BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(key); if (null != basicConfig) { - data.append(basicConfig.getName()+"、"); + data.append(basicConfig.getName() + "、"); } } - if(data.toString().endsWith("、")){ - return data.toString().substring(0,data.toString().length()-1); - }else { + if (data.toString().endsWith("、")) { + return data.toString().substring(0, data.toString().length() - 1); + } else { return data.toString(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index fdf6752..8d1e50d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -26,31 +26,6 @@ public class AntExAddRequest implements IBasicRequestConvert mHighRiskReason; - - public List getmHighRiskReason() { - return mHighRiskReason; - } - - public void setmHighRiskReason(List mHighRiskReason) { - this.mHighRiskReason = mHighRiskReason; - } /** 处理意见 */ private Map> treatmentOpinion2; private List treatmentOpinion2Types; @@ -59,41 +34,13 @@ public class AntExAddRequest implements IBasicRequestConvert getTreatmentOpinion2Types() { - return treatmentOpinion2Types; - } - - public Map> getTreatmentOpinion2() { - return treatmentOpinion2; - } - - public void setTreatmentOpinion2(Map> treatmentOpinion2) { - this.treatmentOpinion2 = treatmentOpinion2; - } - - public void setTreatmentOpinion2Types(List treatmentOpinion2Types) { - this.treatmentOpinion2Types = treatmentOpinion2Types; - } // 访视记录id private String id; + // 是否需要发送 + private boolean isSendMsg; + private String barCode; /** * 其他的诊断意见 @@ -243,6 +190,71 @@ public class AntExAddRequest implements IBasicRequestConvert mHighRiskReason; + + public String getLisCheckItems() { + return lisCheckItems; + } + + public void setLisCheckItems(String lisCheckItems) { + this.lisCheckItems = lisCheckItems; + } + + public String getGenRemark() { + return genRemark; + } + + public void setGenRemark(String genRemark) { + this.genRemark = genRemark; + } + + public boolean getIsSendMsg() { + return isSendMsg; + } + + public void setIsSendMsg(boolean sendMsg) { + isSendMsg = sendMsg; + } + + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } + public String getQuickenRemark() { + return quickenRemark; + } + + public void setQuickenRemark(String quickenRemark) { + this.quickenRemark = quickenRemark; + } + + public String getQuicken() { + return quicken; + } + + public void setQuicken(String quicken) { + this.quicken = quicken; + } + + public List getTreatmentOpinion2Types() { + return treatmentOpinion2Types; + } + + public Map> getTreatmentOpinion2() { + return treatmentOpinion2; + } + + public void setTreatmentOpinion2(Map> treatmentOpinion2) { + this.treatmentOpinion2 = treatmentOpinion2; + } + + public void setTreatmentOpinion2Types(List treatmentOpinion2Types) { + this.treatmentOpinion2Types = treatmentOpinion2Types; + } + public String getTtita() { return ttita; @@ -608,6 +620,7 @@ public class AntExAddRequest implements IBasicRequestConvert { private Integer first; // 1否 2 是，是否当前医院第一次初诊 德州需求 private int isSend; // 是否发送推送，1是 + // 是否需要发送 + private boolean isSendMsg; //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项 private String lisCheckItems; @@ -343,6 +345,13 @@ public class AntExcAddRequest implements IBasicRequestConvert { //浮肿 private String edema; + public boolean getIsSendMsg() { + return isSendMsg; + } + + public void setIsSendMsg(boolean sendMsg) { + isSendMsg = sendMsg; + } public Integer getFirst() { return first; @@ -1632,6 +1641,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel = new AntExChuModel(); + antExChuModel.setSendMsg(isSendMsg); antExChuModel.setScreenResult(screenResult); antExChuModel.setResultSupple(resultSupple); antExChuModel.setTtita(ttita); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 6d1cede..92dfc9a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -20,8 +20,6 @@ public class AntexListResult { private String id; - - private Integer pregnancyTimes; private Integer prodTime; private Integer abortion; @@ -64,15 +62,33 @@ public class AntexListResult { private String vcCardNo; private String isSieve; private String isH = "0"; - private String sieveStatus; - + //是否发放服务推广体系 + private Integer isSendTui; + //上次发送推送的时间消息 + private String lastSendMsg; //高危诊断是否开启 0停用，1启用 private String enableConfig = "0"; // + public String getLastSendMsg() { + return lastSendMsg; + } + + public void setLastSendMsg(String lastSendMsg) { + this.lastSendMsg = lastSendMsg; + } + + public Integer getIsSendTui() { + return isSendTui; + } + + public void setIsSendTui(Integer isSendTui) { + this.isSendTui = isSendTui; + } + public List> getScreenResult() { return screenResult; } 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 483ab35..85757ab 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 @@ -2,41 +2,38 @@ package com.lyms.platform.operate.web.utils; import com.lyms.platform.beans.MsgListRequest; -import com.lyms.platform.common.enums.ProjectTypeEnums; +import com.lyms.platform.beans.MsgRequest; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.utils.*; import com.lyms.platform.common.utils.HttpClientUtil; import com.lyms.platform.operate.web.request.MessageListRequest; -import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.result.Config; +import com.lyms.platform.operate.web.result.*; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by Administrator on 2016/7/5. */ public class MessageCenterService { - public static final String CENTER_BASE_URL= PropertiesUtils.getPropertyValue("center_base_url"); - public static final String CENTER_TOKEN = PropertiesUtils.getPropertyValue("center_token"); + public static final String CENTER_BASE_URL = PropertiesUtils.getPropertyValue("center_base_url"); + public static final String CENTER_TOKEN = PropertiesUtils.getPropertyValue("center_token"); /** * 服务配置修改 修改这个类短信不发送或者开启发送 + * * @param configs * @param hid * @return */ - public static boolean serviceConfig(List configs,String hid) - { + public static boolean serviceConfig(List configs, String hid) { String json = JsonUtil.array2JsonString(configs); String result = HttpRequest.sendPut(CENTER_BASE_URL + "serviceConfig/" + hid, json, CENTER_TOKEN); - if (StringUtils.isNotEmpty(result)) - { - Map map = JsonUtil.str2Obj(result, Map.class); - if ("0".equals(map.get("errorcode"))) - { + if (StringUtils.isNotEmpty(result)) { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode"))) { return true; } } @@ -46,19 +43,17 @@ public class MessageCenterService { /** * 服务配置修改 修改这个类短信不发送或者开启发送 + * * @param configs * @param hid * @return */ - public static boolean updateMsgStatus(List configs,String hid) - { + public static boolean updateMsgStatus(List configs, String hid) { String json = JsonUtil.array2JsonString(configs); String result = HttpClientUtil.doPostSSL(CENTER_BASE_URL + "/biz-push-web/push/" + hid, json); - if (StringUtils.isNotEmpty(result)) - { - Map map = JsonUtil.str2Obj(result, Map.class); - if ("0".equals(map.get("errorcode"))) - { + if (StringUtils.isNotEmpty(result)) { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode"))) { return true; } } @@ -66,92 +61,80 @@ public class MessageCenterService { } - /** * 线上环境调用 * 保存到短信中心 短信 + * * @param list * @return */ - public static boolean saveSmsCenter(MessageListRequest list) - { + public static boolean saveSmsCenter(MessageListRequest list) { String json = ""; - try{ + try { json = JsonUtil.obj2Str(list); - String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN); - if (StringUtils.isNotEmpty(result)) - { - Map map = JsonUtil.str2Obj(result, Map.class); - if ("0".equals(map.get("errorcode").toString())) - { + String result = HttpRequest.sendPost(CENTER_BASE_URL + "saveCreatedSMS", json, CENTER_TOKEN); + if (StringUtils.isNotEmpty(result)) { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode").toString())) { return true; } } - } - catch (Exception e) - { - ExceptionUtils.catchException(e,"保存短信中心异常"+json); + } catch (Exception e) { + ExceptionUtils.catchException(e, "保存短信中心异常" + json); } return false; } - /** * 线上环境调用 * 保存到短信中心 短信 + * * @param list * @return */ - public static boolean saveMsgCenter(MsgListRequest list) - { + public static boolean saveMsgCenter(MsgListRequest list) { String json = ""; - try{ + try { json = JsonUtil.obj2Str(list); String result = HttpClientUtil.doPostSSL(CENTER_BASE_URL + "/biz-push-web/push", json); - if (StringUtils.isNotEmpty(result)) - { - Map map = JsonUtil.str2Obj(result, Map.class); - if ("0".equals(map.get("errorcode").toString())) - { + if (StringUtils.isNotEmpty(result)) { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode").toString())) { return true; } } - } - catch (Exception e) - { - ExceptionUtils.catchException(e,"保存短信中心异常"+json); + } catch (Exception e) { + ExceptionUtils.catchException(e, "保存短信中心异常" + json); } return false; } public static int getCourseCountData(String hospitalId, - String subTypeId, - Integer status, - Integer sendType, - String tempId, - String createTimeStart, - String createTimeEnd) - { - Map param = new HashMap<>(); - - param.put("hospitalId",hospitalId); - param.put("subTypeId",subTypeId); - param.put("tempId",tempId == null ? null : String.valueOf(tempId)); - param.put("status",status == null ? null : String.valueOf(status)); - param.put("sendType",sendType == null ? null : String.valueOf(sendType)); - param.put("createTimeStart",createTimeStart); - param.put("createTimeEnd",createTimeEnd); - param.put("page","1"); - param.put("limit","900000000"); + String subTypeId, + Integer status, + Integer sendType, + String tempId, + String createTimeStart, + String createTimeEnd) { + Map param = new HashMap<>(); + + param.put("hospitalId", hospitalId); + param.put("subTypeId", subTypeId); + param.put("tempId", tempId == null ? null : String.valueOf(tempId)); + param.put("status", status == null ? null : String.valueOf(status)); + param.put("sendType", sendType == null ? null : String.valueOf(sendType)); + param.put("createTimeStart", createTimeStart); + param.put("createTimeEnd", createTimeEnd); + param.put("page", "1"); + param.put("limit", "900000000"); String result = HttpClientUtil.doGet(CENTER_BASE_URL + "/biz-push-web/pushCount", param, "utf-8", null); - Map map = JsonUtil.str2Obj(result, Map.class); - if ("0".equals(String.valueOf(map.get("errorcode")))) - { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(String.valueOf(map.get("errorcode")))) { return Integer.parseInt(String.valueOf(map.get("object"))); } return 0; @@ -209,61 +192,56 @@ public class MessageCenterService { // } - public static SmsResult querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTimeStart,String planTimeEnd,String actualTimeStart,String actualTimeEnd,Integer objType ,Integer page, Integer limit) - { - String param = "typeId="+ ProjectTypeEnums.YNXT.getId()+"&ext1="+StringUtils.emptyStr(hospitalId)+"&phone="+StringUtils.emptyStr(phone)+"&subTypeId="+StringUtils.emptyInt(smsType)+"&content="+StringUtils.emptyStr(content)+ - "&planTimeStart="+planTimeStart+"&planTimeEnd="+planTimeEnd+"&actualTimeStart="+actualTimeStart+ - "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&objType="+StringUtils.emptyInt(objType)+"&page="+page+"&limit="+limit; - String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN); + public static SmsResult querySmsList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String content, String planTimeStart, String planTimeEnd, String actualTimeStart, String actualTimeEnd, Integer objType, Integer page, Integer limit) { + String param = "typeId=" + ProjectTypeEnums.YNXT.getId() + "&ext1=" + StringUtils.emptyStr(hospitalId) + "&phone=" + StringUtils.emptyStr(phone) + "&subTypeId=" + StringUtils.emptyInt(smsType) + "&content=" + StringUtils.emptyStr(content) + + "&planTimeStart=" + planTimeStart + "&planTimeEnd=" + planTimeEnd + "&actualTimeStart=" + actualTimeStart + + "&actualTimeEnd=" + actualTimeEnd + "&status=" + StringUtils.emptyInt(smsStatus) + "&objType=" + StringUtils.emptyInt(objType) + "&page=" + page + "&limit=" + limit; + String result = HttpRequest.sendGet(CENTER_BASE_URL + "messages", param, CENTER_TOKEN); SmsResult map = JsonUtil.str2Obj(result, SmsResult.class); JSONObject jsonObject = JsonUtil.getObj(result); - if (jsonObject != null && jsonObject.getJSONArray("list") != null) - { - JSONArray jsonArray = jsonObject.getJSONArray("list"); + if (jsonObject != null && jsonObject.getJSONArray("list") != null) { + JSONArray jsonArray = jsonObject.getJSONArray("list"); String list = jsonArray.toString(); - map.setList(JsonUtil.toList(list,SmsObj.class)); + map.setList(JsonUtil.toList(list, SmsObj.class)); } return map; } - public static MsgResult queryMsgList(String hospitalId, String phone,Integer smsType, - Integer smsStatus,String planTimeStart, - String planTimeEnd,String actualTimeStart, - String actualTimeEnd,String smsActualTimeStart,String smsActualTimeEnd,Integer objType , - Integer sendType,Integer dxStatus,Integer timeType, - Integer page, Integer limit) - { - Map param = new HashMap<>(); - param.put("page",page == null ? null : String.valueOf(page)); - param.put("limit",limit == null ? null : String.valueOf(limit)); - param.put("hospitalId",hospitalId); - param.put("phone",phone); - param.put("subTypeId",smsType == null ? null : String.valueOf(smsType)); - param.put("status",smsStatus == null ? null : String.valueOf(smsStatus)); - param.put("smsStatus",dxStatus == null ? null : String.valueOf(dxStatus)); - param.put("sendType",sendType == null ? null : String.valueOf(sendType)); - param.put("timeType",timeType == null ? null : String.valueOf(timeType)); - param.put("planTimeStart",planTimeStart); - 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+"/biz-push-web/push", param, "utf-8", null); + public static MsgResult queryMsgList(String hospitalId, String phone, Integer smsType, + Integer smsStatus, String planTimeStart, + String planTimeEnd, String actualTimeStart, + String actualTimeEnd, String smsActualTimeStart, String smsActualTimeEnd, Integer objType, + Integer sendType, Integer dxStatus, Integer timeType, + Integer page, Integer limit) { + Map param = new HashMap<>(); + param.put("page", page == null ? null : String.valueOf(page)); + param.put("limit", limit == null ? null : String.valueOf(limit)); + param.put("hospitalId", hospitalId); + param.put("phone", phone); + param.put("subTypeId", smsType == null ? null : String.valueOf(smsType)); + param.put("status", smsStatus == null ? null : String.valueOf(smsStatus)); + param.put("smsStatus", dxStatus == null ? null : String.valueOf(dxStatus)); + param.put("sendType", sendType == null ? null : String.valueOf(sendType)); + param.put("timeType", timeType == null ? null : String.valueOf(timeType)); + param.put("planTimeStart", planTimeStart); + 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 + "/biz-push-web/push", param, "utf-8", null); // 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) - { + if (result != null) { MsgResult map = JsonUtil.str2Obj(result, MsgResult.class); JSONObject jsonObject = JsonUtil.getObj(result); - if (jsonObject != null && jsonObject.getJSONArray("data") != null) - { - JSONArray jsonArray = jsonObject.getJSONArray("data"); + if (jsonObject != null && jsonObject.getJSONArray("data") != null) { + JSONArray jsonArray = jsonObject.getJSONArray("data"); String list = jsonArray.toString(); map.setData(JsonUtil.toList(list, MsgObj.class)); } @@ -283,12 +261,36 @@ public class MessageCenterService { // } -// public static void main(String[] args) -// { -// -// int allSends = getCourseCountData("216", String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 1, -// 1,null, null, null); -// System.out.println(allSends); -// } + public static void main(String[] args) { + List messages = new ArrayList<>(); + MsgRequest mr = new MsgRequest(); + mr.setFirst("【XX】" + "aaaaaaaaaaa"); + mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); + mr.setPhone("13122132"); + mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); + mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setSubTypeId(SmsServiceEnums.FWDGTX.getId()); + mr.setStatus(SmsStatusEnums.WFS.getId()); + mr.setHospitalId("216"); + mr.setTempId("sfasdf"); + mr.setPatientId("sdfasdf"); + mr.setSmsStatus(SmsStatusEnums.WFS.getId()); + messages.add(mr); + + MsgListRequest smsList = new MsgListRequest(); + smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); + smsList.setMessages(messages); + + String json = JsonUtil.obj2Str(smsList); + System.out.println("参数："+json); + + String result = HttpClientUtil.doPostSSL("https://push.stage.platform.healthbaby.com.cn/biz-push-web/push", json); + // + // + // int allSends = getCourseCountData("216", String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 1, + // 1, null, null, null); + System.out.println(result); + } }