Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -11,6 +11,7 @@ import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysPerson;
 import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserVO;
+import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.model.LoginUser;
 import com.usky.system.service.ISysPermissionService;
 import com.usky.system.service.ISysUserService;
@@ -46,6 +47,9 @@ public class TokenController {
     @Autowired
     private SysPersonService sysPersonService;
 
+    @Autowired
+    private SysUserMapper userMapper;
+
     @PostMapping("login")
     public ApiResult<?> login(@RequestBody LoginBody form) {
         // 用户登录
@@ -67,6 +71,17 @@ public class TokenController {
         sysUser.setRoles(rolePermission);
         SysPerson sysPerson = sysPersonService.getsysPerson(userInfo.getUserId());
         sysUser.setSysPerson(sysPerson);
+
+        //插入或更新mce_mbuser消息中心_移动端注册表表记录cids，通过userId去这个表中查询，有记录则更新对应的cids，没有就插入
+        String cids = form.getCids();
+        Long userId = userInfo.getUserId();
+        int count = userMapper.selectMbUserCount(userId);
+        if(count > 0){
+            userMapper.updateMbUser(userId,cids, userInfo.getUserName());
+        }else{
+            userMapper.insertMbUser(userId,cids, userInfo.getUserName());
+        }
+
         // 获取登录token
         return ApiResult.success(tokenService.createToken(sysUser));
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -161,4 +161,13 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
                               @Param("phone") String phone);
 
     public List<SysUser> userAllList();
+
+    /**
+     * 查询mce_mbuser消息中心_移动端注册表对应的userId记录
+     */
+    public int selectMbUserCount(@Param("userId") Long userId);
+
+    public void insertMbUser(@Param("userId") Long userId,@Param("cids") String cids,@Param("createBy") String createBy);
+
+    public void updateMbUser(@Param("userId") Long userId,@Param("cids") String cids,@Param("updateBy") String updateBy);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/LoginBody.java

@@ -32,6 +32,21 @@ public class LoginBody
      */
     private String phone;
 
+    /**
+     * 应用Id
+     */
+    private String cids;
+
+    public String getCids()
+    {
+        return cids;
+    }
+
+    public void setCids(String cids)
+    {
+        this.cids = cids;
+    }
+
     public String getPhone()
     {
         return phone;

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -325,4 +325,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 
 	</select>
+
+	<select id="selectMbUserCount" parameterType="Long" resultType="int">
+		select count(*) from mce_mbuser where user_id = #{userId}
+	</select>
+
+	<insert id="insertMbUser">
+		insert into mce_mbuser(
+		<if test="userId != null and userId != 0">user_id,</if>
+		<if test="cids != null and cids != ''">cids,</if>
+		<if test="createBy != null and createBy != ''">create_by,</if>
+		create_time
+		)values(
+		<if test="userId != null and userId != ''">#{userId},</if>
+		<if test="cids != null and cids != ''">#{cids},</if>
+		<if test="createBy != null and createBy != ''">#{createBy},</if>
+		sysdate()
+		)
+	</insert>
+
+	<update id="updateMbUser">
+		update mce_mbuser set cids = #{cids},update_by=#{updateBy},update_time=sysdate() where user_id = #{userId}
+	</update>
 </mapper>