fix 新增在线人数显示

boman-api/boman-api-system/src/main/java/com/boman/system/api/model/LoginUser.java

@@ -80,7 +80,18 @@ public class LoginUser implements Serializable
      * 小程序登录的状态码
      */
     private Integer code;
+    /**
+     * 登录类型
+     */
+    private String loginType;
 
+    public String getLoginType() {
+        return loginType;
+    }
+
+    public void setLoginType(String loginType) {
+        this.loginType = loginType;
+    }
 
     public Integer getCode() {
         return code;
@@ -220,6 +231,7 @@ public class LoginUser implements Serializable
                 ", subDeptUserIds=" + subDeptUserIds +
                 ", deptUserIds=" + deptUserIds +
                 ", code=" + code +
+                ", loginType=" + loginType +
                 '}';
     }
 }

boman-api/boman-domain/src/main/java/com.boman.domain/constant/Constants.java

@@ -107,7 +107,7 @@ public class Constants
     /**
      * 令牌有效期（分钟）
      */
-    public final static long TOKEN_EXPIRE = 720;
+    public final static long TOKEN_EXPIRE = 120;
 
     /**
      * 参数管理 cache key

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserOnlineController.java

@@ -1,9 +1,10 @@
 package com.boman.system.controller;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+
+import com.boman.common.core.utils.SecurityUtils;
+import com.boman.domain.SysUser;
+import com.boman.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,6 +39,24 @@ public class SysUserOnlineController extends BaseController
     @Autowired
     private RedisService redisService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @GetMapping("/onlineNum")
+    public AjaxResult onlineNum()
+    {
+        Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
+        Map<String,Object> map = new HashMap<>();
+        int allCount = sysUserService.selectUserListAllCount();
+        map.put("onlineNum",keys.size());
+        map.put("allCount",allCount);
+        // 获取当前的用户信息
+        LoginUser user = redisService.getCacheObject(CacheConstants.LOGIN_TOKEN_KEY + SecurityUtils.getToken());
+        Set<String> roles = user.getRoles();
+        map.put("roles",roles);
+        return AjaxResult.success(map);
+    }
+
     @PreAuthorize(hasPermi = "monitor:online:list")
     @GetMapping("/list")
     public TableDataInfo list(String ipaddr, String userName)

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysUserOnline.java

@@ -27,6 +27,18 @@ public class SysUserOnline
 
     /** 登录时间 */
     private Long loginTime;
+    /**
+     * 登录类型
+     */
+    private String loginType;
+
+    public String getLoginType() {
+        return loginType;
+    }
+
+    public void setLoginType(String loginType) {
+        this.loginType = loginType;
+    }
 
     public String getTokenId()
     {

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserMapper.java

@@ -121,6 +121,12 @@ public interface SysUserMapper
      */
     List<SysUser> selectUserListAll();
 
+    /**
+     * 查询总人数
+     * @return
+     */
+    int selectUserListAllCount();
+
     int updateUnionId(SysUser user);
 
     SysUser queryByOpenId(String openId);

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysUserService.java

@@ -186,6 +186,12 @@ public interface ISysUserService
      */
     List<SysUser> selectUserListAll();
 
+    /**
+     * 查询总人数
+     * @return
+     */
+    int selectUserListAllCount();
+
     /**
      * 根据id修改用户的unionId(来自微信小程序)
      * @param sysUser

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysUserOnlineServiceImpl.java

@@ -84,6 +84,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
         sysUserOnline.setUserName(user.getUsername());
         sysUserOnline.setIpaddr(user.getIpaddr());
         sysUserOnline.setLoginTime(user.getLoginTime());
+        sysUserOnline.setLoginType(user.getLoginType());
         return sysUserOnline;
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysUserServiceImpl.java

@@ -506,6 +506,15 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserListAll();
     }
 
+    /**
+     * 查询所有用户
+     * @return
+     */
+    @Override
+    public int selectUserListAllCount() {
+        return userMapper.selectUserListAllCount();
+    }
+
     @Override
     public AjaxResult updateUnionId(SysUser user) {
         try {

boman-modules/boman-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -197,6 +197,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where u.status = '0' and del_flag = '0'
 	</select>
 
+	<select id="selectUserListAllCount" resultType="int">
+		select count(1) from sys_user
+		where status = '0' and del_flag = '0'
+	</select>
+
 	<update id="updateUnionId" parameterType="com.boman.domain.SysUser">
 		update sys_user set open_id = #{openId} where id = #{id}
 	</update>

boman-web-core/src/main/java/com/boman/web/core/controller/CzrkController.java

@@ -344,6 +344,7 @@ public class CzrkController extends BaseController {
      * 一键未认领(把未填写到村级别的户籍用户设置为未认领,根据不同镇来操作)
      */
     @GetMapping("/setNoRl")
+    @PreAuthorize(hasPermi = "system:czrk:setNoRl")
     public AjaxResult setNoRl() {
         return  toAjax(czrkService.setNoRl()) ;
     }

boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkMapper.java

@@ -249,5 +249,5 @@ public interface CzrkMapper {
 
     List<Czrk> getAllCzrkHjVillage(Czrk czrk);
 
-    int setNoRl(@Param("czrk") Czrk czrk);
+    int setNoRl(Czrk czrk);
 }

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -1552,7 +1552,7 @@
     <select id="getCzrkByIdCard" resultMap="CzrkResult">
         select id,id_card,house_type from czrk where is_del = 'N' and id_card = #{idCard}
     </select>
-    <update id="setNoRl">
+    <update id="setNoRl" parameterType="com.boman.domain.Czrk">
         update czrk set is_rl = '否',is_confirm = 'N'
         <where>
             (village_id = '' or village_id is null or village_id = '0')

boman-wechat/src/main/java/com/boman/wechat/controller/AppletLoginController.java

@@ -110,7 +110,7 @@ public class AppletLoginController {
 
         JSONObject userEnv = packUserEnv(loginUser);
         loginUser.setUserEnv(userEnv);
-
+        loginUser.setLoginType("App");
         refreshToken(loginUser);
 
         // 保存或更新用户token