调整简历代码、新增企业公司信息和企业管理员信息功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dingding/service/DingAuthServiceInfoImpl.java

@@ -2,10 +2,12 @@ package com.ruoyi.web.controller.dingding.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
 import com.aliyun.dingtalkcontact_1_0.models.GetUserResponseBody;
 import com.dingtalk.api.response.OapiV2UserGetResponse;
 import com.dingtalk.oapi.lib.aes.DingTalkEncryptException;
 import com.dingtalk.oapi.lib.aes.DingTalkEncryptor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -19,17 +21,19 @@ import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.resume.ICompanyInfoService;
 import com.ruoyi.system.service.resume.ICompanyUserService;
+import com.ruoyi.tool.domain.TCompanyUser;
+import com.ruoyi.tool.domain.TEnterpriseCompany;
+import com.ruoyi.tool.service.ITCompanyUserService;
+import com.ruoyi.tool.service.ITEnterpriseCompanyService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.web.controller.dingding.config.SyncHttpConstant;
 
 import javax.annotation.Resource;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.web.controller.dingding.config.CallbackConstant.*;
 
@@ -62,6 +66,12 @@ public class DingAuthServiceInfoImpl implements DingAuthServiceInfo {
     @Resource
     private SysMenuMapper sysMenuMapper;
 
+    @Autowired
+    private ITEnterpriseCompanyService tEnterpriseCompanyService;
+
+    @Autowired
+    private ITCompanyUserService tCompanyUserService;
+
     @Override
     public SysUser getUserByUserId(String userId) {
 
@@ -171,6 +181,20 @@ public class DingAuthServiceInfoImpl implements DingAuthServiceInfo {
     public Map<String, String> caseProcess(JSONObject plainNode) {
         Map<String, String> resultMap = new LinkedHashMap<>();
         String eventType = plainNode.getString("EventType");
+        JSONArray bizData = plainNode.getJSONArray("bizData");
+        String corp_id = null;
+        JSONObject biz_data = null;
+        Integer bizType = 0;
+        for (Object bizDatum : bizData) {
+            JSONObject bizDataJson = (JSONObject) bizDatum;
+            log.info("[callback] 获取到授权bizDataJson:" + bizDataJson);
+            String biz_data_str = bizDataJson.getString("biz_data");
+            biz_data = JSONObject.parseObject(biz_data_str);
+            bizType = bizDataJson.getInteger("biz_type");
+            log.info("[callback] 获取到bizType:" + bizType);
+            corp_id = bizDataJson.getString("corp_id");
+        }
+
         switch (eventType) {
             case SUITE_TICKET_CALLBACK_URL_VALIDATE:
                 log.info("[callback] 验证回调地址有效性质:{}", plainNode);
@@ -178,11 +202,17 @@ public class DingAuthServiceInfoImpl implements DingAuthServiceInfo {
                 break;
             case TEMP_AUTH_CODE_ACTIVE:
                 log.info("[callback] 企业开通授权:{}", plainNode);
-
+                log.info("[callback] 企业开通授权信息：", bizData);
+                if (bizType == 4 && biz_data != null && corp_id != null) {
+                    updateCompanyInfo(biz_data,corp_id);
+                }
                 resultMap = encryptText(CALLBACK_RETURN_SUCCESS);
                 break;
             case SUITE_RELIEVE:
                 log.info("[callback] 企业解除授权:{}", plainNode);
+                if (bizType == 4 && biz_data != null && corp_id != null) {
+                    tEnterpriseCompanyService.updateTCompanyUserClose(corp_id);
+                }
                 resultMap = encryptText(CALLBACK_RETURN_SUCCESS);
                 break;
             case CHECK_UPDATE_SUITE_URL:
@@ -207,23 +237,17 @@ public class DingAuthServiceInfoImpl implements DingAuthServiceInfo {
                 break;
             case SYNC_HTTP_PUSH_HIGH:
                 log.info("[callback] 套件票据事件:" + plainNode);
-                JSONArray bizData = plainNode.getJSONArray("bizData");
                 log.info("[callback] 套件票据事件123:" + bizData);
-                for (Object bizDatum : bizData) {
-                    JSONObject bizDataJson = (JSONObject) bizDatum;
-                    log.info("[callback] 获取到套件票据bizDataJson:" + bizDataJson);
-                    Integer bizType = bizDataJson.getInteger("biz_type");
-                    log.info("[callback] 获取到套件票据bizType:" + bizType);
-                    if (bizType == 2) {
-                        String biz_data_str = bizDataJson.getString("biz_data");
-                        JSONObject biz_data = JSONObject.parseObject(biz_data_str);
-                        log.info("[callback] 获取到套件票据biz_data:" + biz_data);
-                        String suiteTicket = biz_data.getString("suiteTicket");
-                        String corp_id = bizDataJson.getString("corp_id");
-                        String redisKeyPrefix = Constants.DAILY_DING_AUTH + corp_id + ":";
-                        log.info("[callback] 获取到套件票据corp_id:{}", corp_id);
-                        redisCache.setCacheObject(redisKeyPrefix + Constants.DAILY_DING_SUITE_TICKET, suiteTicket, 5, TimeUnit.HOURS);
-                    }
+                //套件票据
+                if (bizType == 2 && biz_data != null && corp_id != null) {
+                    String suiteTicket = biz_data.getString("suiteTicket");
+                    String redisKeyPrefix = Constants.DAILY_DING_AUTH + corp_id + ":";
+                    log.info("[callback] 获取到套件票据corp_id:{}", corp_id);
+                    redisCache.setCacheObject(redisKeyPrefix + Constants.DAILY_DING_SUITE_TICKET, suiteTicket, 5, TimeUnit.HOURS);
+                }
+                //套件票据授权
+                if (bizType == 4 && biz_data != null && corp_id != null) {
+                    updateCompanyInfo(biz_data,corp_id);
                 }
                 resultMap = encryptText(CALLBACK_RETURN_SUCCESS);
                 break;
@@ -263,4 +287,60 @@ public class DingAuthServiceInfoImpl implements DingAuthServiceInfo {
         return sb.toString();
     }
 
+    /**
+     * 更新企业详细信息
+     * @param biz_data
+     * @param corp_id
+     */
+    public void updateCompanyInfo(JSONObject biz_data, String corp_id){
+        String authCorpInfo_str = biz_data.getString("auth_corp_info");
+        JSONObject authCorpInfo = JSONObject.parseObject(authCorpInfo_str);
+        String authInfo_str = biz_data.getString("auth_info");
+        JSONObject authInfo = JSONObject.parseObject(authInfo_str);
+        //管理员信息存储
+        String admin_list_str = authInfo.getString("admin_list");
+        // 去除字符串两端的方括号
+        admin_list_str = admin_list_str.substring(1, admin_list_str.length() - 1);
+        // 使用split方法按逗号分割字符串
+        String[] admin_list = admin_list_str.split("\",\\s*\"");
+        // 由于split后的结果带有双引号，我们需要去掉它们
+        List<String> list = Arrays.stream(admin_list)
+                .map(part -> part.substring(1, part.length() - 1)) // 去除每个字符串两端的双引号
+                .collect(Collectors.toList());
+
+        // 输出结果
+        String finalCorp_id = corp_id;
+        TCompanyUser po = new TCompanyUser();
+        po.setAgentid(authInfo.getString("agentid"));
+        po.setCorpid(finalCorp_id);
+        List<TCompanyUser> poList = tCompanyUserService.selectTCompanyUserList(po);
+        list.forEach(data -> {
+            po.setUserId(data);
+            boolean exists = poList.stream()
+                    .anyMatch(companyUser -> companyUser.getUserId().equals(data)); // 检查userId是否已存在
+            if (!exists) {
+                tCompanyUserService.insertTCompanyUser(po);
+            }
+        });
+
+        // 查询企业信息
+        TEnterpriseCompany tEnterpriseCompany = tEnterpriseCompanyService.selectTEnterpriseCompanyByCorpId(authCorpInfo.getString("corpid"));
+        if(null != tEnterpriseCompany){
+            TEnterpriseCompany other = JSON.toJavaObject(authCorpInfo, TEnterpriseCompany.class);
+            other.setAgentid(authInfo.getString("agentid"));
+            other.setName(authInfo.getString("agent_name"));
+            other.setLogoUrl(authInfo.getString("logo_url"));
+            tEnterpriseCompany.copyFrom(other,true);
+            tEnterpriseCompanyService.updateTEnterpriseCompany(tEnterpriseCompany);
+        } else {
+            // 转换JSONObject为TEnterpriseCompany对象
+            tEnterpriseCompany = JSON.toJavaObject(authCorpInfo, TEnterpriseCompany.class);
+            tEnterpriseCompany.setAgentid(authInfo.getString("agentid"));
+            tEnterpriseCompany.setName(authInfo.getString("agent_name"));
+            tEnterpriseCompany.setLogoUrl(authInfo.getString("logo_url"));
+            tEnterpriseCompanyService.insertTEnterpriseCompany(tEnterpriseCompany);
+        }
+
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fg/FgController.java

@@ -1,197 +0,0 @@
-package com.ruoyi.web.controller.fg;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.fg.FgUrlConstant;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.common.utils.http.OkHttpFGUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.fg.SalesTrendData;
-import com.ruoyi.system.domain.fg.School;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Api(value = "fgController", tags = "飞瓜数据抓取接口")
-@Controller
-@RequestMapping(value = "/fg")
-public class FgController {
-
-
-
-
-
-
-
-
-    /**
-     * 获取数据
-     * @param response
-     */
-    @ApiOperation(value = "导出茶90天直播销售额与视频销售额")
-    @PostMapping("/exportSalesTrendData")
-    @ResponseBody
-    public void exportSalesTrendData(HttpServletResponse response) {
-
-        String URL = "http://120.27.232.118/api/v1/goodsDataOverView/salesTrendData";
-
-        List<SalesTrendData> resultList = new ArrayList<>();
-
-        String result = HttpUtils.sendGet(URL,"periodType=90&fromDateCode=20230829&toDateCode=20231126&cateId=20004");
-
-        Map maps = (Map) JSON.parse(result);
-        for(Object map : maps.entrySet()){
-            if(((Map.Entry)map).getKey().toString().equals("Data")){
-
-                JSONArray dataJArray = JSONObject.parseArray(((Map.Entry)map).getValue().toString());
-                List<Object> dataList = dataJArray;
-
-                for (Object po:
-                        dataList) {
-                    Map poMap = (Map) JSON.parse(po.toString());
-
-                    poMap.get("DateCode").toString();
-                    SalesTrendData salesTrendData = new SalesTrendData();
-
-                    salesTrendData.setAwemeSalesCount(poMap.get("AwemeSalesCount").toString());
-                    salesTrendData.setAwemeSalesCountStr(poMap.get("AwemeSalesCountStr").toString());
-                    salesTrendData.setAwemeSaleCountRatio(poMap.get("AwemeSaleCountRatio").toString());
-                    salesTrendData.setAwemeSales(poMap.get("AwemeSales").toString());
-                    salesTrendData.setAwemeSalesStr(poMap.get("AwemeSalesStr").toString());
-                    salesTrendData.setAwemeSalesRatio(poMap.get("AwemeSalesRatio").toString());
-
-                    salesTrendData.setDateCode(poMap.get("DateCode").toString());
-
-                    salesTrendData.setLiveSalesCount(poMap.get("LiveSalesCount").toString());
-                    salesTrendData.setLiveSalesCountStr(poMap.get("LiveSalesCountStr").toString());
-                    salesTrendData.setLiveSaleCountRatio(poMap.get("LiveSaleCountRatio").toString());
-                    salesTrendData.setLiveSales(poMap.get("LiveSales").toString());
-                    salesTrendData.setLiveSalesStr(poMap.get("LiveSalesStr").toString());
-                    salesTrendData.setLiveSalesRatio(poMap.get("LiveSalesRatio").toString());
-
-                    salesTrendData.setOtherSalesCount(poMap.get("OtherSalesCount").toString());
-                    salesTrendData.setOtherSalesCountStr(poMap.get("OtherSalesCountStr").toString());
-                    salesTrendData.setOtherSaleCountRatio(poMap.get("OtherSaleCountRatio").toString());
-                    salesTrendData.setOtherSales(poMap.get("OtherSales").toString());
-                    salesTrendData.setOtherSalesStr(poMap.get("OtherSalesStr").toString());
-                    salesTrendData.setOtherSalesRatio(poMap.get("OtherSalesRatio").toString());
-
-                    salesTrendData.setPV(poMap.get("PV").toString());
-                    salesTrendData.setPVStr(poMap.get("PVStr").toString());
-                    salesTrendData.setStatDate(poMap.get("StatDate").toString());
-                    salesTrendData.setSumSalesCount(poMap.get("SumSalesCount").toString());
-                    salesTrendData.setSumSalesCountStr(poMap.get("SumSalesCountStr").toString());
-                    salesTrendData.setTotalSales(poMap.get("TotalSales").toString());
-                    salesTrendData.setTotalSalesStr(poMap.get("TotalSalesStr").toString());
-
-                    resultList.add(salesTrendData);
-
-                }
-            }
-        }
-
-        ExcelUtil<SalesTrendData> util = new ExcelUtil<SalesTrendData>(SalesTrendData.class);
-        util.exportExcel(response, resultList, "茶90天直播销售额与视频销售额");
-
-    }
-
-
-    /**
-     * 导出crm附件列表
-     */
-    @ApiOperation("")
-    @Log(title = "导出中国大学专业排名", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, String year) throws InterruptedException {
-        String URL = "https://www.shanghairanking.cn/api/pub/v1/bcmr/rank";
-
-        List<School> resultList = new ArrayList<>();
-
-        String result = HttpUtils.sendGet(URL,"year=2023&majorCode=010101");
-
-        Map<String, List<Object>> map = OkHttpFGUtils.getSchoolMap(result);
-
-        for (Object majors: map.get("majorsList")) {
-
-            Map majorsMap = (Map) JSON.parse(majors.toString());
-
-            JSONArray childrens = JSONObject.parseArray(majorsMap.get("children").toString());
-            List<Object> childrenList = childrens;
-            if(StringUtils.isNotEmpty(childrenList)){
-                for (Object children: childrenList) {
-                    Map childrenMap = (Map) JSON.parse(children.toString());
-
-                    JSONArray childrens1 = JSONObject.parseArray(childrenMap.get("children").toString());
-                    List<Object> children1List = childrens1;
-                    if(StringUtils.isNotEmpty(children1List)) {
-                        for (Object children1 : children1List) {
-                            Map children1Map = (Map) JSON.parse(children1.toString());
-                            String rankingsResult = HttpUtils.sendGet(URL,"year=2023&majorCode="+children1Map.get("code").toString());
-
-                            Thread.sleep(10000); // 暂停10秒
-                            Map<String, List<Object>> univMap = OkHttpFGUtils.getSchoolMap(rankingsResult);
-
-                            for (Object rankings:
-                                    univMap.get("rankingsList")) {
-                                Map rankingsMap = (Map) JSON.parse(rankings.toString());
-
-                                if(rankingsMap.get("grade").toString().equals("A+")||rankingsMap.get("grade").toString().equals("A")){
-
-                                    School school = new School();
-
-                                    school.setlName(majorsMap.get("name").toString());
-                                    school.setlCode(majorsMap.get("code").toString());
-                                    school.setpName(childrenMap.get("name").toString());
-                                    school.setpCode(childrenMap.get("code").toString());
-                                    school.setzName(children1Map.get("name").toString());
-                                    school.setzCode(children1Map.get("code").toString());
-                                    school.setGrade(rankingsMap.get("grade").toString());
-                                    school.setUnivNameCn(rankingsMap.get("univNameCn").toString());
-                                    school.setScore(rankingsMap.get("score").toString());
-                                    school.setProvince(rankingsMap.get("province").toString());
-                                    school.setCity(rankingsMap.get("city").toString());
-                                    school.setUnivLikeCount(rankingsMap.get("univLikeCount").toString());
-                                    school.setUnivTags(rankingsMap.get("univTags").toString());
-                                    school.setRanking(rankingsMap.get("ranking").toString());
-
-                                    Map indGradesMap = (Map) JSON.parse(rankingsMap.get("indGrades").toString());
-                                    if (!indGradesMap.isEmpty()){
-                                        school.setNameCn12(indGradesMap.get(12)!=null?indGradesMap.get(12).toString():"/");
-                                        school.setNameCn13(indGradesMap.get(13)!=null?indGradesMap.get(13).toString():"/");
-                                        school.setNameCn14(indGradesMap.get(14)!=null?indGradesMap.get(14).toString():"/");
-                                        school.setNameCn15(indGradesMap.get(15)!=null?indGradesMap.get(15).toString():"/");
-                                        school.setNameCn16(indGradesMap.get(16)!=null?indGradesMap.get(16).toString():"/");
-                                    }
-
-                                    resultList.add(school);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        ExcelUtil<School> util = new ExcelUtil<School>(School.class);
-        util.exportExcel(response, resultList, "学校附件数据统计");
-
-    }
-
-
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/CrmController.java

@@ -1,80 +0,0 @@
-package com.ruoyi.web.controller.tool;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.flowable.domain.vo.FlowTaskVo;
-import com.ruoyi.flowable.service.crm.CrmService;
-import com.ruoyi.system.domain.crm.Customer;
-import com.ruoyi.system.service.crm.ICustomerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- *  crm系统
- */
-@Api(tags = "CRM系统")
-@RestController
-@RequestMapping("/crmSystem")
-public class CrmController extends BaseController {
-
-    @Autowired
-    private CrmService crmService;
-
-    @Autowired
-    private ICustomerService customerService;
-
-    @ApiOperation(value = "发起流程")
-    @PostMapping("/start/{procDefId}")
-    public AjaxResult start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
-                            @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables
-    ) {
-        return crmService.startProcessInstanceById(procDefId,variables);
-    }
-
-    /**
-     * 获取公司客户列表
-     */
-    @ApiOperation(value = "获取公司客户列表")
-    @PreAuthorize("@ss.hasPermi('crmSystem:crm:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Customer customer)
-    {
-        startPage();
-        List<Customer> list = customerService.selectCustomerList(customer);
-        return getDataTable(list);
-    }
-
-    @ApiOperation(value = "获取待办列表", response = Customer.class)
-    @GetMapping(value = "/myTaskList")
-    public TableDataInfo myTaskList(@ApiParam(value = "客户实体") @RequestBody Customer customer)
-    {
-        startPage();
-        List<Customer> list = customerService.myTaskList(customer);
-        return getDataTable(list);
-    }
-
-
-    @ApiOperation(value = "修改客户和项目信息，进入流程")
-    @PostMapping("/submit")
-    public AjaxResult submit(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
-                            @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables
-    ) {
-        return AjaxResult.success("审批成功");
-    }
-
-    @ApiOperation(value = "审批任务")
-    @PostMapping(value = "/complete")
-    public AjaxResult complete(@RequestBody FlowTaskVo flowTaskVo) {
-        return AjaxResult.success("审批成功");
-    }
-
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/CrmFileController.java

@@ -1,106 +0,0 @@
-package com.ruoyi.web.controller.tool;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.system.domain.crm.CrmFile;
-import com.ruoyi.system.service.crm.ICrmFileService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * crm附件Controller
- * 
- * @author ruoyi
- * @date 2023-11-15
- */
-@RestController
-@RequestMapping("/crm/crmFile")
-public class CrmFileController extends BaseController
-{
-    @Autowired
-    private ICrmFileService crmFileService;
-
-    /**
-     * 查询crm附件列表
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(CrmFile crmFile)
-    {
-        startPage();
-        List<CrmFile> list = crmFileService.selectCrmFileList(crmFile);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出crm附件列表
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:export')")
-    @Log(title = "crm附件", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CrmFile crmFile)
-    {
-        List<CrmFile> list = crmFileService.selectCrmFileList(crmFile);
-        ExcelUtil<CrmFile> util = new ExcelUtil<CrmFile>(CrmFile.class);
-        util.exportExcel(response, list, "crm附件数据");
-    }
-
-    /**
-     * 获取crm附件详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(crmFileService.selectCrmFileById(id));
-    }
-
-    /**
-     * 新增crm附件
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:add')")
-    @Log(title = "crm附件", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CrmFile crmFile)
-    {
-        return toAjax(crmFileService.insertCrmFile(crmFile));
-    }
-
-    /**
-     * 修改crm附件
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:edit')")
-    @Log(title = "crm附件", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CrmFile crmFile)
-    {
-        return toAjax(crmFileService.updateCrmFile(crmFile));
-    }
-
-    /**
-     * 删除crm附件
-     */
-    @PreAuthorize("@ss.hasPermi('crm:crmFile:remove')")
-    @Log(title = "crm附件", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(crmFileService.deleteCrmFileByIds(ids));
-    }
-
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TCompanyUserController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.tool;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.tool.domain.TCompanyUser;
+import com.ruoyi.tool.service.ITCompanyUserService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 企业管理员Controller
+ * 
+ * @author ruoyi
+ * @date 2024-06-04
+ */
+@RestController
+@RequestMapping("/tool/authUser")
+public class TCompanyUserController extends BaseController
+{
+    @Autowired
+    private ITCompanyUserService tCompanyUserService;
+
+    /**
+     * 查询企业管理员列表
+     */
+    @PreAuthorize("@ss.hasPermi('tool:authUser:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TCompanyUser tCompanyUser)
+    {
+        startPage();
+        List<TCompanyUser> list = tCompanyUserService.selectTCompanyUserList(tCompanyUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出企业管理员列表
+     */
+    @PreAuthorize("@ss.hasPermi('tool:authUser:export')")
+    @Log(title = "企业管理员", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TCompanyUser tCompanyUser)
+    {
+        List<TCompanyUser> list = tCompanyUserService.selectTCompanyUserList(tCompanyUser);
+        ExcelUtil<TCompanyUser> util = new ExcelUtil<TCompanyUser>(TCompanyUser.class);
+        util.exportExcel(response, list, "企业管理员数据");
+    }
+
+    /**
+     * 获取企业管理员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('tool:authUser:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tCompanyUserService.selectTCompanyUserById(id));
+    }
+
+    /**
+     * 新增企业管理员
+     */
+    @PreAuthorize("@ss.hasPermi('tool:authUser:add')")
+    @Log(title = "企业管理员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TCompanyUser tCompanyUser)
+    {
+        return toAjax(tCompanyUserService.insertTCompanyUser(tCompanyUser));
+    }
+
+    /**
+     * 修改企业管理员
+     */
+    @PreAuthorize("@ss.hasPermi('tool:authUser:edit')")
+    @Log(title = "企业管理员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TCompanyUser tCompanyUser)
+    {
+        return toAjax(tCompanyUserService.updateTCompanyUser(tCompanyUser));
+    }
+
+    /**
+     * 删除企业管理员
+     */
+    @PreAuthorize("@ss.hasPermi('tool:authUser:remove')")
+    @Log(title = "企业管理员", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tCompanyUserService.deleteTCompanyUserByIds(ids));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/fg/Blogger.java

@@ -1,737 +0,0 @@
-package com.ruoyi.system.domain.fg;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 达人数据对象 t_blogger
- * 
- * @author ruoyi
- * @date 2023-11-24
- */
-public class Blogger extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String age;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avatar;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgGuestPrice;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgGuestPriceStr;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avglike30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgTotalUserCount30Day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgUserCount30Day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgUserSale;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String avgUserSaleStr;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemeavgsalescount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemeavgsalesgmv30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemeCount30Day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemecount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemesalescount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemesalesgmv30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String awemes;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String city;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String contentTags;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String customVerify;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String enterpriseVerify;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String fansinc30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String gender;
-
-    /** $column.columnComment */
-    private String id;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String includeState;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isBrandSelf;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isFavorite;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isFocus;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isMcn;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean isRooming;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String likeCount;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String likesinc30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String liveavggmv30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String liveavgsalescount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String liveCount30Day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String livegmv30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String livesalescount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String liveTags;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String location;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String nickName;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String platformFans;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String province;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String score;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String sellgoodsawemecount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String sellgoodslivecount30day;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String shortId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String signature;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String tags;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String uid;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String uniqueId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String url;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Boolean withFusionShopEntry;
-
-    public void setAge(String age) 
-    {
-        this.age = age;
-    }
-
-    public String getAge() 
-    {
-        return age;
-    }
-    public void setAvatar(String avatar) 
-    {
-        this.avatar = avatar;
-    }
-
-    public String getAvatar() 
-    {
-        return avatar;
-    }
-    public void setAvgGuestPrice(String avgGuestPrice) 
-    {
-        this.avgGuestPrice = avgGuestPrice;
-    }
-
-    public String getAvgGuestPrice() 
-    {
-        return avgGuestPrice;
-    }
-    public void setAvgGuestPriceStr(String avgGuestPriceStr) 
-    {
-        this.avgGuestPriceStr = avgGuestPriceStr;
-    }
-
-    public String getAvgGuestPriceStr() 
-    {
-        return avgGuestPriceStr;
-    }
-    public void setAvglike30day(String avglike30day) 
-    {
-        this.avglike30day = avglike30day;
-    }
-
-    public String getAvglike30day() 
-    {
-        return avglike30day;
-    }
-    public void setAvgTotalUserCount30Day(String avgTotalUserCount30Day) 
-    {
-        this.avgTotalUserCount30Day = avgTotalUserCount30Day;
-    }
-
-    public String getAvgTotalUserCount30Day() 
-    {
-        return avgTotalUserCount30Day;
-    }
-    public void setAvgUserCount30Day(String avgUserCount30Day) 
-    {
-        this.avgUserCount30Day = avgUserCount30Day;
-    }
-
-    public String getAvgUserCount30Day() 
-    {
-        return avgUserCount30Day;
-    }
-    public void setAvgUserSale(String avgUserSale) 
-    {
-        this.avgUserSale = avgUserSale;
-    }
-
-    public String getAvgUserSale() 
-    {
-        return avgUserSale;
-    }
-    public void setAvgUserSaleStr(String avgUserSaleStr) 
-    {
-        this.avgUserSaleStr = avgUserSaleStr;
-    }
-
-    public String getAvgUserSaleStr() 
-    {
-        return avgUserSaleStr;
-    }
-    public void setAwemeavgsalescount30day(String awemeavgsalescount30day) 
-    {
-        this.awemeavgsalescount30day = awemeavgsalescount30day;
-    }
-
-    public String getAwemeavgsalescount30day() 
-    {
-        return awemeavgsalescount30day;
-    }
-    public void setAwemeavgsalesgmv30day(String awemeavgsalesgmv30day) 
-    {
-        this.awemeavgsalesgmv30day = awemeavgsalesgmv30day;
-    }
-
-    public String getAwemeavgsalesgmv30day() 
-    {
-        return awemeavgsalesgmv30day;
-    }
-    public void setAwemeCount30Day(String awemeCount30Day) 
-    {
-        this.awemeCount30Day = awemeCount30Day;
-    }
-
-    public String getAwemeCount30Day() 
-    {
-        return awemeCount30Day;
-    }
-    public void setAwemecount30day(String awemecount30day) 
-    {
-        this.awemecount30day = awemecount30day;
-    }
-
-    public String getAwemecount30day() 
-    {
-        return awemecount30day;
-    }
-    public void setAwemesalescount30day(String awemesalescount30day) 
-    {
-        this.awemesalescount30day = awemesalescount30day;
-    }
-
-    public String getAwemesalescount30day() 
-    {
-        return awemesalescount30day;
-    }
-    public void setAwemesalesgmv30day(String awemesalesgmv30day) 
-    {
-        this.awemesalesgmv30day = awemesalesgmv30day;
-    }
-
-    public String getAwemesalesgmv30day() 
-    {
-        return awemesalesgmv30day;
-    }
-    public void setAwemes(String awemes) 
-    {
-        this.awemes = awemes;
-    }
-
-    public String getAwemes() 
-    {
-        return awemes;
-    }
-    public void setCity(String city) 
-    {
-        this.city = city;
-    }
-
-    public String getCity() 
-    {
-        return city;
-    }
-    public void setContentTags(String contentTags) 
-    {
-        this.contentTags = contentTags;
-    }
-
-    public String getContentTags() 
-    {
-        return contentTags;
-    }
-    public void setCustomVerify(String customVerify) 
-    {
-        this.customVerify = customVerify;
-    }
-
-    public String getCustomVerify() 
-    {
-        return customVerify;
-    }
-    public void setEnterpriseVerify(String enterpriseVerify) 
-    {
-        this.enterpriseVerify = enterpriseVerify;
-    }
-
-    public String getEnterpriseVerify() 
-    {
-        return enterpriseVerify;
-    }
-    public void setFansinc30day(String fansinc30day) 
-    {
-        this.fansinc30day = fansinc30day;
-    }
-
-    public String getFansinc30day() 
-    {
-        return fansinc30day;
-    }
-    public void setGender(String gender) 
-    {
-        this.gender = gender;
-    }
-
-    public String getGender() 
-    {
-        return gender;
-    }
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setIncludeState(String includeState) 
-    {
-        this.includeState = includeState;
-    }
-
-    public String getIncludeState() 
-    {
-        return includeState;
-    }
-    public void setIsBrandSelf(Boolean isBrandSelf) 
-    {
-        this.isBrandSelf = isBrandSelf;
-    }
-
-    public Boolean getIsBrandSelf() 
-    {
-        return isBrandSelf;
-    }
-    public void setIsFavorite(Boolean isFavorite) 
-    {
-        this.isFavorite = isFavorite;
-    }
-
-    public Boolean getIsFavorite() 
-    {
-        return isFavorite;
-    }
-    public void setIsFocus(Boolean isFocus) 
-    {
-        this.isFocus = isFocus;
-    }
-
-    public Boolean getIsFocus() 
-    {
-        return isFocus;
-    }
-    public void setIsMcn(Boolean isMcn) 
-    {
-        this.isMcn = isMcn;
-    }
-
-    public Boolean getIsMcn() 
-    {
-        return isMcn;
-    }
-    public void setIsRooming(Boolean isRooming) 
-    {
-        this.isRooming = isRooming;
-    }
-
-    public Boolean getIsRooming() 
-    {
-        return isRooming;
-    }
-    public void setLikeCount(String likeCount) 
-    {
-        this.likeCount = likeCount;
-    }
-
-    public String getLikeCount() 
-    {
-        return likeCount;
-    }
-    public void setLikesinc30day(String likesinc30day) 
-    {
-        this.likesinc30day = likesinc30day;
-    }
-
-    public String getLikesinc30day() 
-    {
-        return likesinc30day;
-    }
-    public void setLiveavggmv30day(String liveavggmv30day) 
-    {
-        this.liveavggmv30day = liveavggmv30day;
-    }
-
-    public String getLiveavggmv30day() 
-    {
-        return liveavggmv30day;
-    }
-    public void setLiveavgsalescount30day(String liveavgsalescount30day) 
-    {
-        this.liveavgsalescount30day = liveavgsalescount30day;
-    }
-
-    public String getLiveavgsalescount30day() 
-    {
-        return liveavgsalescount30day;
-    }
-    public void setLiveCount30Day(String liveCount30Day) 
-    {
-        this.liveCount30Day = liveCount30Day;
-    }
-
-    public String getLiveCount30Day() 
-    {
-        return liveCount30Day;
-    }
-    public void setLivegmv30day(String livegmv30day) 
-    {
-        this.livegmv30day = livegmv30day;
-    }
-
-    public String getLivegmv30day() 
-    {
-        return livegmv30day;
-    }
-    public void setLivesalescount30day(String livesalescount30day) 
-    {
-        this.livesalescount30day = livesalescount30day;
-    }
-
-    public String getLivesalescount30day() 
-    {
-        return livesalescount30day;
-    }
-    public void setLiveTags(String liveTags) 
-    {
-        this.liveTags = liveTags;
-    }
-
-    public String getLiveTags() 
-    {
-        return liveTags;
-    }
-    public void setLocation(String location) 
-    {
-        this.location = location;
-    }
-
-    public String getLocation() 
-    {
-        return location;
-    }
-    public void setNickName(String nickName) 
-    {
-        this.nickName = nickName;
-    }
-
-    public String getNickName() 
-    {
-        return nickName;
-    }
-    public void setPlatformFans(String platformFans) 
-    {
-        this.platformFans = platformFans;
-    }
-
-    public String getPlatformFans() 
-    {
-        return platformFans;
-    }
-    public void setProvince(String province) 
-    {
-        this.province = province;
-    }
-
-    public String getProvince() 
-    {
-        return province;
-    }
-    public void setScore(String score) 
-    {
-        this.score = score;
-    }
-
-    public String getScore() 
-    {
-        return score;
-    }
-    public void setSellgoodsawemecount30day(String sellgoodsawemecount30day) 
-    {
-        this.sellgoodsawemecount30day = sellgoodsawemecount30day;
-    }
-
-    public String getSellgoodsawemecount30day() 
-    {
-        return sellgoodsawemecount30day;
-    }
-    public void setSellgoodslivecount30day(String sellgoodslivecount30day) 
-    {
-        this.sellgoodslivecount30day = sellgoodslivecount30day;
-    }
-
-    public String getSellgoodslivecount30day() 
-    {
-        return sellgoodslivecount30day;
-    }
-    public void setShortId(String shortId) 
-    {
-        this.shortId = shortId;
-    }
-
-    public String getShortId() 
-    {
-        return shortId;
-    }
-    public void setSignature(String signature) 
-    {
-        this.signature = signature;
-    }
-
-    public String getSignature() 
-    {
-        return signature;
-    }
-    public void setTags(String tags) 
-    {
-        this.tags = tags;
-    }
-
-    public String getTags() 
-    {
-        return tags;
-    }
-    public void setUid(String uid) 
-    {
-        this.uid = uid;
-    }
-
-    public String getUid() 
-    {
-        return uid;
-    }
-    public void setUniqueId(String uniqueId) 
-    {
-        this.uniqueId = uniqueId;
-    }
-
-    public String getUniqueId() 
-    {
-        return uniqueId;
-    }
-    public void setUrl(String url) 
-    {
-        this.url = url;
-    }
-
-    public String getUrl() 
-    {
-        return url;
-    }
-    public void setWithFusionShopEntry(Boolean withFusionShopEntry) 
-    {
-        this.withFusionShopEntry = withFusionShopEntry;
-    }
-
-    public Boolean getWithFusionShopEntry() 
-    {
-        return withFusionShopEntry;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("age", getAge())
-            .append("avatar", getAvatar())
-            .append("avgGuestPrice", getAvgGuestPrice())
-            .append("avgGuestPriceStr", getAvgGuestPriceStr())
-            .append("avglike30day", getAvglike30day())
-            .append("avgTotalUserCount30Day", getAvgTotalUserCount30Day())
-            .append("avgUserCount30Day", getAvgUserCount30Day())
-            .append("avgUserSale", getAvgUserSale())
-            .append("avgUserSaleStr", getAvgUserSaleStr())
-            .append("awemeavgsalescount30day", getAwemeavgsalescount30day())
-            .append("awemeavgsalesgmv30day", getAwemeavgsalesgmv30day())
-            .append("awemeCount30Day", getAwemeCount30Day())
-            .append("awemecount30day", getAwemecount30day())
-            .append("awemesalescount30day", getAwemesalescount30day())
-            .append("awemesalesgmv30day", getAwemesalesgmv30day())
-            .append("awemes", getAwemes())
-            .append("city", getCity())
-            .append("contentTags", getContentTags())
-            .append("customVerify", getCustomVerify())
-            .append("enterpriseVerify", getEnterpriseVerify())
-            .append("fansinc30day", getFansinc30day())
-            .append("gender", getGender())
-            .append("id", getId())
-            .append("includeState", getIncludeState())
-            .append("isBrandSelf", getIsBrandSelf())
-            .append("isFavorite", getIsFavorite())
-            .append("isFocus", getIsFocus())
-            .append("isMcn", getIsMcn())
-            .append("isRooming", getIsRooming())
-            .append("likeCount", getLikeCount())
-            .append("likesinc30day", getLikesinc30day())
-            .append("liveavggmv30day", getLiveavggmv30day())
-            .append("liveavgsalescount30day", getLiveavgsalescount30day())
-            .append("liveCount30Day", getLiveCount30Day())
-            .append("livegmv30day", getLivegmv30day())
-            .append("livesalescount30day", getLivesalescount30day())
-            .append("liveTags", getLiveTags())
-            .append("location", getLocation())
-            .append("nickName", getNickName())
-            .append("platformFans", getPlatformFans())
-            .append("province", getProvince())
-            .append("score", getScore())
-            .append("sellgoodsawemecount30day", getSellgoodsawemecount30day())
-            .append("sellgoodslivecount30day", getSellgoodslivecount30day())
-            .append("shortId", getShortId())
-            .append("signature", getSignature())
-            .append("tags", getTags())
-            .append("uid", getUid())
-            .append("uniqueId", getUniqueId())
-            .append("url", getUrl())
-            .append("withFusionShopEntry", getWithFusionShopEntry())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/fg/SalesTrendData.java

@@ -1,273 +0,0 @@
-package com.ruoyi.system.domain.fg;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-public class SalesTrendData extends BaseEntity {
-
-    @Excel(name = "视频销量总数")
-    private String AwemeSalesCount;
-    @Excel(name = "视频销量区间数")
-    private String AwemeSalesCountStr;
-    @Excel(name = "视频销量百分比")
-    private String AwemeSaleCountRatio;
-    @Excel(name = "视频销售额")
-    private String AwemeSales;
-    @Excel(name = "视频销售额区间数")
-    private String AwemeSalesStr;
-    @Excel(name = "视频销售额百分比")
-    private String AwemeSalesRatio;
-
-    @Excel(name = "日期")
-    private String DateCode;
-    @Excel(name = "直播销量总数")
-    private String LiveSalesCount;
-    @Excel(name = "直播销量区间数")
-    private String LiveSalesCountStr;
-    @Excel(name = "直播销量百分比")
-    private String LiveSaleCountRatio;
-    @Excel(name = "直播销售额")
-    private String LiveSales;
-    @Excel(name = "直播销售额区间数")
-    private String LiveSalesStr;
-    @Excel(name = "直播销售额百分比")
-    private String LiveSalesRatio;
-
-    @Excel(name = "商品卡销量总数")
-    private String OtherSalesCount;
-    @Excel(name = "商品卡销售区间数")
-    private String OtherSalesCountStr;
-    @Excel(name = "商品卡销量百分比")
-    private String OtherSaleCountRatio;
-    @Excel(name = "商品卡销量额")
-    private String OtherSales;
-    @Excel(name = "商品卡销量额区间数")
-    private String OtherSalesStr;
-    @Excel(name = "商品卡销售额百分比")
-    private String OtherSalesRatio;
-
-
-
-    @Excel(name = "总PV")
-    private String PV;
-    @Excel(name = "总PV区间值")
-    private String PVStr;
-    @Excel(name = "时间")
-    private String StatDate;
-    @Excel(name = "总计")
-    private String SumSalesCount;
-    @Excel(name = "总计区间值")
-    private String SumSalesCountStr;
-    @Excel(name = "总量")
-    private String TotalSales;
-    @Excel(name = "总量区间值")
-    private String TotalSalesStr;
-
-    public String getAwemeSalesCount() {
-        return AwemeSalesCount;
-    }
-
-    public void setAwemeSalesCount(String awemeSalesCount) {
-        AwemeSalesCount = awemeSalesCount;
-    }
-
-    public String getAwemeSalesCountStr() {
-        return AwemeSalesCountStr;
-    }
-
-    public void setAwemeSalesCountStr(String awemeSalesCountStr) {
-        AwemeSalesCountStr = awemeSalesCountStr;
-    }
-
-    public String getAwemeSaleCountRatio() {
-        return AwemeSaleCountRatio;
-    }
-
-    public void setAwemeSaleCountRatio(String awemeSaleCountRatio) {
-        AwemeSaleCountRatio = awemeSaleCountRatio;
-    }
-
-    public String getAwemeSales() {
-        return AwemeSales;
-    }
-
-    public void setAwemeSales(String awemeSales) {
-        AwemeSales = awemeSales;
-    }
-
-    public String getAwemeSalesStr() {
-        return AwemeSalesStr;
-    }
-
-    public void setAwemeSalesStr(String awemeSalesStr) {
-        AwemeSalesStr = awemeSalesStr;
-    }
-
-    public String getAwemeSalesRatio() {
-        return AwemeSalesRatio;
-    }
-
-    public void setAwemeSalesRatio(String awemeSalesRatio) {
-        AwemeSalesRatio = awemeSalesRatio;
-    }
-
-    public String getDateCode() {
-        return DateCode;
-    }
-
-    public void setDateCode(String dateCode) {
-        DateCode = dateCode;
-    }
-
-    public String getLiveSalesCount() {
-        return LiveSalesCount;
-    }
-
-    public void setLiveSalesCount(String liveSalesCount) {
-        LiveSalesCount = liveSalesCount;
-    }
-
-    public String getLiveSalesCountStr() {
-        return LiveSalesCountStr;
-    }
-
-    public void setLiveSalesCountStr(String liveSalesCountStr) {
-        LiveSalesCountStr = liveSalesCountStr;
-    }
-
-    public String getLiveSaleCountRatio() {
-        return LiveSaleCountRatio;
-    }
-
-    public void setLiveSaleCountRatio(String liveSaleCountRatio) {
-        LiveSaleCountRatio = liveSaleCountRatio;
-    }
-
-    public String getLiveSales() {
-        return LiveSales;
-    }
-
-    public void setLiveSales(String liveSales) {
-        LiveSales = liveSales;
-    }
-
-    public String getLiveSalesStr() {
-        return LiveSalesStr;
-    }
-
-    public void setLiveSalesStr(String liveSalesStr) {
-        LiveSalesStr = liveSalesStr;
-    }
-
-    public String getLiveSalesRatio() {
-        return LiveSalesRatio;
-    }
-
-    public void setLiveSalesRatio(String liveSalesRatio) {
-        LiveSalesRatio = liveSalesRatio;
-    }
-
-    public String getOtherSalesCount() {
-        return OtherSalesCount;
-    }
-
-    public void setOtherSalesCount(String otherSalesCount) {
-        OtherSalesCount = otherSalesCount;
-    }
-
-    public String getOtherSalesCountStr() {
-        return OtherSalesCountStr;
-    }
-
-    public void setOtherSalesCountStr(String otherSalesCountStr) {
-        OtherSalesCountStr = otherSalesCountStr;
-    }
-
-    public String getOtherSaleCountRatio() {
-        return OtherSaleCountRatio;
-    }
-
-    public void setOtherSaleCountRatio(String otherSaleCountRatio) {
-        OtherSaleCountRatio = otherSaleCountRatio;
-    }
-
-    public String getOtherSales() {
-        return OtherSales;
-    }
-
-    public void setOtherSales(String otherSales) {
-        OtherSales = otherSales;
-    }
-
-    public String getOtherSalesStr() {
-        return OtherSalesStr;
-    }
-
-    public void setOtherSalesStr(String otherSalesStr) {
-        OtherSalesStr = otherSalesStr;
-    }
-
-    public String getOtherSalesRatio() {
-        return OtherSalesRatio;
-    }
-
-    public void setOtherSalesRatio(String otherSalesRatio) {
-        OtherSalesRatio = otherSalesRatio;
-    }
-
-    public String getPV() {
-        return PV;
-    }
-
-    public void setPV(String PV) {
-        this.PV = PV;
-    }
-
-    public String getPVStr() {
-        return PVStr;
-    }
-
-    public void setPVStr(String PVStr) {
-        this.PVStr = PVStr;
-    }
-
-    public String getStatDate() {
-        return StatDate;
-    }
-
-    public void setStatDate(String statDate) {
-        StatDate = statDate;
-    }
-
-    public String getSumSalesCount() {
-        return SumSalesCount;
-    }
-
-    public void setSumSalesCount(String sumSalesCount) {
-        SumSalesCount = sumSalesCount;
-    }
-
-    public String getSumSalesCountStr() {
-        return SumSalesCountStr;
-    }
-
-    public void setSumSalesCountStr(String sumSalesCountStr) {
-        SumSalesCountStr = sumSalesCountStr;
-    }
-
-    public String getTotalSales() {
-        return TotalSales;
-    }
-
-    public void setTotalSales(String totalSales) {
-        TotalSales = totalSales;
-    }
-
-    public String getTotalSalesStr() {
-        return TotalSalesStr;
-    }
-
-    public void setTotalSalesStr(String totalSalesStr) {
-        TotalSalesStr = totalSalesStr;
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/fg/School.java

@@ -1,199 +0,0 @@
-package com.ruoyi.system.domain.fg;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-public class School extends BaseEntity {
-
-    @Excel(name = "大类")
-    private String lName;
-
-    @Excel(name = "大类code")
-    private String lCode;
-    @Excel(name = "小类")
-    private String pName;
-    @Excel(name = "小类code")
-    private String pCode;
-    @Excel(name = "子类")
-    private String zName;
-    @Excel(name = "子类code")
-    private String zCode;
-    @Excel(name = "评级")
-    private String grade;
-    @Excel(name = "学校名称")
-    private String univNameCn;
-    @Excel(name = "总分")
-    private String score;
-    @Excel(name = "省")
-    private String province;
-    @Excel(name = "市")
-    private String city;
-    @Excel(name = "总分数")
-    private String univLikeCount;
-    @Excel(name = "学校类型")
-    private String univTags;
-    @Excel(name = "排名")
-    private String ranking;
-    @Excel(name = "学校条件")
-    private String nameCn12;
-    @Excel(name = "学校支撑")
-    private String nameCn13;
-    @Excel(name = "专业生源")
-    private String nameCn14;
-    @Excel(name = "专业就业")
-    private String nameCn15;
-    @Excel(name = "专业条件")
-    private String nameCn16;
-
-    public String getlName() {
-        return lName;
-    }
-
-    public void setlName(String lName) {
-        this.lName = lName;
-    }
-
-    public String getlCode() {
-        return lCode;
-    }
-
-    public void setlCode(String lCode) {
-        this.lCode = lCode;
-    }
-
-    public String getpName() {
-        return pName;
-    }
-
-    public void setpName(String pName) {
-        this.pName = pName;
-    }
-
-    public String getpCode() {
-        return pCode;
-    }
-
-    public void setpCode(String pCode) {
-        this.pCode = pCode;
-    }
-
-    public String getzName() {
-        return zName;
-    }
-
-    public void setzName(String zName) {
-        this.zName = zName;
-    }
-
-    public String getzCode() {
-        return zCode;
-    }
-
-    public void setzCode(String zCode) {
-        this.zCode = zCode;
-    }
-
-    public String getGrade() {
-        return grade;
-    }
-
-    public void setGrade(String grade) {
-        this.grade = grade;
-    }
-
-    public String getUnivNameCn() {
-        return univNameCn;
-    }
-
-    public void setUnivNameCn(String univNameCn) {
-        this.univNameCn = univNameCn;
-    }
-
-    public String getScore() {
-        return score;
-    }
-
-    public void setScore(String score) {
-        this.score = score;
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getUnivLikeCount() {
-        return univLikeCount;
-    }
-
-    public void setUnivLikeCount(String univLikeCount) {
-        this.univLikeCount = univLikeCount;
-    }
-
-    public String getUnivTags() {
-        return univTags;
-    }
-
-    public void setUnivTags(String univTags) {
-        this.univTags = univTags;
-    }
-
-    public String getRanking() {
-        return ranking;
-    }
-
-    public void setRanking(String ranking) {
-        this.ranking = ranking;
-    }
-
-    public String getNameCn12() {
-        return nameCn12;
-    }
-
-    public void setNameCn12(String nameCn12) {
-        this.nameCn12 = nameCn12;
-    }
-
-    public String getNameCn13() {
-        return nameCn13;
-    }
-
-    public void setNameCn13(String nameCn13) {
-        this.nameCn13 = nameCn13;
-    }
-
-    public String getNameCn14() {
-        return nameCn14;
-    }
-
-    public void setNameCn14(String nameCn14) {
-        this.nameCn14 = nameCn14;
-    }
-
-    public String getNameCn15() {
-        return nameCn15;
-    }
-
-    public void setNameCn15(String nameCn15) {
-        this.nameCn15 = nameCn15;
-    }
-
-    public String getNameCn16() {
-        return nameCn16;
-    }
-
-    public void setNameCn16(String nameCn16) {
-        this.nameCn16 = nameCn16;
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/fg/BloggerMapper.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.mapper.fg;
-
-import com.ruoyi.system.domain.fg.Blogger;
-
-import java.util.List;
-
-/**
- * 达人数据Mapper接口
- * 
- * @author ruoyi
- * @date 2023-11-24
- */
-public interface BloggerMapper 
-{
-    /**
-     * 查询达人数据
-     * 
-     * @param age 达人数据主键
-     * @return 达人数据
-     */
-    public Blogger selectBloggerByAge(String age);
-
-    /**
-     * 查询达人数据列表
-     * 
-     * @param blogger 达人数据
-     * @return 达人数据集合
-     */
-    public List<Blogger> selectBloggerList(Blogger blogger);
-
-    /**
-     * 新增达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    public int insertBlogger(Blogger blogger);
-
-    /**
-     * 修改达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    public int updateBlogger(Blogger blogger);
-
-    /**
-     * 删除达人数据
-     * 
-     * @param age 达人数据主键
-     * @return 结果
-     */
-    public int deleteBloggerByAge(String age);
-
-    /**
-     * 批量删除达人数据
-     * 
-     * @param ages 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteBloggerByAges(String[] ages);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/fg/IBloggerService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.system.service.fg;
-
-import com.ruoyi.system.domain.fg.Blogger;
-
-import java.util.List;
-
-/**
- * 达人数据Service接口
- * 
- * @author ruoyi
- * @date 2023-11-24
- */
-public interface IBloggerService 
-{
-    /**
-     * 查询达人数据
-     * 
-     * @param age 达人数据主键
-     * @return 达人数据
-     */
-    public Blogger selectBloggerByAge(String age);
-
-    /**
-     * 查询达人数据列表
-     * 
-     * @param blogger 达人数据
-     * @return 达人数据集合
-     */
-    public List<Blogger> selectBloggerList(Blogger blogger);
-
-    /**
-     * 新增达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    public int insertBlogger(Blogger blogger);
-
-    /**
-     * 修改达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    public int updateBlogger(Blogger blogger);
-
-    /**
-     * 批量删除达人数据
-     * 
-     * @param ages 需要删除的达人数据主键集合
-     * @return 结果
-     */
-    public int deleteBloggerByAges(String[] ages);
-
-    /**
-     * 删除达人数据信息
-     * 
-     * @param age 达人数据主键
-     * @return 结果
-     */
-    public int deleteBloggerByAge(String age);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/fg/impl/BloggerServiceImpl.java

@@ -1,94 +0,0 @@
-package com.ruoyi.system.service.fg.impl;
-
-import java.util.List;
-
-import com.ruoyi.system.domain.fg.Blogger;
-import com.ruoyi.system.mapper.fg.BloggerMapper;
-import com.ruoyi.system.service.fg.IBloggerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 达人数据Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-24
- */
-@Service
-public class BloggerServiceImpl implements IBloggerService
-{
-    @Autowired
-    private BloggerMapper bloggerMapper;
-
-    /**
-     * 查询达人数据
-     * 
-     * @param age 达人数据主键
-     * @return 达人数据
-     */
-    @Override
-    public Blogger selectBloggerByAge(String age)
-    {
-        return bloggerMapper.selectBloggerByAge(age);
-    }
-
-    /**
-     * 查询达人数据列表
-     * 
-     * @param blogger 达人数据
-     * @return 达人数据
-     */
-    @Override
-    public List<Blogger> selectBloggerList(Blogger blogger)
-    {
-        return bloggerMapper.selectBloggerList(blogger);
-    }
-
-    /**
-     * 新增达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    @Override
-    public int insertBlogger(Blogger blogger)
-    {
-        return bloggerMapper.insertBlogger(blogger);
-    }
-
-    /**
-     * 修改达人数据
-     * 
-     * @param blogger 达人数据
-     * @return 结果
-     */
-    @Override
-    public int updateBlogger(Blogger blogger)
-    {
-        return bloggerMapper.updateBlogger(blogger);
-    }
-
-    /**
-     * 批量删除达人数据
-     * 
-     * @param ages 需要删除的达人数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBloggerByAges(String[] ages)
-    {
-        return bloggerMapper.deleteBloggerByAges(ages);
-    }
-
-    /**
-     * 删除达人数据信息
-     * 
-     * @param age 达人数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBloggerByAge(String age)
-    {
-        return bloggerMapper.deleteBloggerByAge(age);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/tool/domain/TCompanyUser.java

@@ -0,0 +1,96 @@
+package com.ruoyi.tool.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 企业管理员对象 t_company_user
+ * 
+ * @author ruoyi
+ * @date 2024-06-04
+ */
+public class TCompanyUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 企业应用ID */
+    @Excel(name = "企业应用ID")
+    private String agentid;
+
+    /** 授权管理员用户ID */
+    @Excel(name = "授权管理员用户ID")
+    private String userId;
+
+    /** 授权企业的CorpId */
+    @Excel(name = "授权企业的CorpId")
+    private String corpid;
+
+    /** 状态 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setAgentid(String agentid) 
+    {
+        this.agentid = agentid;
+    }
+
+    public String getAgentid() 
+    {
+        return agentid;
+    }
+    public void setUserId(String userId) 
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId() 
+    {
+        return userId;
+    }
+    public void setCorpid(String corpid) 
+    {
+        this.corpid = corpid;
+    }
+
+    public String getCorpid() 
+    {
+        return corpid;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("agentid", getAgentid())
+            .append("userId", getUserId())
+            .append("corpid", getCorpid())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/tool/domain/TEnterpriseCompany.java

@@ -1,5 +1,6 @@
 package com.ruoyi.tool.domain;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -289,4 +290,54 @@ public class TEnterpriseCompany extends BaseEntity
             .append("updateTime", getUpdateTime())
             .toString();
     }
+
+    /**
+     * 自定义的复制方法，忽略空值
+     * @param other
+     * @param ignoreNulls
+     */
+    public void copyFrom(TEnterpriseCompany other, boolean ignoreNulls) {
+        if (other == null) {
+            throw new IllegalArgumentException("Other object cannot be null");
+        }
+        if (ignoreNulls) {
+            this.setName(other.getName() != null && StringUtils.isNotEmpty(other.getName()) ? other.getName() : this.getName());
+            this.setAgentid(other.getAgentid() != null && StringUtils.isNotEmpty(other.getAgentid()) ? other.getAgentid() : this.getAgentid());
+            this.setLogoUrl(other.getLogoUrl() != null && StringUtils.isNotEmpty(other.getLogoUrl()) ? other.getLogoUrl() : this.getLogoUrl());
+            this.setDescription(other.getDescription() != null && StringUtils.isNotEmpty(other.getDescription()) ? other.getDescription() : this.getDescription());
+            this.setClose(other.getClose() != null && StringUtils.isNotEmpty(other.getClose()) ? other.getClose() : this.getClose());
+            this.setCorpid(other.getCorpid() != null && StringUtils.isNotEmpty(other.getCorpid()) ? other.getCorpid() : this.getCorpid());
+            this.setInviteCode(other.getInviteCode() != null && StringUtils.isNotEmpty(other.getInviteCode()) ? other.getInviteCode() : this.getInviteCode());
+            this.setIndustry(other.getIndustry() != null && StringUtils.isNotEmpty(other.getIndustry()) ? other.getIndustry() : this.getIndustry());
+            this.setCorpName(other.getCorpName() != null && StringUtils.isNotEmpty(other.getCorpName()) ? other.getCorpName() : this.getCorpName());
+            this.setLicenseCode(other.getLicenseCode() != null && StringUtils.isNotEmpty(other.getLicenseCode()) ? other.getLicenseCode() : this.getLicenseCode());
+            this.setAuthChannel(other.getAuthChannel() != null && StringUtils.isNotEmpty(other.getAuthChannel()) ? other.getAuthChannel() : this.getAuthChannel());
+            this.setAuthChannelType(other.getAuthChannelType() != null && StringUtils.isNotEmpty(other.getAuthChannelType()) ? other.getAuthChannelType() : this.getAuthChannelType());
+            this.setIsAuthenticated(other.getIsAuthenticated() != null && StringUtils.isNotEmpty(other.getIsAuthenticated()) ? other.getIsAuthenticated() : this.getIsAuthenticated());
+            this.setAuthLevel(other.getAuthLevel() != null && StringUtils.isNotEmpty(other.getAuthLevel()) ? other.getAuthLevel() : this.getAuthLevel());
+            this.setInviteUrl(other.getInviteUrl() != null && StringUtils.isNotEmpty(other.getInviteUrl()) ? other.getInviteUrl() : this.getInviteUrl());
+            this.setCorpLogoUrl(other.getCorpLogoUrl() != null && StringUtils.isNotEmpty(other.getCorpLogoUrl()) ? other.getCorpLogoUrl() : this.getCorpLogoUrl());
+
+
+        } else {
+            // 如果不忽略空值，则直接复制
+            this.setName(other.getName());
+            this.setAgentid(other.getAgentid());
+            this.setLogoUrl(other.getLogoUrl());
+            this.setDescription(other.getDescription());
+            this.setClose(other.getClose());
+            this.setCorpid(other.getCorpid());
+            this.setInviteCode(other.getInviteCode());
+            this.setIndustry(other.getIndustry());
+            this.setCorpName(other.getCorpName());
+            this.setLicenseCode(other.getLicenseCode());
+            this.setAuthChannel(other.getAuthChannel());
+            this.setAuthChannelType(other.getAuthChannelType());
+            this.setIsAuthenticated(other.getIsAuthenticated());
+            this.setAuthLevel(other.getAuthLevel());
+            this.setInviteUrl(other.getInviteUrl());
+            this.setCorpLogoUrl(other.getCorpLogoUrl());
+        }
+    }
+
 }

ruoyi-system/src/main/java/com/ruoyi/tool/mapper/TCompanyUserMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.tool.mapper;
+
+import java.util.List;
+import com.ruoyi.tool.domain.TCompanyUser;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 企业管理员Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-06-04
+ */
+public interface TCompanyUserMapper 
+{
+    /**
+     * 查询企业管理员
+     * 
+     * @param id 企业管理员主键
+     * @return 企业管理员
+     */
+    public TCompanyUser selectTCompanyUserById(String id);
+
+    /**
+     * 查询企业管理员列表
+     * 
+     * @param tCompanyUser 企业管理员
+     * @return 企业管理员集合
+     */
+    public List<TCompanyUser> selectTCompanyUserList(TCompanyUser tCompanyUser);
+
+    /**
+     * 新增企业管理员
+     * 
+     * @param tCompanyUser 企业管理员
+     * @return 结果
+     */
+    public int insertTCompanyUser(TCompanyUser tCompanyUser);
+
+    /**
+     * 修改企业管理员
+     * 
+     * @param tCompanyUser 企业管理员
+     * @return 结果
+     */
+    public int updateTCompanyUser(TCompanyUser tCompanyUser);
+
+    /**
+     * 删除企业管理员
+     * 
+     * @param id 企业管理员主键
+     * @return 结果
+     */
+    public int deleteTCompanyUserById(String id);
+
+    /**
+     * 批量删除企业管理员
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTCompanyUserByIds(String[] ids);
+
+}

ruoyi-system/src/main/java/com/ruoyi/tool/mapper/TEnterpriseCompanyMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.tool.mapper;
 
 import java.util.List;
 import com.ruoyi.tool.domain.TEnterpriseCompany;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 企业信息管理Mapper接口
@@ -58,4 +59,17 @@ public interface TEnterpriseCompanyMapper
      * @return 结果
      */
     public int deleteTEnterpriseCompanyByIds(String[] ids);
+
+    /**
+     * 根据企业ID查询数据
+     * @param corpid
+     * @return
+     */
+    TEnterpriseCompany selectTEnterpriseCompanyByCorpId(@Param("corpid") String corpid);
+
+    /**
+     * 解除授权企业
+     * @param corpid
+     */
+    int updateTCompanyUserClose(@Param("corpid") String corpid);
 }

ruoyi-system/src/main/java/com/ruoyi/tool/service/ITCompanyUserService.java

@@ -0,0 +1,64 @@
+package com.ruoyi.tool.service;
+
+import java.util.List;
+import com.ruoyi.tool.domain.TCompanyUser;
+
+/**
+ * 企业管理员Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-06-04
+ */
+public interface ITCompanyUserService 
+{
+    /**
+     * 查询企业管理员
+     * 
+     * @param id 企业管理员主键
+     * @return 企业管理员
+     */
+    public TCompanyUser selectTCompanyUserById(String id);
+
+    /**
+     * 查询企业管理员列表
+     * 
+     * @param tCompanyUser 企业管理员
+     * @return 企业管理员集合
+     */
+    public List<TCompanyUser> selectTCompanyUserList(TCompanyUser tCompanyUser);
+
+    /**
+     * 新增企业管理员
+     * 
+     * @param tCompanyUser 企业管理员
+     * @return 结果
+     */
+    public int insertTCompanyUser(TCompanyUser tCompanyUser);
+
+    /**
+     * 修改企业管理员
+     * 
+     * @param tCompanyUser 企业管理员
+     * @return 结果
+     */
+    public int updateTCompanyUser(TCompanyUser tCompanyUser);
+
+    /**
+     * 批量删除企业管理员
+     * 
+     * @param ids 需要删除的企业管理员主键集合
+     * @return 结果
+     */
+    public int deleteTCompanyUserByIds(String[] ids);
+
+    /**
+     * 删除企业管理员信息
+     * 
+     * @param id 企业管理员主键
+     * @return 结果
+     */
+    public int deleteTCompanyUserById(String id);
+
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/tool/service/ITEnterpriseCompanyService.java

@@ -58,4 +58,17 @@ public interface ITEnterpriseCompanyService
      * @return 结果
      */
     public int deleteTEnterpriseCompanyById(String id);
+
+    /**
+     * 根据企业ID查询数据
+     * @param corpid
+     * @return
+     */
+    TEnterpriseCompany selectTEnterpriseCompanyByCorpId(String corpid);
+
+    /**
+     * 解除授权方企业信息
+     * @param corpId
+     */
+    int updateTCompanyUserClose(String corpId);
 }

ruoyi-system/src/main/java/com/ruoyi/tool/service/impl/TCompanyUserServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.tool.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.tool.mapper.TCompanyUserMapper;
+import com.ruoyi.tool.domain.TCompanyUser;
+import com.ruoyi.tool.service.ITCompanyUserService;
+
+/**
+ * 企业管理员Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-06-04
+ */
+@Service
+public class TCompanyUserServiceImpl implements ITCompanyUserService
+{
+    @Autowired
+    private TCompanyUserMapper tCompanyUserMapper;
+
+    /**
+     * 查询企业管理员
+     * 
+     * @param id 企业管理员主键
+     * @return 企业管理员
+     */
+    @Override
+    public TCompanyUser selectTCompanyUserById(String id)
+    {
+        return tCompanyUserMapper.selectTCompanyUserById(id);
+    }
+
+    /**
+     * 查询企业管理员列表
+     * 
+     * @param tCompanyUser 企业管理员
+     * @return 企业管理员
+     */
+    @Override
+    public List<TCompanyUser> selectTCompanyUserList(TCompanyUser tCompanyUser)
+    {
+        return tCompanyUserMapper.selectTCompanyUserList(tCompanyUser);
+    }
+
+    /**
+     * 新增企业管理员
+     * 
+     * @param tCompanyUser 企业管理员
+     * @return 结果
+     */
+    @Override
+    public int insertTCompanyUser(TCompanyUser tCompanyUser)
+    {
+        tCompanyUser.setId(IdUtils.fastSimpleUUID());
+        tCompanyUser.setCreateTime(DateUtils.getNowDate());
+        return tCompanyUserMapper.insertTCompanyUser(tCompanyUser);
+    }
+
+    /**
+     * 修改企业管理员
+     * 
+     * @param tCompanyUser 企业管理员
+     * @return 结果
+     */
+    @Override
+    public int updateTCompanyUser(TCompanyUser tCompanyUser)
+    {
+        tCompanyUser.setUpdateTime(DateUtils.getNowDate());
+        return tCompanyUserMapper.updateTCompanyUser(tCompanyUser);
+    }
+
+    /**
+     * 批量删除企业管理员
+     * 
+     * @param ids 需要删除的企业管理员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCompanyUserByIds(String[] ids)
+    {
+        return tCompanyUserMapper.deleteTCompanyUserByIds(ids);
+    }
+
+    /**
+     * 删除企业管理员信息
+     * 
+     * @param id 企业管理员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTCompanyUserById(String id)
+    {
+        return tCompanyUserMapper.deleteTCompanyUserById(id);
+    }
+
+}

ruoyi-system/src/main/java/com/ruoyi/tool/service/impl/TEnterpriseCompanyServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.tool.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.tool.mapper.TEnterpriseCompanyMapper;
@@ -53,6 +54,7 @@ public class TEnterpriseCompanyServiceImpl implements ITEnterpriseCompanyService
     @Override
     public int insertTEnterpriseCompany(TEnterpriseCompany tEnterpriseCompany)
     {
+        tEnterpriseCompany.setId(IdUtils.fastSimpleUUID());
         tEnterpriseCompany.setCreateTime(DateUtils.getNowDate());
         return tEnterpriseCompanyMapper.insertTEnterpriseCompany(tEnterpriseCompany);
     }
@@ -93,4 +95,24 @@ public class TEnterpriseCompanyServiceImpl implements ITEnterpriseCompanyService
     {
         return tEnterpriseCompanyMapper.deleteTEnterpriseCompanyById(id);
     }
+
+    /**
+     * 根据企业ID查询数据
+     * @param corpid
+     * @return
+     */
+    @Override
+    public TEnterpriseCompany selectTEnterpriseCompanyByCorpId(String corpid) {
+        return tEnterpriseCompanyMapper.selectTEnterpriseCompanyByCorpId(corpid);
+    }
+
+    /**
+     * 解除授权企业
+     * @param corpId
+     */
+    @Override
+    public int updateTCompanyUserClose(String corpId) {
+        return tEnterpriseCompanyMapper.updateTCompanyUserClose(corpId);
+    }
+
 }

ruoyi-system/src/main/resources/mapper/tool/TCompanyUserMapper.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.tool.mapper.TCompanyUserMapper">
+    
+    <resultMap type="TCompanyUser" id="TCompanyUserResult">
+        <result property="id"    column="id"    />
+        <result property="agentid"    column="agentid"    />
+        <result property="userId"    column="userId"    />
+        <result property="corpid"    column="corpid"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectTCompanyUserVo">
+        select id, agentid, userId, corpid, del_flag, create_by, create_time, update_by, update_time from t_company_user
+    </sql>
+
+    <select id="selectTCompanyUserList" parameterType="TCompanyUser" resultMap="TCompanyUserResult">
+        <include refid="selectTCompanyUserVo"/>
+        <where>  
+            <if test="agentid != null  and agentid != ''"> and agentid = #{agentid}</if>
+            <if test="userId != null  and userId != ''"> and userId = #{userId}</if>
+            <if test="corpid != null  and corpid != ''"> and corpid = #{corpid}</if>
+        </where>
+    </select>
+    
+    <select id="selectTCompanyUserById" parameterType="String" resultMap="TCompanyUserResult">
+        <include refid="selectTCompanyUserVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTCompanyUser" parameterType="TCompanyUser">
+        insert into t_company_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="agentid != null">agentid,</if>
+            <if test="userId != null">userId,</if>
+            <if test="corpid != null">corpid,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="agentid != null">#{agentid},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="corpid != null">#{corpid},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTCompanyUser" parameterType="TCompanyUser">
+        update t_company_user
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="agentid != null">agentid = #{agentid},</if>
+            <if test="userId != null">userId = #{userId},</if>
+            <if test="corpid != null">corpid = #{corpid},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTCompanyUserById" parameterType="String">
+        delete from t_company_user where id = #{id}
+    </delete>
+
+    <delete id="deleteTCompanyUserByIds" parameterType="String">
+        delete from t_company_user where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/tool/TEnterpriseCompanyMapper.xml

@@ -155,4 +155,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectTEnterpriseCompanyByCorpId" parameterType="String" resultMap="TEnterpriseCompanyResult">
+        <include refid="selectTEnterpriseCompanyVo"/>
+        where corpid = #{corpid}
+    </select>
+
+    <update id="updateTCompanyUserClose" parameterType="String">
+        update t_enterprise_company SET `close` = 1
+        where corpid = #{corpid}
+    </update>
+
+
 </mapper>