企业后台,管理后台企业后台接口提交

src/test/java/com/kjj/bean/corp/BizTypeBean.java

+package com.kjj.bean.corp;
+
+import lombok.Data;
+
+@Data
+public class BizTypeBean {
+    private long bizCompanyId;
+    private int bizType;
+}

src/test/java/com/kjj/cases/assistant/enterprise/Enterprise.java

@@ -28,6 +28,8 @@ public class Enterprise implements Authorization {
     public Object departmentId2;
     public Object employeeId1;
     public Object employeeId2;
+    public Object companyUserId;
+    public Object officeUserId;
 
     @Test(description = "企业后台_获取当前用户公司列表",priority = 1)
     public void 企业后台_获取当前用户公司列表(){
@@ -296,9 +298,9 @@ public class Enterprise implements Authorization {
         //通过批量上传的营业部，余杭区营业部
         departmentId1 = response.jsonPath().getJsonObject("data.get(0).id");
         //企业后台固定的营业部，西湖区营业部
-        departmentId2 = response.jsonPath().getJsonObject("data.get(1).id");
+        departmentId2 = response.jsonPath().getJsonObject("data.get(2).id");
         int dataSize = response.jsonPath().getInt("data.size()");
-        Assert.assertEquals(dataSize,2, network.message(BasicConfig.CORP_simpleList,"当前公司营业部列表获取错误",response.body().asString()));
+        Assert.assertEquals(dataSize,3, network.message(BasicConfig.CORP_simpleList,"当前公司营业部列表获取错误",response.body().asString()));
     }
 
     @Test(description = "获取公司员工统计信息",priority = 22)
@@ -403,4 +405,195 @@ public class Enterprise implements Authorization {
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data, network.message(params,BasicConfig.CORP_deptDel,"删除营业部失败",response.body().asString()));
     }
+
+    //生成公司激活码
+    @Test(description = "生成公司激活码",priority = 30)
+    public void 生成公司激活码(){
+        Response response = network.getResponse(BasicConfig.CORP_activationCode);
+        boolean success = response.jsonPath().getBoolean("success");
+        Assert.assertTrue(success,network.message(BasicConfig.CORP_activationCode,"生成激活码失败",response.body().asString()));
+    }
+    /**
+     企业后台权限控制
+     **/
+    @Test(description = "获取管理员列表信息",priority = 31)
+    public void 获取管理员列表信息(){
+        Map<String,Object> params = new HashMap<>();
+        params.put("pageSize",20);
+        params.put("pageIndex",1);
+        params.put("staffType",1);
+        Response response = network.getResponse(params,BasicConfig.CORP_staffList);
+        //获取超级管理员列表个数
+        int totalCount = response.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(totalCount,1, network.message(params,BasicConfig.CORP_staffList,"获取超管列表信息错误",response.body().asString()));
+
+        params.clear();
+        params.put("pageSize",20);
+        params.put("pageIndex",1);
+        params.put("staffType",2);
+        Response companyRes = network.getResponse(params,BasicConfig.CORP_staffList);
+        //获取公司管理员列表个数
+        int companyCount = companyRes.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(companyCount,1, network.message(params,BasicConfig.CORP_staffList,"获取超管列表信息错误",companyRes.body().asString()));
+
+        params.clear();
+        params.put("pageSize",20);
+        params.put("pageIndex",1);
+        params.put("staffType",3);
+        Response officeRes = network.getResponse(params,BasicConfig.CORP_staffList);
+        //获取营业部管理员个数
+        int officeCount = companyRes.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(officeCount,1, network.message(params,BasicConfig.CORP_staffList,"获取超管列表信息错误",officeRes.body().asString()));
+
+    }
+
+    //新增管理员
+    @Test(description = "管理后台_新增超级管理员",priority = 32)
+    public void 管理后台_新增超级管理员(){
+        Map<String,Object> params = new HashMap<>();
+        params.put("companyId",26);
+        params.put("staffName","自动化超管2");
+        params.put("staffPhone","15136361111");
+        params.put("staffType",1);
+        Response response = network.postResponse(params,BasicConfig.MANAGER_staffSave);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data, network.message(params,BasicConfig.MANAGER_staffSave,"新增超级管理员失败",response.body().asString()));
+
+        params.clear();
+        params.put("pageSize",20);
+        params.put("pageIndex",1);
+        params.put("staffType",1);
+        Response superRes = network.getResponse(params,BasicConfig.CORP_staffList);
+        //获取超级管理员列表个数
+        int totalCount = superRes.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(totalCount,2, network.message(params,BasicConfig.CORP_staffList,"获取超管列表信息错误",superRes.body().asString()));
+
+    }
+
+    @Test(description = "企业后台_新增公司管理员",priority = 33)
+    public void 企业后台_新增公司管理员(){
+        superUserLogin();
+        Map<String,Object> params = new HashMap<>();
+        params.put("staffName","自动化公司管理员2");
+        params.put("staffPhone","13456467582");
+        params.put("staffType",2);
+        Response response = network.postResponse(params,BasicConfig.CORP_staffAdd);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data, network.message(params,BasicConfig.CORP_staffAdd,"新增公司管理员失败",response.body().asString()));
+
+        params.clear();
+        params.put("pageSize",20);
+        params.put("pageIndex",1);
+        params.put("staffType",2);
+        Response companyRes = network.getResponse(params,BasicConfig.CORP_staffList);
+        //获取公司管理员列表个数
+        int totalCount = companyRes.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(totalCount,2, network.message(params,BasicConfig.CORP_staffList,"获取公司管理员列表信息错误",companyRes.body().asString()));
+
+        //获取新增的公司管理员id
+        companyUserId = companyRes.jsonPath().getJsonObject("data.list[0].id");
+        System.out.println(companyUserId);
+    }
+
+    @Test(description = "企业后台_新增营业部管理员",priority = 34)
+    public void 企业后台_新增营业部管理员(){
+        superUserLogin();
+        ThreadSleepUtils.sleep(2000);
+        Map<String,Object> params = new HashMap<>();
+        params.put("deptId",departmentId2);
+        params.put("staffName","自动化营业部管理员2");
+        params.put("staffPhone","16287368296");
+        params.put("staffType",3);
+        Response response = network.postResponse(params,BasicConfig.CORP_staffAdd);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data, network.message(params,BasicConfig.CORP_staffAdd,"新增营业部管理员失败",response.body().asString()));
+
+        params.clear();
+        params.put("pageSize",20);
+        params.put("pageIndex",1);
+        params.put("staffType",3);
+        Response officeRes = network.getResponse(params,BasicConfig.CORP_staffList);
+        //获取公司管理员列表个数
+        int totalCount = officeRes.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(totalCount,2, network.message(params,BasicConfig.CORP_staffList,"获取营业部管理员列表信息错误",officeRes.body().asString()));
+
+        //获取新增的营业部管理员id
+        officeUserId = officeRes.jsonPath().getJsonObject("data.list[0].id");
+        System.out.println(officeUserId);
+    }
+
+    @Test(description = "获取超级管理员的管理员列表",priority = 35)
+    public void 获取超级管理员的管理员列表(){
+        Response response = network.getResponse(BasicConfig.CORP_corpStaffList);
+        //超管对超级管理员列表的操作权限
+        boolean superOperated = response.jsonPath().getBoolean("data.get(0).operated");
+        Assert.assertFalse(superOperated, network.message(BasicConfig.CORP_corpStaffList,"超级管理员权限错误",response.body().asString()));
+        //超管对公司管理员列表的操作权限
+        boolean companyOperated = response.jsonPath().getBoolean("data.get(1).operated");
+        Assert.assertTrue(companyOperated, network.message(BasicConfig.CORP_corpStaffList,"超级管理员权限错误",response.body().asString()));
+        //超管对营业部管理员列表的操作权限
+        boolean officeOperated = response.jsonPath().getBoolean("data.get(2).operated");
+        Assert.assertTrue(officeOperated, network.message(BasicConfig.CORP_corpStaffList,"超级管理员权限错误",response.body().asString()));
+    }
+
+    @Test(description = "管理后台_删除超级管理员",priority = 36)
+    public void 管理后台_删除超级管理员(){
+        //获取要删除的超级管理员的id
+        Map<String,Object> params = new HashMap<>();
+        params.put("companyId",26);
+        Response response = network.getResponse(params,BasicConfig.MANAGER_corpStaffList);
+        long id = response.jsonPath().getLong("data.get(0).id");
+
+        //删除超级管理员
+        params.clear();
+        params.put("id",id);
+        Response delRes = network.postResponse(params,BasicConfig.MANAGER_corpStaffDelete);
+        boolean data = delRes.jsonPath().getBoolean("data");
+        Assert.assertTrue(data, network.message(params,BasicConfig.MANAGER_corpStaffDelete,"删除超级管理员失败",delRes.body().asString()));
+
+        //企业后台校验删除是否成功
+        params.clear();
+        params.put("pageSize",20);
+        params.put("pageIndex",1);
+        params.put("staffType",1);
+        Response listRes = network.getResponse(params,BasicConfig.CORP_staffList);
+        int totalCount = listRes.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(totalCount,1, network.message(params,BasicConfig.CORP_staffList,"企业后台超级管理员数量统计错误",listRes.body().asString()));
+
+    }
+
+    @Test(description = "删除公司管理员",priority =37)
+    public void 删除公司管理员(){
+        Map<String,Object> params = new HashMap<>();
+        params.put("id",companyUserId);
+        Response response = network.postResponse(params,BasicConfig.CORP_corpStaffDel);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data, network.message(params,BasicConfig.CORP_corpStaffDel,"删除公司管理员失败",response.body().asString()));
+
+        params.clear();
+        params.put("pageSize",20);
+        params.put("pageIndex",1);
+        params.put("staffType",2);
+        Response listRes = network.getResponse(params,BasicConfig.CORP_staffList);
+        int totalCount = listRes.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(totalCount,1, network.message(params,BasicConfig.CORP_staffList,"企业后台公司管理员数量统计错误",listRes.body().asString()));
+
+    }
+    @Test(description = "删除营业部管理员",priority =38)
+    public void 删除营业部管理员(){
+        Map<String,Object> params = new HashMap<>();
+        params.put("id",officeUserId);
+        Response response = network.postResponse(params,BasicConfig.CORP_corpStaffDel);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data, network.message(params,BasicConfig.CORP_corpStaffDel,"删除营业部管理员失败",response.body().asString()));
+
+        params.clear();
+        params.put("pageSize",20);
+        params.put("pageIndex",1);
+        params.put("staffType",3);
+        Response listRes = network.getResponse(params,BasicConfig.CORP_staffList);
+        int totalCount = listRes.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(totalCount,1, network.message(params,BasicConfig.CORP_staffList,"企业后台公司管理员数量统计错误",listRes.body().asString()));
+    }
+
 }

