Commit 42205875 by 阳浪

我的诉求

parent 5f06a178
......@@ -2,6 +2,7 @@ package com.yizhi.site.application.feign.api;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.site.application.vo.domain.SystemMailboxConditionVo;
import com.yizhi.site.application.vo.domain.SystemMailboxParamVo;
import com.yizhi.site.application.vo.domain.SystemMailboxVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -29,4 +30,7 @@ public interface SystemMailboxClients {
@GetMapping("/systemMailbox/removeById")
Boolean removeById(@RequestParam("id")Long id);
@GetMapping("/systemMailbox/selectMyPage")
Page<SystemMailboxParamVo> selectMyPage(@RequestParam("pageNo")Integer pageNo, @RequestParam("pageSize")Integer pageSize);
}
package com.yizhi.site.application.vo.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* com.yizhi.site.application.vo.domain
*
* @author yanglang
* @create 2025-03-06 16:20:19
*/
@Data
public class SystemMailboxParamVo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主鍵")
private Long id;
@ApiModelProperty(value = "信箱标题")
private String fileName;
@ApiModelProperty(value = "信箱类型 1: 纪检 2: 书记")
private Integer type;
@ApiModelProperty(value = "提交时间")
private Date submitTime;
}
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.site.application.domain.SystemMailbox;
import com.yizhi.site.application.service.SystemMailboxService;
import com.yizhi.site.application.vo.domain.SystemMailboxConditionVo;
import com.yizhi.site.application.vo.domain.SystemMailboxParamVo;
import com.yizhi.site.application.vo.domain.SystemMailboxVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -40,4 +41,9 @@ public class SystemMailboxController {
public Boolean removeById(@RequestParam("id")Long id){
return systemMailboxService.removeById(id);
}
@GetMapping("selectMyPage")
public Page<SystemMailboxParamVo> selectMyPage(@RequestParam("pageNo")Integer pageNo, @RequestParam("pageSize")Integer pageSize){
return systemMailboxService.selectMyPage(pageNo,pageSize);
}
}
......@@ -2,6 +2,10 @@ package com.yizhi.site.application.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.yizhi.site.application.domain.SystemMailbox;
import com.yizhi.site.application.vo.domain.SystemMailboxParamVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* com.yizhi.site.application.mapper
......@@ -10,4 +14,9 @@ import com.yizhi.site.application.domain.SystemMailbox;
* @create 2025-01-09 13:55:24
*/
public interface SystemMailboxMapper extends BaseMapper<SystemMailbox> {
List<SystemMailboxParamVo> selectMyPage(@Param("accountId") Long accountId, @Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize);
int selectMyCount(@Param("accountId") Long accountId);
}
......@@ -3,6 +3,7 @@ package com.yizhi.site.application.service;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.yizhi.site.application.domain.SystemMailbox;
import com.yizhi.site.application.vo.domain.SystemMailboxParamVo;
import com.yizhi.site.application.vo.domain.SystemMailboxVo;
import com.yizhi.site.application.vo.domain.SystemMailboxConditionVo;
......@@ -21,4 +22,7 @@ public interface SystemMailboxService extends IService<SystemMailbox> {
SystemMailboxVo getById(Long id);
Boolean removeById(Long id);
Page<SystemMailboxParamVo> selectMyPage(Integer pageNo, Integer pageSize);
}
......@@ -14,6 +14,7 @@ import com.yizhi.site.application.domain.SystemMailbox;
import com.yizhi.site.application.mapper.MyItemConfigMapper;
import com.yizhi.site.application.mapper.SystemMailboxMapper;
import com.yizhi.site.application.service.SystemMailboxService;
import com.yizhi.site.application.vo.domain.SystemMailboxParamVo;
import com.yizhi.site.application.vo.domain.SystemMailboxVo;
import com.yizhi.site.application.vo.domain.SystemMailboxConditionVo;
import org.springframework.beans.BeanUtils;
......@@ -126,4 +127,14 @@ public class SystemMailboxServiceImpl extends ServiceImpl<SystemMailboxMapper,Sy
public Boolean removeById(Long id) {
return this.removeById(id);
}
@Override
public Page<SystemMailboxParamVo> selectMyPage(Integer pageNo,Integer pageSize){
pageNo = pageSize * (pageNo - 1);
Long accountId = ContextHolder.get().getAccountId();
Page<SystemMailboxParamVo> page = new Page<>(pageNo,pageSize);
page.setTotal(this.baseMapper.selectMyCount(accountId));
page.setRecords(this.baseMapper.selectMyPage(accountId,pageNo,pageSize));
return page;
}
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yizhi.site.application.mapper.SystemMailboxMapper">
<select id="selectMyPage" resultType="com.yizhi.site.application.vo.domain.SystemMailboxParamVo">
select
id,
file_name ,
submit_time ,
`type`
from
(
select
id,
file_name,
submit_time ,
`type`
from
system_mailbox
where
deleted = 0
and create_by_id = #{accountId}
union all
select
id,
name as file_name,
create_time as submit_time,
3 as `type`
from
cloud_trainning_project.leave_word
where
deleted = 0
and create_by_id = #{accountId}
) a
order by a.submit_time desc
LIMIT #{pageNo}, #{pageSize}
</select>
<select id="selectMyCount" resultType="java.lang.Integer">
select count(1)
from
(
select
id,
file_name,
submit_time ,
`type`
from
system_mailbox
where
deleted = 0
and create_by_id = #{accountId}
union all
select
id,
name as file_name,
create_time as submit_time,
3 as `type`
from
cloud_trainning_project.leave_word
where
deleted = 0
and create_by_id = #{accountId}
) a
</select>
</mapper>
\ No newline at end of file
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