jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d56db8e8b509f90037a9a23984ac498616b76239

Authored by jiangjiazhi
2 parents b20c772cd5 c2406d1495
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 7 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java View file @ d56db8e
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +import java.util.ArrayList;
  4 +import java.util.HashMap;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +
  8 +/**
  9 + *
  10 + * 周类型
  11 + *
  12 + * @author lqy
  13 + *
  14 + */
  15 +public enum WeekEnums {
  16 +
  17 + WEEK_ONE(1,"星期一"),WEEK_TWO(2,"星期二"),WEEK_THREE(3,"星期三"),WEEK_FOUR(4,"星期四"),WEEK_FIVE(5,"星期五"),WEEK_SIX(6,"星期六"),WEEK_SEVEN(7,"星期日");
  18 + private WeekEnums(int id, String name) {
  19 + this.id = id;
  20 + this.name = name;
  21 + }
  22 +
  23 + public static String getNameById(int id){
  24 + for(WeekEnums week : values()){
  25 + if(id==week.id){
  26 + return week.getName();
  27 + }
  28 + }
  29 + return "";
  30 + }
  31 +
  32 + public static int getIdByName(String name){
  33 + for(WeekEnums week : values()){
  34 + if(name==week.name){
  35 + return week.getId();
  36 + }
  37 + }
  38 + return 0;
  39 + }
  40 +
  41 + public static List<String> getWeekEnums() {
  42 + List<String> list = new ArrayList<>();
  43 + for (WeekEnums e : WeekEnums.values()) {
  44 + list.add(e.getName());
  45 + }
  46 + return list;
  47 + }
  48 +
  49 + private int id;
  50 +
  51 + private String name;
  52 +
  53 + public int getId() {
  54 + return id;
  55 + }
  56 +
  57 + public String getName() {
  58 + return name;
  59 + }
  60 +}
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ d56db8e
... ... @@ -25,7 +25,7 @@
25 25  
26 26 /**
27 27 * 短信生成
28   - * Created by Administrator on 2016/7/5.
  28 + * Created by lqy on 2016/7/5.
29 29 */
30 30 @Service("smsService")
31 31 public class SmsServiceImpl implements SmsService{
32 32  
33 33  
34 34  
35 35  
... ... @@ -82,29 +82,22 @@
82 82 {
83 83 continue;
84 84 }
  85 + String strService = config.getSmsService();
85 86  
86   - String serviceStr = config.getSmsService();
87   - if (StringUtils.isEmpty(serviceStr))
88   - {
89   - continue;
90   - }
91   -
92   - //消息服务启动
93   - List<Map> smsServices = JsonUtil.toList(serviceStr, Map.class);
94 87 //判断消息服务是否启动
95   - boolean isStart = isStartService(SmsServiceEnums.YBZD.getId(),smsServices);
  88 + boolean isStart = isStartService(SmsServiceEnums.YBZD.getId(),strService);
96 89 if (!isStart)
97 90 {
98 91 continue;
99 92 }
100 93  
101 94 //通过医院id先从缓存中取 如果没有取到就调用ams获取该医院短信 并保存到amsSmses中
102   - Map<String, List<MessageContent>> amsSmses = amsSmsCache.get(String.valueOf(hospitalId));
  95 + Map<String, List<MessageContent>> amsSmses = amsSmsCache.get(hospitalId);
103 96 if (amsSmses == null || amsSmses.size() == 0)
104 97 {
105 98 // 查询模板短信 从ams平台配置的短信通过医院ID
106 99 amsSmses = AmsMessageService
107   - .getMessageTemplateMap(String.valueOf(hospitalId),
  100 + .getMessageTemplateMap(hospitalId,
108 101 AmsServiceTypeEnum.YUN_GUIDE);
109 102 amsSmsCache.put(String.valueOf(hospitalId),amsSmses);
110 103  
... ... @@ -116,7 +109,7 @@
116 109 patientsQuery.setType(1);
117 110  
118 111 //末次月经必须大于当前时间减去42周视为为分娩孕妇
119   - Date lastMensesMax = DateUtil.addDay(new Date(), -42);
  112 + Date lastMensesMax = DateUtil.getNewDate(-42,"周",1);
120 113 patientsQuery.setLastMensesStart(lastMensesMax);
121 114 //健康指导短信 只能是类型为 增值服务 开通状态 才发送
122 115 patientsQuery.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
123 116  
124 117  
125 118  
126 119  
127 120  
128 121  
129 122  
130 123  
131 124  
132 125  
133 126  
... ... @@ -147,55 +140,80 @@
147 140 messagePrefix = res == "" ? messagePrefix : res;
148 141 }
149 142  
150   - /**
151   - * 高危短信
152   - */
  143 + String timeStr = config.getGuideTime();
  144 + if (StringUtils.isEmpty(timeStr))
  145 + {
  146 + continue;
  147 + }
  148 +
  149 + List<String> guideTimes = JsonUtil.toList(timeStr,String.class);
  150 + if (guideTimes == null || guideTimes.size() != 2)
  151 + {
  152 + continue;
  153 + }
  154 + int weekNum = 0;
  155 + for (String guide : guideTimes)
  156 + {
  157 + if (!week.equals(guide))
  158 + {
  159 + weekNum = WeekEnums.getIdByName(guide);
  160 + }
  161 + }
153 162 boolean isRisk = false;
154   - //获取最后一次高危因素
155   - List risks = findLastRisk(pat.getId());
156   - if (CollectionUtils.isNotEmpty(risks))
  163 + if (weekNum < WeekEnums.getIdByName(week))
157 164 {
158   - for (Object obj : risks)
  165 + /**
  166 + * 高危短信
  167 + */
  168 + //获取最后一次高危因素
  169 + List risks = findLastRisk(pat.getId());
  170 + if (CollectionUtils.isNotEmpty(risks))
159 171 {
160   - Map<String,Object> riskMap = (Map<String,Object>)obj;
161   -
162   - HighRiskSmsQuery hquery = new HighRiskSmsQuery();
163   - hquery.setHighId(String.valueOf(riskMap.get("id")));
164   - hquery.setPhone(pat.getPhone());
165   - hquery.setPatientId(pat.getId());
166   - int count = highRiskService.queryHighRiskCount(hquery);
167   - if (count > 0)
  172 + for (Object obj : risks)
168 173 {
169   - continue;
170   - }
  174 + Map<String,Object> riskMap = (Map<String,Object>)obj;
171 175  
172   - HighRiskSmsModel highRiskSmsModel = new HighRiskSmsModel();
173   - highRiskSmsModel.setPatientId(pat.getId());
174   - highRiskSmsModel.setHighId(String.valueOf(riskMap.get("id")));
175   - highRiskSmsModel.setPhone(pat.getPhone());
176   - highRiskSmsModel.setHospitalId(pat.getHospitalId());
177   - highRiskSmsModel.setCreated(new Date());
178   - highRiskSmsModel.setModified(new Date());
179   - highRiskService.addHighRiskSmsModel(highRiskSmsModel);
  176 + HighRiskSmsQuery hquery = new HighRiskSmsQuery();
  177 + hquery.setHighId(String.valueOf(riskMap.get("id")));
  178 + hquery.setPhone(pat.getPhone());
  179 + hquery.setPatientId(pat.getId());
  180 + int count = highRiskService.queryHighRiskCount(hquery);
  181 + if (count > 0)
  182 + {
  183 + continue;
  184 + }
180 185  
181   - String name = String.valueOf(riskMap.get("id"));
182   - List<MessageContent> messageContents = amsSmses.get(name);
183   - if (CollectionUtils.isNotEmpty(messageContents))
184   - {
185   - for (MessageContent message : messageContents)
  186 + HighRiskSmsModel highRiskSmsModel = new HighRiskSmsModel();
  187 + highRiskSmsModel.setPatientId(pat.getId());
  188 + highRiskSmsModel.setHighId(String.valueOf(riskMap.get("id")));
  189 + highRiskSmsModel.setPhone(pat.getPhone());
  190 + highRiskSmsModel.setHospitalId(pat.getHospitalId());
  191 + highRiskSmsModel.setCreated(new Date());
  192 + highRiskSmsModel.setModified(new Date());
  193 + highRiskService.addHighRiskSmsModel(highRiskSmsModel);
  194 +
  195 + String name = String.valueOf(riskMap.get("id"));
  196 + List<MessageContent> messageContents = amsSmses.get(name);
  197 + if (CollectionUtils.isNotEmpty(messageContents))
186 198 {
187   - String messageContent = "【"+messagePrefix+"】" + message.getContent();
  199 + for (MessageContent message : messageContents)
  200 + {
  201 + String messageContent = "【"+messagePrefix+"】" + message.getContent();
188 202  
189   - MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.GWZD.getId(),
190   - pat.getHospitalId(),message.getId(),pat.getId());
  203 + MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.GWZD.getId(),
  204 + pat.getHospitalId(),message.getId(),pat.getId());
191 205  
192   - messages.add(request);
193   - isRisk = true;
194   - break;
195   - }
  206 + messages.add(request);
  207 + isRisk = true;
  208 + break;
  209 + }
196 210  
  211 + if (isRisk)
  212 + {
  213 + break;
  214 + }
  215 + }
197 216 }
198   -
199 217 }
200 218 }
201 219  
202 220  
203 221  
... ... @@ -267,15 +285,9 @@
267 285 }
268 286  
269 287 String serviceStr = config.getSmsService();
270   - if (StringUtils.isEmpty(serviceStr))
271   - {
272   - continue;
273   - }
274 288  
275   - //消息服务启动
276   - List<Map> smsServices = JsonUtil.toList(serviceStr, Map.class);
277 289 //判断消息服务是否启动
278   - boolean isStart = isStartService(SmsServiceEnums.YBZD.getId(),smsServices);
  290 + boolean isStart = isStartService(SmsServiceEnums.YBZD.getId(),serviceStr);
