|
@@ -32,7 +32,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
|
|
@Autowired
|
|
@Autowired
|
|
private CompanyEmailConfigService companyEmailConfigService;
|
|
private CompanyEmailConfigService companyEmailConfigService;
|
|
/**
|
|
/**
|
|
- * 表格查询
|
|
|
|
|
|
+ * 公司邮箱页面展示查询
|
|
* @param email
|
|
* @param email
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -57,7 +57,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 查询邮箱发送历史
|
|
|
|
|
|
+ * 查询邮箱配置信息
|
|
* @param companyId
|
|
* @param companyId
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -76,8 +76,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
|
|
public ResultVo deleteEmail(@RequestBody IdVO comyanyEmailIdVO){
|
|
public ResultVo deleteEmail(@RequestBody IdVO comyanyEmailIdVO){
|
|
ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
|
|
ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
|
|
try{
|
|
try{
|
|
- SuccessVO successVO = companyEmailSendHistoryService.deleteEmail(comyanyEmailIdVO.getCompanyId());
|
|
|
|
- vo.setData(successVO);
|
|
|
|
|
|
+ companyEmailSendHistoryService.deleteEmail(comyanyEmailIdVO.getCompanyId());
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
vo = new ResultVo(ResultCode.SAVE_FAILED);
|
|
vo = new ResultVo(ResultCode.SAVE_FAILED);
|
|
logger.error(e.getMessage(),e);
|
|
logger.error(e.getMessage(),e);
|
|
@@ -85,15 +84,14 @@ public class CompanyEmailSendHistoryController extends BaseController {
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
- * 删除邮箱发送历史数据
|
|
|
|
|
|
+ * 批量删除邮箱发送历史数据
|
|
* @param comyanyEmailIdVO
|
|
* @param comyanyEmailIdVO
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@PostMapping("delete-email-history")
|
|
@PostMapping("delete-email-history")
|
|
public ResultVo deleteEmailHistory(@RequestBody IdVO comyanyEmailIdVO){
|
|
public ResultVo deleteEmailHistory(@RequestBody IdVO comyanyEmailIdVO){
|
|
ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
|
|
ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
|
|
- SuccessVO successVO = companyEmailSendHistoryService.deleteEmailHistory(comyanyEmailIdVO.getIdList());
|
|
|
|
- vo.setData(successVO);
|
|
|
|
|
|
+ companyEmailSendHistoryService.deleteEmailHistory(comyanyEmailIdVO.getIdList());
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -106,8 +104,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
|
|
public ResultVo saveCompanyEmailConfig(@RequestBody List<CompanyEmailConfigVO> companyEmailConfigVOList){
|
|
public ResultVo saveCompanyEmailConfig(@RequestBody List<CompanyEmailConfigVO> companyEmailConfigVOList){
|
|
ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
|
|
ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
|
|
try{
|
|
try{
|
|
- SuccessVO saveSuccessVO = companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
|
|
|
|
- vo.setData(saveSuccessVO);
|
|
|
|
|
|
+ companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
vo = new ResultVo(ResultCode.SAVE_FAILED);
|
|
vo = new ResultVo(ResultCode.SAVE_FAILED);
|
|
logger.error(e.getMessage(),e);
|
|
logger.error(e.getMessage(),e);
|
|
@@ -124,8 +121,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
|
|
public ResultVo updateCompanyEmailConfig(@RequestBody CompanyEmailConfigVO companyEmailConfigVO){
|
|
public ResultVo updateCompanyEmailConfig(@RequestBody CompanyEmailConfigVO companyEmailConfigVO){
|
|
ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
|
|
ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
|
|
try{
|
|
try{
|
|
- SuccessVO saveSuccessVO = companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
|
|
|
|
- vo.setData(saveSuccessVO);
|
|
|
|
|
|
+ companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
vo = new ResultVo(ResultCode.SAVE_FAILED);
|
|
vo = new ResultVo(ResultCode.SAVE_FAILED);
|
|
logger.error(e.getMessage(),e);
|
|
logger.error(e.getMessage(),e);
|
|
@@ -134,7 +130,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 删除邮箱配置
|
|
|
|
|
|
+ * 根据ID删除邮箱配置
|
|
* @param comyanyEmailIdVO
|
|
* @param comyanyEmailIdVO
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -142,8 +138,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
|
|
public ResultVo deleteCompanyEmailConfig(@RequestBody IdVO comyanyEmailIdVO){
|
|
public ResultVo deleteCompanyEmailConfig(@RequestBody IdVO comyanyEmailIdVO){
|
|
ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
|
|
ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
|
|
try{
|
|
try{
|
|
- SuccessVO saveSuccessVO = companyEmailConfigService.deleteCompanyEmailConfig(comyanyEmailIdVO.getId());
|
|
|
|
- vo.setData(saveSuccessVO);
|
|
|
|
|
|
+ companyEmailConfigService.deleteCompanyEmailConfig(comyanyEmailIdVO.getId());
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
vo = new ResultVo(ResultCode.DELETE_FAILED);
|
|
vo = new ResultVo(ResultCode.DELETE_FAILED);
|
|
logger.error(e.getMessage(),e);
|
|
logger.error(e.getMessage(),e);
|