更新返回值引用

fs-admin/src/main/java/com/fs/company/controller/CompanyDomainBindController.java

@@ -3,7 +3,7 @@ package com.fs.company.controller;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.utils.ServletUtils;
 import com.fs.company.param.CompanyDomainBindParam;
@@ -118,10 +118,10 @@ public class CompanyDomainBindController extends BaseController
     @PostMapping("/domainBatchBinding")
     public R domainBatchBinding(@RequestBody CompanyDomainBindParam param) {
         if (ObjectUtil.isEmpty(param.getCompanyIds()) || param.getCompanyIds().isEmpty()) {
-            return R.failed("绑定失败，至少有一条域名分配信息！");
+            return R.error("绑定失败，至少有一条域名分配信息！");
         }
         if (ObjectUtil.isEmpty(param.getCompanyUserIds()) || param.getCompanyUserIds().isEmpty()) {
-            return R.failed("绑定失败，至少有一条分配人员信息！");
+            return R.error("绑定失败，至少有一条分配人员信息！");
         }
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setUserId(loginUser.getUser().getUserId().toString());

fs-admin/src/main/java/com/fs/company/controller/CompanyDomainController.java

@@ -3,7 +3,7 @@ package com.fs.company.controller;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.ServletUtils;
@@ -127,10 +127,10 @@ public class CompanyDomainController extends BaseController {
     @PostMapping("/domainBatchBinding")
     public R domainBatchBinding(@RequestBody CompanyDomainParam param) {
         if (ObjectUtil.isEmpty(param.getDomainIds()) || param.getDomainIds().isEmpty()) {
-            return R.failed("绑定失败，至少有一条绑定域名信息！");
+            return R.error("绑定失败，至少有一条绑定域名信息！");
         }
         if (ObjectUtil.isEmpty(param.getCompanyIds()) || param.getCompanyIds().isEmpty()) {
-            return R.failed("绑定失败，至少有一条绑定公司信息！");
+            return R.error("绑定失败，至少有一条绑定公司信息！");
         }
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setUserId(loginUser.getUser().getUserId().toString());
@@ -151,18 +151,18 @@ public class CompanyDomainController extends BaseController {
     public R importDomainData(MultipartFile file) {
         // 1. 检查文件是否为空
         if (file.isEmpty()) {
-            return R.failed("上传的文件不能为空");
+            return R.error("上传的文件不能为空");
         }
 
         // 2. 检查文件大小
         if (file.getSize() > MAX_FILE_SIZE) {
-            return R.failed("文件大小不能超过5MB");
+            return R.error("文件大小不能超过5MB");
         }
 
         // 3. 检查文件扩展名
         String fileName = file.getOriginalFilename();
         if (fileName == null || !isValidExcelFile(fileName)) {
-            return R.failed("请上传Excel文件（.xlsx或.xls格式）");
+            return R.error("请上传Excel文件（.xlsx或.xls格式）");
         }
         CompanyDomainParam param = new CompanyDomainParam();
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
@@ -173,7 +173,7 @@ public class CompanyDomainController extends BaseController {
             return companyDomainService.importDomainData(param, companyDomainList);
         } catch (Exception e) {
             e.getStackTrace();
-            return R.failed("导入失败！");
+            return R.error("导入失败！");
         }
     }
 

fs-service/src/main/java/com/fs/company/service/ICompanyDomainBindService.java

@@ -2,8 +2,8 @@ package com.fs.company.service;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.common.core.domain.R;
 import com.fs.company.domain.CompanyDomainBind;
 import com.fs.company.param.CompanyDomainBindParam;
 import com.fs.company.vo.CompanyDomainBindVo;

fs-service/src/main/java/com/fs/company/service/ICompanyDomainService.java

@@ -2,7 +2,7 @@ package com.fs.company.service;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.company.domain.CompanyDomain;
 import com.fs.company.param.CompanyDomainParam;

fs-service/src/main/java/com/fs/company/service/impl/CompanyDomainBindServiceImpl.java

@@ -8,7 +8,7 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.company.domain.CompanyDomain;
@@ -132,26 +132,26 @@ public class CompanyDomainBindServiceImpl extends ServiceImpl<CompanyDomainBindM
         List<CompanyDomainBind> companyDomainBindList = baseMapper.selectList(new LambdaQueryWrapper<CompanyDomainBind>().in(CompanyDomainBind::getId, param.getCompanyIds()));
 
         if (companyDomainBindList.isEmpty()) {
-            return R.failed("分配域名企业数据不存在！");
+            return R.error("分配域名企业数据不存在！");
         }
         if (companyDomainBindList.size() != param.getCompanyIds().size()) {
-            return R.failed("分配域名中存在不存在的记录！");
+            return R.error("分配域名中存在不存在的记录！");
         }
 
         CompanyDomain domain = companyDomainMapper.selectById(companyDomainBindList.get(0).getDomainId());
 
         if (ObjectUtil.isEmpty(domain)) {
-            return R.failed("操作失败，域名不存在！");
+            return R.error("操作失败，域名不存在！");
         }
 
         //验证分配人员是否存在
         List<CompanyUser> companyUserList = companyUserMapper.getUserInfoByUserIds(param.getCompanyUserIds());
         if (companyUserList.isEmpty()) {
-            return R.failed("分配人员数据不存在！");
+            return R.error("分配人员数据不存在！");
         }
 
         if (companyUserList.size() != param.getCompanyUserIds().size()) {
-            return R.failed("分配人员中存在不存在的记录！");
+            return R.error("分配人员中存在不存在的记录！");
         }
 
         //获取分配关系

fs-service/src/main/java/com/fs/company/service/impl/CompanyDomainServiceImpl.java

@@ -5,13 +5,12 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.fs.common.core.domain.R;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyDomainBind;
-import com.fs.company.domain.CompanyDomainBindUser;
 import com.fs.company.mapper.CompanyDomainBindMapper;
 import com.fs.company.mapper.CompanyMapper;
 import com.fs.company.mapper.CompanyUserMapper;
@@ -186,21 +185,21 @@ public class CompanyDomainServiceImpl extends ServiceImpl<CompanyDomainMapper, C
         );
 
         if (domainList.isEmpty()) {
-            return R.failed("绑定域名数据不存在！");
+            return R.error("绑定域名数据不存在！");
         }
 
         if (domainList.size() != param.getDomainIds().size()) {
-            return R.failed("绑定域名中存在状态非激活或不存在的记录！");
+            return R.error("绑定域名中存在状态非激活或不存在的记录！");
         }
 
         // 验证绑定企业是否存在
         List<Company> companyList = companyMapper.selectCompanyByIds(param.getCompanyIds());
         if (companyList.isEmpty()) {
-            return R.failed("绑定企业数据不存在！");
+            return R.error("绑定企业数据不存在！");
         }
 
         if (companyList.size() != param.getCompanyIds().size()) {
-            return R.failed("绑定企业中存在不存在的记录！");
+            return R.error("绑定企业中存在不存在的记录！");
         }
 
         // 获取已存在的绑定关系
@@ -265,7 +264,7 @@ public class CompanyDomainServiceImpl extends ServiceImpl<CompanyDomainMapper, C
                 batchDomainInsert(insertList, 1000);
             }
         }
-        return R.ok(null);
+        return R.ok();
     }
 
     // 辅助方法：创建绑定对象