279 291 if (!isStart)
280 292 {
281 293 continue;
282 294  
283 295  
... ... @@ -392,15 +404,9 @@
392 404 }
393 405  
394 406 String serviceStr = config.getSmsService();
395   - if (StringUtils.isEmpty(serviceStr))
396   - {
397   - continue;
398   - }
399 407  
400   - //消息服务启动
401   - List<Map> smsServices = JsonUtil.toList(serviceStr, Map.class);
402 408 //判断消息服务是否启动
403   - boolean isStart = isStartService(SmsServiceEnums.YBZD.getId(),smsServices);
  409 + boolean isStart = isStartService(SmsServiceEnums.YBZD.getId(),serviceStr);
404 410 if (!isStart)
405 411 {
406 412 continue;
... ... @@ -446,7 +452,6 @@
446 452 continue;
447 453 }
448 454  
449   -
450 455 String messagePrefix = getSmsPrefix(config, pat.getBookbuildingDoctor());
451 456  
452 457 //计算产后多少周 按分娩日期计算
453 458  
... ... @@ -477,9 +482,7 @@
477 482 }
478 483 list.setMessages(messages);
479 484 sendSms(list);
480   -
481 485 }
482   -
483 486 }
484 487 }
485 488  
486 489  
487 490  
488 491  
... ... @@ -490,11 +493,39 @@
490 493 */
491 494 @Override
492 495 public void serviceEnd() {
  496 + /**
  497 + * 产妇服务结束
  498 + */
  499 + Date chanEndDate = DateUtil.getNewDate(-16, "周", 0);
  500 + //把时间格式化成 yyyy_MM_dd 的日期
  501 + chanEndDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(chanEndDate));
  502 + PatientsQuery chanpatientsQuery = new PatientsQuery();
  503 + chanpatientsQuery.setYn(YnEnums.YES.getId());
  504 + //3产妇
  505 + chanpatientsQuery.setType(3);
  506 + chanpatientsQuery.setLastMensesEnd(chanEndDate);
  507 + chanpatientsQuery.setLastMensesStart(chanEndDate);
