jiangjiazhi / regional-platform

Download as
Browse Code »

Commit fb883188ec84f973bebde6a4730acbf34cbce3ab

Authored by liquanyu
1 parent 2e54fc0068
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

短信修改

Showing 3 changed files with 84 additions and 84 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java View file @ fb88318
... ... @@ -18,85 +18,85 @@
18 18 @RequestMapping("/msg")
19 19 public class MsgGenerateController extends BaseController {
20 20  
21   -// private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class);
22   -////
23   -// @Autowired
24   -// private IMsgGenerateService msgGenerateService;
  21 + private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class);
25 22 //
26   -// /**
27   -// * 生成孕妇ams消息
28   -// * @param hospitalId
29   -// * @return
30   -// */
31   -// @RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg")
32   -// @ResponseBody
33   -// public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId)
34   -// {
35   -//
36   -// logger.info("The request hospital id is {} ", hospitalId);
37   -// msgGenerateService.generatePatAmsMsg(hospitalId);
38   -// return "";
39   -// }
40   -//
41   -//
42   -// /**
43   -// * 生成儿童ams消息
44   -// * @param hospitalId
45   -// * @return
46   -// */
47   -// @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg")
48   -// @ResponseBody
49   -// public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId)
50   -// {
51   -//
52   -// logger.info("The request hospital id is {} ", hospitalId);
53   -// msgGenerateService.generateBabyAmsMsg(hospitalId);
54   -// return "";
55   -// }
56   -//
57   -//
58   -// /**
59   -// * 生成产妇ams消息
60   -// * @param hospitalId
61   -// * @return
62   -// */
63   -// @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg")
64   -// @ResponseBody
65   -// public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId)
66   -// {
67   -//
68   -// logger.info("The request hospital id is {} ", hospitalId);
69   -// msgGenerateService.generateChanAmsMsg(hospitalId);
70   -// return "";
71   -// }
72   -//
73   -// /**
74   -// * 生成模板推送消息
75   -// * @param hospitalId
76   -// * @return
77   -// */
78   -// @RequestMapping(method = RequestMethod.GET, value = "/generateTemplateMsg")
79   -// @ResponseBody
80   -// public String generateTemplateMsg(@RequestParam(required = false) String hospitalId)
81   -// {
82   -//
83   -// logger.info("The request hospital id is {} ", hospitalId);
84   -// msgGenerateService.generateTemplateMsg(hospitalId);
85   -// return "";
86   -// }
87   -//
88   -//
89   -// /**
90   -// * 生成所有
91   -// * @return
92   -// */
93   -// @RequestMapping(method = RequestMethod.GET, value = "/generaterAllMsg")
94   -// @ResponseBody
95   -// public String generaterAllMsg()
96   -// {
97   -// msgGenerateService.generaterAllMsg();
98   -// return "";
99   -// }
  23 + @Autowired
  24 + private IMsgGenerateService msgGenerateService;
  25 +
  26 + /**
  27 + * 生成孕妇ams消息
  28 + * @param hospitalId
  29 + * @return
  30 + */
  31 + @RequestMapping(method = RequestMethod.GET, value = "/generatePatAmsMsg")
  32 + @ResponseBody
  33 + public String generatePatAmsMsg(@RequestParam(required = false) String hospitalId)
  34 + {
  35 +
  36 + logger.info("The request hospital id is {} ", hospitalId);
  37 + msgGenerateService.generatePatAmsMsg(hospitalId);
  38 + return "";
  39 + }
  40 +
  41 +
  42 + /**
  43 + * 生成儿童ams消息
  44 + * @param hospitalId
  45 + * @return
  46 + */
  47 + @RequestMapping(method = RequestMethod.GET, value = "/generateBabyAmsMsg")
  48 + @ResponseBody
  49 + public String generateBabyAmsMsg(@RequestParam(required = false) String hospitalId)
  50 + {
  51 +
  52 + logger.info("The request hospital id is {} ", hospitalId);
  53 + msgGenerateService.generateBabyAmsMsg(hospitalId);
  54 + return "";
  55 + }
  56 +
  57 +
  58 + /**
  59 + * 生成产妇ams消息
  60 + * @param hospitalId
  61 + * @return
  62 + */
  63 + @RequestMapping(method = RequestMethod.GET, value = "/generateChanAmsMsg")
  64 + @ResponseBody
  65 + public String generateChanAmsMsg(@RequestParam(required = false) String hospitalId)
  66 + {
  67 +
  68 + logger.info("The request hospital id is {} ", hospitalId);
  69 + msgGenerateService.generateChanAmsMsg(hospitalId);
  70 + return "";
  71 + }
  72 +
  73 + /**
  74 + * 生成模板推送消息
  75 + * @param hospitalId
  76 + * @return
  77 + */
  78 + @RequestMapping(method = RequestMethod.GET, value = "/generateTemplateMsg")
  79 + @ResponseBody
  80 + public String generateTemplateMsg(@RequestParam(required = false) String hospitalId)
  81 + {
  82 +
  83 + logger.info("The request hospital id is {} ", hospitalId);
  84 + msgGenerateService.generateTemplateMsg(hospitalId);
  85 + return "";
  86 + }
  87 +
  88 +
  89 + /**
  90 + * 生成所有
  91 + * @return
  92 + */
  93 + @RequestMapping(method = RequestMethod.GET, value = "/generaterAllMsg")
  94 + @ResponseBody
  95 + public String generaterAllMsg()
  96 + {
  97 + msgGenerateService.generaterAllMsg();
  98 + return "";
  99 + }
