Skip to content

H
haoban-manage3.0
Commit 310fe0c9 by fudahua
Options

secret配置表

parent a0a5ecb0
Showing with 126 additions and 19 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java
......@@ -5,6 +5,7 @@ import java.util.Set;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
......@@ -39,4 +40,27 @@ public interface WxEnterpriseApiService {
List<YwWxEnterpriseDTO> listByIds(Set<String> enterpriseIds);
boolean enterpriseIsOver(String enterpriseId);
/**
* 获取配置
* @param wxEnterpriseId
* @param secretType
* @param enterpriseId
* @return
*/
public SecretSettingDTO getSecretSetting(String wxEnterpriseId,int secretType,String enterpriseId);
/**
* 保存
* @param secretSettingDTO
* @return
*/
public boolean saveSecretSetting(SecretSettingDTO secretSettingDTO);
/**
* secretList
* @param wxEnterpriseId
* @return
*/
List<SecretSettingDTO> listSecret(String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java
......@@ -7,6 +7,9 @@ import com.alibaba.fastjson.JSON;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.service.service.SecretSettingService;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
......@@ -44,6 +47,9 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
@Autowired
private EnterpriseService enterpriseService;
@Autowired
private SecretSettingService secretSettingService;
@Override
public void callbackReviceEnterprise(QywxCorpInfoSimpleDTO dto) {
......@@ -140,4 +146,23 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
return true;
}
@Override
public SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType, String enterpriseId) {
if (secretType == SecretTypeEnum.MEMBER_WAPP.getVal()) {
return secretSettingService.getMemberSecretSetting(wxEnterpriseId,enterpriseId);
}else{
return secretSettingService.getSecretSetting(wxEnterpriseId,secretType);
}
}
@Override
public boolean saveSecretSetting(SecretSettingDTO secretSettingDTO) {
return secretSettingService.saveSecretSetting(secretSettingDTO);
}
@Override
public List<SecretSettingDTO> listSecret(String wxEnterpriseId) {
return secretSettingService.listSecretSetting(wxEnterpriseId);
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java
......@@ -15,7 +15,9 @@ import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
......@@ -241,14 +243,22 @@ public class WxEnterpriseController extends WebBaseController{
contactSecret = contactSecret.trim();
UserDTO user = qywxUserApiService.getSelfWorkWxUser(wxEnterprise.getCorpid(), contactSecret, login.getStaffDTO().getWxUserId());
logger.info("【保存联系人key】user={}",JSON.toJSONString(user));
SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_SECRET.getVal(), null);
if (null== secretSetting) {
secretSetting=new SecretSettingDTO();
}
secretSetting.setSecretType(SecretTypeEnum.CONTACT_SECRET.getVal());
secretSetting.setSecretName(SecretTypeEnum.CONTACT_SECRET.getName());
secretSetting.setWxEnterpriseId(wxEnterpriseId);
if(user != null){
wxEnterprise.setContactSecret(contactSecret);
wxEnterprise.setContactSecretLastTime(new Date());
wxEnterpriseApiService.update(wxEnterprise);
secretSetting.setSecretVal(contactSecret);
secretSetting.setCheckFlag(1);
wxEnterpriseApiService.saveSecretSetting(secretSetting);
return resultResponse(HaoBanErrCode.ERR_1,true);
}else{
wxEnterprise.setContactSecretLastTime(new Date());
wxEnterpriseApiService.update(wxEnterprise);
secretSetting.setCheckFlag(0);
wxEnterpriseApiService.saveSecretSetting(secretSetting);
return resultResponse(HaoBanErrCode.ERR_10013);
}
......@@ -271,23 +281,43 @@ public class WxEnterpriseController extends WebBaseController{
wxSecretKey = wxSecretKey.trim();
String res = qywxUserApiService.listSelfExternalUserid(wxEnterprise.getCorpid(), wxSecretKey, login.getStaffDTO().getWxUserId());
logger.info("【保存联系人key】res={}",res);
if(res == null){
wxEnterprise.setWxSecretKeyLastTime(new Date());
wxEnterpriseApiService.update(wxEnterprise);
return resultResponse(HaoBanErrCode.ERR_10013);
}else{
wxEnterprise.setWxSecretKey(wxSecretKey);
wxEnterprise.setWxSecretKeyLastTime(new Date());
wxEnterpriseApiService.update(wxEnterprise);
SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal(), null);
if (null== secretSetting) {
secretSetting=new SecretSettingDTO();
}
secretSetting.setSecretType(SecretTypeEnum.CONTACT_CUSTOMER.getVal());
secretSetting.setSecretName(SecretTypeEnum.CONTACT_CUSTOMER.getName());
secretSetting.setWxEnterpriseId(wxEnterpriseId);
if(res != null){
secretSetting.setSecretVal(wxSecretKey);
secretSetting.setCheckFlag(1);
wxEnterpriseApiService.saveSecretSetting(secretSetting);
return resultResponse(HaoBanErrCode.ERR_1,true);
}else{
secretSetting.setCheckFlag(0);
wxEnterpriseApiService.saveSecretSetting(secretSetting);
return resultResponse(HaoBanErrCode.ERR_10013);
}
//
// if(res == null){
// wxEnterprise.setWxSecretKeyLastTime(new Date());
// wxEnterpriseApiService.update(wxEnterprise);
// return resultResponse(HaoBanErrCode.ERR_10013);
// }else{
// wxEnterprise.setWxSecretKey(wxSecretKey);
// wxEnterprise.setWxSecretKeyLastTime(new Date());
// wxEnterpriseApiService.update(wxEnterprise);
// return resultResponse(HaoBanErrCode.ERR_1,true);
// }
}
//微信企业会员小程序
@IgnoreLogin
@RequestMapping("wx-enterprise-member-secret-set")
public HaobanResponse wxEnterpriseMemberSecretSet(String memberSecret) {
public HaobanResponse wxEnterpriseMemberSecretSet(String memberSecret,String enterpriseId,String secretName) {
if(org.apache.commons.lang3.StringUtils.isAnyBlank(memberSecret)){
return resultResponse(HaoBanErrCode.ERR_2);
}
......@@ -300,17 +330,45 @@ public class WxEnterpriseController extends WebBaseController{
}
memberSecret = memberSecret.trim();
UserDTO user = qywxUserApiService.getSelfWorkWxUser(wxEnterprise.getCorpid(), memberSecret, login.getStaffDTO().getWxUserId());
SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
if (null== secretSetting) {
secretSetting=new SecretSettingDTO();
}
secretSetting.setSecretType(SecretTypeEnum.MEMBER_WAPP.getVal());
secretSetting.setSecretName(secretName);
secretSetting.setEnterpriseId(enterpriseId);
secretSetting.setWxEnterpriseId(wxEnterpriseId);
if(user != null){
wxEnterprise.setMemberSecret(memberSecret);
wxEnterprise.setMemberSecretLastTime(new Date());
wxEnterpriseApiService.update(wxEnterprise);
secretSetting.setSecretVal(memberSecret);
secretSetting.setCheckFlag(1);
wxEnterpriseApiService.saveSecretSetting(secretSetting);
return resultResponse(HaoBanErrCode.ERR_1,true);
}else{
wxEnterprise.setMemberSecretLastTime(new Date());
wxEnterpriseApiService.update(wxEnterprise);
secretSetting.setCheckFlag(0);
wxEnterpriseApiService.saveSecretSetting(secretSetting);
return resultResponse(HaoBanErrCode.ERR_10013);
}
}
//微信企业会员小程序
@IgnoreLogin
@RequestMapping("secret-list")
public HaobanResponse secretList() {
String wxEnterpriseId = "";
LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
wxEnterpriseId = login.getWxEnterpriseId();
WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
if(wxEnterprise == null){
return resultResponse(HaoBanErrCode.ERR_10012);
}
List<SecretSettingDTO> listSecret = wxEnterpriseApiService.listSecret(wxEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_1,listSecret);
}
//企业信息
......
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