493 508  
494   - Date endDate = DateUtil.getNewDate(-42, "周", 0);
  509 + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(chanpatientsQuery);
  510 + if (CollectionUtils.isNotEmpty(patients))
  511 + {
  512 + for (Patients pat : patients)
  513 + {
  514 + //更新状态为过期
  515 + //判断其为增值服务还是 标准服务
  516 + if (pat.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())
  517 + {
  518 + pat.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId());
  519 + }
  520 + else if (pat.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId())
  521 + {
  522 + pat.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
  523 + }
  524 + yunBookbuildingService.updatePregnant(pat, pat.getId());
495 525  
496   -// yunBookbuildingService.updatePatientStatus(endDate,ServiceStatusEnums.);
  526 + }
497 527  
  528 + }
498 529 }
499 530  
500 531  
501 532  
502 533  
503 534  
... ... @@ -759,14 +790,43 @@
759 790 //服务结束
760 791 if (specialDateType == SpecialDateEnums.FWJS.getId())
761 792 {
762   - //TODO
763   - }
764   - //孕妇建档在 孕妇建档生成
765   - else if (specialDateType == SpecialDateEnums.JD.getId())
766   - {
  793 + /**
  794 + * 孕妇超过42周的 就自动分娩
  795 + */
  796 + Date endDate = DateUtil.getNewDate(-42, "周", 0);
  797 + //把时间格式化成 yyyy_MM_dd 的日期
  798 + endDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(endDate));
  799 + patientsQuery.setYn(YnEnums.YES.getId());
  800 + //1孕妇
  801 + patientsQuery.setType(1);
  802 + patientsQuery.setLastMensesEnd(endDate);
  803 + patientsQuery.setLastMensesStart(endDate);
