Skip to content

E
email
Commit c9f611df by chentianzhong
Options

2023年3月21日

parent 60f9d0c7
Showing with 38 additions and 17 deletions
src/main/java/com/zq/email/controller/EmailController.java
...@@ -57,12 +57,16 @@ public class EmailController { ...@@ -57,12 +57,16 @@ public class EmailController {
@ApiOperation("列表总数(文件夹未读总数也可以使用这个接口，注意参数)") @ApiOperation("列表总数(文件夹未读总数也可以使用这个接口，注意参数)")
@PostMapping("total") @PostMapping("total")
public ResultVo total(@RequestBody EmailReqVo vo) { public ResultVo total(@RequestBody EmailReqVo vo) {
AssertUtils.notNull(vo.getSearchRange(), "缺少参数：searchRange");
AssertUtils.notNull(vo.getFolderId(), "缺少参数：folderId");
return ResultVo.success(emailPersonService.emailCount(vo)); return ResultVo.success(emailPersonService.emailCount(vo));
} }
@ApiOperation("列表分页") @ApiOperation("列表分页")
@PostMapping("page") @PostMapping("page")
public ResultVo page(@RequestBody EmailReqVo vo) { public ResultVo page(@RequestBody EmailReqVo vo) {
AssertUtils.notNull(vo.getSearchRange(), "缺少参数：searchRange");
AssertUtils.notNull(vo.getFolderId(), "缺少参数：folderId");
return ResultVo.success(emailPersonService.emailPage(vo)); return ResultVo.success(emailPersonService.emailPage(vo));
} }
...@@ -173,6 +177,7 @@ public class EmailController { ...@@ -173,6 +177,7 @@ public class EmailController {
@PostMapping("lastEmail") @PostMapping("lastEmail")
public ResultVo lastEmail(@RequestBody EmailLastAndAfterReqVo vo) { public ResultVo lastEmail(@RequestBody EmailLastAndAfterReqVo vo) {
AssertUtils.notNull(vo.getFolderId(), "缺少参数：folderId"); AssertUtils.notNull(vo.getFolderId(), "缺少参数：folderId");
AssertUtils.notNull(vo.getSearchRange(), "缺少参数：searchRange");
AssertUtils.notNull(vo.getCurrentPersonId(), "缺少参数：currentPersonId"); AssertUtils.notNull(vo.getCurrentPersonId(), "缺少参数：currentPersonId");
EmailPerson person = this.emailPersonService.lastAndAfterEmail(vo, 0); EmailPerson person = this.emailPersonService.lastAndAfterEmail(vo, 0);
AssertUtils.notNull(person, "没有上一封了"); AssertUtils.notNull(person, "没有上一封了");
...@@ -183,6 +188,7 @@ public class EmailController { ...@@ -183,6 +188,7 @@ public class EmailController {
@PostMapping("afterEmail") @PostMapping("afterEmail")
public ResultVo afterEmail(@RequestBody EmailLastAndAfterReqVo vo) { public ResultVo afterEmail(@RequestBody EmailLastAndAfterReqVo vo) {
AssertUtils.notNull(vo.getFolderId(), "缺少参数：folderId"); AssertUtils.notNull(vo.getFolderId(), "缺少参数：folderId");
AssertUtils.notNull(vo.getSearchRange(), "缺少参数：searchRange");
AssertUtils.notNull(vo.getCurrentPersonId(), "缺少参数：currentPersonId"); AssertUtils.notNull(vo.getCurrentPersonId(), "缺少参数：currentPersonId");
EmailPerson person = this.emailPersonService.lastAndAfterEmail(vo, 1); EmailPerson person = this.emailPersonService.lastAndAfterEmail(vo, 1);
AssertUtils.notNull(person, "没有下一封了"); AssertUtils.notNull(person, "没有下一封了");
......
src/main/java/com/zq/email/controller/EmailPersonController.java
...@@ -41,8 +41,8 @@ public class EmailPersonController { ...@@ -41,8 +41,8 @@ public class EmailPersonController {
@PostMapping("move") @PostMapping("move")
public ResultVo edit(@RequestBody EmailFolderMoveVo vo) { public ResultVo edit(@RequestBody EmailFolderMoveVo vo) {
AssertUtils.notEmpty(vo.getPersonIdList(), "缺少参数:personIdList"); AssertUtils.notEmpty(vo.getPersonIdList(), "缺少参数:personIdList");
AssertUtils.notNull(vo.getSearchRange(), "缺少参数:searchRange");
AssertUtils.notNull(vo.getFolderId(), "缺少参数:folderId"); AssertUtils.notNull(vo.getFolderId(), "缺少参数:folderId");
AssertUtils.notNull(vo.getSearchRange(), "缺少参数:searchRange");
emailPersonService.moveEmailFolder(vo); emailPersonService.moveEmailFolder(vo);
return ResultVo.success(); return ResultVo.success();
} }
......
src/main/java/com/zq/email/service/impl/EmailPersonServiceImpl.java
...@@ -218,19 +218,32 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email ...@@ -218,19 +218,32 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
@Override @Override
public void moveEmailFolder(EmailFolderMoveVo vo) { public void moveEmailFolder(EmailFolderMoveVo vo) {
List<EmailPerson> list =
this.lambdaQuery()
.in(EmailPerson::getId, vo.getPersonIdList())
.ge(EmailPerson::getSendTime, DateUtils.getRangeStart(vo.getSearchRange()))
.le(EmailPerson::getSendTime, LocalDateTime.now())
.list();
List<EmailPerson> personList = this.lambdaQuery() for (EmailPerson person : list) {
.ge(EmailPerson::getSendTime, DateUtils.getRangeStart(vo.getSearchRange())) person.setOldFolderId(person.getFolderId());
.le(EmailPerson::getSendTime, LocalDateTime.now()) person.setFolderId(vo.getFolderId());
.in(EmailPerson::getId, vo.getPersonIdList()).list();
for (EmailPerson emailPerson : personList) {
Long folderId = emailPerson.getFolderId();
LocalDateTime sendTime = emailPerson.getSendTime();
this.lambdaUpdate().eq(EmailPerson::getSendTime, sendTime)
.eq(EmailPerson::getId, emailPerson.getId())
.set(EmailPerson::getFolderId, vo.getFolderId())
.set(EmailPerson::getOldFolderId, folderId).update();
} }
this.updateBatchById(list);
// List<EmailPerson> personList = this.lambdaQuery()
// .ge(EmailPerson::getSendTime, DateUtils.getRangeStart(vo.getSearchRange()))
// .le(EmailPerson::getSendTime, LocalDateTime.now())
// .in(EmailPerson::getId, vo.getPersonIdList()).list();
// for (EmailPerson emailPerson : personList) {
// Long folderId = emailPerson.getFolderId();
// LocalDateTime sendTime = emailPerson.getSendTime();
// this.lambdaUpdate().eq(EmailPerson::getSendTime, sendTime)
// .eq(EmailPerson::getId, emailPerson.getId())
// .set(EmailPerson::getFolderId, vo.getFolderId())
// .set(EmailPerson::getOldFolderId, folderId).update();
// }
} }
@Override @Override
...@@ -387,10 +400,10 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email ...@@ -387,10 +400,10 @@ public class EmailPersonServiceImpl extends ServiceImpl<EmailPersonMapper, Email
if (type.equals(WhetherEnum.YES.getKey())){ //下 if (type.equals(WhetherEnum.YES.getKey())){ //下
queryWrapper.lt(EmailPerson::getSendTime, currentPerson.getSendTime()); queryWrapper.lt(EmailPerson::getSendTime, currentPerson.getSendTime());
queryWrapper.ge(EmailPerson::getSendTime, currentPerson.getSendTime().plusMonths(6)); queryWrapper.ge(EmailPerson::getSendTime, DateUtils.getRangeStart(vo.getSearchRange()));
queryWrapper.orderByDesc(EmailPerson::getSendTime); queryWrapper.orderByDesc(EmailPerson::getSendTime);
}else if (type.equals(WhetherEnum.NO.getKey())){ //上 }else if (type.equals(WhetherEnum.NO.getKey())){ //上
queryWrapper.lt(EmailPerson::getSendTime, currentPerson.getSendTime().plusMonths(-6)); queryWrapper.lt(EmailPerson::getSendTime, LocalDateTime.now());
queryWrapper.gt(EmailPerson::getSendTime, currentPerson.getSendTime()); queryWrapper.gt(EmailPerson::getSendTime, currentPerson.getSendTime());
queryWrapper.orderByAsc(EmailPerson::getSendTime); queryWrapper.orderByAsc(EmailPerson::getSendTime);
}else{ }else{
......
src/main/java/com/zq/email/vo/EmailFolderMoveVo.java
...@@ -20,7 +20,7 @@ public class EmailFolderMoveVo { ...@@ -20,7 +20,7 @@ public class EmailFolderMoveVo {
private List<Long> personIdList; private List<Long> personIdList;
@ApiModelProperty("查询范围，默认最近三个月") @ApiModelProperty("查询范围，默认最近三个月")
private Integer searchRange; private Integer searchRange = 0;
} }
src/main/java/com/zq/email/vo/EmailLastAndAfterReqVo.java
...@@ -20,5 +20,7 @@ public class EmailLastAndAfterReqVo { ...@@ -20,5 +20,7 @@ public class EmailLastAndAfterReqVo {
private Integer isSend; private Integer isSend;
@ApiModelProperty("当前对象的personId") @ApiModelProperty("当前对象的personId")
private Long currentPersonId; private Long currentPersonId;
@ApiModelProperty("查询范围，默认最近三个月")
private Integer searchRange = 0;
} }
src/main/resources/mapper/EmailPersonMapper.xml
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
SELECT SELECT
EA."EMAIL_CONTENT_ID" EA."EMAIL_CONTENT_ID"
FROM FROM
"EMAIL_CONTENT" EA "EMAIL_ATTACH" EA
WHERE WHERE
EA."ATTACH_NAME" LIKE concat('%', #{s.attachName}, '%') EA."ATTACH_NAME" LIKE concat('%', #{s.attachName}, '%')
) )
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
SELECT SELECT
EA."EMAIL_CONTENT_ID" EA."EMAIL_CONTENT_ID"
FROM FROM
"EMAIL_CONTENT" EA "EMAIL_ATTACH" EA
WHERE WHERE
EA."ATTACH_NAME" LIKE concat('%', #{s.attachName}, '%') EA."ATTACH_NAME" LIKE concat('%', #{s.attachName}, '%')
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment