第一次登陆设备

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuthRedirectController.java

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.UserVO;
-import com.management.platform.mapper.CompanyMapper;
-import com.management.platform.mapper.SysConfigMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.mapper.WxCorpInfoMapper;
+import com.management.platform.mapper.*;
 import com.management.platform.service.FeishuInfoService;
 import com.management.platform.service.UserService;
 import com.management.platform.service.WxCorpInfoService;
@@ -66,6 +63,8 @@ public class AuthRedirectController {
     WxCorpInfoService wxCorpInfoService;
     @Resource
     FeishuInfoServiceImpl feishuInfoService;
+    @Resource
+    UserLoginInfoMapper userLoginInfoMapper;
 
 
     @RequestMapping("/corpWXAuth")
@@ -152,6 +151,18 @@ public class AuthRedirectController {
         ModelAndView modelAndView = new ModelAndView(
                 new RedirectView(redirecUrl), reqParam);
 
+        //存储该公司第一次登录所使用的设备
+        if (!reqParam.containsKey("errorMsg")){
+            Integer company = userLoginInfoMapper.selectCount(new QueryWrapper<UserLoginInfo>().eq("company_id",companyId));
+            if (company.equals(0)){
+                UserLoginInfo userLoginInfo = new UserLoginInfo();
+                userLoginInfo.setCompanyId(companyId);
+                userLoginInfo.setFirstLoginDevice(deviceType);
+                userLoginInfo.setWxUserId(wxUserId);
+                userLoginInfoMapper.insert(userLoginInfo);
+                System.err.println(userLoginInfo.toString());
+            }
+        }
         return modelAndView;
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/UserLoginInfo.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-03-07
+ * @since 2023-03-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -34,16 +34,16 @@ public class UserLoginInfo extends Model<UserLoginInfo> {
     private Integer companyId;
 
     /**
-     * 用户ID
+     * 用户的微信uerID
      */
-    @TableField("user_id")
-    private String userId;
+    @TableField("wx_user_id")
+    private String wxUserId;
 
     /**
-     * 该公司第一次登陆的设备（1代表pc端，2代表手机端）
+     * 该公司第一次登陆的设备(Mobile/Computer/other)
      */
     @TableField("first_login_device")
-    private Integer firstLoginDevice;
+    private String firstLoginDevice;
 
 
     @Override

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserLoginInfoMapper.xml

@@ -6,13 +6,13 @@
     <resultMap id="BaseResultMap" type="com.management.platform.entity.UserLoginInfo">
         <id column="id" property="id" />
         <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
+        <result column="wx_user_id" property="wxUserId" />
         <result column="first_login_device" property="firstLoginDevice" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, user_id, first_login_device
+        id, company_id, wx_user_id, first_login_device
     </sql>
 
 </mapper>