767 804  
  805 + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
  806 + if (CollectionUtils.isNotEmpty(patients))
  807 + {
  808 + for (Patients pat : patients)
  809 + {
768 810  
  811 + //短信前缀
  812 + String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor());
  813 + String messageContent = "【"+messagePrefix+"】"+template.getContent();
  814 + messageContent = replaceName(pat.getUsername(), messageContent);
  815 + MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
  816 + pat.getHospitalId(),template.getId(),pat.getId());
  817 + messages.add(request);
  818 +
  819 + //更新成产妇状态 分娩时间设置成当前时间
  820 + pat.setType(3);
  821 + pat.setDueDate(new Date());
  822 + pat.setModified(new Date());
  823 + yunBookbuildingService.updatePregnant(pat, pat.getId());
  824 + }
  825 +
  826 + }
769 827 }
  828 + //孕妇建档在 孕妇建档生成
  829 +
770 830 }
771 831 //特殊日期中的公历和农历
772 832 else if (sendDateType == SendDateEnums.GL.getId() || sendDateType == SendDateEnums.NL.getId() )
773 833  
774 834  
775 835  
... ... @@ -1063,16 +1123,50 @@
1063 1123 babyModelQuery.setBirthEnd(birthday);
1064 1124 messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template));
1065 1125 }
1066   - //儿童建档
1067   - else if (specialDateType == SpecialDateEnums.JD.getId())
1068   - {
1069 1126  
1070   - }
1071 1127 //儿童服务结束
1072 1128 else if (specialDateType == SpecialDateEnums.FWJS.getId())
1073 1129 {
1074   - //TODO
  1130 +
  1131 + /**
  1132 + * 儿童服务结束
  1133 + */
  1134 + babyModelQuery.setYn(YnEnums.YES.getId());
  1135 + Date babyEndDate = DateUtil.getNewDate(-36, "月", 0);
  1136 + //把时间格式化成 yyyy_MM_dd 的日期
  1137 + babyEndDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(babyEndDate));
  1138 +
  1139 + babyModelQuery.setBirthStart(babyEndDate);
  1140 + babyModelQuery.setBirthEnd(babyEndDate);
  1141 +
  1142 + List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
  1143 + if (CollectionUtils.isNotEmpty(babyModels))
  1144 + {
  1145 + for(BabyModel model : babyModels)
  1146 + {
  1147 + //短信前缀
  1148 + String messagePrefix = getSmsPrefix(config, model.getBuildDoctor());
  1149 + String messageContent = "【"+messagePrefix+"】"+template.getContent();
  1150 + messageContent = replaceName(model.getName(), messageContent);
  1151 + MessageRequest request = getMessageRequest(messageContent,model.getMphone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
  1152 + model.getHospitalId(),template.getId(),model.getId());
  1153 + messages.add(request);
  1154 +
  1155 + //更新状态为过期
  1156 + //判断其为增值服务还是 标准服务
  1157 + if (model.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())
  1158 + {
  1159 + model.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId());
  1160 + }
  1161 + else if (model.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId())
  1162 + {
  1163 + model.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
  1164 + }
  1165 + babyBookbuildingService.updateBabyBuild(model,model.getId());
  1166 + }
  1167 + }
