Skip to content

G
gic-platform-auth
Commit 3b33e42e by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !18
parents cb5b04f5 d682ee60
Showing with 78 additions and 39 deletions
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AuditorApiServiceImpl.java
......@@ -18,7 +18,6 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.qo.ProjectItemQO;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.ProjectItemApiService;
import com.gic.member.api.dto.ServiceUserDTO;
import com.gic.member.api.service.ServiceUserApiService;
import com.gic.wechat.business.api.service.fwh.WeixinBaseFunService;
import org.apache.commons.collections.CollectionUtils;
......@@ -163,26 +162,28 @@ public class AuditorApiServiceImpl implements AuditorApiService {
auditorDTO.setAuditedGroupIdList(groupIds);
}
// 如果没有绑定 就展示二维码， 如果绑定了 就展示微信名和头像
if (StringUtils.isBlank(auditor.getOpenid())) {
String codeUrl = this.getTempQrCodeUrl(auditorId);
auditorDTO.setHeadUrl(codeUrl);
} else {
ServiceResponse<ServiceUserDTO> service = this.serviceUserApiService.getByOpenid(auditorDTO.getOpenid(), auditorDTO.getEnterpriseId());
if (service.isSuccess()) {
ServiceUserDTO userDTO = service.getResult();
if (userDTO != null) {
String headUrl = userDTO.getHeadUrl();
auditorDTO.setHeadUrl(headUrl);
String nickname = userDTO.getNickname();
auditorDTO.setWeChatNickName(nickname);
} else {
logger.info("openid:{}, enterpriseId:{} 查询不到该openid对应的信息", auditorDTO.getOpenid(), auditorDTO.getEnterpriseId());
}
}else{
logger.warn("调用serviceUserApiService.getByOpenid 服务失败,openid:{}, msg:{}", auditorDTO.getOpenid(), service.getMessage());
}
}
// 如果没有绑定 就展示二维码， 如果绑定了 就展示微信名和头像
// if (StringUtils.isBlank(auditor.getOpenid())) {
// String codeUrl = this.getTempQrCodeUrl(auditorId);
// auditorDTO.setHeadUrl(codeUrl);
// } else {
// ServiceResponse<ServiceUserDTO> service = this.serviceUserApiService.getByOpenid(auditorDTO.getOpenid(), auditorDTO.getEnterpriseId());
// if (service.isSuccess()) {
// ServiceUserDTO userDTO = service.getResult();
// if (userDTO != null) {
// String headUrl = userDTO.getHeadUrl();
// auditorDTO.setHeadUrl(headUrl);
// String nickname = userDTO.getNickname();
// auditorDTO.setWeChatNickName(nickname);
// } else {
// logger.info("openid:{}, enterpriseId:{} 查询不到该openid对应的信息", auditorDTO.getOpenid(), auditorDTO.getEnterpriseId());
// }
// }else{
// logger.warn("调用serviceUserApiService.getByOpenid 服务失败,openid:{}, msg:{}", auditorDTO.getOpenid(), service.getMessage());
// }
// }
return ServiceResponse.success(auditorDTO);
}
......@@ -298,6 +299,7 @@ public class AuditorApiServiceImpl implements AuditorApiService {
private String getTempQrCodeUrl(Integer auditorId) {
logger.info("生成临时带参二维码 auditorId:{}", auditorId);
System.out.println(config.getAppkey());
ServiceResponse<String> serviceResponse = weixinBaseFunService.getTemporaryQRcodeURL(config.getAppkey(), "auditor_" + auditorId, 300);
if (serviceResponse.isSuccess()) {
logger.info("临时带参二维码生成成功:{}", serviceResponse.getResult());
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java
......@@ -23,6 +23,8 @@ import com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO;
import com.gic.member.config.api.service.AppletsConfigApiService;
import com.gic.member.config.api.service.MemberCardApiService;
import com.gic.member.config.api.service.ServiceConfigApiService;
import com.gic.member.filter.api.dto.CrowdWidgetDTO;
import com.gic.member.filter.api.service.CrowdWidgetApiService;
import com.gic.store.service.StoreWidgetApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -65,7 +67,8 @@ public class ResourceApiServiceImpl implements ResourceApiService {
private ServiceConfigApiService serviceConfigApiService;
@Autowired
private StoreWidgetApiService storeWidgetApiService;
@Autowired
private CrowdWidgetApiService crowdWidgetApiService;
@Override
@Transactional
......@@ -103,7 +106,6 @@ public class ResourceApiServiceImpl implements ResourceApiService {
Integer channel = orderAppResourceService.save(channelDTO);
resourceDTO.setChannelResource(channel);
if (resourceDTO.getResourceId() == null) {
// save
resourceService.save(resourceDTO);
......@@ -356,6 +358,7 @@ public class ResourceApiServiceImpl implements ResourceApiService {
}
UserResourceDTO userResourceDTO = resourceDTOList.get(0);
TabSysResource resource = this.resourceService.getResource(userResourceDTO.getResourceId());
return EnterpriseServiceResponse.success(resource.getUserResource());
CrowdWidgetDTO widgetDTO = crowdWidgetApiService.getScreenWidgetInfo(resource.getUserResource(), resource.getEnterpriseId()).getResult();
return EnterpriseServiceResponse.success(StringUtils.isNotBlank(widgetDTO.getSearchParams()) ? resource.getUserResource() : null);
}
}
gic-platform-auth-service/src/main/resources/dubbo-gic-platform-auth-service.xml
......@@ -71,4 +71,5 @@
<dubbo:reference interface="com.gic.goods.api.service.GoodsRightsSelectorApiService" id="goodsRightsSelectorApiService" timeout="6000" />
<dubbo:reference interface="com.gic.authcenter.api.service.GicUserService" id="gicUserService" timeout="6000" />
<dubbo:reference interface="com.gic.authcenter.api.service.GicDepartmentService" id="gicDepartmentService" timeout="6000" />
<dubbo:reference interface="com.gic.member.filter.api.service.CrowdWidgetApiService" id="crowdWidgetApiService" timeout="6000" />
</beans>
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/AccountGroupController.java
......@@ -212,4 +212,35 @@ public class AccountGroupController {
String operationObject = result.isSuccess() ? result.getResult() : null;
return OperationResultUtils.operationResult(result, "添加组员", operationObject);
}
/**
* 新增账号分组，并且添加组员
* @Title: addGroupAndMember

* @Description:

* @author guojuxing
* @param memberArr
* @param dto

* @return com.gic.commons.webapi.reponse.RestResponse


*/
@RequestMapping("/add-group-and-member")
public RestResponse addGroupAndMember(String memberArr, AccountGroupDTO dto) {
LOGGER.info("添加账号分组&组员数组参数:{}", memberArr);
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
dto.setEnterpriseId(enterpriseId);
ServiceResponse<Integer> addGroupResponse = accountGroupApiService.save(dto);
if (addGroupResponse.isSuccess()) {
Integer groupId = addGroupResponse.getResult();
List<AccountGroupMemberDTO> list = JSON.parseArray(memberArr, AccountGroupMemberDTO.class);
if (CollectionUtils.isNotEmpty(list)) {
for (AccountGroupMemberDTO temp : list) {
temp.setEnterpriseId(enterpriseId);
temp.setAccountGroupId(groupId);
}
}
ServiceResponse<String> result = accountGroupApiService.saveAccountGroupRelFetch(list);
String operationObject = result.isSuccess() ? result.getResult() : null;
return OperationResultUtils.operationResult(result, "添加账号分组和组员", operationObject);
}
return RestResponse.failure(addGroupResponse.getCode(), addGroupResponse.getMessage());
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/MenuController.java
......@@ -291,23 +291,25 @@ public class MenuController {
}
//用于过滤
List<String> matchPhoneList = new ArrayList<>();
//过滤运营操作，如果是品牌方登录；过滤品牌方日志，如果是运营登录
ServiceResponse<List<UserDTO>> userResult;
if (userDetail.getUserInfo().getLoginType().intValue() == 0) {
userResult = userApiService.listGicUser(enterpriseId);
} else {
userResult = userApiService.listOperationUser(enterpriseId);
}
if (userResult.isSuccess()) {
List<UserDTO> userList = userResult.getResult();
matchPhoneList = userList.stream()
.map(e -> e.getPhoneNumber())
.collect(Collectors.toList());
}
if (CollectionUtils.isNotEmpty(matchPhoneList)) {
searchParam.setPhoneList(matchPhoneList);
}
// List<String> matchPhoneList = new ArrayList<>();
// //过滤运营操作，如果是品牌方登录；过滤品牌方日志，如果是运营登录
// ServiceResponse<List<UserDTO>> userResult;
// if (userDetail.getUserInfo().getLoginType().intValue() == 0) {
// userResult = userApiService.listGicUser(enterpriseId);
// } else {
// userResult = userApiService.listOperationUser(enterpriseId);
// }
// if (userResult.isSuccess()) {
// List<UserDTO> userList = userResult.getResult();
// matchPhoneList = userList.stream()
// .map(e -> e.getPhoneNumber())
// .collect(Collectors.toList());
// }
// if (CollectionUtils.isNotEmpty(matchPhoneList)) {
// searchParam.setPhoneList(matchPhoneList);
// }
//过滤登录人员类型：运营人员/gic管理员
searchParam.setLoginType(userDetail.getUserInfo().getLoginType().toString());
ServiceResponse<Page<SystemSetLogDTO>> response = logApiService.listSystemSetLog(pageQO.getPageSize(),
pageQO.getCurrentPage(), searchParam);
......
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