|
@@ -7,6 +7,7 @@ import com.aliyun.odps.data.Record;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.tzld.piaoquan.wecom.dao.mapper.*;
|
|
|
import com.tzld.piaoquan.wecom.model.bo.PushMessage;
|
|
|
+import com.tzld.piaoquan.wecom.model.bo.XxlJobParam;
|
|
|
import com.tzld.piaoquan.wecom.model.po.*;
|
|
|
import com.tzld.piaoquan.wecom.service.MessageAttachmentService;
|
|
|
import com.tzld.piaoquan.wecom.service.MessageService;
|
|
@@ -128,12 +129,19 @@ public class WeComMessageDataJob1 {
|
|
|
|
|
|
@XxlJob("assembleSendMessageJob1")
|
|
|
public ReturnT<String> assembleSendMessage(String param) {
|
|
|
+ XxlJobParam xxlJobParam = new XxlJobParam();
|
|
|
+ if (StringUtils.isNotEmpty(param)) {
|
|
|
+ xxlJobParam = JSONObject.parseObject(param, XxlJobParam.class);
|
|
|
+ }
|
|
|
init();
|
|
|
Long staffId = null;
|
|
|
- if (StringUtils.isNotEmpty(param)) {
|
|
|
- staffId = Long.parseLong(param);
|
|
|
+ if (xxlJobParam != null && xxlJobParam.getStaffId() != null) {
|
|
|
+ staffId = xxlJobParam.getStaffId();
|
|
|
}
|
|
|
UserExample example = new UserExample();
|
|
|
+ if (xxlJobParam != null && xxlJobParam.getUserId() != null) {
|
|
|
+ example.createCriteria().andIdEqualTo(xxlJobParam.getUserId());
|
|
|
+ }
|
|
|
long count = userMapper.countByExample(example);
|
|
|
int page = 1;
|
|
|
int pageSize = 1000;
|