Commit 449f778c by 陶光胜

用户资源

parent c9606867
...@@ -39,6 +39,10 @@ public class ResourceDTO implements Serializable { ...@@ -39,6 +39,10 @@ public class ResourceDTO implements Serializable {
* 小程序资源 * 小程序资源
*/ */
private Long appletResource; private Long appletResource;
/**
* 用户资源
*/
private Long userResource;
/** /**
* 门店资源 * 门店资源
...@@ -212,4 +216,12 @@ public class ResourceDTO implements Serializable { ...@@ -212,4 +216,12 @@ public class ResourceDTO implements Serializable {
public void setUserResourceCount(Integer userResourceCount) { public void setUserResourceCount(Integer userResourceCount) {
this.userResourceCount = userResourceCount; this.userResourceCount = userResourceCount;
} }
public Long getUserResource() {
return userResource;
}
public void setUserResource(Long userResource) {
this.userResource = userResource;
}
} }
...@@ -20,4 +20,12 @@ public interface UserResourceApiService { ...@@ -20,4 +20,12 @@ public interface UserResourceApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
 * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */ 
 */
ServiceResponse<Void> save(UserResourceDTO dto); ServiceResponse<Void> save(UserResourceDTO dto);
/** @Description: 查询用户的资源id
* @author taogs
* @Date 15:30 2019/12/6
* @Param
* @return
*/
ServiceResponse<UserResourceDTO> getResourceByUserId(Integer userId);
} }
package com.gic.auth.service.outer.impl; package com.gic.auth.service.outer.impl;
import java.util.Date; import java.util.Date;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -38,4 +40,13 @@ public class UserResourceApiServiceImpl implements UserResourceApiService{ ...@@ -38,4 +40,13 @@ public class UserResourceApiServiceImpl implements UserResourceApiService{
userResourceService.save(dto); userResourceService.save(dto);
return ServiceResponse.success(); return ServiceResponse.success();
} }
@Override
public ServiceResponse<UserResourceDTO> getResourceByUserId(Integer userId) {
List<UserResourceDTO> list = this.userResourceService.listUserResourceByUserId(userId);
if(CollectionUtils.isNotEmpty(list)){
ServiceResponse.success(list.get(0));
}
return ServiceResponse.success(new UserResourceDTO());
}
} }
...@@ -10,6 +10,10 @@ import javax.servlet.http.HttpServletRequest; ...@@ -10,6 +10,10 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.gic.auth.constant.LoginUserTypeEnum; import com.gic.auth.constant.LoginUserTypeEnum;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.dto.UserResourceDTO;
import com.gic.auth.service.*;
import com.gic.enterprise.base.UserResourceInfo;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.log4j.LogManager; import org.apache.log4j.LogManager;
...@@ -21,9 +25,6 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -21,9 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.MenuDTO; import com.gic.auth.dto.MenuDTO;
import com.gic.auth.dto.UserDTO; import com.gic.auth.dto.UserDTO;
import com.gic.auth.service.MenuApiService;
import com.gic.auth.service.OperationUserApiService;
import com.gic.auth.service.UserApiService;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.Md5Util; import com.gic.commons.util.Md5Util;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
...@@ -51,6 +52,10 @@ public class LoginController { ...@@ -51,6 +52,10 @@ public class LoginController {
private MenuApiService menuApiService; private MenuApiService menuApiService;
@Autowired @Autowired
private OperationUserApiService operationUserApiService; private OperationUserApiService operationUserApiService;
@Autowired
private UserResourceApiService userResourceApiService;
@Autowired
private ResourceApiService resourceApiService;
@RequestMapping("list-enterprise-by-phone") @RequestMapping("list-enterprise-by-phone")
public RestResponse listUserEnterprise(String phoneNumber) { public RestResponse listUserEnterprise(String phoneNumber) {
...@@ -140,6 +145,8 @@ public class LoginController { ...@@ -140,6 +145,8 @@ public class LoginController {
} }
userDetail.setMenuInfoList(tempMenuInfoList); userDetail.setMenuInfoList(tempMenuInfoList);
} }
//设置用户资源组
this.setUserResource(userDetail, userDetail.getUserId());
//塞值 //塞值
userDetail.setMenuUrlMap(map); userDetail.setMenuUrlMap(map);
userDetail.setModuleUrlMap(moduleMap); userDetail.setModuleUrlMap(moduleMap);
...@@ -188,4 +195,22 @@ public class LoginController { ...@@ -188,4 +195,22 @@ public class LoginController {
} }
return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "token错误"); return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "token错误");
} }
private void setUserResource(UserDetail detail, Integer userId){
ServiceResponse<UserResourceDTO> resource = this.userResourceApiService.getResourceByUserId(userId);
if(resource.isSuccess() && resource.getResult() != null){
ServiceResponse<ResourceDTO> serviceResource = this.resourceApiService.getResource(resource.getResult().getResourceId());
if(serviceResource.isSuccess() && serviceResource.getResult() != null){
UserResourceInfo userResourceInfo = new UserResourceInfo();
userResourceInfo.setUserResource(serviceResource.getResult().getUserResource());
userResourceInfo.setStoreResource(serviceResource.getResult().getStoreResource());
userResourceInfo.setGoodsResourceId(serviceResource.getResult().getGoodsResourceId());
userResourceInfo.setAppResource(serviceResource.getResult().getAppResource());
userResourceInfo.setOrderResource(serviceResource.getResult().getOrderResource());
userResourceInfo.setSmsSignResource(serviceResource.getResult().getSmsSignResource());
detail.setUserResourceInfo(userResourceInfo);
}
}
detail.setUserResourceInfo(new UserResourceInfo());
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment