链属导入

sc-service/src/main/java/com/huyi/service/rel/controller/CompanyRelImportController.java

@@ -6,6 +6,8 @@ import com.huyi.service.base.entity.SysCompanyRel;
 import com.huyi.service.base.entity.SysCompanySpare;
 import com.huyi.service.base.entity.SysUserCompanyRel;
 import com.huyi.service.base.service.*;
+import com.huyi.service.rel.service.IOwnCompanyRelService;
+import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.exception.BaseException;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
@@ -73,6 +75,9 @@ public class CompanyRelImportController extends BaseController
     private ISysUserCompanyRelService iSysUserCompanyRelService;
 
     @Autowired
+    private IOwnCompanyRelService iOwnCompanyRelService;
+
+    @Autowired
     private TokenService tokenService;
 
     /**
@@ -462,103 +467,24 @@ public class CompanyRelImportController extends BaseController
                     remoteSystemService.sendNotice(scyId, id,title,"01","03",null,"0",longs.toString(),null,null,null);
                 }
             }else {
-                //查询企业名称是否已经存在
-                LambdaQueryWrapper<SysCompany> companyLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                //企业名称或统一代码已存在
-                companyLambdaQueryWrapper.and(f->f.eq(SysCompany::getScyName, scyName).or().eq(SysCompany::getScySocialCode, scySocialCode));
-                //除删除状态
-                companyLambdaQueryWrapper.ne(SysCompany::getScyStatus,"99");
-                List<SysCompany> companyListist = iSysCompanyService.findSysCompanys(companyLambdaQueryWrapper);
-                if(companyListist.size() > 0){
-                    userNameList += scyName+",";
-                    failureNum++;
-                    failureMsg.append("<br/>第" + (i+1) + "行,企业名称与统一代码不匹配，不可关联此企业");
-                    log.error("新增" + scyName + "的链属，企业名称与统一代码不匹配，不可关联此企业");
-                    continue;
-                }
-                LambdaQueryWrapper<SysCompanySpare> spareLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                spareLambdaQueryWrapper.eq(SysCompanySpare::getScpCompanyId,hId);
-                spareLambdaQueryWrapper.ne(SysCompanySpare::getScpStatus,"99");
-                spareLambdaQueryWrapper.eq(SysCompanySpare::getScpSocialCode, scySocialCode);
-                List<SysCompanySpare> sysCompanySpareList = iSysCompanySpareService.findSysCompanySpares(spareLambdaQueryWrapper);
-                if(sysCompanySpareList.size() > 0){
-                    String invite = sysCompanySpareList.get(0).getScpInvite();
-                    BigDecimal bigDecimal = new BigDecimal(invite);
-                    BigDecimal tow = new BigDecimal("1");
-                    if(bigDecimal.compareTo(tow) > -1){
-                        userNameList += scyName+",";
-                        failureNum++;
-                        failureMsg.append("<br/>第" + (i+1) + "行,此企业已邀请");
-                        log.error("新增" + scyName + "的链属，此企业已邀请");
-                        continue;
-                    }
-                    String status = sysCompanySpareList.get(0).getScpStatus();
-                    if("01".equals(status)){
-                        userNameList += scyName+",";
-                        failureNum++;
-                        failureMsg.append("<br/>第" + (i+1) + "行,与此企业已是链属关系");
-                        log.error("新增" + scyName + "的链属，与此企业已是链属关系");
-                        continue;
-                    }
-                }
-                //新增链属公司信息
-                SysCompanySpare sysCompanySpare = new SysCompanySpare();
-                //主键
-                sysCompanySpare.setScpId(id);
-                //录入企业
-                sysCompanySpare.setScpCompanyId(hId);
-                //企业名称
-                sysCompanySpare.setScpName(scyName);
-                //统一社会信用代码
-                sysCompanySpare.setScpSocialCode(scySocialCode);
-                //联系人
-                sysCompanySpare.setScpContarct(scrContarct);
-                //联系电话
-                sysCompanySpare.setScpContarctPhone(scrContarctPhone);
-                //企业类型 00:供应商
-                sysCompanySpare.setScpType(NORMAL_STATE);
-                //状态 00:正常
-                sysCompanySpare.setScpStatus(NORMAL_STATE);
-                //创建人
-                sysCompanySpare.setCreateBy(userId);
-                //创建时间
-                sysCompanySpare.setCreateTime(DateUtils.getNowDate());
-//                spareRelList.add(sysCompanySpare);
-                iSysCompanySpareService.createSysCompanySpare(sysCompanySpare);
-                //联系人
-                String scpContarct = sysCompanySpare.getScpContarct();
-                //联系人手机号
-                String scpContarctPhone = sysCompanySpare.getScpContarctPhone();
-                if(CommonUtil.isNotEmpty(scpContarct) && CommonUtil.isNotEmpty(scpContarctPhone)) {
-                    String title = "【企业邀请】"+ name +"邀请"+ scyName +"非平台用户，请联系"+ scpContarct + scpContarctPhone +"跟进";
-                    remoteSystemService.sendNotice(/*企业id*/"000000", /*表主键*/id, /*标题*/title,/*待办*/"00",
-                            /*消息类型*/null,/*待办类型*/"03",/*是否发送短信*/"0", /*收到信息用户id*/"1",
-                            null, null, null);
-                    //获取字典的阿里短信模板
-//                    String templateCode = "SMS_222871823";
-//            List<SysDictData> state = RedisUtils.getDictCache("aliyun_message_code");
-//            for (SysDictData sysDictData :state){
-//                if("yaoqing".equals(sysDictData.getDictLabel())) {
-//                    templateCode = sysDictData.getDictValue();
-//                }
-//            }
-                    //获取url
-//                    String url = configService.selectConfigByKey("zc_spare");
-//                    Map msgMap = new HashMap();
-//                    msgMap.put("companyName", scpContarct);
-//                    msgMap.put("url", url);
-                    //发送短信
-//            iMessageUtilsService.sendMessageCode(scpContarctPhone, templateCode, msgMap,null);
-                    //邀请次数赋值
-                    SysCompanySpare spares = iSysCompanySpareService.getById(id);
-                    spares.setScpInvite("1");
-                    iSysCompanySpareService.updateById(spares);
-                }
+               R r = iOwnCompanyRelService.addCompanySpare(map);
+               if(r.getCode() != 200) {
+                   String msg = r.getMsg();
+                   userNameList += scyName + ",";
+                   failureNum++;
+                   failureMsg.append("<br/>第" + (i + 1) + "行," + msg);
+                   log.error("新增" + scyName + "的链属，" + msg);
+                   continue;
+               }
+                String title = "【企业邀请】:" + name + "邀请" + scyName + "非平台用户，请联系" + scrContarct + scrContarctPhone + "跟进";
+                remoteSystemService.sendNotice(/*企业id*/"000000", /*表主键*/scpId, /*标题*/title,/*待办*/"00",
+                        /*消息类型*/null,/*待办类型*/"07",/*是否发送短信*/"0", /*收到信息用户id*/"1",
+                        null, "00", null);
             }
             successNum++;
         }
         if(CommonUtil.isNotEmpty(userNameList)){
-            failureMsg.insert(0, "很抱歉，导入！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new BaseException(failureMsg.toString());
 //            return AjaxResult.success(failureMsg.toString());
         }

sc-service/src/main/java/com/huyi/service/rel/service/IOwnCompanyRelService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huyi.service.base.entity.SysCompanyRel;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.web.domain.AjaxResult;
 
 import java.util.List;
 import java.util.Map;

sc-service/src/main/java/com/huyi/service/rel/service/impl/OwnCompanyRelServiceImpl.java

@@ -15,6 +15,7 @@ import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
 import com.tianhu.common.core.utils.IdUtils;
+import com.tianhu.common.core.web.domain.AjaxResult;
 import com.tianhu.common.security.service.TokenService;
 import com.tianhu.system.api.RemoteSystemService;
 import com.tianhu.system.api.model.LoginUser;
@@ -96,7 +97,7 @@ public class OwnCompanyRelServiceImpl extends ServiceImpl<OwnCompanyRelMapper, S
 
     @Override
     @Transactional(rollbackFor=Exception.class)
-    public R addCompanySpare(@RequestBody Map map){
+    public R addCompanySpare(@RequestBody Map map) {
         //获取当前操作员
         LoginUser user = tokenService.getLoginUser();
         String companyId = user.getSysUser().getCompanyId();
@@ -188,83 +189,60 @@ public class OwnCompanyRelServiceImpl extends ServiceImpl<OwnCompanyRelMapper, S
                 spare.setScpInvite("1");
                 iSysCompanySpareService.updateById(spare);
             }
-            return R.ok();
-        }else {
-            companySpare(map);
-            return R.ok();
-        }
-    }
-
-    @Transactional(rollbackFor=Exception.class)
-    public R companySpare(@RequestBody Map map) {
-        //获取当前操作员
-        LoginUser user = tokenService.getLoginUser();
-        String companyId = user.getSysUser().getCompanyId();
-        String userId = String.valueOf(user.getSysUser().getUserId());
-
-        //链属企业名称
-        String scyName = CommonUtil.objToString(map.get("scyName"));
-        //统一社会信用代码
-        String scySocialCode = CommonUtil.objToString(map.get("scySocialCode"));
-        //链属联系人
-        String scrContarct = CommonUtil.objToString(map.get("scrContarct"));
-        //链属联系人手机号
-        String scrContarctPhone = CommonUtil.objToString(map.get("scrContarctPhone"));
-
-        //创建主键
-        String scpId = IdUtils.fastSimpleUUID();
-        //判重
-        LambdaQueryWrapper<SysCompany> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.and(f -> f.eq(SysCompany::getScyName, scyName).or().eq(SysCompany::getScySocialCode, scySocialCode));
-        lambdaQueryWrapper.ne(SysCompany::getScyStatus, "99");
-        List<SysCompany> sysCompanyList = iSysCompanyService.findSysCompanys(lambdaQueryWrapper);
-        if (sysCompanyList.size() > 0) {
-            return R.fail("企业名称与统一代码不匹配，不可链属此企业");
-        }
-        LambdaQueryWrapper<SysCompanySpare> spareLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        spareLambdaQueryWrapper.eq(SysCompanySpare::getScpCompanyId, companyId);
-        spareLambdaQueryWrapper.ne(SysCompanySpare::getScpStatus, "99");
-        spareLambdaQueryWrapper.eq(SysCompanySpare::getScpSocialCode, scySocialCode);
-        List<SysCompanySpare> spareList = iSysCompanySpareService.findSysCompanySpares(spareLambdaQueryWrapper);
-        if (spareList.size() > 0) {
-            String invite = spareList.get(0).getScpInvite();
-            BigDecimal bigDecimal = new BigDecimal(invite);
-            BigDecimal tow = new BigDecimal("1");
-            if (bigDecimal.compareTo(tow) > -1) {
-                return R.fail("该企业已邀请");
+        } else {
+            //判重
+            LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.and(f -> f.eq(SysCompany::getScyName, scyName).or().eq(SysCompany::getScySocialCode, scySocialCode));
+            queryWrapper.ne(SysCompany::getScyStatus, "99");
+            List<SysCompany> sysCompanyList = iSysCompanyService.findSysCompanys(queryWrapper);
+            if (sysCompanyList.size() > 0) {
+                return R.fail("企业名称与统一代码不匹配，不可链属此企业");
             }
-            String status = spareList.get(0).getScpStatus();
-            if ("01".equals(status)) {
-                return R.fail("与该企业已是链属关系");
+            LambdaQueryWrapper<SysCompanySpare> spareLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            spareLambdaQueryWrapper.eq(SysCompanySpare::getScpCompanyId, companyId);
+            spareLambdaQueryWrapper.ne(SysCompanySpare::getScpStatus, "99");
+            spareLambdaQueryWrapper.eq(SysCompanySpare::getScpSocialCode, scySocialCode);
+            List<SysCompanySpare> spareList = iSysCompanySpareService.findSysCompanySpares(spareLambdaQueryWrapper);
+            if (spareList.size() > 0) {
+                String invite = spareList.get(0).getScpInvite();
+                BigDecimal bigDecimal = new BigDecimal(invite);
+                BigDecimal tow = new BigDecimal("1");
+                if (bigDecimal.compareTo(tow) > -1) {
+                    return R.fail("该企业已邀请");
+                }
+                String status = spareList.get(0).getScpStatus();
+                if ("01".equals(status)) {
+                    return R.fail("与该企业已是链属关系");
+                }
+            }
+            //新增链属公司信息
+            SysCompanySpare sysCompanySpare = new SysCompanySpare();
+            sysCompanySpare.setScpId(scpId);
+            sysCompanySpare.setScpCompanyId(companyId);
+            //企业名称
+            sysCompanySpare.setScpName(scyName);
+            //统一社会信用代码
+            sysCompanySpare.setScpSocialCode(scySocialCode);
+            //联系人
+            sysCompanySpare.setScpContarct(scrContarct);
+            //联系电话
+            sysCompanySpare.setScpContarctPhone(scrContarctPhone);
+            //企业类型 00:供应商,01:核心企业
+            sysCompanySpare.setScpType(NORMAL_STATE);
+            //状态 00:正常
+            sysCompanySpare.setScpStatus(NORMAL_STATE);
+            //创建人
+            sysCompanySpare.setCreateBy(userId);
+            //创建时间
+            sysCompanySpare.setCreateTime(DateUtils.getNowDate());
+            iSysCompanySpareService.createSysCompanySpare(sysCompanySpare);
+            if (CommonUtil.isNotEmpty(scrContarct) && CommonUtil.isNotEmpty(scrContarctPhone)) {
+                //邀请次数赋值
+                SysCompanySpare spare = iSysCompanySpareService.getById(scpId);
+                spare.setScpInvite("1");
+                iSysCompanySpareService.updateById(spare);
             }
         }
-        //新增链属公司信息
-        SysCompanySpare sysCompanySpare = new SysCompanySpare();
-        sysCompanySpare.setScpId(scpId);
-        sysCompanySpare.setScpCompanyId(companyId);
-        //企业名称
-        sysCompanySpare.setScpName(scyName);
-        //统一社会信用代码
-        sysCompanySpare.setScpSocialCode(scySocialCode);
-        //联系人
-        sysCompanySpare.setScpContarct(scrContarct);
-        //联系电话
-        sysCompanySpare.setScpContarctPhone(scrContarctPhone);
-        //企业类型 00:供应商,01:核心企业
-        sysCompanySpare.setScpType(NORMAL_STATE);
-        //状态 00:正常
-        sysCompanySpare.setScpStatus(NORMAL_STATE);
-        //创建人
-        sysCompanySpare.setCreateBy(userId);
-        //创建时间
-        sysCompanySpare.setCreateTime(DateUtils.getNowDate());
-        iSysCompanySpareService.createSysCompanySpare(sysCompanySpare);
-        if (CommonUtil.isNotEmpty(scrContarct) && CommonUtil.isNotEmpty(scrContarctPhone)) {
-        //邀请次数赋值
-        SysCompanySpare spare = iSysCompanySpareService.getById(scpId);
-        spare.setScpInvite("1");
-        iSysCompanySpareService.updateById(spare);
-    }
         return R.ok();
     }
 }