Sfoglia il codice sorgente

fix: 任务信息增加操作人

chenjianhua 6 mesi fa
parent
commit
84425f85fc

+ 15 - 9
service-daq/src/main/java/com/simuwang/daq/service/EmailParseApiServiceImpl.java

@@ -61,10 +61,21 @@ public class EmailParseApiServiceImpl implements EmailParseApiService {
 
     @Override
     public void parseEmail(MailboxInfoDTO mailboxInfoDTO, Date startDate, Date endDate) {
+        Integer userId = null;
+        try{
+            if(UserUtils.getPrincipal() == null){
+                userId = 1;
+            }else{
+                userId = UserUtils.getLoginUser().getUserId();
+            }
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
+        Integer finalUserId = userId;
         asyncExecutor.execute(new Runnable() {
                   @Override
                   public void run() {
-                      EmailTaskInfoDO emailTaskInfoDO = startEmailTask(mailboxInfoDTO.getAccount(), 1);
+                      EmailTaskInfoDO emailTaskInfoDO = startEmailTask(mailboxInfoDTO.getAccount(), 1, finalUserId);
                       try{
                           emailParseService.parseEmail(mailboxInfoDTO, startDate, endDate);
                       }catch (Exception e){
@@ -91,7 +102,7 @@ public class EmailParseApiServiceImpl implements EmailParseApiService {
         }
     }
 
-    private EmailTaskInfoDO startEmailTask(String email,Integer taskStatus) {
+    private EmailTaskInfoDO startEmailTask(String email,Integer taskStatus,Integer userId) {
         EmailTaskInfoDO  emailTaskInfoDO = new EmailTaskInfoDO();
         try{
             emailTaskInfoDO.setTaskName(TaskType.EMAIL_PARSE.getInfo());
@@ -102,13 +113,8 @@ public class EmailParseApiServiceImpl implements EmailParseApiService {
             emailTaskInfoDO.setEmail(email);
             emailTaskInfoDO.setCreateTime(DateUtils.getNowDate());
             emailTaskInfoDO.setUpdateTime(DateUtils.getNowDate());
-            try{
-                emailTaskInfoDO.setCreatorId(UserUtils.getLoginUser().getUserId());
-                emailTaskInfoDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
-            }catch (Exception e){
-                emailTaskInfoDO.setCreatorId(1);
-                emailTaskInfoDO.setUpdaterId(1);
-            }
+            emailTaskInfoDO.setCreatorId(userId);
+            emailTaskInfoDO.setUpdaterId(userId);
             emailTaskInfoMapper.insert(emailTaskInfoDO);
         }catch (Exception e){
             log.error(e.getMessage());