100 100  
101 101 }
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java View file @ fb88318
... ... @@ -209,7 +209,7 @@
209 209 */
210 210 public int isStartService(Integer smsType,String serviceStr,String serviceType)
211 211 {
212   - if (StringUtils.isEmpty(serviceStr))
  212 + if (StringUtils.isEmpty(serviceStr) || StringUtils.isEmpty(serviceType) || smsType == null)
213 213 {
214 214 return 0;
215 215 }
... ... @@ -228,7 +228,7 @@
228 228 Map<String,String> parents = JsonUtil.getMap(serviceType);
229 229 if (parents != null && !parents.isEmpty())
230 230 {
231   - String type = parents.get(smsType);
  231 + String type = parents.get(String.valueOf(smsType));
232 232 if (StringUtils.isNotEmpty(type))
233 233 {
234 234 Map<String,String> child = JsonUtil.getMap(type);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ fb88318
... ... @@ -830,7 +830,7 @@
830 830 */
831 831 private int isStartService(Integer smsType,String serviceStr,String serviceType)
832 832 {
833   - if (StringUtils.isEmpty(serviceStr))
  833 + if (StringUtils.isEmpty(serviceStr) || StringUtils.isEmpty(serviceType) || smsType == null)
834 834 {
835 835 return 0;
836 836 }
... ... @@ -849,7 +849,7 @@
849 849 Map<String,String> parents = JsonUtil.getMap(serviceType);
850 850 if (parents != null && !parents.isEmpty())
851 851 {
852   - String type = parents.get(smsType);
  852 + String type = parents.get(String.valueOf(smsType));
853 853 if (StringUtils.isNotEmpty(type))
854 854 {
855 855 Map<String,String> child = JsonUtil.getMap(type);
856 856  
... ... @@ -859,11 +859,11 @@
859 859 String push = child.get("push");
860 860 if (StringUtils.isNotEmpty(message) && "true".equals(message) && StringUtils.isNotEmpty(push) && "true".equals(push))
861 861 {
862   - return 3;
  862 + return 2;
863 863 }
864 864 else if (StringUtils.isNotEmpty(message) && "true".equals(message))
865 865 {
866   - return 2;
  866 + return 3;
867 867 }
868 868 else if (StringUtils.isNotEmpty(push) && "true".equals(push))
869 869 {