src/test/java/com/kjj/cases/assistant/management/Management.java

+package com.kjj.cases.assistant.management;
+
+import com.kjj.bean.corp.BizTypeBean;
+import com.kjj.cases.admin.Authorization;
+import com.kjj.config.BasicConfig;
+
+import io.restassured.response.Response;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.kjj.utils.BaseUtils.ssoLogin;
+
+public class Management implements Authorization {
+    @BeforeClass
+    public void setUp() {
+        ssoLogin();
+    }
+
+    @Test(description = "公司名称模糊搜索",priority = 1)
+    public void 公司名称模糊搜索(){
+        Map<String,Object> params = new HashMap<>();
+        params.put("companyName","自动化");
+        Response response = network.getResponse(params, BasicConfig.MANAGER_companySearch);
+        int dataSize = response.jsonPath().getInt("data.size()");
+        Assert.assertTrue(dataSize>0, network.message(params,BasicConfig.MANAGER_companySearch,"模糊搜索失败",response.body().asString()));
+    }
+
+    @Test(description = "分页查询公司列表",priority = 2)
+    public void 分页查询公司列表(){
+        Map<String,Object> params = new HashMap<>();
+        params.put("pageIndex",2);
+        params.put("pageSize",10);
+        Response response = network.getResponse(params,BasicConfig.MANAGER_corpCompanyList);
+        int dataSize = response.jsonPath().getInt("data.list.size()");
+        Assert.assertEquals(dataSize,10, network.message(params,BasicConfig.MANAGER_corpCompanyList,"查询第2页公司数据错误",response.body().asString()));
+    }
+
+    @Test(description = "编辑企业信息",priority = 3)
+    public  void 编辑企业信息(){
+        Map<String,Object> params = new HashMap<>();
+        params.put("authExpiryDate","1669737600000");
+        params.put("companyLevel",1);
+        params.put("companyLogo","//yun.dui88.com/kjy/image/20211115/1636965273816.webp");
+        params.put("companyName","【勿动】自动化测试专用");
+        params.put("employeeNum",3);
+        params.put("id",26);
+        List<BizTypeBean> bizTypes = new ArrayList<>();
+        BizTypeBean bizType1 = new BizTypeBean();
+        bizType1.setBizType(1);
+        bizType1.setBizCompanyId(6);
+        bizTypes.add(bizType1);
+        BizTypeBean bizType2 = new BizTypeBean();
+        bizType2.setBizType(2);
+        bizType2.setBizCompanyId(101);
+        bizTypes.add(bizType2);
+        BizTypeBean bizType3 = new BizTypeBean();
+        bizType3.setBizType(3);
+        bizType3.setBizCompanyId(0);
+        bizTypes.add(bizType3);
+        params.put("bizTypeList",bizTypes);
+        Response response = network.postResponse(params,BasicConfig.MANAGER_companySaveOrUpdate);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(params,BasicConfig.MANAGER_companySaveOrUpdate,"编辑企业信息正确",response.body().asString()));
+    }
+
+    @Test(description = "获取公司详细信息",priority = 4)
+    public void 获取公司详细信息(){
+        Map<String,Object> params = new HashMap<>();
+        params.put("id",26);
+        Response response = network.getResponse(params,BasicConfig.MANAGER_corpCompanyDetail);
+        Object data = response.jsonPath().getJsonObject("data");
+        Assert.assertNotNull(data, network.message(params,BasicConfig.MANAGER_corpCompanyDetail,"获取公司详情信息失败",response.body().asString()));
+    }
+
+    @Test(description = "获取公司等级列表",priority = 5)
+    public void 获取公司等级列表(){
+        Response response = network.getResponse(BasicConfig.MANAGER_corpCompanyLevelList);
+        int dataSize = response.jsonPath().getInt("data.size()");
+        //公司等级包含总公司、分公司、中心支公司
+        Assert.assertTrue(dataSize==3, network.message(BasicConfig.MANAGER_corpCompanyLevelList,"获取公司等级列表错误",response.body().asString()));
+    }
+
+    @Test(description = "获取公司类型列表",priority = 6)
+    public void 获取公司类型列表(){
+        Response response = network.getResponse(BasicConfig.MANAGER_corpCompanyTypeList);
+        int dataSize = response.jsonPath().getInt("data.size()");
+        //公司类型包含集客助手、直播、跟拍助手
+        Assert.assertTrue(dataSize==3, network.message(BasicConfig.MANAGER_corpCompanyLevelList,"获取公司类型列表错误",response.body().asString()));
+    }
+
+    @Test(description = "获取员工类型列表",priority = 7)
+    public void 获取员工类型列表(){
+        Response response = network.getResponse(BasicConfig.MANAGER_corpStaffTypeList);
+        Object descName = response.jsonPath().getJsonObject("data.get(0).desc");
+        Assert.assertEquals(descName,"超级管理员", network.message(BasicConfig.MANAGER_corpStaffTypeList,"获取员工类型错误",response.body().asString()));
+    }
+
+}

