公司创建人

src/main/java/com/fdkankan/manage/common/RedisKeyUtil.java

@@ -2,17 +2,12 @@ package com.fdkankan.manage.common;
 
 public class RedisKeyUtil {
 
-    public static final String PREFIX_MSG_NOT_CODE = "msg:not:code:";//短信重发验证
-    public static final String PREFIX_MSG_AUTH_CODE = "msg:auth:code:";
 
-    public static final String PREFIX_CACHE_CAMERA = "camera:";
     public static final String SCENE_UNUSED_NUMS = "4dkankan:scene:nums";
     public static final String SCENE_NUMS_LOADING = "4dkankan:scene:nums:loading";
-    public static final String SCENE_VIEW_COUNT = "4dkankan:scene:nums:view_count:";
-
-    public static final String QRCODE= "4dkankan:qr_code:";
-
     public static final String loginNum= "manage:login:userName:%s:ip:%s";
 
+    public static final String loginToken= "manage:login:token:%s";
+
 
 }

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -8,11 +8,12 @@ public enum ResultCode  {
     NOT_PERMISSION(4002, "无此权限"),
     USER_NOT_EXIST(4003, "用户不存在"),
     USER_EXIST(4004, "用户已存在"),
+    PASSWORD_ERROR(4005, "账号密码错误，请重新登录!"),
+    USERNAME_ERROR(4006, "该账号已停止使用"),
     MISSING_REQUIRED_PARAMETERS(4007, "缺少必要参数"),
     USER_NOT_LOGIN(4008, "用户未登录"),
 
     VISION_EXIST(50001, "版本号已存在!"),
-    PASSWORD_ERROR(50002, "账号密码错误，请重新登录!"),
     LOGIN_NUM_MUCH(50003, "频繁登录失败，请五分钟后再次尝试登录!"),
     UPLOAD_ERROR(50004, "上传失败"),
     SDK_DEL_ERROR(50005, "删除失败，请先下架在删除"),

src/main/java/com/fdkankan/manage/config/SaTokenConfigure.java

@@ -12,6 +12,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.HttpMethod;
+import com.fdkankan.manage.common.RedisKeyUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
@@ -111,10 +112,10 @@ public class SaTokenConfigure {
     }
 
     private void checkLogin(){
-        if(!redisUtil.hasKey(String.format(RedisKey.TOKEN_V3,StpUtil.getTokenValue()))){
+        if(!redisUtil.hasKey(String.format(RedisKeyUtil.loginToken,StpUtil.getTokenValue()))){
             throw new BusinessException(ResultCode.USER_NOT_LOGIN);
         }
-        redisUtil.expire(String.format(RedisKey.TOKEN_V3,StpUtil.getTokenValue()),21600);
+        redisUtil.expire(String.format(RedisKeyUtil.loginToken,StpUtil.getTokenValue()),21600);
         StpUtil.checkLogin();
     }
 

src/main/java/com/fdkankan/manage/controller/CompanyController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
@@ -36,8 +37,7 @@ public class CompanyController {
 
     @PostMapping("/add")
     public ResultData add(@RequestBody Company param){
-        param.setUpdateTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
-        param.setCreateTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
+        param.setSysUserId(Long.valueOf(StpUtil.getLoginId().toString()));
         companyService.save(param);
         return ResultData.ok();
     }

src/main/java/com/fdkankan/manage/controller/LoginController.java

@@ -26,7 +26,6 @@ public class LoginController extends BaseController {
     @PostMapping("/login")
     public ResultData login(@RequestBody ManageLoginRequest param) {
         String clientIP = ServletUtil.getClientIP(request);
-
         return ResultData.ok(manageService.login(clientIP,param.getUserName(),param.getPassword()));
     }
     /**

src/main/java/com/fdkankan/manage/entity/Company.java

@@ -63,8 +63,8 @@ public class Company implements Serializable {
     /**
      * t_manager表的id
      */
-    @TableField("manager_id")
-    private Long managerId;
+    @TableField("sys_user_id")
+    private Long sysUserId;
 
     /**
      * 新增的相机是否注册，0否，1删

src/main/java/com/fdkankan/manage/service/impl/ManageService.java

@@ -44,20 +44,23 @@ public class ManageService {
             this.addLoginErrorNum(ip,userName);
             throw new BusinessException(ResultCode.PASSWORD_ERROR);
         }
+        if(result.getStatus() == 0){
+            throw new BusinessException(ResultCode.USERNAME_ERROR);
+        }
         StpUtil.login(result.getId(), SaLoginConfig
                 .setExtra("userId",result.getId())
                 .setExtra("isAdmin",1)
                 .setExtra("userName",result.getUserName())
                 .setExtra("nickName",result.getNickName()));
         result.setToken(StpUtil.getTokenValue());
-        redisUtil.set(String.format(RedisKey.TOKEN_V3 ,result.getToken()), JSONObject.toJSONString(result), 216000);
+        redisUtil.set(String.format(RedisKeyUtil.loginToken ,result.getToken()), JSONObject.toJSONString(result), 216000);
         return result;
     }
 
 
 
     public void logout() {
-        redisUtil.del(String.format(RedisKey.TOKEN_V3 ,StpUtil.getTokenValue()));
+        redisUtil.del(String.format(RedisKeyUtil.loginToken ,StpUtil.getTokenValue()));
         StpUtil.logout();
     }
 

src/main/java/com/fdkankan/manage/vo/response/ManageLoginResponse.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.vo.response;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 @Data
@@ -10,4 +11,9 @@ public class ManageLoginResponse {
     private String token;
     private Long roleId;
     private String roleName;
+    /**
+     * 是否禁用 0禁用，1启用
+     */
+    private Integer status;
+
 }

src/main/resources/mapper/manage/CompanyMapper.xml

@@ -6,7 +6,7 @@
         select c.id,c.company_name,c.company_desc ,c.manager_id as createUserId, u.user_name as createUserName,c.create_time,
                c.top_logo,c.floor_logo,c.qr_logo,c.show_logo
         from  t_company c
-        left join sys_user u on c.manager_id = u.id
+        left join sys_user u on c.sys_user_id = u.id
         where c.rec_status = 'A'
         <if test="param.companyName != null and param.companyName != '' ">
             and c.company_name like concat ('%',#{param.companyName},'%')