Commit 06c0a8f7 by huangZW

111

parent 37d9f8db
...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON; ...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig; import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import com.gic.haoban.common.utils.GlobalVar; import com.gic.haoban.common.utils.GlobalVar;
import com.gic.haoban.manage.api.dto.*; import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.service.ApplicationSettingApiService;
import com.gic.haoban.manage.api.service.DepartmentApiService; import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.WxApplicationApiService; import com.gic.haoban.manage.api.service.WxApplicationApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService; import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
...@@ -15,6 +16,8 @@ import com.gic.haoban.manage.web.config.Config; ...@@ -15,6 +16,8 @@ import com.gic.haoban.manage.web.config.Config;
import com.gic.haoban.manage.web.vo.LoginVO; import com.gic.haoban.manage.web.vo.LoginVO;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService; import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
import com.gic.wechat.api.service.qywx.QywxUserApiService; import com.gic.wechat.api.service.qywx.QywxUserApiService;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -41,14 +44,26 @@ public class ApplicationController extends WebBaseController{ ...@@ -41,14 +44,26 @@ public class ApplicationController extends WebBaseController{
private Config config; private Config config;
@Autowired @Autowired
private DepartmentApiService departmentApiService; private DepartmentApiService departmentApiService;
@Autowired
private ApplicationSettingApiService applicationSettingApiService;
@RequestMapping("application-list") @RequestMapping("application-list")
public HaobanResponse applicationList() { public HaobanResponse applicationList() {
List<ApplicationDTO> list = applicationApiService.listApplication(); List<ApplicationDTO> list = applicationApiService.listApplication();
return resultResponse(HaoBanErrCode.ERR_1,list); return resultResponse(HaoBanErrCode.ERR_1,list);
} }
@RequestMapping("open-or-close")
public HaobanResponse applicationList(String wxEnterpriseId, String applicationId, Integer openFlag) {
if(StringUtils.isAnyBlank(wxEnterpriseId,applicationId)){
return resultResponse(HaoBanErrCode.ERR_2);
}
if(openFlag == null){
return resultResponse(HaoBanErrCode.ERR_2);
}
applicationSettingApiService.saveSetting(wxEnterpriseId, applicationId, openFlag);
return resultResponse(HaoBanErrCode.ERR_1);
}
@RequestMapping("has-bind-contract") @RequestMapping("has-bind-contract")
@IgnoreLogin @IgnoreLogin
public HaobanResponse hasBindContract(){ public HaobanResponse hasBindContract(){
......
...@@ -87,7 +87,6 @@ public class WxEnterpriseController extends WebBaseController{ ...@@ -87,7 +87,6 @@ public class WxEnterpriseController extends WebBaseController{
} }
//微信企业绑定接口 //微信企业绑定接口
@IgnoreLogin @IgnoreLogin
@RequestMapping("wx-enterprise-bind") @RequestMapping("wx-enterprise-bind")
public HaobanResponse wxEnterpriseBind(String enterpriseId,String wxEnterpriseId,String version) { public HaobanResponse wxEnterpriseBind(String enterpriseId,String wxEnterpriseId,String version) {
if(org.apache.commons.lang3.StringUtils.isAnyBlank(enterpriseId,version)){ if(org.apache.commons.lang3.StringUtils.isAnyBlank(enterpriseId,version)){
......
...@@ -45,4 +45,10 @@ ...@@ -45,4 +45,10 @@
<dubbo:reference interface="com.gic.haoban.communicate.api.service.valid.ValidationCodeService" id="validationCodeService"/> <dubbo:reference interface="com.gic.haoban.communicate.api.service.valid.ValidationCodeService" id="validationCodeService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.ApplicationSettingApiService" id="applicationSettingApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.AuditApiService" id="auditApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.AuditSettingApiService" id="auditSettingApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.DictApiService" id="dictApiService"/>
</beans> </beans>
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