Merge branch 'main' into staging-stress-test

# Conflicts:
#	src/main/java/com/cmeeting/job/CmeetingJob.java

src/main/java/com/cmeeting/controller/UnifiedController.java

@@ -57,9 +57,9 @@ public class UnifiedController {
         tencentMeetingUsers = tecentMeetingMapper.getAlluser();
         // 分类 WeComUser 数据
         for (WeComUser user : weComUsers) {
-            if ("0".equals(user.getIsRepeatName())) {
+            if ("0".equals(user.getIsrepeatName())) {
                 weComUsersIsRepeat0.add(user);
-            } else if ("1".equals(user.getIsRepeatName())) {
+            } else if ("1".equals(user.getIsrepeatName())) {
                 weComUsersIsRepeat1.add(user);
             }
         }

src/main/java/com/cmeeting/controller/WeComcontroller.java

@@ -2,14 +2,13 @@ package com.cmeeting.controller;
 
 import com.cmeeting.pojo.WeComUser;
 import com.cmeeting.service.WeComService;
+import com.cmeeting.util.R;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -17,6 +16,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 @RestController
@@ -32,4 +32,27 @@ public class WeComcontroller {
     }
 
 
+    /**
+     * 更新个人的邮件推送许可
+     * @param params
+     * @return
+     */
+    @PostMapping("/updateEmailPushAccess")
+    public R updateEmailPushAccess(@RequestBody Map<String,Object> params) {
+        if(!params.containsKey("emailPushAccess")){
+            return R.error("参数缺失");
+        }
+        return R.ok(weComService.updateEmailPushAccess((boolean)params.get("emailPushAccess")));
+    }
+
+    /**
+     * 查询个人的邮件推送许可
+     * @return
+     */
+    @GetMapping("/findEmailPushAccess")
+    public R findEmailPushAccess() {
+        return R.ok(weComService.findEmailPushAccess());
+    }
+
+
 }
\ No newline at end of file

src/main/java/com/cmeeting/pojo/WeComUser.java

@@ -24,6 +24,7 @@ public class WeComUser implements Serializable {
     private Integer id;
     private String userName;
     private String userId;
-    private String isRepeatName;
+    private String isrepeatName;
     private String email;
+    private Boolean emailPushAccess;
 }

src/main/java/com/cmeeting/service/WeComService.java

@@ -25,4 +25,8 @@ public interface WeComService  extends IService<WeComUser> {
      * 绑定企微和腾会的人员关系
      */
     void userBind();
+
+    Object updateEmailPushAccess(Boolean emailPushAccess);
+
+    Object findEmailPushAccess();
 }

src/main/java/com/cmeeting/service/impl/WeComServiceImpl.java

@@ -2,7 +2,12 @@ package com.cmeeting.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cmeeting.ad.entity.RobotSecurityUser;
+import com.cmeeting.ad.util.SecurityUtil;
+import com.cmeeting.exception.RobotBaseException;
 import com.cmeeting.mapper.primary.UserIdMapper;
 import com.cmeeting.mapper.primary.WeComUserMapper;
 import com.cmeeting.pojo.MeetingInfo;
@@ -13,6 +18,7 @@ import com.cmeeting.service.WeComService;
 import com.cmeeting.util.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -222,6 +228,31 @@ public class WeComServiceImpl extends ServiceImpl<WeComUserMapper, WeComUser>  i
         }
     }
 
+    @Override
+    public Object updateEmailPushAccess(Boolean emailPushAccess) {
+        RobotSecurityUser user = SecurityUtil.getUser();
+        String userId = user.getId();
+        if(user == null || StringUtils.isEmpty(userId)){
+            throw new RobotBaseException("登录信息过期",401);
+        }
+        boolean update = update(null, new LambdaUpdateWrapper<WeComUser>()
+                .set(WeComUser::getEmailPushAccess, emailPushAccess)
+                .eq(WeComUser::getUserId, userId));
+        return update;
+    }
+
+    @Override
+    public Object findEmailPushAccess() {
+        RobotSecurityUser user = SecurityUtil.getUser();
+        String userId = user.getId();
+        if(user == null || StringUtils.isEmpty(userId)){
+            throw new RobotBaseException("登录信息过期",401);
+        }
+        WeComUser weComUser = getOne(new LambdaQueryWrapper<WeComUser>()
+                .eq(WeComUser::getUserId, userId));
+        return weComUser.getEmailPushAccess();
+    }
+
     /**
      * 获取企微部门列表
      *
@@ -298,9 +329,9 @@ public class WeComServiceImpl extends ServiceImpl<WeComUserMapper, WeComUser>  i
         // 设置是否重名标志
         users.forEach(user -> {
             if (nameCountMap.get(user.getUserName()) > 1) {
-                user.setIsRepeatName("1"); // 重名
+                user.setIsrepeatName("1"); // 重名
             } else {
-                user.setIsRepeatName("0"); // 不重名
+                user.setIsrepeatName("0"); // 不重名
             }
         });
     }

src/main/java/com/cmeeting/util/WeComUserService.java

@@ -55,9 +55,9 @@ public class WeComUserService {
         // 设置是否重名标志
         users.forEach(user -> {
             if (nameCountMap.get(user.getUserName()) > 1) {
-                user.setIsRepeatName("1"); // 重名
+                user.setIsrepeatName("1"); // 重名
             } else {
-                user.setIsRepeatName("0"); // 不重名
+                user.setIsrepeatName("0"); // 不重名
             }
         });
     }