1075 1168 }
  1169 + //儿童建档 在儿童建档时候生成 及时短信
1076 1170 }
1077 1171 else if (sendDateType == SendDateEnums.GL.getId() || sendDateType == SendDateEnums.NL.getId())
1078 1172 {
... ... @@ -1212,11 +1306,7 @@
1212 1306 }
1213 1307 }
1214 1308 }
1215   - //产妇为分娩日期
1216   - else if (sendDateType == SendDateEnums.TSRQ.getId())
1217   - {
1218   - //TODO
1219   - }
  1309 +
1220 1310 }
1221 1311 else if (sendFreq == SendFrequencyEnums.MONTH.getId())
1222 1312 {
1223 1313  
... ... @@ -1263,9 +1353,23 @@
1263 1353 }
1264 1354 }
1265 1355 }
  1356 + //产妇为分娩日期
1266 1357 else if (sendDateType == SendDateEnums.TSRQ.getId())
1267 1358 {
1268   - //TODO
  1359 + Integer specialDateType = template.getSpecialDateType();
  1360 + if (specialDateType == SpecialDateEnums.FM.getId())
  1361 + {
  1362 + //分娩都为分娩后第二天发送短信
  1363 + Date dueDate = DateUtil.addDay(new Date(),-1);
  1364 + //把时间格式化成 yyyy_MM_dd 的日期
  1365 + dueDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(dueDate));
  1366 +
  1367 + patientsQuery.setDueDateStart(dueDate);
  1368 + patientsQuery.setDueDateEnd(dueDate);
  1369 +
  1370 + messages.addAll(getChanMessageRequestList(patientsQuery, config, template));
  1371 + }
  1372 +
