【工作端-数据端 登出拆分】-【登出接口拆分】-（王童）-2020/06/18

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@@ -445,6 +445,19 @@ public class SysUserController {
         return new Result();
     }
 
+    /**
+    * @describe: 数据端-用户退出
+    * @author wangtong
+    * @date 2020/6/18 16:36
+    * @param userId
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("updateAnalysisUserOpenId/{userId}")
+    public Result updateAnalysisUserOpenId(@PathVariable("userId") Long userId) {
+        sysUserService.updateUserAnalysisOpenId(userId);
+        return new Result();
+    }
+
     /**
      * @Description: 根据部门id，查询部门下的所有用户手机号
      * @Param: [deptId]

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java

@@ -107,6 +107,15 @@ public interface SysUserDao extends BaseDao<SysUserEntity> {
      */
     void updateUserOpenId(@Param("userId") Long userId);
 
+    /**
+    * @describe: 数据端-用户退出
+    * @author wangtong
+    * @date 2020/6/18 16:38
+    * @param [userId]
+    * @return void
+    */
+    void updateUserAnalysisOpenId(@Param("userId") Long userId);
+
     /**
      * @Description: 根据部门id，查询部门下的所有用户手机号
      * @Param: [map]

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java

@@ -122,6 +122,15 @@ public interface SysUserService extends BaseService<SysUserEntity> {
      */
     void updateUserOpenId(Long userId);
 
+    /**
+    * @describe: 数据端-用户退出
+    * @author wangtong
+    * @date 2020/6/18 16:37
+    * @param userId
+    * @return void
+    */
+    void updateUserAnalysisOpenId(Long userId);
+
     /**
      * @Description: 根据部门id，查询部门下的所有用户手机号
      * @Param: [deptId]

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -283,6 +283,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         baseDao.updateUserOpenId(userId);
     }
 
+    @Override
+    public void updateUserAnalysisOpenId(Long userId) {
+        baseDao.updateUserAnalysisOpenId(userId);
+    }
+
     @Override
     public Result<List<String>> getUserPhoneByListDeptId(List<Long> deptId) {
         Map<String,Object> map = new HashMap<>();

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml

@@ -135,7 +135,11 @@
     </update>
 
     <update id="updateUserOpenId">
-        UPDATE sys_user SET open_id = '' WHERE id = #{userId} AND del_flag = 0
+        UPDATE sys_user SET work_open_id = '' WHERE id = #{userId} AND del_flag = 0
+    </update>
+
+    <update id="updateUserAnalysisOpenId">
+        UPDATE sys_user SET analysis_open_id = '' WHERE id = #{userId} AND del_flag = 0
     </update>
 
     <!-- 根据部门id，查询部门下的所有用户手机号 -->

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java

@@ -213,4 +213,17 @@ public class AuthController {
 
         return authService.logoutUser(Long.parseLong(userId));
     }
+
+    /**
+    * @describe: 数据端-用户退出
+    * @author wangtong
+    * @date 2020/6/18 16:34
+    * @param userId
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("logoutAnalysisUser/{userId}")
+    public Result logoutAnalysisUser(@PathVariable("userId") String userId) {
+
+        return authService.logoutAnalysisUser(Long.parseLong(userId));
+    }
 }

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -99,5 +99,13 @@ public interface UserFeignClient {
     @GetMapping("sys/user/updateUserOpenId/{userId}")
     Result updateUserOpenId(@PathVariable("userId") Long userId);
 
-
+    /**
+    * @describe: 数据端-用户退出
+    * @author wangtong
+    * @date 2020/6/18 16:35
+    * @param [userId]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("sys/user/updateAnalysisUserOpenId/{userId}")
+    Result updateAnalysisUserOpenId(@PathVariable("userId") Long userId);
 }

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -61,4 +61,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result updateUserOpenId(Long userId) {
         return new Result<>();
     }
+
+    @Override
+    public Result updateAnalysisUserOpenId(Long userId) {
+        return new Result<>();
+    }
 }

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/AuthService.java

@@ -92,5 +92,12 @@ public interface AuthService {
      */
     Result logoutUser(Long userId);
 
-
+    /**
+    * @describe: 数据端-用户退出
+    * @author wangtong
+    * @date 2020/6/18 16:34
+    * @param [parseLong]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result logoutAnalysisUser(Long userId);
 }

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java

@@ -368,12 +368,20 @@ public class AuthServiceImpl implements AuthService {
         // 清空redis
         String key = RedisKeys.getSecurityUserKey(userId);
         redisUtils.hSet(key, "kill", UserKillEnum.YES.value());
-
         // 更新open_id
         userFeignClient.updateUserOpenId(userId);
 
         return new Result();
+    }
 
+    @Override
+    public Result logoutAnalysisUser(Long userId) {
+        // 清空redis
+        String key = RedisKeys.getSecurityUserKey(userId);
+        redisUtils.hSet(key, "kill", UserKillEnum.YES.value());
+        // 更新open_id
+        userFeignClient.updateAnalysisUserOpenId(userId);
 
+        return new Result();
     }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java

@@ -4,6 +4,8 @@ import com.elink.esua.epdc.common.token.dto.AnalysisUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.AnalysisUserLoginDTO;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
@@ -112,4 +114,19 @@ public class ApiAnalysisUserController {
     public Result<List<UserSortRankResultDTO>> userRegisterSort(UserSortRankFormDTO formDto) {
         return analysisUserService.userRegisterSort(formDto);
     }
+
+
+    /**
+    * @describe: 数据端-用户退出
+    * @author wangtong
+    * @date 2020/6/18 16:30
+    * @param
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("logout")
+    public Result logout() {
+        UserDetail user = SecurityUser.getUser();
+        Long userId = user.getId();
+        return analysisUserService.logout(userId);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java

@@ -73,4 +73,14 @@ public interface ResourceFeignClient {
      */
     @GetMapping("auth/logoutUser/{userId}")
     Result logoutUser(@PathVariable("userId") String userId);
+
+    /**
+    * @describe: 数据端-用户退出
+    * @author wangtong
+    * @date 2020/6/18 16:32
+    * @param [s]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("auth/logoutAnalysisUser/{userId}")
+    Result logoutAnalysisUser(@PathVariable("userId") String userId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java

@@ -41,4 +41,9 @@ public class ResourceFeignClientFallback implements ResourceFeignClient {
     public Result logoutUser(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_AUTH_SERVER, "logoutUser", userId);
     }
+
+    @Override
+    public Result logoutAnalysisUser(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_AUTH_SERVER, "logoutAnalysisUser", userId);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java

@@ -97,4 +97,12 @@ public interface AnalysisUserService {
      **/
     Result<List<UserSortRankResultDTO>> userRegisterSort(UserSortRankFormDTO formDto);
 
+    /**
+    * @describe: 数据端-用户退出
+    * @author wangtong
+    * @date 2020/6/18 16:31
+    * @param [userId]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result logout(Long userId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java

@@ -96,6 +96,10 @@ public class AnalysisUserServiceImpl implements AnalysisUserService {
         return analysisUserFeignClient.userRegisterSort(formDto);
     }
 
+    @Override
+    public Result logout(Long userId) {
+        return resourceFeignClient.logoutAnalysisUser(userId+"");
+    }
 
 
     @Override