lichaoliu пре 4 година
родитељ
комит
638f41503d

+ 1 - 1
src/main/java/com/migao/config/authority/AuthUtils.java

@@ -1,7 +1,7 @@
 package com.migao.config.authority;
 
-import com.migao.config.response.ResponseBuilder;
 import com.alibaba.fastjson.JSON;
+import com.migao.config.response.ResponseBuilder;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

+ 3 - 0
src/main/java/com/migao/controller/UserController.java

@@ -6,6 +6,8 @@ import com.migao.config.response.ResponseBean;
 import com.migao.config.validation.Insert;
 import com.migao.entity.vo.req.UserInsertReq;
 import com.migao.entity.vo.req.UserLoginReq;
+import com.migao.entity.vo.req.UserPageQueryReq;
+import com.migao.entity.vo.res.UserQueryRes;
 import com.migao.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,4 +45,5 @@ public class UserController {
     public ResponseEntity<?> login(@RequestBody UserLoginReq userLoginReq) {
         return userService.login(userLoginReq);
     }
+
 }

+ 2 - 2
src/main/java/com/migao/entity/po/Archives.java

@@ -36,8 +36,8 @@ public class Archives {
     @Column(name = "type", columnDefinition = "varchar(255) comment '类型(资料要求)'")
     private String type;
 
-    @Column(name = "explain", columnDefinition = "varchar(255) comment '说明'")
-    private String explain;
+    @Column(name = "remark", columnDefinition = "varchar(255) comment '说明'")
+    private String remark;
 
     @Column(name = "username", columnDefinition = "varchar(255) comment '提交人'")
     private String username;

+ 22 - 0
src/main/java/com/migao/entity/vo/req/UserPageQueryReq.java

@@ -0,0 +1,22 @@
+package com.migao.entity.vo.req;
+
+import com.migao.config.response.BasePageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class UserPageQueryReq extends BasePageRequest {
+
+
+    @ApiModelProperty(value = "注册手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "用户")
+    private String name;
+
+}

+ 51 - 0
src/main/java/com/migao/entity/vo/res/UserQueryRes.java

@@ -0,0 +1,51 @@
+package com.migao.entity.vo.res;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Data
+public class UserQueryRes {
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty(value = "注册手机号")
+    @ApiModelProperty(value = "注册手机号")
+    private String phone;
+
+    @ExcelProperty(value = "用户")
+    @ApiModelProperty(value = "用户")
+    private String username;
+
+    @ExcelProperty(value = "用户名称")
+    @ApiModelProperty(value = "用户名称")
+    private String name;
+
+    @ExcelProperty(value = "部门id")
+    @ApiModelProperty(value = "部门id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long departmentId;
+
+    @ExcelProperty(value = "部门名称")
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+
+}

+ 15 - 0
src/main/java/com/migao/mapper/DepartmentMapper.java

@@ -0,0 +1,15 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.Department;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @author : lcl
+ * @date : 2020/4/16 16:28
+ */
+public interface DepartmentMapper extends BaseMapper<Department> {
+}

+ 3 - 0
src/main/java/com/migao/service/UserService.java

@@ -3,10 +3,13 @@ package com.migao.service;
 import com.migao.config.response.ResponseBean;
 import com.migao.entity.vo.req.UserInsertReq;
 import com.migao.entity.vo.req.UserLoginReq;
+import com.migao.entity.vo.req.UserPageQueryReq;
+import com.migao.entity.vo.res.UserQueryRes;
 import org.springframework.http.ResponseEntity;
 
 public interface UserService {
     ResponseEntity<?> login(UserLoginReq userLoginReq);
 
     ResponseBean<?> insert(UserInsertReq userInsertReq);
+
 }

+ 0 - 22
src/main/java/com/migao/service/impl/FileServiceImpl.java

@@ -1,38 +1,16 @@
 package com.migao.service.impl;
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.http.Header;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.migao.config.authority.AuthenticationProperties;
-import com.migao.config.authority.LoginUtils;
-import com.migao.config.constant.SystemConstant;
 import com.migao.config.properties.SystemProperties;
-import com.migao.config.response.ResponseBean;
-import com.migao.config.response.ResponseBuilder;
 import com.migao.entity.po.FileInfo;
-import com.migao.entity.vo.res.FileRes;
 import com.migao.mapper.FileInfoMapper;
 import com.migao.service.FileService;
-import com.migao.util.EntityUtils;
-import com.migao.util.FileUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 @Slf4j
 @Service