|
@@ -11,6 +11,7 @@ import com.unissoft.service.QuartzService;
|
11
|
11
|
import com.unissoft.service.SysMessageService;
|
12
|
12
|
import com.unissoft.utils.DateUtil;
|
13
|
13
|
import com.unissoft.vo.WarnScheduleVO;
|
|
14
|
+import org.apache.commons.lang3.StringUtils;
|
14
|
15
|
import org.apache.commons.lang3.time.DateUtils;
|
15
|
16
|
import org.quartz.*;
|
16
|
17
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -51,6 +52,7 @@ public class ToBeDoneJob implements Job, Serializable {
|
51
|
52
|
String usersInfo = dataMap.getString("usersInfo");
|
52
|
53
|
String timePeriod = dataMap.getString("timePeriod");
|
53
|
54
|
String aheadTime = dataMap.getString("aheadTime");//预警时间
|
|
55
|
+ Integer levelDepotHouse = dataMap.getInt("levelDepotHouse");
|
54
|
56
|
String toPage = dataMap.getString("toPage");
|
55
|
57
|
String type = dataMap.getString("type");
|
56
|
58
|
//
|
|
@@ -61,6 +63,7 @@ public class ToBeDoneJob implements Job, Serializable {
|
61
|
63
|
done.setStartDate(startDate);
|
62
|
64
|
Date endDate = getEndDate(startDate, timePeriod);
|
63
|
65
|
done.setEndDate(endDate);
|
|
66
|
+ done.setLevelDepotHouse(levelDepotHouse);
|
64
|
67
|
done.setToPage(toPage);
|
65
|
68
|
done.setType(type);
|
66
|
69
|
//生成待办数据
|
|
@@ -72,7 +75,14 @@ public class ToBeDoneJob implements Job, Serializable {
|
72
|
75
|
for(ToBeDoneCallbackVO vo : toBeDoneCallbackList) {
|
73
|
76
|
MessageVO messageVO = new MessageVO();
|
74
|
77
|
messageVO.setTitle(title);
|
75
|
|
- String content = vo.getDepotName() + "-" + vo.getHouseName() + "-" + "待处理";
|
|
78
|
+ StringBuilder stringBuilder = new StringBuilder();
|
|
79
|
+ stringBuilder.append(vo.getDepotName()).append("-");
|
|
80
|
+ if(StringUtils.isNotBlank(vo.getHouseName())) {
|
|
81
|
+ stringBuilder.append(vo.getHouseName()).append("-");
|
|
82
|
+ }
|
|
83
|
+ stringBuilder.append("待处理");
|
|
84
|
+
|
|
85
|
+ String content = stringBuilder.toString();
|
76
|
86
|
messageVO.setContent(content);
|
77
|
87
|
//
|
78
|
88
|
messageVO.setFromUserId(-1);//-1 代表系统推送
|