|
@@ -1,13 +1,16 @@
|
|
package com.usky.dxtop.service.job;
|
|
package com.usky.dxtop.service.job;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.usky.dxtop.common.utils.http.HttpUtils;
|
|
import com.usky.dxtop.common.utils.http.HttpUtils;
|
|
import com.usky.dxtop.model.Dept;
|
|
import com.usky.dxtop.model.Dept;
|
|
|
|
+import com.usky.dxtop.model.MsgLog;
|
|
import com.usky.dxtop.model.Staff;
|
|
import com.usky.dxtop.model.Staff;
|
|
import com.usky.dxtop.service.DeptService;
|
|
import com.usky.dxtop.service.DeptService;
|
|
|
|
+import com.usky.dxtop.service.MsgLogService;
|
|
import com.usky.dxtop.service.StaffService;
|
|
import com.usky.dxtop.service.StaffService;
|
|
import com.usky.dxtop.service.api.SmApi;
|
|
import com.usky.dxtop.service.api.SmApi;
|
|
import com.usky.dxtop.service.config.rabbitmq.face.FaceConsumeConfig;
|
|
import com.usky.dxtop.service.config.rabbitmq.face.FaceConsumeConfig;
|
|
@@ -53,6 +56,9 @@ public class SmJob {
|
|
@Qualifier(GroupConsumeConfig.TEMPLATE)
|
|
@Qualifier(GroupConsumeConfig.TEMPLATE)
|
|
private RabbitTemplate groupRabbitTemplate;
|
|
private RabbitTemplate groupRabbitTemplate;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private MsgLogService msgLogService;
|
|
|
|
+
|
|
@Scheduled(cron = "0 0 0 */1 * ?")
|
|
@Scheduled(cron = "0 0 0 */1 * ?")
|
|
public void personExecute() {
|
|
public void personExecute() {
|
|
personApi(null);
|
|
personApi(null);
|
|
@@ -168,7 +174,12 @@ public class SmJob {
|
|
map.put("groupid",staff.getPid());
|
|
map.put("groupid",staff.getPid());
|
|
map.put("tel","");
|
|
map.put("tel","");
|
|
map.put("level_name","");
|
|
map.put("level_name","");
|
|
- profileRabbitTemplate.convertAndSend(ProfileConsumeConfig.NAME, ProfileConsumeConfig.NAME, map);
|
|
|
|
|
|
+ MsgLog msgLog = new MsgLog();
|
|
|
|
+ msgLog.setBusinessId(staff.getSId());
|
|
|
|
+ msgLog.setExchange(ProfileConsumeConfig.NAME);
|
|
|
|
+ msgLog.setRoutingKey(ProfileConsumeConfig.NAME);
|
|
|
|
+ msgLog.setMsg(JSON.toJSONString(map));
|
|
|
|
+ msgLogService.sendMessage(msgLog,profileRabbitTemplate);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -181,7 +192,12 @@ public class SmJob {
|
|
map.put("seq",dept.getDId());
|
|
map.put("seq",dept.getDId());
|
|
map.put("id",dept.getId());
|
|
map.put("id",dept.getId());
|
|
map.put("name",dept.getName());
|
|
map.put("name",dept.getName());
|
|
- groupRabbitTemplate.convertAndSend(GroupConsumeConfig.NAME, GroupConsumeConfig.NAME, map);
|
|
|
|
|
|
+ MsgLog msgLog = new MsgLog();
|
|
|
|
+ msgLog.setBusinessId(dept.getDId());
|
|
|
|
+ msgLog.setExchange(GroupConsumeConfig.NAME);
|
|
|
|
+ msgLog.setRoutingKey(GroupConsumeConfig.NAME);
|
|
|
|
+ msgLog.setMsg(JSON.toJSONString(map));
|
|
|
|
+ msgLogService.sendMessage(msgLog,groupRabbitTemplate);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -194,6 +210,12 @@ public class SmJob {
|
|
map.put("mob",staff.getId());
|
|
map.put("mob",staff.getId());
|
|
map.put("image",staff.getFace());
|
|
map.put("image",staff.getFace());
|
|
faceRabbitTemplate.convertAndSend(FaceConsumeConfig.NAME, FaceConsumeConfig.NAME, map);
|
|
faceRabbitTemplate.convertAndSend(FaceConsumeConfig.NAME, FaceConsumeConfig.NAME, map);
|
|
|
|
+ MsgLog msgLog = new MsgLog();
|
|
|
|
+ msgLog.setBusinessId(staff.getSId());
|
|
|
|
+ msgLog.setExchange(FaceConsumeConfig.NAME);
|
|
|
|
+ msgLog.setRoutingKey(FaceConsumeConfig.NAME);
|
|
|
|
+ msgLog.setMsg(JSON.toJSONString(map));
|
|
|
|
+ msgLogService.sendMessage(msgLog,faceRabbitTemplate);
|
|
}
|
|
}
|
|
|
|
|
|
@Data
|
|
@Data
|