1269 1373 }
1270 1374  
1271 1375 }
... ... @@ -1926,11 +2030,7 @@
1926 2030 {
1927 2031 if (config != null) {
1928 2032 String serviceStr = config.getSmsService();
1929   - if (StringUtils.isEmpty(serviceStr)) {
1930   - return false;
1931   - }
1932   - List<Map> smsTypes = JsonUtil.toList(serviceStr, Map.class);
1933   - boolean isStart = isStartService(smsType, smsTypes);
  2033 + boolean isStart = isStartService(smsType, serviceStr);
1934 2034 return isStart;
1935 2035 }
1936 2036 return false;
1937 2037  
... ... @@ -2013,8 +2113,15 @@
2013 2113 /**
2014 2114 * 判断对应服务是否启动
2015 2115 */
2016   - private boolean isStartService(Integer smsType,List<Map> smsServices)
  2116 + private boolean isStartService(Integer smsType,String serviceStr)
2017 2117 {
  2118 + if (StringUtils.isEmpty(serviceStr))
  2119 + {
  2120 + return false;
  2121 + }
  2122 + //消息服务启动
  2123 + List<Map> smsServices = JsonUtil.toList(serviceStr, Map.class);
  2124 +
2018 2125 if (CollectionUtils.isNotEmpty(smsServices))
2019 2126 {
2020 2127 for (Map map : smsServices)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java View file @ d56db8e
... ... @@ -325,6 +325,16 @@
325 325 return list;
326 326 }
327 327  
  328 + /**
  329 + * 周枚举
  330 + * @return
  331 + */
  332 + @RequestMapping(value = "/getWeeks", method = RequestMethod.GET)
  333 + @ResponseBody
  334 + public List<String> getWeeks() {
  335 + return WeekEnums.getWeekEnums();
  336 + }
  337 +
328 338 public static void main(String a[]) {
329 339  
330 340 List list = SmsServiceEnums.getSmsServiceLeaf();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java View file @ d56db8e
... ... @@ -65,7 +65,8 @@
65 65 @RequestParam(value = "serviceType", required = false) Integer serviceType,
66 66 @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
67 67 @RequestParam(value = "smsType", required = false) Integer smsType,
68   - @RequestParam(value = "content", required = false) String content) {
  68 + @RequestParam(value = "content", required = false) String content,
  69 + @RequestParam(value = "hospitalId", required = false) String hospitalId) {
69 70  
70 71 SmsTemplateRequest request = new SmsTemplateRequest();
71 72 request.setServiceObj(serviceObj);
... ... @@ -75,6 +76,7 @@
75 76 request.setServiceStatus(serviceStatus);
76 77 request.setLimit(limit);
77 78 request.setPage(page);
  79 + request.setHospitalId(hospitalId);
78 80 return smsTemplateFacade.querySmsTemps(request);
79 81 }
80 82  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ d56db8e
... ... @@ -13,6 +13,7 @@
13 13 import com.lyms.platform.permission.service.DepartmentsService;
14 14 import com.lyms.platform.pojo.*;
15 15 import com.lyms.platform.query.*;
  16 +import com.qiniu.util.Json;
16 17 import org.apache.commons.collections.CollectionUtils;
17 18 import org.springframework.beans.factory.annotation.Autowired;
18 19 import org.springframework.stereotype.Component;
... ... @@ -57,7 +58,7 @@
57 58 model.setPrefixType(request.getPrefixType());
58 59 model.setHospitalPrefix(request.getHospitalPrefix());
59 60 model.setDeptPrefix(JsonUtil.array2JsonString(request.getDeptPrefix()));
60   - model.setGuideTime(request.getGuideTime());
  61 + model.setGuideTime(JsonUtil.array2JsonString(request.getGuideTime()));
61 62 model.setSmsService(JsonUtil.array2JsonString(request.getSmsService()));
62 63  
63 64 return model;
... ... @@ -159,7 +160,7 @@
159 160 sr.setHospitalPrefix(model.getHospitalPrefix());
160 161 sr.setHospitalId(model.getHospitalId());
161 162 sr.setPrefixType(model.getPrefixType());
162   - sr.setGuideTime(model.getGuideTime());
  163 + sr.setGuideTime(JsonUtil.toList(model.getGuideTime(),String.class));
163 164 List<Map> deptsPrefix = JsonUtil.toList(model.getDeptPrefix(), Map.class);
164 165 if (CollectionUtils.isNotEmpty(deptsPrefix))
165 166 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java View file @ d56db8e
... ... @@ -28,7 +28,7 @@
28 28 //指导发送时间
29 29 @FormParam
30 30 @NotEmpty(message = "指导发送时间不能为空.")
31   - private String guideTime;
  31 + private List<String> guideTime;
32 32  
33 33 //消息服务启动
34 34 private List<Map<String,String>> smsService;
35 35  
... ... @@ -75,11 +75,11 @@
75 75 this.deptPrefix = deptPrefix;
76 76 }
77 77  
78   - public String getGuideTime() {
  78 + public List<String> getGuideTime() {
79 79 return guideTime;
80 80 }
81 81  
82   - public void setGuideTime(String guideTime) {
  82 + public void setGuideTime(List<String> guideTime) {
83 83 this.guideTime = guideTime;
84 84 }
85 85  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java View file @ d56db8e
... ... @@ -20,7 +20,7 @@
20 20 private List<Map> deptPrefix;
21 21  
22 22 //指导发送时间
23   - private String guideTime;
  23 + private List<String> guideTime;
24 24  
25 25 //消息服务启动
26 26 private List<Map> smsService;
27 27  
... ... @@ -67,11 +67,11 @@
67 67 this.deptPrefix = deptPrefix;
68 68 }
69 69  
70   - public String getGuideTime() {
  70 + public List<String> getGuideTime() {
71 71 return guideTime;
72 72 }
73 73  
74   - public void setGuideTime(String guideTime) {
  74 + public void setGuideTime(List<String> guideTime) {
75 75 this.guideTime = guideTime;
76 76 }
77 77