jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8c6b499967c2dfeecd058968777a07ef013f0934

Authored by gengxiaokai
2 parents 62e98f6d1b 23de990034
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml View file @ 8c6b499
... ... @@ -214,6 +214,9 @@
214 214 <if test="lisId != null and lisId != ''">
215 215 AND LIS_ID = #{lisId}
216 216 </if>
  217 + <if test="title != null and title != ''">
  218 + AND TITLE = #{title}
  219 + </if>
217 220 <if test="hospitalId != null and hospitalId != ''">
218 221 AND HOSPITAL_ID = #{hospitalId}
219 222 </if>
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 8c6b499
... ... @@ -713,7 +713,6 @@
713 713 String[] weekDays = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
714 714 Calendar cal = Calendar.getInstance();
715 715 cal.setTime(dt);
716   - System.out.println(cal.get(Calendar.DAY_OF_WEEK));
717 716 int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
718 717 if (w < 0)
719 718 w = 0;
... ... @@ -737,7 +736,6 @@
737 736 }
738 737 rightNow.add(Calendar.DAY_OF_YEAR, delayDay);
739 738 String date = y_m_d.format(rightNow.getTime());
740   - System.out.println(date);
741 739 return rightNow.getTime();
742 740 }
743 741  
... ... @@ -758,7 +756,6 @@
758 756 }
759 757 rightNow.add(Calendar.DAY_OF_YEAR, day);
760 758 String date = y_m_d.format(rightNow.getTime());
761   - System.out.println(date);
762 759 return rightNow.getTime();
763 760 }
764 761  
platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java View file @ 8c6b499
... ... @@ -42,16 +42,16 @@
42 42 // writeString(response, "success");
43 43 // }
44 44 //
45   -// @RequestMapping(value = "/smsTemplate")
46   -// public void smsTemplate(HttpServletResponse response,@RequestParam("token")String token){
47   -// if (!"lyms@2016!000".equals(token))
48   -// {
49   -// ResultUtils.buildParameterErrorResultAndWrite(response, "没有token");
50   -// return;
51   -// }
52   -// smsService.productTemplateSms();
53   -// writeString(response, "sms template success");
54   -// }
  45 + @RequestMapping(value = "/smsTemplate")
  46 + public void smsTemplate(HttpServletResponse response,@RequestParam("token")String token){
  47 + if (!"lyms@2016!000".equals(token))
  48 + {
  49 + ResultUtils.buildParameterErrorResultAndWrite(response, "没有token");
  50 + return;
  51 + }
  52 + smsService.productTemplateSms();
  53 + writeString(response, "sms template success");
  54 + }
55 55 //
56 56 // @RequestMapping(value = "/productChanAmsSms")
57 57 // public void productChanAmsSms(HttpServletResponse response,@RequestParam("token")String token){
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ 8c6b499
... ... @@ -396,7 +396,7 @@
396 396 String serviceStr = config.getSmsService();
397 397  
398 398 //判断消息服务是否启动
399   - boolean isStart = isStartService(SmsServiceEnums.YBZD.getId(),serviceStr);
  399 + boolean isStart = isStartService(SmsServiceEnums.YBZD.getId(), serviceStr);
