Commit edb8fa8d by 墨竹

fix:增加是否为代开发字段

parent 859eaf08
...@@ -60,14 +60,19 @@ public class QywxCorpInfoSimpleDTO implements Serializable{ ...@@ -60,14 +60,19 @@ public class QywxCorpInfoSimpleDTO implements Serializable{
/** /**
* 权限等级。 * 权限等级。
1:通讯录基本信息只读 * 1:通讯录基本信息只读
2:通讯录全部信息只读(已废弃) * 2:通讯录全部信息只读(已废弃)
3:通讯录全部信息读写 * 3:通讯录全部信息读写
4:单个基本信息只读 * 4:单个基本信息只读
5:通讯录全部信息只写(已废弃) * 5:通讯录全部信息只写(已废弃)
* **/ **/
private Integer level; private Integer level;
/**
* 是否使用代开发,1:是,0:否
*/
private Integer isCustomizedApp;
public Integer getErrcode() { public Integer getErrcode() {
return errcode; return errcode;
} }
...@@ -219,4 +224,12 @@ public class QywxCorpInfoSimpleDTO implements Serializable{ ...@@ -219,4 +224,12 @@ public class QywxCorpInfoSimpleDTO implements Serializable{
public void setLevel(Integer level) { public void setLevel(Integer level) {
this.level = level; this.level = level;
} }
public Integer getIsCustomizedApp() {
return isCustomizedApp;
}
public void setIsCustomizedApp(Integer isCustomizedApp) {
this.isCustomizedApp = isCustomizedApp;
}
} }
...@@ -4,6 +4,9 @@ import java.io.Serializable; ...@@ -4,6 +4,9 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
public class TabHaobanWxApplication implements Serializable { public class TabHaobanWxApplication implements Serializable {
private static final long serialVersionUID = 1L;
private String wxApplicationId; private String wxApplicationId;
private String siteId; private String siteId;
...@@ -26,7 +29,10 @@ public class TabHaobanWxApplication implements Serializable { ...@@ -26,7 +29,10 @@ public class TabHaobanWxApplication implements Serializable {
private Date updateTime; private Date updateTime;
private static final long serialVersionUID = 1L; /**
* 是否使用代开发,1:是,0:否
*/
private Integer isCustomizedApp;
public String getWxApplicationId() { public String getWxApplicationId() {
return wxApplicationId; return wxApplicationId;
...@@ -115,4 +121,12 @@ public class TabHaobanWxApplication implements Serializable { ...@@ -115,4 +121,12 @@ public class TabHaobanWxApplication implements Serializable {
public void setUpdateTime(Date updateTime) { public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
public Integer getIsCustomizedApp() {
return isCustomizedApp;
}
public void setIsCustomizedApp(Integer isCustomizedApp) {
this.isCustomizedApp = isCustomizedApp;
}
} }
\ No newline at end of file
...@@ -23,23 +23,23 @@ import java.util.List; ...@@ -23,23 +23,23 @@ import java.util.List;
@Service @Service
public class SecretSettingServiceImpl implements SecretSettingService { public class SecretSettingServiceImpl implements SecretSettingService {
private static final Logger logger= LoggerFactory.getLogger(SecretSettingServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(SecretSettingServiceImpl.class);
@Autowired @Autowired
private SecretSettingMapper secretSettingMapper; private SecretSettingMapper secretSettingMapper;
@Override @Override
public boolean saveSecretSetting(SecretSettingDTO secretSetting) { public boolean saveSecretSetting(SecretSettingDTO secretSetting) {
if (secretSetting.getSecretId()!=null) { if (secretSetting.getSecretId() != null) {
secretSetting.setUpdateTime(new Date()); secretSetting.setUpdateTime(new Date());
secretSettingMapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabSecretSetting.class,secretSetting)); secretSettingMapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabSecretSetting.class, secretSetting));
return true; return true;
}else{ } else {
secretSetting.setSecretId(ToolUtil.randomUUID()); secretSetting.setSecretId(ToolUtil.randomUUID());
secretSetting.setCreateTime(new Date()); secretSetting.setCreateTime(new Date());
secretSetting.setUpdateTime(new Date()); secretSetting.setUpdateTime(new Date());
secretSetting.setStatusFlag(1); secretSetting.setStatusFlag(1);
secretSettingMapper.insert(EntityUtil.changeEntityByJSON(TabSecretSetting.class,secretSetting)); secretSettingMapper.insert(EntityUtil.changeEntityByJSON(TabSecretSetting.class, secretSetting));
return true; return true;
} }
} }
...@@ -51,13 +51,13 @@ public class SecretSettingServiceImpl implements SecretSettingService { ...@@ -51,13 +51,13 @@ public class SecretSettingServiceImpl implements SecretSettingService {
tabSecretSetting.setStatusFlag(0); tabSecretSetting.setStatusFlag(0);
tabSecretSetting.setUpdateTime(new Date()); tabSecretSetting.setUpdateTime(new Date());
int i = secretSettingMapper.updateByPrimaryKeySelective(tabSecretSetting); int i = secretSettingMapper.updateByPrimaryKeySelective(tabSecretSetting);
return i>0; return i > 0;
} }
@Override @Override
public List<SecretSettingDTO> listSecretSetting(String wxEnterpriseId) { public List<SecretSettingDTO> listSecretSetting(String wxEnterpriseId) {
List<TabSecretSetting> list = secretSettingMapper.listSecretSetting(wxEnterpriseId); List<TabSecretSetting> list = secretSettingMapper.listSecretSetting(wxEnterpriseId);
return EntityUtil.changeEntityListByJSON(SecretSettingDTO.class,list); return EntityUtil.changeEntityListByJSON(SecretSettingDTO.class, list);
} }
@Override @Override
...@@ -67,12 +67,12 @@ public class SecretSettingServiceImpl implements SecretSettingService { ...@@ -67,12 +67,12 @@ public class SecretSettingServiceImpl implements SecretSettingService {
return null; return null;
} }
TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null); TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
return EntityUtil.changeEntityByJSON(SecretSettingDTO.class,secretSetting); return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);
} }
@Override @Override
public SecretSettingDTO getMemberSecretSetting(String wxEnterpriseId, String enterpriseId) { public SecretSettingDTO getMemberSecretSetting(String wxEnterpriseId, String enterpriseId) {
TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId); TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
return EntityUtil.changeEntityByJSON(SecretSettingDTO.class,secretSetting); return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);
} }
} }
...@@ -81,6 +81,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -81,6 +81,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
String agentName = dto.getAgentName(); String agentName = dto.getAgentName();
String permanentCode = dto.getPermanentCode(); String permanentCode = dto.getPermanentCode();
String applicationName = dto.getName(); String applicationName = dto.getName();
Integer isCustomizedApp = dto.getIsCustomizedApp();
TabHaobanWxApplication tab = wxApplicationService.selectBySiteIdAndWxEnterpriseId(siteId, wxEnterpriseId); TabHaobanWxApplication tab = wxApplicationService.selectBySiteIdAndWxEnterpriseId(siteId, wxEnterpriseId);
if (tab == null) { if (tab == null) {
...@@ -91,6 +92,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -91,6 +92,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
tab.setName(applicationName); tab.setName(applicationName);
//permanentCode = secret //permanentCode = secret
tab.setPermanentCode(permanentCode); tab.setPermanentCode(permanentCode);
tab.setIsCustomizedApp(isCustomizedApp);
tab.setWxEnterpriseId(wxEnterpriseId); tab.setWxEnterpriseId(wxEnterpriseId);
wxApplicationService.insert(tab); wxApplicationService.insert(tab);
} else { } else {
......
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