导购设置

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ApplicationSettingApiService.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.service;
 
 import java.util.List;
 
+import com.alibaba.fastjson.JSONArray;
 import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
 
 /**
@@ -9,7 +10,7 @@ import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
  */
 public interface ApplicationSettingApiService {
 	
-	void saveSetting(String wxEnterpriseId,String applicationId, int openFlag);
+	void saveSetting(String wxEnterpriseId,JSONArray jsonArr);
 
 	ApplicationSettingDTO findSettingByWxEnterpriseIdAndApplicationId(String wxEnterpriseId,String applicationId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ApplicationSettingApiServiceImpl.java

 package com.gic.haoban.manage.service.service.out.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
@@ -23,7 +27,14 @@ public class ApplicationSettingApiServiceImpl implements ApplicationSettingApiSe
     private ApplicationSettingMapper applicationSettingMapper;
 
     @Override
-    public void saveSetting(String wxEnterpriseId, String applicationId, int openFlag) {
+    public void saveSetting(String wxEnterpriseId, JSONArray jsonArr) {
+        for(int i=0;i<jsonArr.size();i++) {
+            JSONObject json = jsonArr.getJSONObject(i) ;
+            String applicationId = json.getString("applicationId") ;
+            Integer openFlag = json.getInteger("openFlag") ;
+            if(null == openFlag || null == applicationId) {
+                continue ;
+            }
             TabHaobanApplicationSetting tab = applicationSettingMapper.findSetting(wxEnterpriseId, applicationId);
             if (tab == null) {
                 tab = new TabHaobanApplicationSetting();
@@ -39,6 +50,7 @@ public class ApplicationSettingApiServiceImpl implements ApplicationSettingApiSe
                 applicationSettingMapper.saveSetting(wxEnterpriseId, applicationId, openFlag);
             }
         }
+    }
 
     @Override
     public ApplicationSettingDTO findSettingByWxEnterpriseIdAndApplicationId(String wxEnterpriseId, String applicationId) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java

 package com.gic.haoban.manage.web.controller;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.ApplicationDTO;
+import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
+import com.gic.haoban.manage.api.dto.QywxCorpInfoDTO;
+import com.gic.haoban.manage.api.dto.SecretSettingDTO;
+import com.gic.haoban.manage.api.dto.WxApplicationDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.ApplicationApiService;
+import com.gic.haoban.manage.api.service.ApplicationSettingApiService;
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.WxApplicationApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 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.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
+import cn.hutool.core.collection.CollectionUtil;
 
 @RestController
 public class ApplicationController extends WebBaseController {
@@ -107,14 +125,16 @@ public class ApplicationController extends WebBaseController {
     }
 
     @RequestMapping("open-or-close")
-    public HaobanResponse applicationList(String wxEnterpriseId, String applicationId, Integer openFlag) {
-        if (StringUtils.isAnyBlank(wxEnterpriseId, applicationId)) {
+    public HaobanResponse applicationList(String wxEnterpriseId, String dataJson) {
+        log.info("dataJson={}",dataJson);
+        if(StringUtils.isBlank(dataJson)) {
             return resultResponse(HaoBanErrCode.ERR_2); 
         }
-        if (openFlag == null) {
+        JSONArray jsonArr = JSONArray.parseArray(dataJson) ;
+        if(jsonArr.size()<=0) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        applicationSettingApiService.saveSetting(wxEnterpriseId, applicationId, openFlag);
+        applicationSettingApiService.saveSetting(wxEnterpriseId,jsonArr);
         return resultResponse(HaoBanErrCode.ERR_1);
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -97,6 +97,10 @@ public class LoginController extends WebBaseController {
         UserDTO wxUser = JSON.parseObject(userJson, UserDTO.class);
         logger.info("企微登录user={}", JSON.toJSONString(wxUser));
         String corpId = wxUser.getCorpid();
+        if(StringUtils.isBlank(corpId)) {
+            logger.info("企微登录失败auth_code={}", auth_code);
+            return this.fail("auth_code解析失败,corpId is null");
+        }
         WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
         if(null == wxEnterprise) {
             logger.info("微信企业不存在corpId={}", corpId);
@@ -271,6 +275,8 @@ public class LoginController extends WebBaseController {
     public HaobanResponse getLoginInfo() {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         logger.info("当前登录信息={}",JSON.toJSON(loginUser));
+        // 判断是否超管
+        
         WebLoginVO  vo = EntityUtil.changeEntityByOrika(WebLoginVO.class, loginUser) ;
         String staffId = loginUser.getStaffId() ;
         StaffDTO dto = this.staffApiService.selectById(staffId) ;
@@ -399,6 +405,7 @@ public class LoginController extends WebBaseController {
     }
 
     @RequestMapping("/gic-login-check")
+    @IgnoreLogin
     public ModelAndView gicLogin(String code, String hbEnt) {
         logger.info("gic登录clerkId={},hbEnt={}", code, hbEnt);
         PowerClerkDTO clerkDTO = this.userService.haobanLoginBack(code);