ZhangWenQiang 6 лет назад
Родитель
Сommit
87ab47af61

+ 241 - 204
happy-boot-module-hppay/src/main/java/org/jeecg/modules/user/controller/UserController.java

@@ -8,13 +8,16 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.user.entity.User;
 import org.jeecg.modules.user.service.IUserService;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,217 +38,251 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
- /**
+/**
  * @Description: 用户审核
  * @Author: jeecg-boot
- * @Date:   2019-05-30
+ * @Date: 2019-05-30
  * @Version: V1.0
  */
 @Slf4j
-@Api(tags="用户审核")
+@Api(tags = "用户审核")
 @RestController
 @RequestMapping("/user/user")
 public class UserController {
-	@Autowired
-	private IUserService userService;
-	
-	/**
-	  * 分页列表查询
-	 * @param user
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "用户审核-分页列表查询")
-	@ApiOperation(value="用户审核-分页列表查询", notes="用户审核-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<User>> queryPageList(User user,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<User>> result = new Result<IPage<User>>();
-		QueryWrapper<User> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-		Page<User> page = new Page<User>(pageNo, pageSize);
-		IPage<User> pageList = userService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param user
-	 * @return
-	 */
-	@AutoLog(value = "用户审核-添加")
-	@ApiOperation(value="用户审核-添加", notes="用户审核-添加")
-	@PostMapping(value = "/add")
-	public Result<User> add(@RequestBody User user) {
-		Result<User> result = new Result<User>();
-		try {
-			userService.save(user);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param user
-	 * @return
-	 */
-	@AutoLog(value = "用户审核-编辑")
-	@ApiOperation(value="用户审核-编辑", notes="用户审核-编辑")
-	@PutMapping(value = "/edit")
-	public Result<User> edit(@RequestBody User user) {
-		Result<User> result = new Result<User>();
-		User userEntity = userService.getById(user.getId());
-		if(userEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = userService.updateById(user);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "用户审核-通过id删除")
-	@ApiOperation(value="用户审核-通过id删除", notes="用户审核-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<User> delete(@RequestParam(name="id",required=true) String id) {
-		Result<User> result = new Result<User>();
-		User user = userService.getById(id);
-		if(user==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = userService.removeById(id);
-			if(ok) {
-				result.success("删除成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "用户审核-批量删除")
-	@ApiOperation(value="用户审核-批量删除", notes="用户审核-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<User> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<User> result = new Result<User>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.userService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "用户审核-通过id查询")
-	@ApiOperation(value="用户审核-通过id查询", notes="用户审核-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<User> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<User> result = new Result<User>();
-		User user = userService.getById(id);
-		if(user==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(user);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<User> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              User user = JSON.parseObject(deString, User.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(user, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<User> pageList = userService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "用户审核列表");
-      mv.addObject(NormalExcelConstants.CLASS, User.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("用户审核列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<User> listUsers = ExcelImportUtil.importExcel(file.getInputStream(), User.class, params);
-              for (User userExcel : listUsers) {
-                  userService.save(userExcel);
-              }
-              return Result.ok("文件导入成功!数据行数:" + listUsers.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
+    @Autowired
+    private IUserService userService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param user
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "用户审核-分页列表查询")
+    @ApiOperation(value = "用户审核-分页列表查询", notes = "用户审核-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<User>> queryPageList(User user,
+                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                             HttpServletRequest req) {
+        Result<IPage<User>> result = new Result<IPage<User>>();
+        QueryWrapper<User> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
+        Page<User> page = new Page<User>(pageNo, pageSize);
+        IPage<User> pageList = userService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param user
+     * @return
+     */
+    @AutoLog(value = "用户审核-添加")
+    @ApiOperation(value = "用户审核-添加", notes = "用户审核-添加")
+    @PostMapping(value = "/add")
+    public Result<User> add(@RequestBody User user) {
+        Result<User> result = new Result<User>();
+        try {
+            userService.save(user);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param user
+     * @return
+     */
+    @AutoLog(value = "用户审核-编辑")
+    @ApiOperation(value = "用户审核-编辑", notes = "用户审核-编辑")
+    @PutMapping(value = "/edit")
+    public Result<User> edit(@RequestBody User user) {
+        Result<User> result = new Result<User>();
+        User userEntity = userService.getById(user.getId());
+        if (userEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = userService.updateById(user);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 审核
+     *
+     * @param user
+     * @return
+     */
+    @AutoLog(value = "用户审核-审核")
+    @ApiOperation(value = "用户审核-审核", notes = "用户审核-审核")
+    @PutMapping(value = "/audit")
+    public Result<User> audit(@RequestBody User user) {
+        Result<User> result = new Result<User>();
+        User userEntity = userService.getById(user.getId());
+        if (userEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            user.setAuthenticationStatus(user.getAuthenticationStatus());
+            boolean ok = userService.updateById(user);
+            //TODO 返回false说明什么?
+            if (ok) {
+                result.success("保存成功!");
+            } else {
+                result.error("保存失败");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "用户审核-通过id删除")
+    @ApiOperation(value = "用户审核-通过id删除", notes = "用户审核-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<User> delete(@RequestParam(name = "id", required = true) String id) {
+        Result<User> result = new Result<User>();
+        User user = userService.getById(id);
+        if (user == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = userService.removeById(id);
+            if (ok) {
+                result.success("删除成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "用户审核-批量删除")
+    @ApiOperation(value = "用户审核-批量删除", notes = "用户审核-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<User> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<User> result = new Result<User>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.userService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "用户审核-通过id查询")
+    @ApiOperation(value = "用户审核-通过id查询", notes = "用户审核-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<User> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<User> result = new Result<User>();
+        User user = userService.getById(id);
+        if (user == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(user);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<User> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                User user = JSON.parseObject(deString, User.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(user, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<User> pageList = userService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "用户审核列表");
+        mv.addObject(NormalExcelConstants.CLASS, User.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("用户审核列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<User> listUsers = ExcelImportUtil.importExcel(file.getInputStream(), User.class, params);
+                for (User userExcel : listUsers) {
+                    userService.save(userExcel);
+                }
+                return Result.ok("文件导入成功!数据行数:" + listUsers.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
 
 }