所有列表加入日期搜索与导出功能

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java

@@ -7,6 +7,7 @@ import org.hibernate.annotations.CreationTimestamp;
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Objects;
 import java.util.Set;
@@ -19,7 +20,7 @@ import java.util.Set;
 @Getter
 @Setter
 @Table(name = "menu")
-public class Menu{
+public class Menu implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java

@@ -7,6 +7,7 @@ import org.hibernate.annotations.CreationTimestamp;
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Objects;
 import java.util.Set;
@@ -20,7 +21,7 @@ import java.util.Set;
 @Table(name = "role")
 @Getter
 @Setter
-public class Role{
+public class Role implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java

@@ -7,6 +7,7 @@ import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.Set;
@@ -19,7 +20,7 @@ import java.util.Set;
 @Getter
 @Setter
 @Table(name="user")
-public class User{
+public class User implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java

@@ -8,6 +8,7 @@ import me.zhengjie.base.BaseEntity;
 import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.sql.Timestamp;
 
 /**
@@ -19,7 +20,7 @@ import java.sql.Timestamp;
 @Setter
 @NoArgsConstructor
 @Table(name = "user_avatar")
-public class UserAvatar {
+public class UserAvatar implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java

@@ -15,6 +15,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -37,6 +40,14 @@ public class DeptController {
         this.dataScope = dataScope;
     }
 
+    @Log("导出部门数据")
+    @ApiOperation("导出部门数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('dept:list')")
+    public void download(HttpServletResponse response, DeptQueryCriteria criteria) throws IOException {
+        deptService.download(deptService.queryAll(criteria), response);
+    }
+
     @Log("查询部门")
     @ApiOperation("查询部门")
     @GetMapping

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java

@@ -14,6 +14,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
 * @author Zheng Jie
 * @date 2019-04-10
@@ -31,6 +34,14 @@ public class DictController {
         this.dictService = dictService;
     }
 
+    @Log("导出字典数据")
+    @ApiOperation("导出字典数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('dict:list')")
+    public void download(HttpServletResponse response, DictQueryCriteria criteria) throws IOException {
+        dictService.download(dictService.queryAll(criteria), response);
+    }
+
     @Log("查询字典")
     @ApiOperation("查询字典")
     @GetMapping

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java

@@ -16,6 +16,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
 * @author Zheng Jie
 * @date 2019-03-29
@@ -36,6 +39,14 @@ public class JobController {
         this.dataScope = dataScope;
     }
 
+    @Log("导出岗位数据")
+    @ApiOperation("导出岗位数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('job:list')")
+    public void download(HttpServletResponse response, JobQueryCriteria criteria) throws IOException {
+        jobService.download(jobService.queryAll(criteria), response);
+    }
+
     @Log("查询岗位")
     @ApiOperation("查询岗位")
     @GetMapping

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java

@@ -17,6 +17,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -45,6 +48,14 @@ public class MenuController {
         this.roleService = roleService;
     }
 
+    @Log("导出菜单数据")
+    @ApiOperation("导出菜单数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('menu:list')")
+    public void download(HttpServletResponse response, MenuQueryCriteria criteria) throws IOException {
+        menuService.download(menuService.queryAll(criteria), response);
+    }
+
     @ApiOperation("获取前端所需菜单")
     @GetMapping(value = "/build")
     public ResponseEntity buildMenus(){

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java

@@ -19,6 +19,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -47,6 +50,14 @@ public class RoleController {
         return new ResponseEntity<>(roleService.findById(id), HttpStatus.OK);
     }
 
+    @Log("导出角色数据")
+    @ApiOperation("导出角色数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('role:list')")
+    public void download(HttpServletResponse response, RoleQueryCriteria criteria) throws IOException {
+        roleService.download(roleService.queryAll(criteria), response);
+    }
+
     @ApiOperation("返回全部的角色")
     @GetMapping(value = "/all")
     @PreAuthorize("@el.check('roles:list','user:add','user:edit')")

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java

@@ -61,7 +61,7 @@ public class UserController {
     @ApiOperation("导出用户数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('user:list')")
-    public void update(HttpServletResponse response, UserQueryCriteria criteria) throws IOException {
+    public void download(HttpServletResponse response, UserQueryCriteria criteria) throws IOException {
         userService.download(userService.queryAll(criteria), response);
     }
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java

@@ -3,6 +3,9 @@ package me.zhengjie.modules.system.service;
 import me.zhengjie.modules.system.domain.Dept;
 import me.zhengjie.modules.system.service.dto.DeptDTO;
 import me.zhengjie.modules.system.service.dto.DeptQueryCriteria;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
@@ -27,4 +30,6 @@ public interface DeptService {
     List<Dept> findByPid(long pid);
 
     Set<Dept> findByRoleIds(Long id);
+
+    void download(List<DeptDTO> queryAll, HttpServletResponse response) throws IOException;
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java

@@ -5,13 +5,20 @@ import me.zhengjie.modules.system.service.dto.DictDTO;
 import me.zhengjie.modules.system.service.dto.DictQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
 /**
 * @author Zheng Jie
 * @date 2019-04-10
 */
 public interface DictService {
 
-    Object queryAll(DictQueryCriteria dict, Pageable pageable);
+    Map<String,Object> queryAll(DictQueryCriteria dict, Pageable pageable);
+
+    List<DictDTO> queryAll(DictQueryCriteria dict);
 
     DictDTO findById(Long id);
 
@@ -20,4 +27,6 @@ public interface DictService {
     void update(Dict resources);
 
     void delete(Long id);
+
+    void download(List<DictDTO> queryAll, HttpServletResponse response) throws IOException;
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java

@@ -5,6 +5,11 @@ import me.zhengjie.modules.system.service.dto.JobDTO;
 import me.zhengjie.modules.system.service.dto.JobQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
 /**
 * @author Zheng Jie
 * @date 2019-03-29
@@ -19,5 +24,9 @@ public interface JobService {
 
     void delete(Long id);
 
-    Object queryAll(JobQueryCriteria criteria, Pageable pageable);
+    Map<String,Object> queryAll(JobQueryCriteria criteria, Pageable pageable);
+
+    List<JobDTO> queryAll(JobQueryCriteria criteria);
+
+    void download(List<JobDTO> queryAll, HttpServletResponse response) throws IOException;
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java

@@ -4,6 +4,9 @@ import me.zhengjie.modules.system.domain.Menu;
 import me.zhengjie.modules.system.service.dto.MenuDTO;
 import me.zhengjie.modules.system.service.dto.MenuQueryCriteria;
 import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -37,4 +40,6 @@ public interface MenuService {
     Menu findOne(Long id);
 
     void delete(Set<Menu> menuSet);
+
+    void download(List<MenuDTO> queryAll, HttpServletResponse response) throws IOException;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java

@@ -5,6 +5,9 @@ import me.zhengjie.modules.system.service.dto.RoleDTO;
 import me.zhengjie.modules.system.service.dto.RoleQueryCriteria;
 import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
 import org.springframework.data.domain.Pageable;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
@@ -35,4 +38,6 @@ public interface RoleService {
     Object queryAll(RoleQueryCriteria criteria, Pageable pageable);
 
     List<RoleDTO> queryAll(RoleQueryCriteria criteria);
+
+    void download(List<RoleDTO> queryAll, HttpServletResponse response) throws IOException;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.Setter;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -13,7 +14,7 @@ import java.util.List;
 */
 @Getter
 @Setter
-public class DeptDTO{
+public class DeptDTO implements Serializable {
 
     // ID
     private Long id;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java

@@ -2,6 +2,8 @@ package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;
+
+import java.sql.Timestamp;
 import java.util.Set;
 
 /**
@@ -22,4 +24,10 @@ public class DeptQueryCriteria{
 
     @Query
     private Long pid;
+
+    @Query(type = Query.Type.GREATER_THAN,propName = "createTime")
+    private Timestamp startTime;
+
+    @Query(type = Query.Type.LESS_THAN,propName = "createTime")
+    private Timestamp endTime;
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java

@@ -3,7 +3,9 @@ package me.zhengjie.modules.system.service.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
 * @author Zheng Jie
@@ -11,7 +13,7 @@ import java.sql.Timestamp;
 */
 @Getter
 @Setter
-public class DictDTO{
+public class DictDTO implements Serializable {
 
     private Long id;
 
@@ -19,5 +21,7 @@ public class DictDTO{
 
     private String remark;
 
+    private List<DictDetailDTO> dictDetails;
+
     private Timestamp createTime;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java

@@ -3,6 +3,7 @@ package me.zhengjie.modules.system.service.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
 import java.sql.Timestamp;
 
 /**
@@ -11,7 +12,7 @@ import java.sql.Timestamp;
 */
 @Getter
 @Setter
-public class DictDetailDTO{
+public class DictDetailDTO implements Serializable {
 
     private Long id;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java

@@ -3,6 +3,8 @@ package me.zhengjie.modules.system.service.dto;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+
+import java.io.Serializable;
 import java.sql.Timestamp;
 
 /**
@@ -12,7 +14,7 @@ import java.sql.Timestamp;
 @Getter
 @Setter
 @NoArgsConstructor
-public class JobDTO{
+public class JobDTO implements Serializable {
 
     private Long id;