400 400 if (!isStart)
401 401 {
402 402 continue;
403 403  
... ... @@ -711,13 +711,12 @@
711 711 SmsConfigQuery configQuery = new SmsConfigQuery();
712 712 configQuery.setYn(YnEnums.YES.getId());
713 713 configQuery.setPrefixTypes(new Integer[]{0, 1});
714   -// configQuery.setHospitalId(221 + "");
  714 +// configQuery.setHospitalId("1000000114");
715 715  
716 716 //查询出对应医院配置
717 717 List<SmsConfigModel> configs = smsConfigService.querySmsConfig(configQuery);
718 718 if (CollectionUtils.isNotEmpty(configs))
719 719 {
720   -
721 720 //查询短信模板
722 721 SmsTemplateQuery tempQuery = new SmsTemplateQuery();
723 722 tempQuery.setYn(YnEnums.YES.getId());
... ... @@ -727,6 +726,9 @@
727 726 {
728 727  
729 728 String hospitalId = config.getHospitalId();
  729 +
  730 + System.out.println("config hospitalId=" + hospitalId + ";hospitalPrefix=" + config.getHospitalPrefix());
  731 +
730 732 if (StringUtils.isEmpty(hospitalId))
731 733 {
732 734 continue;
... ... @@ -738,7 +740,6 @@
738 740 continue;
739 741 }
740 742  
741   -
742 743 //查询到当前配置的医院的所有模板 可用状态的模板
743 744 tempQuery.setHospitalId(hospitalId);
744 745 List<SmsTemplateModel> templates = smsTemplateService.querySmsTemplates(tempQuery);
745 746  
... ... @@ -749,15 +750,13 @@
749 750 }
750 751  
751 752 try {
752   -
753   -
  753 + System.out.println("temp hospitalId=" + hospitalId + ";temp size =" + templates.size());
754 754 //循环每一个模板，根据模板条件查询到用户 发送短信
755 755 for (SmsTemplateModel template : templates)
756 756 {
757 757  
758 758 //模板属于的医院id
759 759 String tempHid = template.getHospitalId();
760   -
761 760 //服务对象1孕妇 2儿童 3产妇
762 761 Integer serviceObj = template.getServiceObj();
763 762 //服务类型
... ... @@ -1102,6 +1101,7 @@
1102 1101 }
1103 1102 list.setMessages(messages);
1104 1103 sendSms(list);
  1104 + printSmsInfo(list, serviceObj, template.getId());
1105 1105 }
1106 1106 //发送对象为儿童
1107 1107 else if (serviceObj == ServiceObjEnums.BABYOBJ.getId())
... ... @@ -1456,6 +1456,7 @@
1456 1456  
1457 1457 list.setMessages(messages);
1458 1458 sendSms(list);
  1459 + printSmsInfo( list, serviceObj, template.getId());
1459 1460 }
1460 1461 //产妇
1461 1462 else if (serviceObj == ServiceObjEnums.CHANOBJ.getId())
... ... @@ -1714,6 +1715,7 @@
1714 1715  
1715 1716 list.setMessages(messages);
1716 1717 sendSms(list);
  1718 + printSmsInfo( list, serviceObj, template.getId());
1717 1719 }
1718 1720 //全部发送对象
1719 1721 else if (serviceObj == ServiceObjEnums.ALLOBJ.getId())
... ... @@ -1835,10 +1837,7 @@
1835 1837 }
1836 1838 list.setMessages(messages);
1837 1839 sendSms(list);
1838   - for (MessageRequest msg :messages)
1839   - {
1840   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信======"+msg.getPhone()+"content=" + msg.getContent());
1841   - }
  1840 + printSmsInfo( list, serviceObj, template.getId());
1842 1841 }
1843 1842 }
1844 1843 }
1845 1844  
1846 1845  
... ... @@ -1850,11 +1849,37 @@
1850 1849 }
1851 1850 }
1852 1851 }
  1852 +
  1853 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+":模板短信生成结束");
1853 1854 }
1854 1855  
  1856 + /**
  1857 + * 打印模板短信
  1858 + * @param list
  1859 + * @param serviceObj
  1860 + * @param tempId
  1861 + */
  1862 + private void printSmsInfo(MessageListRequest list,Integer serviceObj,String tempId)
  1863 + {
  1864 + String serviceObjStr = "";
  1865 + if (serviceObj == 1)
  1866 + {
  1867 + serviceObjStr = "孕妇";
  1868 + }
  1869 + else if (serviceObj == 2)
  1870 + {
  1871 + serviceObjStr = "儿童";
  1872 + }
  1873 + else if (serviceObj == 3)
  1874 + {
  1875 + serviceObjStr = "产妇";
  1876 + }
  1877 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+";"+serviceObjStr+";模板="+tempId+";短信条数="+list.getMessages().size());
  1878 + }
1855 1879  
1856 1880  
1857 1881  
  1882 +
1858 1883 /**
1859 1884 * 儿童服务状态和服务类型条件
1860 1885 * @param serviceType
... ... @@ -2421,7 +2446,7 @@
2421 2446 if (end > msgs.size()) {
2422 2447 end = msgs.size();
2423 2448 }
2424   - System.out.println("start:" + i + ",end:" + end);
  2449 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"start:" + i + ",end:" + end);
2425 2450 List<MessageRequest> tempList = msgs.subList(i, end);
2426 2451 MessageListRequest sentList = new MessageListRequest();
2427 2452 sentList.setMessages(tempList);