src/test/java/com/kjj/config/BasicConfig.java

@@ -1193,7 +1193,16 @@ public class BasicConfig {
   public static final String MANAGER_cockpitList = MANAGER_HOST +"/kjy/manager/corp/cockpit/list";
   public static final String MANAGER_cockpitSwitchStatus = MANAGER_HOST + "/kjy/manager/corp/cockpit/switchStatus";
   public static final String MANAGER_cockpitDelete = MANAGER_HOST +"/kjy/manager/corp/cockpit/delete";
-
+  public static final String MANAGER_staffSave = MANAGER_HOST + "/kjy/manager/corp/staff/save";
+  public static final String MANAGER_corpStaffList = MANAGER_HOST + "/kjy/manager/corp/staff/list";
+  public static final String MANAGER_corpStaffDelete = MANAGER_HOST + "/kjy/manager/corp/staff/delete";
+  public static final String MANAGER_companySearch = MANAGER_HOST + "/kjy/manager/corp/company/search";
+  public static final String MANAGER_corpCompanyList = MANAGER_HOST + "/kjy/manager/corp/company/list";
+  public static final String MANAGER_companySaveOrUpdate = MANAGER_HOST +  "/kjy/manager/corp/company/saveOrUpdate";
+  public static final String MANAGER_corpCompanyDetail = MANAGER_HOST +  "/kjy/manager/corp/company/detail";
+  public static final String MANAGER_corpCompanyLevelList = MANAGER_HOST +"/kjy/manager/corp/company/levelList";
+  public static final String MANAGER_corpCompanyTypeList = MANAGER_HOST + "/kjy/manager/corp/company/typeList";
+  public static final String MANAGER_corpStaffTypeList = MANAGER_HOST + "/kjy/manager/corp/staff/typeList";
   //企业后台
   public static final String CORP_pageList = CORP_HOST +"/kjy/corp/page/list";
   public static final String CORP_batchImport = CORP_HOST +"/kjy/corp/employee/batch/import";
@@ -1210,5 +1219,31 @@ public class BasicConfig {
   public static final String CORP_deptEdit = CORP_HOST +  "/kjy/corp/dept/edit";
   public static final String CORP_employeeSaveOrUpdate = CORP_HOST + "/kjy/corp/employee/saveOrUpdate";
   public static final String CORP_employeeDel = CORP_HOST +"/kjy/corp/employee/del";
-  public static final String CORP_deptDel = CORP_HOST +"/kjy/corp/dept/del";
+  public static final String CORP_deptDel = CORP_HOST + "/kjy/corp/dept/del";
+  public static final String CORP_activationCode = CORP_HOST +"/kjy/corp/company/activation/code";
+  public static final String CORP_staffList = CORP_HOST +"/kjy/corp/staff/list";
+  public static final String CORP_staffAdd = CORP_HOST + "/kjy/corp/staff/add";
+  public static final String CORP_corpStaffList = CORP_HOST + "/kjy/corp/staffList";
+  public static final String CORP_corpStaffDel = CORP_HOST + "/kjy/corp/staff/del";
+  public static final String CORP_corpActivityDetail = CORP_HOST + "/kjy/corp/activity/detail";
+  public static final String CORP_activityStateUpdate = CORP_HOST +  "/kjy/corp/activity/activity/state/update";
+  public static final String CORP_corpActivityList = CORP_HOST +  "/kjy/corp/activity/list";
+  public static final String CORP_corpActivitySave = CORP_HOST + "/kjy/corp/activity/save";
+  public static final String CORP_putawayStateUpdate = CORP_HOST + "/kjy/corp/activity/putaway/state/update";
+  public static final String CORP_activityExporte = CORP_HOST + "/kjy/corp/activity/export";
+  //企业版代理人
+
+  public static final String HOME_employeeActivate = HOST  + "/kjy/corp/employee/activate";
+  public static final String HOME_corpCompanyInfo = HOST  + "/kjy/corp/company/info";
+  public static final String HOME_employeeAuth = HOST  + "/kjy/corp/employee/auth";
+  public static final String HOME_corpLiveList = HOST  + "/kjy/corp/live/list";
+  public static final String HOME_liveShortLink = HOST  +  "/kjy/corp/live/shortLink";
+  public static final String HOME_employeeInfo = HOST  +  "/kjy/corp/employee/info";
+  public static final String HOME_employeeIndexStat = HOST  +"/kjy/corp/employee/indexStat";
+  public static final String HOME_corpActivityList = HOST  + "/kjy/corp/activity/list";
+  public static final String HOME_activityDetail = HOST  +  "/kjy/corp/activity/detail";
+  public static final String HOME_activityJoin = HOST  +  "/kjy/corp/activity/join";
+  public static final String HOME_customerList = HOST  + "/kjy/corp/employee/customer/list";
+  public static final String HOME_customerStatistic = HOST  + "/kjy/corp/employee/customer/statistic";
+  public static final String HOME_customerLiveClue = HOST  + "/kjy/corp/employee/customer/liveClue";
 }

src/test/java/com/kjj/utils/BaseUtils.java

@@ -217,7 +217,7 @@ public class BaseUtils {
         System.out.println(captcha);
 
         //登录接口
-        ThreadSleepUtils.sleep(2000);
+        ThreadSleepUtils.sleep(5000);
         params.clear();
         params.put("phone","15136361308");
         params.put("captcha",captcha);
@@ -263,7 +263,7 @@ public class BaseUtils {
         System.out.println(captcha);
 
         //登录接口
-        ThreadSleepUtils.sleep(2000);
+        ThreadSleepUtils.sleep(5000);
         params.clear();
         params.put("phone","15136361307");
         params.put("captcha",captcha);

src/test/wechatTestNG.xml

@@ -76,11 +76,16 @@
             <class name="com.kjj.cases.assistant.markettools.GameLottery"/>
         </classes>
     </test>
-    <test preserve-order="true" name = "邀请函和趣味测评">
+    <test preserve-order="true" name = "企业后台">
         <classes>
             <class name="com.kjj.cases.assistant.enterprise.Enterprise"/>
         </classes>
     </test>
+    <test preserve-order="true" name = "管理后台-企业后台">
+        <classes>
+            <class name="com.kjj.cases.assistant.management.Management"/>
+        </classes>
+    </test>
 </suite>
         <!-- Suite -->