数据端到工作端用户凭证

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

@@ -387,6 +387,17 @@ public class SysUserController {
         ValidatorUtils.validateEntity(epdcScripUserInfoFormDTO);
         return new Result<String>().ok(sysUserService.getUserInfoByGridAndMobile(epdcScripUserInfoFormDTO));
     }
+    /**
+     * @Description  根据ID获取临时凭证
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [epdcScripUserInfoFormDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    @PostMapping("getScripBySysUserId/{id}")
+    public Result<String> getScripBySysUserId(@PathVariable Long id){
+        return new Result<String>().ok(sysUserService.getScripBySysUserId(id));
+    }
 
     /**
      * @Description  根据临时凭证获取用户信息

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

@@ -120,7 +120,7 @@ public interface SysUserService extends BaseService<SysUserEntity> {
      */
     Result<List<String>> getSysGridLeaderPhone(Long deptId);
     /**
-     * @Description  根据网格ID和手机号获取用户信息
+     * @Description  根据网格ID和手机号获取临时凭证
      * @Author songyunpeng
      * @Date  2020/6/22
      * @Param [epdcScripUserInfoFormDTO]
@@ -135,4 +135,12 @@ public interface SysUserService extends BaseService<SysUserEntity> {
      * @return com.elink.esua.epdc.dto.SysUserDTO
      **/
     SysUserDTO getByScrip(String scrip);
+    /**
+     * @Description  根据ID获取临时凭证
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [id]
+     * @return java.lang.String
+     **/
+    String getScripBySysUserId(Long id);
 }

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

@@ -26,7 +26,6 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.SysUserDao;
 import com.elink.esua.epdc.dto.SysUserDTO;
-import com.elink.esua.epdc.dto.SysUserDeptDTO;
 import com.elink.esua.epdc.dto.SysUserDeptInfoDTO;
 import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
@@ -318,5 +317,19 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         return sysUserDTO;
     }
 
+    @Override
+    public String getScripBySysUserId(Long id) {
+        SysUserEntity sysUserEntity = baseDao.selectById(id);
+        if(sysUserEntity==null){
+            throw new RenException("未查询到相关账号信息");
+        }
+        String randomValue = String.valueOf((int)(Math.random()*(1000000-100000)+100000));
+        SysUserEntity userEntity = new SysUserEntity();
+        userEntity.setScrip(randomValue);
+        userEntity.setId(sysUserEntity.getId());
+        updateById(userEntity);
+        return randomValue;
+    }
+
 
 }

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

@@ -5,9 +5,11 @@ import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserScripLoginDTO;
 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.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
+import com.elink.esua.epdc.service.AdminService;
 import com.elink.esua.epdc.service.AnalysisUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,7 +26,8 @@ public class ApiAnalysisUserController {
     @Autowired
     private AnalysisUserService analysisUserService;
 
-
+    @Autowired
+    private AdminService adminService;
     /**
      * 测试demo
 
@@ -51,6 +54,19 @@ public class ApiAnalysisUserController {
         ValidatorUtils.validateEntity(formDto);
         return analysisUserService.login(formDto);
     }
+
+    /**
+     * @Description   获取用户凭证
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [userDetail]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    @PostMapping("getScrip")
+    public Result<String> getScrip(){
+        return adminService.getScripBySysUserId(SecurityUser.getUserId());
+    }
+
     /**
      * 数据分析端-用户凭证登录
      *

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

@@ -146,6 +146,16 @@ public interface AdminFeignClient {
      **/
     @PostMapping(value = "sys/user/getUserInfoByGridAndMobile", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<String> getUserInfoByGridAndMobile(@RequestBody EpdcScripUserInfoFormDTO epdcScripUserInfoFormDTO);
+    /**
+     * @Description  根据用户ID获取用户临时凭证 
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [id]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    @PostMapping(value = "sys/user/getScripBySysUserId/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<String> getScripBySysUserId(@PathVariable Long id);
+
 
     /**
      * 获取字典信息

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

@@ -10,7 +10,6 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -77,6 +76,11 @@ public class AdminFeignClientFallback implements AdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserInfoByGridAndMobile", epdcScripUserInfoFormDTO);
     }
 
+    @Override
+    public Result<String> getScripBySysUserId(Long id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getScripBySysUserId", id);
+    }
+
     @Override
     public Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dicType) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listFullDictInfo", dicType);

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

@@ -51,4 +51,12 @@ public interface AdminService {
      * @since 2020/10/12 9:35
      */
     Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dicType);
+    /**
+     * @Description  根据用户ID获取临时凭证
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    Result<String> getScripBySysUserId(Long userId);
 }

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

@@ -65,4 +65,9 @@ public class AdminServiceImpl implements AdminService {
     public Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dicType) {
         return adminFeignClient.listFullDictInfo(dicType);
     }
+
+    @Override
+    public Result<String> getScripBySysUserId(Long userId) {
+        return  adminFeignClient.getScripBySysUserId(userId);
+    }
 }