|
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
+import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.aspect.annotation.PermissionData;
|
|
import org.jeecg.common.aspect.annotation.PermissionData;
|
|
@@ -22,9 +23,14 @@ import org.jeecg.common.system.api.ISysBaseAPI;
|
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.system.vo.DictModel;
|
|
import org.jeecg.common.system.vo.DictModel;
|
|
|
|
|
+import org.jeecg.common.system.vo.LoginUser;
|
|
|
|
|
+import org.jeecg.modules.smscheck.entity.SmsCheckCompany;
|
|
|
import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
|
|
import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
|
|
|
|
|
+import org.jeecg.modules.smscheck.entity.SmsCheckSmsNumber;
|
|
|
import org.jeecg.modules.smscheck.entity.SmsCheckTask;
|
|
import org.jeecg.modules.smscheck.entity.SmsCheckTask;
|
|
|
|
|
+import org.jeecg.modules.smscheck.service.ISmsCheckCompanyService;
|
|
|
import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
|
|
import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
|
|
|
|
|
+import org.jeecg.modules.smscheck.service.ISmsCheckSmsNumberService;
|
|
|
import org.jeecg.modules.smscheck.service.ISmsCheckTaskService;
|
|
import org.jeecg.modules.smscheck.service.ISmsCheckTaskService;
|
|
|
import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoVo;
|
|
import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoVo;
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
@@ -38,6 +44,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -55,7 +62,10 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
|
|
|
private ISmsCheckTaskService taskService;
|
|
private ISmsCheckTaskService taskService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ISmsCheckCustomerInfoService customerInfoService;
|
|
private ISmsCheckCustomerInfoService customerInfoService;
|
|
|
-
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private ISmsCheckCompanyService companyService;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private ISmsCheckSmsNumberService smsNumberService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ISysBaseAPI sysBaseApi;
|
|
private ISysBaseAPI sysBaseApi;
|
|
|
/**
|
|
/**
|
|
@@ -242,6 +252,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
|
|
|
*/
|
|
*/
|
|
|
@PostMapping(value = "/{taskId}/importCustomerData")
|
|
@PostMapping(value = "/{taskId}/importCustomerData")
|
|
|
public Result<?> importCustomerData(@PathVariable String taskId, @RequestBody List<SmsCheckCustomerInfoVo> list) {
|
|
public Result<?> importCustomerData(@PathVariable String taskId, @RequestBody List<SmsCheckCustomerInfoVo> list) {
|
|
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
List<SmsCheckCustomerInfo> dataList = new ArrayList<>();
|
|
List<SmsCheckCustomerInfo> dataList = new ArrayList<>();
|
|
|
int customerCount = 0;
|
|
int customerCount = 0;
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
@@ -266,6 +277,42 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
|
|
|
customerCount++;
|
|
customerCount++;
|
|
|
customerInfoService.save(info);
|
|
customerInfoService.save(info);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ // 添加公司信息 start
|
|
|
|
|
+ long companyCount = companyService.count(new LambdaQueryWrapper<SmsCheckCompany>()
|
|
|
|
|
+ .eq(SmsCheckCompany::getCustomerNo, infoVo.getCustomerNo())
|
|
|
|
|
+ .eq(SmsCheckCompany::getCustomerName, infoVo.getCustomerName()));
|
|
|
|
|
+ if (companyCount == 0) {
|
|
|
|
|
+ SmsCheckCompany company = new SmsCheckCompany();
|
|
|
|
|
+ company.setCustomerNo(infoVo.getCustomerNo());
|
|
|
|
|
+ company.setCustomerName(infoVo.getCustomerName());
|
|
|
|
|
+ company.setManager(infoVo.getStaffName());
|
|
|
|
|
+ company.setSysOrgCode(sysUser.getOrgCode());
|
|
|
|
|
+ company.setCreateBy(sysUser.getUsername());
|
|
|
|
|
+ company.setCreateTime(new Date());
|
|
|
|
|
+ companyService.save(company);
|
|
|
|
|
+ }
|
|
|
|
|
+ // 添加公司信息 end
|
|
|
|
|
+
|
|
|
|
|
+ // 添加服务号码 start
|
|
|
|
|
+ long smsNumberCount = smsNumberService.count(new LambdaQueryWrapper<SmsCheckSmsNumber>()
|
|
|
|
|
+ .eq(SmsCheckSmsNumber::getCustomerNo, infoVo.getCustomerNo())
|
|
|
|
|
+ .eq(SmsCheckSmsNumber::getSmsNumber, infoVo.getSmsNumber()));
|
|
|
|
|
+
|
|
|
|
|
+ if (smsNumberCount == 0) {
|
|
|
|
|
+ SmsCheckSmsNumber smsNumber = new SmsCheckSmsNumber();
|
|
|
|
|
+ smsNumber.setCustomerNo(infoVo.getCustomerNo());
|
|
|
|
|
+ smsNumber.setUserNo(infoVo.getUserNo());
|
|
|
|
|
+ smsNumber.setNetworkAccessTime(infoVo.getNetworkAccessTime());
|
|
|
|
|
+ smsNumber.setSmsNumber(infoVo.getSmsNumber());
|
|
|
|
|
+ smsNumber.setUserState(infoVo.getUserState());
|
|
|
|
|
+ smsNumber.setSysOrgCode(sysUser.getOrgCode());
|
|
|
|
|
+ smsNumber.setCreateBy(sysUser.getUsername());
|
|
|
|
|
+ smsNumber.setCreateTime(new Date());
|
|
|
|
|
+ smsNumberService.save(smsNumber);
|
|
|
|
|
+ }
|
|
|
|
|
+ // 添加服务号码 end
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
SmsCheckTask task = taskService.getById(taskId);
|
|
SmsCheckTask task = taskService.getById(taskId);
|
|
|
// 更新导入
|
|
// 更新导入
|